Fix git push error for protected CLA branch

docs/build/reference/compiler-option-warning-level.md

@@ -10,21 +10,21 @@ Specifies how the compiler generates warnings for a given compilation.
 
 ## Syntax
 
-> **/w**
-> **/W0**
-> **/W1**
-> **/W2**
-> **/W3**
-> **/W4**
-> **/Wall**
-> **/Wv**\[**:**_version_]
-> **/WX**
-> **/w1**_warning_
-> **/w2**_warning_
-> **/w3**_warning_
-> **/w4**_warning_
-> **/wd**_warning_
-> **/we**_warning_
+> **/w**\
+> **/W0**\
+> **/W1**\
+> **/W2**\
+> **/W3**\
+> **/W4**\
+> **/Wall**\
+> **/Wv**\[**:**_version_]\
+> **/WX**\
+> **/w1**_warning_\
+> **/w2**_warning_\
+> **/w3**_warning_\
+> **/w4**_warning_\
+> **/wd**_warning_\
+> **/we**_warning_\
 > **/wo**_warning_
 
 ## Remarks
@@ -81,5 +81,5 @@ The [build errors documentation](../../error-messages/compiler-errors-1/c-cpp-bu
 
 ## See also
 
-[MSVC Compiler Options](compiler-options.md)<br/>
+[MSVC Compiler Options](compiler-options.md)\
 [MSVC Compiler Command-Line Syntax](compiler-command-line-syntax.md)

docs/error-messages/compiler-warnings/compiler-warning-level-3-c4996.md

@@ -1,87 +1,85 @@
 ---
 title: "Compiler Warning (level 3) C4996"
-ms.date: "11/17/2017"
+description: "Explains why Compiler warning C4996 happens, and describes what to do about it."
+ms.date: "11/25/2019"
 f1_keywords: ["C4996"]
 helpviewer_keywords: ["C4996"]
 ms.assetid: 926c7cc2-921d-43ed-ae75-634f560dd317
 ---
 # Compiler Warning (level 3) C4996
 
-The compiler encountered a deprecated declaration. **This warning is always a deliberate message from the author of the library or included header file that you should not use the deprecated symbol without understanding the consequences.** The actual warning message is specified by the deprecation modifier or attribute at the site of the declaration.
+Your code uses a function, class member, variable, or typedef that's marked *deprecated*. Symbols are deprecated by using a [__declspec(deprecated)](../../cpp/deprecated-cpp.md) modifier, or the C++14 [\[\[deprecated\]\]](../../cpp/attributes.md) attribute. The actual C4996 warning message is specified by the `deprecated` modifier or attribute of the declaration.
 
-These are some common C4996 messages generated by the C Runtime Library and the Standard Library, but not an exhaustive list. Follow the links or read on for ways to fix the issue or to turn the warning off.
+> [!IMPORTANT]
+> This warning is always a deliberate message from the author of the header file that declares the symbol. Don't use the deprecated symbol without understanding the consequences.
 
-- [The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name: *new_name*. See online help for details.](#posix-function-names)
-
-- [This function or variable may be unsafe. Consider using *safe_version* instead. To disable deprecation, use \_CRT\_SECURE\_NO\_WARNINGS.  See online help for details.](#unsafe-crt-library-functions)
-
-- ['std::*function_name*::\_Unchecked\_iterators::\_Deprecate' Call to std::*function_name*with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators'](#unsafe-standard-library-functions)
-
-- [This function or variable has been superseded by newer library or operating system functionality. Consider using *new_item* instead. See online help for details.](#obsolete-crt-functions-and-variables)
+## Remarks
 
-## Cause
+Many functions, member functions, template functions, and global variables in Visual Studio libraries are *deprecated*. Some, such as Posix functions, are deprecated because they have a different preferred name. Some C runtime library functions are deprecated because they're insecure and have a more secure variant. Others are deprecated because they're obsolete. The deprecation messages usually include a suggested replacement for the deprecated function or global variable.
 
-C4996 occurs when the compiler encounters a function or variable that is marked as [deprecated](../../cpp/deprecated-cpp.md) by using a `__declspec(deprecated)` modifier, or when you attempt to access a function, class member or typedef that has the C++14 [\[\[deprecated\]\]](../../cpp/attributes.md) attribute. You can use the `__declspec(deprecated)` modifier or `[[deprecated]]` attribute yourself in your libraries or header files to warn your clients about deprecated functions, variables, members, or typedefs.
+## Turn off the warning
 
-## Remarks
+To fix a C4996 issue, we usually recommend you change your code. Use the suggested functions and global variables instead. If you need to use the existing functions or variables for portability reasons, you can turn off the warning.
 
-Many functions, member functions, template functions, and global variables in the libraries in Visual Studio are marked as *deprecated*. These functions are deprecated because they may have a different preferred name, may be insecure or have a more secure variant, or may be obsolete. Many deprecation messages include a suggested replacement for the deprecated function or global variable.
+To turn off the warning for a specific line of code, use the [warning](../../preprocessor/warning.md) pragma, `#pragma warning(suppress : 4996)`.
 
-To fix this issue, we usually recommend you change your code to use the suggested safer or updated functions and global variables instead. If you need to use the existing functions or variables for portability reasons, the warning can be turned off.
+To turn off the warning within a file, use the warning pragma, `#pragma warning(disable : 4996)`.
 
-### To turn the warning off without fixing the issue
+To turn off the warning globally in command-line builds, use the [/wd4996](../../build/reference/compiler-option-warning-level.md) command-line option.
 
-You can turn off the warning for a specific line of code by using the [warning](../../preprocessor/warning.md) pragma, `#pragma warning(suppress : 4996)`. You can also turn the warning off within a file by using the warning pragma, `#pragma warning(disable : 4996)`.
+To turn off the warning for an entire project in the Visual Studio IDE:
 
-You can turn the warning off globally in command line builds by using the **/wd4996** command line option.
+1. Open the **Property Pages** dialog for your project. For information on how to use the Property Pages dialog, see [Property Pages](../../build/reference/property-pages-visual-cpp.md).
 
-To turn off the warning for an entire project in the Visual Studio IDE:
+1. Select the **Configuration Properties** > **C/C++** > **Advanced** page.
 
-- Open the **Property Pages** dialog for your project. For information on how to use the Property Pages dialog, see [Property Pages](../../build/reference/property-pages-visual-cpp.md).
-- Select the **Configuration Properties**, **C/C++**, **Advanced** page.
-- Edit the **Disable Specific Warnings** property to add `4996`. Choose **OK** to apply your changes.
+1. Edit the **Disable Specific Warnings** property to add `4996`. Choose **OK** to apply your changes.
 
 You can also use preprocessor macros to turn off certain specific classes of deprecation warnings used in the libraries. These macros are described below.
 
 To define a preprocessor macro in Visual Studio:
 
-- Open the **Property Pages** dialog for your project. For information on how to use the Property Pages dialog, see [Property Pages](../../build/reference/property-pages-visual-cpp.md).
-- Expand **Configuration Properties > C/C++ > Preprocessor**.
-- In the **Preprocessor Definitions** property, add the macro name. Choose **OK** to save, and then rebuild your project.
+1. Open the **Property Pages** dialog for your project. For information on how to use the Property Pages dialog, see [Property Pages](../../build/reference/property-pages-visual-cpp.md).
 
-To define a macro only in specific source files, add a line such as `#define EXAMPLE_MACRO_NAME` before any line that includes a header file.
+1. Expand **Configuration Properties > C/C++ > Preprocessor**.
+
+1. In the **Preprocessor Definitions** property, add the macro name. Choose **OK** to save, and then rebuild your project.
 
-## Specific C4996 messages
+To define a macro only in specific source files, add a line such as `#define EXAMPLE_MACRO_NAME` before any line that includes a header file.
 
-Here are some of the common sources of C4996 warnings and errors.
+Here are some of the common sources of C4996 warnings and errors:
 
-### POSIX function names
+## POSIX function names
 
-**The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name:** *new_name*. **See online help for details.**
+**The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name:** *new-name*. **See online help for details.**
 
-Microsoft has renamed some POSIX functions in the CRT to conform with C99 and C++03 rules for implementation-defined global function names. Only the original POSIX names are deprecated, not the functions themselves. In most cases, a leading underscore was added to the POSIX function name to create a standard conformant name. The compiler issues a deprecation warning for the original function name, and suggests the preferred name.
+Microsoft renamed some POSIX functions in the CRT to conform with C99 and C++03 rules for implementation-defined global function names. Only the names are deprecated, not the functions themselves. In most cases, a leading underscore was added to the POSIX function name to create a standards conformant name. The compiler issues a deprecation warning for the original function name, and suggests the preferred name.
 
-To fix this issue, we usually recommend you change your code to use the suggested function names instead. However, the updated names are Microsoft-specific. If you need to use the existing function names for portability reasons, you can turn these warnings off. The POSIX functions are still available in the library under their original names.
+To fix this issue, we usually recommend you change your code to use the suggested function names instead. However, the updated names are Microsoft-specific. If you need to use the existing function names for portability reasons, you can turn off these warnings. The POSIX functions are still available in the library under their original names.
 
 To turn off deprecation warnings for these functions, define the preprocessor macro **\_CRT\_NONSTDC\_NO\_WARNINGS**. You can define this macro at the command line by including the option `/D_CRT_NONSTDC_NO_WARNINGS`.
 
-### Unsafe CRT Library functions
+## Unsafe CRT Library functions
+
+**This function or variable may be unsafe. Consider using** *safe-version* **instead. To disable deprecation, use \_CRT\_SECURE\_NO\_WARNINGS.  See online help for details.**
+
+Microsoft deprecated some CRT and C++ Standard Library functions and globals because more secure versions are available. Most of the deprecated functions allow unchecked read or write access to buffers. Their misuse can lead to serious security issues. The compiler issues a deprecation warning for these functions, and suggests the preferred function.
 
-**This function or variable may be unsafe. Consider using** *safe_version* **instead. To disable deprecation, use \_CRT\_SECURE\_NO\_WARNINGS.  See online help for details.**
+To fix this issue, we recommend you use the function or variable *safe-version* instead. Sometimes you can't, for portability or backwards compatibility reasons. Carefully verify it's not possible for a buffer overwrite or overread to occur in your code. Then, you can turn off the warning.
 
-Microsoft has deprecated some CRT and C++ Standard Library functions and globals in favor of more secure versions. In most cases, the deprecated functions allow unchecked read or write access to buffers, which can lead to serious security issues. The compiler issues a deprecation warning for these functions, and suggests the preferred function.
+To turn off deprecation warnings for these functions in the CRT, define **\_CRT\_SECURE\_NO\_WARNINGS**.
 
-To fix this issue, we recommend you use the function or variable *safe_version* instead. If you have verified that it's not possible for a buffer overwrite or overread to occur in your code, and you cannot change the code for portability reasons, you can turn off the warning.
+To turn off warnings about deprecated global variables, define **\_CRT\_SECURE\_NO\_WARNINGS\_GLOBALS**.
 
-To turn off deprecation warnings for these functions in the CRT, define **\_CRT\_SECURE\_NO\_WARNINGS**. To turn off warnings about deprecated global variables, define **\_CRT\_SECURE\_NO\_WARNINGS\_GLOBALS**. For more information about these deprecated functions and globals, see [Security Features in the CRT](../../c-runtime-library/security-features-in-the-crt.md) and [Safe Libraries: C++ Standard Library](../../standard-library/safe-libraries-cpp-standard-library.md).
+For more information about these deprecated functions and globals, see [Security Features in the CRT](../../c-runtime-library/security-features-in-the-crt.md) and [Safe Libraries: C++ Standard Library](../../standard-library/safe-libraries-cpp-standard-library.md).
 
-### Unsafe Standard Library functions
+## Unsafe Standard Library functions
 
 __'std::__*function_name*__::\_Unchecked\_iterators::\_Deprecate' Call to std::__*function_name* **with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D\_SCL\_SECURE\_NO\_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators'**
 
-This warning appears in debug builds because certain C++ Standard Library template functions do not check parameters for correctness. In most cases, this is because not enough information is available to the function to check container bounds, or because iterators may be used incorrectly with the function. This warning helps you identify these function uses, because they may be a source of serious security holes in your program. For more information, see [Checked Iterators](../../standard-library/checked-iterators.md).
+This warning appears in debug builds because certain C++ Standard Library template functions don't check parameters for correctness. Often it's because not enough information is available to the function to check container bounds. Or, because iterators may be used incorrectly with the function. This warning helps you identify these functions, because they may be a source of serious security holes in your program. For more information, see [Checked iterators](../../standard-library/checked-iterators.md).
 
-For example, this warning appears in Debug mode if you pass an element pointer to `std::copy` instead of a plain array. To fix this issue, use an appropriately declared array, so the library can check the array extents and do bounds checking.
+For example, this warning appears in Debug mode if you pass an element pointer to `std::copy`, instead of a plain array. To fix this issue, use an appropriately declared array, so the library can check the array extents and do bounds checking.
 
 ```cpp
 // C4996_copyarray.cpp
@@ -202,11 +200,11 @@ int main()
 }
 ```
 
-If you have verified that your code cannot have a buffer overrun error in the Standard Library functions that trigger this warning, you may want to turn this warning off. To turn off warnings for these functions, define **\_SCL\_SECURE\_NO\_WARNINGS**.
+If you've verified that your code can't have a buffer-overrun error, you can turn off this warning. To turn off warnings for these functions, define **\_SCL\_SECURE\_NO\_WARNINGS**.
 
-### Checked iterators enabled
+## Checked iterators enabled
 
-C4996 can also occur if you do not use a checked iterator when compiling with `_ITERATOR_DEBUG_LEVEL` defined as 1 or 2. It is set to 2 by default for debug mode builds, and to 0 for retail builds. See [Checked Iterators](../../standard-library/checked-iterators.md) for more information.
+C4996 can also occur if you don't use a checked iterator when `_ITERATOR_DEBUG_LEVEL` is defined as 1 or 2. It's set to 2 by default for debug mode builds, and to 0 for retail builds. For more information, see [Checked iterators](../../standard-library/checked-iterators.md).
 
 ```cpp
 // C4996_checked.cpp
@@ -228,15 +226,15 @@ int main() {
 }
 ```
 
-### Unsafe MFC or ATL code
+## Unsafe MFC or ATL code
 
-C4996 can also occur if you use MFC or ATL functions that were deprecated for security reasons.
+C4996 can occur if you use MFC or ATL functions that were deprecated for security reasons.
 
 To fix this issue, we strongly recommend you change your code to use updated functions instead.
 
 For information on how to suppress these warnings, see [_AFX_SECURE_NO_WARNINGS](../../mfc/reference/diagnostic-services.md#afx_secure_no_warnings).
 
-### Obsolete CRT functions and variables
+## Obsolete CRT functions and variables
 
 **This function or variable has been superseded by newer library or operating system functionality. Consider using** *new_item* **instead. See online help for details.**
 
@@ -246,9 +244,9 @@ To fix this issue, we recommend you change your code to use the suggested functi
 
 To turn off deprecation warnings for these items, define **\_CRT\_OBSOLETE\_NO\_WARNINGS**. For more information, see the documentation for the deprecated function or variable.
 
-### Marshalling errors in CLR code
+## Marshaling errors in CLR code
 
-C4996 can also occur when you use the CLR marshaling library. In this case C4996 is an error, not a warning. This error occurs when you use [marshal_as](../../dotnet/marshal-as.md) to convert between two data types that require a [marshal_context Class](../../dotnet/marshal-context-class.md). You can also receive this error when the marshaling library does not support a conversion. For more information about the marshaling library, see [Overview of Marshaling in C++](../../dotnet/overview-of-marshaling-in-cpp.md).
+C4996 can also occur when you use the CLR marshaling library. In this case, C4996 is an error, not a warning. The error occurs when you use [marshal_as](../../dotnet/marshal-as.md) to convert between two data types that require a [marshal_context Class](../../dotnet/marshal-context-class.md). You can also receive this error when the marshaling library doesn't support a conversion. For more information about the marshaling library, see [Overview of marshaling in C++](../../dotnet/overview-of-marshaling-in-cpp.md).
 
 This example generates C4996 because the marshaling library requires a context to convert from a `System::String` to a `const char *`.
 
@@ -273,7 +271,7 @@ int main() {
 
 ## Example: User-defined deprecated function
 
-You can use the deprecated attribute in your own code to warn callers when you no longer recommend use of certain functions. In this example, C4996 is generated for the line on which the deprecated function is declared, and for the line on which the function is used.
+You can use the deprecated attribute in your own code to warn callers when you no longer recommend use of certain functions. In this example, C4996 is generated in two places: One for the line the deprecated function is declared on, and one for the line where the function is used.
 
 ```cpp
 // C4996.cpp
@@ -286,7 +284,8 @@ void func1(void) {
    printf_s("\nIn func1");
 }
 
-__declspec(deprecated) void func1(int) {
+[[deprecated]]
+void func1(int) {
    printf_s("\nIn func2");
 }
 

docs/error-messages/tool-errors/linker-tools-warning-lnk4098.md

@@ -1,6 +1,7 @@
 ---
 title: "Linker Tools Warning LNK4098"
-ms.date: "03/26/2019"
+description: "Describes how incompatible libraries cause linker tools warning LNK4098, and how to use /NODEFAULTLIB to fix it."
+ms.date: "12/02/2019"
 f1_keywords: ["LNK4098"]
 helpviewer_keywords: ["LNK4098"]
 ms.assetid: 1f1b1408-1316-4e34-80f5-6a02f2db0ac1
@@ -28,5 +29,5 @@ The table below shows which libraries should be ignored depending on which run-t
 For example, if you received this warning and you want to create an executable file that uses the non-debug, DLL version of the run-time libraries, you could use the following options with the linker:
 
 ```cmd
-/NODEFAULTLIB:libcmt.lib NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:msvcrtd.lib
-```
+/NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:msvcrtd.lib
+```