Merge pull request #2562 from MicrosoftDocs/master

12/11/2019 AM Publish

Author: Taojunshen

.openpublishing.redirection.json

@@ -720,6 +720,16 @@
       "redirect_url": "/cpp/cpp/arrays-cpp",
       "redirect_document_id": false
     },
+    {
+      "source_path": "docs/cpp/overview-file-translation.md",
+      "redirect_url": "/cpp/preprocessor/phases-of-translation",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/auto-keyword.md",
+      "redirect_url": "/cpp/cpp/auto-cpp",
+      "redirect_document_id": false
+    },
     {
       "source_path": "docs/cpp/attributes2.md",
       "redirect_url": "/cpp/cpp/attributes",
@@ -735,6 +745,81 @@
       "redirect_url": "/cpp/cpp/cpp-language-reference",
       "redirect_document_id": false
     },
+    {
+      "source_path": "docs/cpp/using-wmain-instead-of-main.md",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/main-program-startup.md",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/main-function-restrictions.md",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/additional-startup-considerations.md",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/wildcard-expansion.md",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/parsing-cpp-command-line-arguments.md",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/customizing-cpp-command-line-processing.md",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/startup-and-termination-cpp.md",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/argument-definitions.md",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/exit-function.md",
+      "redirect_url": "/cpp/cpp/program-termination",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/abort-function.md",
+      "redirect_url": "/cpp/cpp/program-termination",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/return-statement-in-program-termination-cpp.md",
+      "redirect_url": "/cpp/cpp/program-termination",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/using-exit-or-return.md",
+      "redirect_url": "/cpp/cpp/program-termination",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/using-atexit.md",
+      "redirect_url": "/cpp/cpp/program-termination",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/tokens-cpp.md",
+      "redirect_url": "/cpp/cpp/character-sets",
+      "redirect_document_id": false
+    },
     {
       "source_path": "docs/cpp/objects-own-resources-raii.md",
       "redirect_url": "/cpp/cpp/object-lifetime-and-resource-management-modern-cpp",
@@ -785,6 +870,21 @@
       "redirect_url": "/cpp/cpp/program-and-linkage-cpp",
       "redirect_document_id": false
     },
+    {
+      "source_path": "docs/cpp/specifiers.md",
+      "redirect_url": "/cpp/cpp/declarations-and-definitions-cpp",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/overview-of-declarators.md",
+      "redirect_url": "/cpp/cpp/declarations-and-definitions-cpp",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/point-of-declaration-in-cpp.md",
+      "redirect_url": "/cpp/cpp/declarations-and-definitions-cpp",
+      "redirect_document_id": false
+    },
     {
       "source_path": "docs/cpp/template-friends.md",
       "redirect_url": "/cpp/cpp/templates-cpp",
@@ -13281,4 +13381,4 @@
       "redirect_document_id": false
     }
   ]
-}
+}

docs/build/cmakesettings-reference.md

