Merging changes synced from https://github.com/MicrosoftDocs/cpp-docs-pr (branch live)

Author: opbld15

docs/assembler/masm/masm-bnf-grammar.md

@@ -1,44 +1,49 @@
 ---
-description: "Learn more about: Understanding Parse Trees"
+description: "Learn more about: Understanding parse trees"
 title: "ATL Registrar and Parse Trees"
-ms.date: "11/04/2016"
+ms.date: 04/15/2021
 helpviewer_keywords: ["parse trees"]
-ms.assetid: 668ce2dd-a1c3-4ca0-8135-b25267cb6a85
 ---
-# Understanding Parse Trees
+# Understanding parse trees
 
 You can define one or more parse trees in your registrar script, where each parse tree has the following form:
 
-> \<root key>{\<registry expression>}+
+> \<root-key>{\<registry expression>}+
 
 where:
 
-> \<root key> ::= HKEY_CLASSES_ROOT \| HKEY_CURRENT_USER \|\
-> &emsp;HKEY_LOCAL_MACHINE \| HKEY_USERS \|\
-> &emsp;HKEY_PERFORMANCE_DATA \| HKEY_DYN_DATA \|\
-> &emsp;HKEY_CURRENT_CONFIG \| HKCR \| HKCU \|\
-> &emsp;HKLM \| HKU \| HKPD \| HKDD \| HKCC
-
-> \<registry expression> ::= \<Add Key> \| \<Delete Key>
-
-> \<Add Key> ::= \[**ForceRemove** \| **NoRemove** \| **val**]\<Key Name> [\<Key Value>][{\<Add Key>}]
-
-> \<Delete Key> ::= **Delete**\<Key Name>
-
-> \<Key Name> ::= **'**\<AlphaNumeric>+**'**
-
-> \<AlphaNumeric> ::= *any character not NULL, i.e. ASCII 0*
-
-> \<Key Value> ::= \<Key Type>\<Key Name>
-
-> \<Key Type> ::= **s** \| **d**
-
-> \<Key Value> ::= **'**\<AlphaNumeric>**'**
+> *\<root-key>* ::=\
+> &emsp;**`HKEY_CLASSES_ROOT`** &vert; **`HKEY_CURRENT_USER`** &vert;\
+> &emsp;**`HKEY_LOCAL_MACHINE`** &vert; **`HKEY_USERS`** &vert;\
+> &emsp;**`HKEY_PERFORMANCE_DATA`** &vert; **`HKEY_DYN_DATA`** &vert;\
+> &emsp;**`HKEY_CURRENT_CONFIG`** &vert; **`HKCR`** &vert; **`HKCU`** &vert;\
+> &emsp;**`HKLM`** &vert; **`HKU`** &vert; **`HKPD`** &vert; **`HKDD`** &vert; **`HKCC`**
+>
+> *\<registry-expression>* ::=\
+> &emsp; *\<Add-Key>* &vert; *\<Delete-Key>*
+>
+> *\<Add-Key>* ::=\
+> &emsp; \[**`ForceRemove`** &vert; **`NoRemove`** &vert; **`val`**] *\<Key-Name>* \[*\<Key-Value>*] \[ **`{`** *\<Add-Key>* **`}`** ]
+>
+> *\<Delete-Key>* ::=\
+> &emsp; **`Delete`** *\<Key-Name>*
+>
+> *\<Key-Name>* ::=\
+> &emsp; **`'`***\<AlphaNumeric>*+**`'`**
+>
+> *\<AlphaNumeric>* ::=\
+> &emsp; any non-null character.
+>
+> *\<Key-Value>* ::=\
+> &emsp; *\<Key-Type>* *\<Key-Name>*
+>
+> *\<Key-Type>* ::=\
+> &emsp; **`s`** &vert; **`d`**
 
 > [!NOTE]
-> `HKEY_CLASSES_ROOT` and `HKCR` are equivalent; `HKEY_CURRENT_USER` and `HKCU` are equivalent; and so on.
+> **`HKEY_CLASSES_ROOT`** and **`HKCR`** are equivalent; **`HKEY_CURRENT_USER`** and **`HKCU`** are equivalent; and so on.
 
-A parse tree can add multiple keys and subkeys to the \<root key>. In doing so, it keeps a subkey's handle open until the parser has completed parsing all of its subkeys. This approach is more efficient than operating on a single key at a time, as seen in the following example:
+A parse tree can add multiple keys and subkeys to the \<root-key>. The Registrar keeps each subkey handle open until the parser has completed parsing all of its subkeys. It's more efficient than operating on a single key at a time. Here's an example:
 
 ```rgs
 HKEY_CLASSES_ROOT
@@ -53,8 +58,8 @@ HKEY_CLASSES_ROOT
 }
 ```
 
