Merge pull request MicrosoftDocs#4698 from MicrosoftDocs/main638294454595223785sync_temp

For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error

Author: learn-build-service-prod[bot]

docs/build/reference/zc-check-gwodr.md

@@ -0,0 +1,34 @@
+---
+title: "/Zc:zc-checkGwOdr (Enforce Standard C++ ODR violations under /Gw)"
+description: "Learn about the Microsoft C++ /Zc:checkGwOdr compiler option for improving C++ standards conformance when using /Gw (Optimize global data)"
+ms.date: 08/31/2023
+f1_keywords: ["/Zc:checkGwOdr"]
+helpviewer_keywords: ["/Zc:checkGwOdr", "Zc:checkGwOdr", "-Zc:checkGwOdr"]
+---
+# `/Zc:checkGwOdr` (Enforce Standard C++ ODR violations under `/Gw`)
+
+This switch enforces C++ standards conformance when using [`/Gw` (Optimize global data)](gw-optimize-global-data.md). When using `/Gw`, certain One Definition Rule (ODR) violations are ignored. This flag ensures that the appropriate errors are raised.
+
+## Syntax
+
+> **`/Zc:checkGwOdr`**\[**`-`**]
+
+## Remarks
+
+This switch is off by default.
+
+To see an example of ODR violations that are ignored when using `/Gw`, see [Standards conformance improvements to /Gw](https://devblogs.microsoft.com/cppblog/standards-conformance-improvements-to-gw-in-visual-studio-version-17-5-preview-2/).
+
+### To set this compiler 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** > **C/C++** > **Command Line** property page.
+
+1. Modify the **Additional Options** property to include *`/Zc:checkGwOdr`* or *`/Zc:checkGwOdr-`* and then choose **OK**.
+
+## See also
+
+[`/Zc` (Conformance)](zc-conformance.md)\
+[One Definition Rule (ODR)](https://en.wikipedia.org/wiki/One_Definition_Rule)\
+[Standards conformance improvements to /Gw](https://devblogs.microsoft.com/cppblog/standards-conformance-improvements-to-gw-in-visual-studio-version-17-5-preview-2/)

docs/build/reference/zc-conformance.md

@@ -1,7 +1,7 @@
 ---
 title: "/Zc (Conformance)"
 description: "The /Zc conformance compiler options enable or disable support for conforming or backward-compatible behavior."
-ms.date: 08/29/2023
+ms.date: 08/31/2023
 helpviewer_keywords: ["/Zc compiler options [C++]", "-Zc compiler options [C++]", "Conformance compiler options", "Zc compiler options [C++]"]
 ---
 # `/Zc` (Conformance)
@@ -27,6 +27,7 @@ Here are the **`/Zc`** compiler options:
 | [`/Zc:alignedNew[-]`](zc-alignednew.md) | Enable C++17 over-aligned dynamic allocation. Off by default unless **`/std:c++17`** or later is specified. |
 | [`/Zc:auto[-]`](zc-auto-deduce-variable-type.md) | Enforce the new Standard C++ meaning for **`auto`**. On by default. |
 | [`/Zc:char8_t[-]`](zc-char8-t.md) | Enable or disable C++20 native `u8` literal support as `const char8_t`. Off by default unless **`/std:c++20`** or later is specified. |
+| [`/Zc:checkGwOdr[-]`](zc-check-gwodr.md) | Enforce Standard C++ ODR violations under `/Gw`. |
 | [`/Zc:enumTypes[-]`](zc-enumtypes.md) | Enable Standard C++ rules for `enum` type deduction. Off by default. |
 | [`/Zc:externC[-]`](zc-externc.md) | Enforce Standard C++ rules for `extern "C"` functions. Off by default unless **`/permissive-`** is specified. |
 | [`/Zc:externConstexpr[-]`](zc-externconstexpr.md) | Enable external linkage for **`constexpr`** variables. Off by default. |

docs/build/toc.yml

@@ -773,7 +773,7 @@ items:
                 - name: /Zc (Conformance)
                   expanded: false
                   items: 
-                    - name: /Zc (Conformance)
+                    - name: "/Zc (Conformance)"
                       href: ../build/reference/zc-conformance.md
                     - name: "/Zc:__cplusplus (Enable updated __cplusplus macro)"
                       href: ../build/reference/zc-cplusplus.md
@@ -785,7 +785,9 @@ items:
                       href: ../build/reference/zc-auto-deduce-variable-type.md
                     - name: "/Zc:char8_t (Enable C++20 char8_t type)"
                       href: ../build/reference/zc-char8-t.md
-                    - name: '/Zc:enumTypes (Enable enum type deduction)'
+                    - name: "/Zc:checkGwOdr (Enforce Standard C++ ODR violations under /Gw)"
+                      href: ../build/reference/zc-check-gwodr.md
+                    - name: "/Zc:enumTypes (Enable enum type deduction)"
                       href: ../build/reference/zc-enumtypes.md
                     - name: '/Zc:externC (Use Standard C++ extern "C" rules)'
                       href: ../build/reference/zc-externc.md