@@ -27,11 +27,11 @@ A `configuration` has these properties:
 - `addressSDanitizerEnabled`: if `true` compiles the program with Address Sanitizer (Experimental on Windows). On Linux, compile with -fno-omit-frame-pointer and compiler optimization level -Os or -Oo for best results.
 - `addressSanitizerRuntimeFlags`: runtime flags passed to AddressSanitizer via the ASAN_OPTIONS environment variable. Format: flag1=value:flag2=value2.
 - `buildCommandArgs`: specifies native build switches passed to CMake after --build --. For example, passing -v when using the Ninja generator forces Ninja to output command lines. See [Ninja command line arguments](#ninja) for more information on Ninja commands.
-- `buildRoot`:  specifies the directory in which CMake generates build scripts for the chosen generator.  Maps to **-DCMAKE_BINARY_DIR** switch and specifies where the CMake cache will be created. If the folder does not exist, it is created. Supported macros include `${workspaceRoot}`, `${workspaceHash}`, `${projectFile}`, `${projectDir}`, `${thisFile}`, `${thisFileDir}`, `${name}`, `${generator}`, and `${env.VARIABLE}`.
+- `buildRoot`:  specifies the directory in which CMake generates build scripts for the chosen generator.  Maps to **-DCMAKE_BINARY_DIR** switch and specifies where *CMakeCache.txt* will be created. If the folder does not exist, it is created. Supported macros include `${workspaceRoot}`, `${workspaceHash}`, `${projectFile}`, `${projectDir}`, `${thisFile}`, `${thisFileDir}`, `${name}`, `${generator}`, `${env.VARIABLE}`.
 - `cacheGenerationCommand`: specifies a command line tool and arguments, for example *gencache.bat debug* to generate the cache. The command is run from the shell in the specified environment for the configuration when the user explicity requests regeneration, or a CMakeLists.txt or CMakeSettings.json file is modified.
-- `cacheRoot`: specifies the path to a CMake cache. This directory should contain an existing CMakeCache.txt file.
+- `cacheRoot`: specifies the path to a CMake cache. This directory should contain an existing *CMakeCache.txt* file.
 - `clangTidyChecks`: comma-separated list of warnigns which will be passed to clang-tidy; wildcards are allowed and '-' prefix will remove checks.
-- `cmakeCommandArgs`: specifies additional command-line options passed to CMake when invoked to generate the cache.
+- `cmakeCommandArgs`: specifies additional command-line options passed to CMake when invoked to generate the project files.
 - `cmakeToolchain`: specifies the toolchain file. This is passed to CMake using -DCMAKE_TOOLCHAIN_FILE."
 - `codeAnalysisRuleset`: specifies the ruleset to use when running code analysis. This can be a full path or the file name of a ruleset file installed by Visual Studio.
 - `configurationType`: specifies the build type configuration for the selected generator. May be one of:
@@ -74,22 +74,8 @@ When the active configuration specifies a Visual Studio generator, by default MS
    "buildCommandArgs": "-m:8 -v:minimal -p:PreferredToolArchitecture=x64"
    ```
 
-- `configurationType`: specifies the build type configuration for the selected generator. May be one of:
-
-  - Debug
-  - Release
-  - MinSizeRel
-  - RelWithDebInfo
- 
-- `buildRoot`:  specifies the directory in which CMake generates build scripts for the chosen generator.  Maps to **-DCMAKE_BINARY_DIR** switch and specifies where the *CMakeCache.txt* will be created. If the folder does not exist, it is created.Supported macros include `${workspaceRoot}`, `${workspaceHash}`, `${projectFile}`, `${projectDir}`, `${thisFile}`, `${thisFileDir}`, `${name}`, `${generator}`, `${env.VARIABLE}`.
 - `installRoot`: specifies the directory in which CMake generates install targets for the chosen generator. Supported macros include `${workspaceRoot}`, `${workspaceHash}`, `${projectFile}`, `${projectDir}`, `${thisFile}`, `${thisFileDir}`, `${name}`, `${generator}`, `${env.VARIABLE}`.
-- `cmakeCommandArgs`: specifies additional command-line options passed to CMake when invoked to generate the project files.
-- `cmakeToolchain`: specifies the toolchain file. This is passed to CMake using -DCMAKE_TOOLCHAIN_FILE."
-- `buildCommandArgs`: specifies native build switches passed to CMake after --build --. For example, passing -v when using the Ninja generator forces Ninja to output command lines. See [Ninja command line arguments](#ninja) for more information on Ninja commands.
-- `ctestCommandArgs`: specifies additional command-line options passed to CTest when running the tests."
-- `codeAnalysisRuleset`: specifies the ruleset to use when running code analysis. This can be a full path or the file name of a ruleset file installed by Visual Studio.
 - `inheritEnvironments`: specifies one or more compiler environments that this configuration depends on. May be any custom environment or one of the predefined environments. For more information, see [Environments](#environments).
-- `installRoot`: specifies the directory in which CMake generates install targets for the chosen generator. Supported macros include `${workspaceRoot}`, `${workspaceHash}`, `${projectFile}`, `${projectDir}`, `${thisFile}`, `${thisFileDir}`, `${name}`, `${generator}`, `${env.VARIABLE}`.
 - `intelliSenseMode`: specifies the mode used for computing intellisense information". May be one of:
 
   - windows-msvc-x86
@@ -112,7 +98,6 @@ When the active configuration specifies a Visual Studio generator, by default MS
   - linux-gcc-x64
   - linux-gcc-arm"
 
-- `cacheRoot`: specifies the path to a CMake cache. This directory should contain an existing *CMakeCache.txt* file.
 - `name`: names the configuration.  See [CMake predefined configuration reference](cmake-predefined-configuration-reference.md) for more information about the pre-defined configurations.
 - `wslPath`: the path to the launcher of an instance of Windows Subsystem for Linux.
 

docs/cpp/abort-function.md

@@ -1,6 +1,6 @@
 ---
 title: "auto (C++)"
-ms.date: "11/04/2016"
+ms.date: "12/10/2019"
 f1_keywords: ["auto_CPP", "auto"]
 helpviewer_keywords: ["auto keyword [C++]"]
 ms.assetid: e9d495d7-601c-4547-b897-998389a311f4
@@ -9,6 +9,9 @@ ms.assetid: e9d495d7-601c-4547-b897-998389a311f4
 
 Deduces the type of a declared variable from its initialization expression.
 
+> [!NOTE]
+> The C++ standard defines an original and a revised meaning for this keyword. Before Visual Studio 2010, the **auto** keyword declares a variable in the *automatic* storage class; that is, a variable that has a local lifetime. Starting with Visual Studio 2010, the **auto** keyword declares a variable whose type is deduced from the initialization expression in its declaration. The [/Zc:auto[-]](../build/reference/zc-auto-deduce-variable-type.md) compiler option controls the meaning of the **auto** keyword.
+
 ## Syntax
 
 ```

docs/cpp/additional-startup-considerations.md

@@ -9,6 +9,8 @@ ms.assetid: 961801e6-2ffd-4bf1-bb71-7f55e48d9c79
 
 This section explains concepts that are critical to understanding C++. C programmers will be familiar with many of these concepts, but there are some subtle differences that can cause unexpected program results. The following topics are included:
 
+- [C++ type system](cpp-type-system-modern-cpp.md)
+
 - [Declarations and definitions](../cpp/declarations-and-definitions-cpp.md)
 
 - [Scope of a C++ object or function](../cpp/scope-visual-cpp.md)