-Here, the Registrar initially opens (creates) `HKEY_CLASSES_ROOT\MyVeryOwnKey`. It then sees that `MyVeryOwnKey` has a subkey. Rather than close the key to `MyVeryOwnKey`, the Registrar retains the handle and opens (creates) `HasASubKey` using this parent handle. (The system registry can be slower when no parent handle is open.) Thus, opening `HKEY_CLASSES_ROOT\MyVeryOwnKey` and then opening `HasASubKey` with `MyVeryOwnKey` as the parent is faster than opening `MyVeryOwnKey`, closing `MyVeryOwnKey`, and then opening `MyVeryOwnKey\HasASubKey`.
+Here, the Registrar initially opens (creates) `HKEY_CLASSES_ROOT\MyVeryOwnKey`. It then sees that `MyVeryOwnKey` has a subkey. Rather than close the key to `MyVeryOwnKey`, the Registrar keeps the handle and opens (creates) `HasASubKey` using this parent handle. (The system registry can be slower when no parent handle is open.) So, opening `HKEY_CLASSES_ROOT\MyVeryOwnKey` and then opening `HasASubKey` with `MyVeryOwnKey` as the parent is faster than opening `MyVeryOwnKey`, closing `MyVeryOwnKey`, and then opening `MyVeryOwnKey\HasASubKey`.
 
 ## See also
 
-[Creating Registrar Scripts](../atl/creating-registrar-scripts.md)
+[Creating registrar scripts](../atl/creating-registrar-scripts.md)

docs/atl/understanding-parse-trees.md

@@ -12,36 +12,36 @@ Defines a preprocessing symbol for a source file.
 
 ## Syntax
 
-> **/D**\[ ]_name_\[`=` \| `#` \[{ *string* \| *number* }] ]\
-> **/D**\[ ]`"`_name_\[`=` \| `#` \[{ *string* \| *number* }] ]`"`
+> **`/D`**\[ ]_name_\[`=` | `#` \[{ *string* | *number* }] ]\
+> **`/D`**\[ ]`"`_name_\[`=` | `#` \[{ *string* | *number* }] ]`"`
 
 ## Remarks
 
 You can use this symbol together with `#if` or `#ifdef` to compile source code conditionally. The symbol definition remains in effect until it's redefined in the code, or is undefined in the code by an `#undef` directive.
 
-**/D** has the same effect as a `#define` directive at the beginning of a source code file. The difference is that **/D** strips quotation marks on the command line, and a `#define` directive keeps them. You can have whitespace between the **/D** and the symbol. There can't be whitespace between the symbol and the equals sign, or between the equals sign and any value assigned.
+**`/D`** has the same effect as a `#define` directive at the beginning of a source code file. The difference is that **`/D`** strips quotation marks on the command line, and a `#define` directive keeps them. You can have whitespace between the **`/D`** and the symbol. There can't be whitespace between the symbol and the equals sign, or between the equals sign and any value assigned.
 
 By default, the value associated with a symbol is 1. For example, `/D name` is equivalent to `/D name=1`. In the example at the end of this article, the definition of `TEST` is shown to print `1`.
 
 Compiling by using `/D name=` causes the symbol *name* to have no associated value. Although the symbol can still be used to conditionally compile code, it otherwise evaluates to nothing. In the example, if you compile by using `/DTEST=`, an error occurs. This behavior resembles the use of `#define` with or without a value.
 
-The **/D** option doesn't support function-like macro definitions. To insert definitions that can't be defined on the command line, consider the [/FI (Name forced include file)](fi-name-forced-include-file.md) compiler option.
+The **`/D`** option doesn't support function-like macro definitions. To insert definitions that can't be defined on the command line, consider the [`/FI` (Name forced include file)](fi-name-forced-include-file.md) compiler option.
 
-You can use **/D** multiple times on the command line to define additional symbols. If the same symbol is defined more than once, the last definition is used.
+You can use **`/D`** multiple times on the command line to define more symbols. If the same symbol is defined more than once, the last definition is used.
 
 This command defines the symbol DEBUG in TEST.c:
 
 ```cmd
 CL /DDEBUG TEST.C
 ```
 
-This command removes all occurrences of the keyword `__far` in TEST.c:
+This command removes all occurrences of the keyword **`__far`** in TEST.c:
 
 ```cmd
 CL /D __far= TEST.C
 ```
 
