Merge pull request #4835 from MicrosoftDocs/FromPublicMasterBranch

Confirm merge from FromPublicMasterBranch to main to sync with https://github.com/MicrosoftDocs/cpp-docs (branch main)

Author: huypub

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

@@ -22,7 +22,7 @@ The BNF grammar allows recursive definitions. For example, the grammar uses *`qu
   *`endOfLine`* | *`comment`*
 
 *`=Dir`*\
-  *`id`* = *`immExpr`* *`;;`*
+  *`id`* **`=`** *`immExpr`* *`;;`*
 
 *`addOp`*\
   **`+`** | **`-`**
@@ -492,7 +492,7 @@ The BNF grammar allows recursive definitions. For example, the grammar uses *`qu
   *`immExpr`*\
   | *`string`*\
   | **`?`**\
-  | *`constExpr`* **`DUP`** ( *`scalarInstList`* )\
+  | *`constExpr`* **`DUP`** **`(`** *`scalarInstList`* **`)`**\
   | *`floatNumber`*\
   | *`bcdConst`*
 
@@ -591,7 +591,7 @@ The BNF grammar allows recursive definitions. For example, the grammar uses *`qu
 
 *`macroCall`*\
   *`id`* *`macroArgList`* *`;;`*\
-  | *`id`* ( *`macroArgList`* )
+  | *`id`* **`(`** *`macroArgList`* **`)`**
 
 *`macroDir`*\
   *`id`* **`MACRO`** ⟦ *`macroParmList`* ⟧ *`;;`*\
@@ -716,7 +716,7 @@ The BNF grammar allows recursive definitions. For example, the grammar uses *`qu
   | **`OLDMACROS`** | **`NOOLDMACROS`**\
   | **`OLDSTRUCTS`** | **`NOOLDSTRUCTS`**\
   | **`PROC`** **`:`** *`oVisibility`*\
-  | **`PROLOGUE`** : *`macroId`*\
+  | **`PROLOGUE`** **`:`** *`macroId`*\
   | **`READONLY`** | **`NOREADONLY`**\
   | **`SCOPED`** | **`NOSCOPED`**\
   | **`SEGMENT`** **`:`** *`segSize`*\

docs/atl/reference/compiler-options-macros.md

@@ -122,7 +122,7 @@ _ATL_FREE_THREADED
 
 Specifies free threading. Free threading is equivalent to a multithread apartment model. See [Specifying the Project's Threading Model](../../atl/specifying-the-threading-model-for-a-project-atl.md) for other threading options, and [Options, ATL Simple Object Wizard](../../atl/reference/options-atl-simple-object-wizard.md) for a description of the threading models available for an ATL object.
 
-## <a name="_ATL_MODULES"></a> `_ATLMODULES`
+## <a name="_ATL_MODULES"></a> `_ATL_MODULES`
 
 Allows you to compile ATL projects with [`permissive-`](../../build/reference/permissive-standards-conformance.md) and use ATL with [C++ modules](../../cpp/modules-cpp.md).
 

docs/cpp/const-cpp.md

@@ -147,7 +147,7 @@ int main()
 
 ## C and C++ `const` differences
 
-When you declare a variable as **`const`** in a C source code file, you do so as:
+When you define a **`const`** variable in a C source code file, you do so as:
 
 ```C
 const int i = 2;
@@ -159,13 +159,18 @@ You can then use this variable in another module as follows:
 extern const int i;
 ```
 
-But to get the same behavior in C++, you must declare your **`const`** variable as:
+But to get the same behavior in C++, you must define your **`const`** variable as:
 
 ```cpp
 extern const int i = 2;
 ```
+Similar to C, you can then use this variable in another module as follows:
 
-If you wish to declare an **`extern`** variable in a C++ source code file for use in a C source code file, use:
+```cpp
+extern const int i;
+```
+
+If you wish to define an **`extern`** variable in a C++ source code file for use in a C source code file, use:
 
 ```cpp
 extern "C" const int x=10;

docs/cpp/left-shift-and-right-shift-operators-input-and-output.md

@@ -13,9 +13,9 @@ The bitwise shift operators are the right-shift operator (**`>>`**), which moves
 ## Syntax
 
 *`shift-expression`*:\
-&emsp *`additive-expression`*\
-&emsp *`shift-expression`* **`<<`** *`additive-expression`*\
-&emsp *`shift-expression`* **`>>`** *`additive-expression`*
+&emsp;*`additive-expression`*\
+&emsp;*`shift-expression`* **`<<`** *`additive-expression`*\
+&emsp;*`shift-expression`* **`>>`** *`additive-expression`*
 
 ## Remarks
 

docs/get-started/tutorial-console-cpp.md

@@ -232,7 +232,7 @@ If you build and run the code again at this point, it will still exit after aski
         {
             cin >> x >> oper >> y;
             result = c.Calculate(x, oper, y);
-            cout << "Result is: " << result << endl;
+            cout << "Result "<<"of "<< x << oper << y <<" is : "<< result << endl;
         }
 
         return 0;
@@ -602,7 +602,7 @@ If you build and run the code again at this point, it will still exit after aski
         {
             cin >> x >> oper >> y;
             result = c.Calculate(x, oper, y);
-            cout << "Result is: " << result << endl;
+            cout << "Result"<<" of "<< x << oper << y <<" is : "<< result << endl;
         }
 
         return 0;
@@ -716,13 +716,14 @@ Let's handle division by zero more gracefully, so a user can understand the prob
             if (oper == '/' && y == 0)
             {
                 cout << "Division by 0 exception" << endl;
+                cout << "Math error: Attempted to divide by Zero! "<<endl;
                 continue;
             }
             else
             {
                 result = c.Calculate(x, oper, y);
             }
-            cout << "Result is: " << result << endl;
+            cout << "Result"<<" of "<< x << oper << y <<" is : "<< result << endl;
         }
 
         return 0;