-The **CL** environment variable can't be set to a string that contains the equal sign. To use **/D** together with the **CL** environment variable, you must specify the number sign (`#`) instead of the equal sign:
+The **CL** environment variable can't be set to a string that contains the equal sign. To use **`/D`** together with the **`CL`** environment variable, you must specify the number sign (`#`) instead of the equal sign:
 
 ```cmd
 SET CL=/DTEST#0
@@ -57,11 +57,11 @@ CL /DTEST=%% TEST.C
 
 1. Open the project **Property Pages** dialog box. For more information, see [Set C++ compiler and build properties in Visual Studio](../working-with-project-properties.md).
 
-1. In the left pane, select **Configuration Properties**, **C/C++**, **Preprocessor**.
+1. Select the **Configuration Properties** > **C/C++** > **Preprocessor** property page.
 
-1. In the right pane, in the right-hand column of the **Preprocessor Definitions** property, open the drop-down menu and choose **Edit**.
+1. Open the drop-down menu of the **Preprocessor Definitions** property and choose **Edit**.
 
-1. In the **Preprocessor Definitions** dialog box, add (one per line), modify, or delete one or more definitions. Choose **OK** to save your changes.
+1. In the **Preprocessor Definitions** dialog box, add, modify, or delete one or more definitions, one per line. Choose **OK** to save your changes.
 
    You don't need to include the '/D' option prefix on the definitions you specify here. In the property page, definitions are separated by semicolons (`;`).
 
@@ -92,9 +92,9 @@ TEST defined 1
 
 ## See also
 
-[MSVC Compiler Options](compiler-options.md)\
-[MSVC Compiler Command-Line Syntax](compiler-command-line-syntax.md)\
-[/FI (Name forced include file)](fi-name-forced-include-file.md)\
-[/U, /u (Undefine Symbols)](u-u-undefine-symbols.md)\
-[#undef Directive (C/C++)](../../preprocessor/hash-undef-directive-c-cpp.md)\
-[#define Directive (C/C++)](../../preprocessor/hash-define-directive-c-cpp.md)
+[MSVC compiler options](compiler-options.md)\
+[MSVC compiler command-line syntax](compiler-command-line-syntax.md)\
+[`/FI` (Name forced include file)](fi-name-forced-include-file.md)\
+[`/U`, `/u` (Undefine Symbols)](u-u-undefine-symbols.md)\
+[`#undef` Directive (C/C++)](../../preprocessor/hash-undef-directive-c-cpp.md)\
+[`#define` Directive (C/C++)](../../preprocessor/hash-define-directive-c-cpp.md)

docs/build/cmake-presets-vs.md

@@ -1,64 +1,72 @@
 ---
 description: "Learn more about: /GENPROFILE, /FASTGENPROFILE (Generate Profiling Instrumented Build)"
 title: "/GENPROFILE, /FASTGENPROFILE (Generate Profiling Instrumented Build)"
-ms.date: "03/14/2018"
+ms.date: 04/14/2021
 f1_keywords: ["GENPROFILE", "FASTGENPROFILE", "/GENPROFILE", "/FASTGENPROFILE"]
 helpviewer_keywords: ["GENPROFILE", "FASTGENPROFILE"]
-ms.assetid: deff5ce7-46f5-448a-b9cd-a7a83a6864c6
 ---
-# /GENPROFILE, /FASTGENPROFILE (Generate Profiling Instrumented Build)
+# `/GENPROFILE`, `/FASTGENPROFILE` (Generate Profiling Instrumented Build)
 
-Specifies generation of a .pgd file by the linker to support profile-guided optimization (PGO). **/GENPROFILE** and **/FASTGENPROFILE** use different default parameters. Use **/GENPROFILE** to favor precision over speed and memory usage during profiling. Use **/FASTGENPROFILE** to favor smaller memory usage and speed over precision.
+Specifies generation of a *`.pgd`* file by the linker to support profile-guided optimization (PGO). **`/GENPROFILE`** and **`/FASTGENPROFILE`** use different default parameters. Use **`/GENPROFILE`** to favor precision over speed and memory usage during profiling. Use **`/FASTGENPROFILE`** to favor smaller memory usage and speed over precision.
 
 ## Syntax
 
-> **/GENPROFILE**\[**:**{\[**COUNTER32**\|**COUNTER64**]\|\[**EXACT**\|**NOEXACT**]\|**MEMMAX=**_#_\|**MEMMIN=**_#_\|\[**PATH**\|**NOPATH**]\|\[**TRACKEH** \|**NOTRACKEH** ]\|**PGD=**_filename_}]\
-> **/FASTGENPROFILE**\[**:**{\[**COUNTER32**\|**COUNTER64**]\|\[**EXACT**\|**NOEXACT**]\|**MEMMAX=**_#_\|**MEMMIN=**_#_\|[**PATH**\|**NOPATH** ]\|\[**TRACKEH** \|**NOTRACKEH** ]\|**PGD=**_filename_}]
+> **`/GENPROFILE`**\[**`:`**_`profile-argument`_\[**`,`**_`profile-argument`_ ...]]\
+> **`/FASTGENPROFILE`**\[**`:`**_`profile-argument`_\[**`,`**_`profile-argument`_ ...]]\
+
+> *`profile-argument`*\
+>  { **`COUNTER32`** | **`COUNTER64`** }\
+>  { **`EXACT`** | **`NOEXACT`** }\
+>  **`MEMMAX=`**_value_\
+>  **`MEMMIN=`**_value_\
+>  { **`PATH`** | **`NOPATH`** }\
+>  { **`TRACKEH`** | **`NOTRACKEH`** }\
+>  **`PGD=`**_filename_
 
 ### Arguments
 
-Any of the following arguments may be specified to **/GENPROFILE** or **/FASTGENPROFILE**. Arguments listed here separated by a pipe (**|**) character are mutually exclusive. Use a comma (**,**) character to separate options.
+Any of the *`profile-argument`* arguments may be specified to **`/GENPROFILE`** or **`/FASTGENPROFILE`**. Arguments listed here separated by a pipe character (**`|`**) are mutually exclusive. Use a comma character (**`,`**) to separate arguments. Don't put spaces between arguments, commas, or after the colon (**`:`**).
 
-**COUNTER32** &#124; **COUNTER64**<br/>
-Use **COUNTER32** to specify the use of 32-bit probe counters, and **COUNTER64** to specify  64-bit probe counters. When you specify **/GENPROFILE**, the default is **COUNTER64**. When you specify **/FASTGENPROFILE**, the default is **COUNTER32**.
+**`COUNTER32`** &vert; **`COUNTER64`**\
+Use **`COUNTER32`** to specify the use of 32-bit probe counters, and **`COUNTER64`** to specify  64-bit probe counters. When you specify **`/GENPROFILE`**, the default is **`COUNTER64`**. When you specify **`/FASTGENPROFILE`**, the default is **`COUNTER32`**.
 
-**EXACT** &#124; **NOEXACT**<br/>
-Use **EXACT** to specify thread-safe interlocked increments for probes. **NOEXACT** specifies unprotected increment operations for probes. The default is **NOEXACT**.
+**`EXACT`** &vert; **`NOEXACT`**\
+Use **`EXACT`** to specify thread-safe interlocked increments for probes. **`NOEXACT`** specifies unprotected increment operations for probes. The default is **`NOEXACT`**.
 
-**MEMMAX**=*value*, **MEMMIN**=*value*<br/>
-Use **MEMMAX** and **MEMMIN** to specify the maximum and minimum reservation sizes for training data in memory. The value is the amount of memory to reserve in bytes. By default, these values are determined by an internal heuristic.
+**`MEMMAX`**=*value*, **`MEMMIN`**=*value*\
+Use **`MEMMAX`** and **`MEMMIN`** to specify the maximum and minimum reservation sizes for training data in memory. The value is the amount of memory to reserve in bytes. By default, these values are determined by an internal heuristic.
 
-**PATH**  &#124; **NOPATH** <br/>
-Use **PATH**  to specify a separate set of PGO counters for each unique path to a function. Use **NOPATH**  to specify only one set of counters for each function. When you specify **/GENPROFILE**, the default is **PATH** . When you specify **/FASTGENPROFILE**, the default is **NOPATH** .
+**`PATH`**  &vert; **`NOPATH`**\
+Use **`PATH`**  to specify a separate set of PGO counters for each unique path to a function. Use **`NOPATH`**  to specify only one set of counters for each function. When you specify **`/GENPROFILE`**, the default is **`PATH`** . When you specify **`/FASTGENPROFILE`**, the default is **`NOPATH`** .
 
-**TRACKEH**  &#124; **NOTRACKEH** <br/>
-Specifies whether to use extra counters to keep an accurate count when exceptions are thrown during training. Use **TRACKEH**  to specify extra counters for an exact count. Use **NOTRACKEH**  to specify single counters for code that does not use exception handling or that does not encounter exceptions in your training scenarios.  When you specify **/GENPROFILE**, the default is **TRACKEH** . When you specify **/FASTGENPROFILE**, the default is **NOTRACKEH** .
+**`TRACKEH`**  &vert; **`NOTRACKEH`**\
+Specifies whether to use extra counters to keep an accurate count when exceptions are thrown during training. Use **`TRACKEH`**  to specify extra counters for an exact count. Use **`NOTRACKEH`**  to specify single counters for code that doesn't use exception handling or that doesn't run into exceptions in your training scenarios.  When you specify **`/GENPROFILE`**, the default is **`TRACKEH`** . When you specify **`/FASTGENPROFILE`**, the default is **`NOTRACKEH`** .
 
-**PGD**=*filename*<br/>
-Specifies a base file name for the .pgd file. By default, the linker uses the base executable image file name with a .pgd extension.
+**`PGD`**=*filename*\
+Specifies a base file name for the *`.pgd`* file. By default, the linker uses the base executable image file name with a *`.pgd`* extension.
 
 ## Remarks
 
-The **/GENPROFILE** and **/FASTGENPROFILE** options tell the linker to generate the profiling instrumentation file needed to support application training for profile-guided optimization (PGO). These options are new in Visual Studio 2015. Prefer these options to the deprecated **/LTCG:PGINSTRUMENT**, **/PGD** and **/POGOSAFEMODE** options and the **PogoSafeMode**, **VCPROFILE_ALLOC_SCALE** and **VCPROFILE_PATH** environment variables. The profiling information generated by application training is used as input to perform targeted whole-program optimizations during builds. You can set additional options to control various profiling features for performance during app training and builds. The default options specified by **/GENPROFILE** give most accurate results, especially for large, complex multi-threaded apps. The **/FASTGENPROFILE** option uses different defaults for a lower memory footprint and faster performance during training, at the expense of accuracy.
+The **`/GENPROFILE`** and **`/FASTGENPROFILE`** options tell the linker to generate the profiling instrumentation file needed to support application training for profile-guided optimization (PGO). These options are new in Visual Studio 2015. Prefer these options to the deprecated **`/LTCG:PGINSTRUMENT`**, **`/PGD`**, and **`/POGOSAFEMODE`** options, and to the **`PogoSafeMode`**, **`VCPROFILE_ALLOC_SCALE`**, and **`VCPROFILE_PATH`** environment variables. The profiling information generated by application training is used as input for targeted whole-program optimizations during builds. You can also set other options to control various profiling features for performance during app training and builds. The default options specified by **`/GENPROFILE`** give the most accurate results, especially for large, complex multi-threaded apps. The **`/FASTGENPROFILE`** option uses different defaults for a lower memory footprint and faster performance during training, at the expense of accuracy.
 
-Profiling information is captured when you run the instrumented app after you build by using **/GENPROFILE** of **/FASTGENPROFILE**. This information is captured when you specify the [/USEPROFILE](useprofile.md) linker option to perform the profiling step and then used to guide the optimized build step. For more information on how to train your app and details on the collected data, see [Profile-Guided Optimizations](../profile-guided-optimizations.md).
+Profiling information is captured when you run the instrumented app after you build by using **`/GENPROFILE`** of **`/FASTGENPROFILE`**. This information is captured when you specify the [`/USEPROFILE`](useprofile.md) linker option to do the profiling step and then used to guide the optimized build step. For more information on how to train your app and details on the collected data, see [Profile-guided optimizations](../profile-guided-optimizations.md).
 
-You must also specify **/LTCG** when you specify **/GENPROFILE** or **/FASTGENPROFILE**.
+Always specify **`/LTCG`** when you specify **`/GENPROFILE`** or **`/FASTGENPROFILE`**.
 
 ### To set this linker option in the Visual Studio development environment
 
 1. Open the project's **Property Pages** dialog box. For details, see [Set C++ compiler and build properties in Visual Studio](../working-with-project-properties.md).
 
 1. Select the **Configuration Properties** > **Linker** > **Command Line** property page.
 
-1. Enter the **/GENPROFILE** or **/FASTGENPROFILE** options and arguments into the **Additional Options** box. Choose **OK** to save your changes.
+1. Enter the **`/GENPROFILE`** or **`/FASTGENPROFILE`** options and arguments into the **Additional Options** box. Choose **`OK`** to save your changes.
 
 ### To set this linker option programmatically
 
 - See <xref:Microsoft.VisualStudio.VCProjectEngine.VCLinkerTool.AdditionalOptions%2A>.
 
 ## See also
 
-[MSVC linker reference](linking.md)<br/>
-[MSVC Linker Options](linker-options.md)<br/>
-[/LTCG (Link-time Code Generation)](ltcg-link-time-code-generation.md)<br/>
+[MSVC linker reference](linking.md)\
+[MSVC linker options](linker-options.md)\
+[`/LTCG` (Link-time code generation)](ltcg-link-time-code-generation.md)