versioning updates in progress

Michael Blome · Michael Blome · commit b05ec04bd043 · 2018-05-31T10:05:46.000-07:00
diff --git a/docs/build/reference/debug-generate-debug-info.md b/docs/build/reference/debug-generate-debug-info.md
@@ -25,7 +25,7 @@ The linker puts the debugging information into a program database (PDB) file. It
   
 An executable (.exe file or DLL) created for debugging contains the name and path of the corresponding PDB. The debugger reads the embedded name and uses the PDB when you debug the program. The linker uses the base name of the program and the extension .pdb to name the program database, and embeds the path where it was created. To override this default, set [/PDB](../../build/reference/pdb-use-program-database.md) and specify a different file name.  
 
-The **/DEBUG:FASTLINK** option leaves private symbol information in the individual compilation products used to build the executable. It generates a limited PDB that indexes into the debug information in the object files and libraries used to build the executable instead of making a full copy. This option can link from two to four times as fast as full PDB generation, and is recommended when you are debugging locally and have the build products available. This limited PDB can't be used for debugging when the required build products are not available, such as when the executable is deployed on another computer. In a developer command prompt, you can use the mspdbcmf.exe tool to generate a full PDB from this limited PDB. In Visual Studio, use the Project or Build menu items for generating a full PDB file to create a full PDB for the project or solution.  
+The **/DEBUG:FASTLINK** option is available in Visual Studio 2017 and later. This option leaves private symbol information in the individual compilation products used to build the executable. It generates a limited PDB that indexes into the debug information in the object files and libraries used to build the executable instead of making a full copy. This option can link from two to four times as fast as full PDB generation, and is recommended when you are debugging locally and have the build products available. This limited PDB can't be used for debugging when the required build products are not available, such as when the executable is deployed on another computer. In a developer command prompt, you can use the mspdbcmf.exe tool to generate a full PDB from this limited PDB. In Visual Studio, use the Project or Build menu items for generating a full PDB file to create a full PDB for the project or solution.  
   
 The **/DEBUG:FULL** option moves all private symbol information from individual compilation products (object files and libraries) into a single PDB, and can be the most time-consuming part of the link. However, the full PDB can be used to debug the executable when no other build products are available, such as when the executable is deployed.  
   
diff --git a/docs/build/reference/permissive-standards-conformance.md b/docs/build/reference/permissive-standards-conformance.md
@@ -21,7 +21,9 @@ Specify standards conformance mode to the compiler. Use this option to help you
 
 ## Remarks
 
-You can use the **/permissive-** compiler option in Visual Studio 2017 and later to specify standards-conforming compiler behavior. This option disables permissive behaviors, and sets the [/Zc](../../build/reference/zc-conformance.md) compiler options for strict conformance. In the IDE, this option also makes the IntelliSense engine underline non-conforming code.
+This option is supported in Visual Studio 2017 and later.
+
+You can use the **/permissive-** compiler option to specify standards-conforming compiler behavior. This option disables permissive behaviors, and sets the [/Zc](../../build/reference/zc-conformance.md) compiler options for strict conformance. In the IDE, this option also makes the IntelliSense engine underline non-conforming code.
 
 By default, the **/permissive-** option is set in new projects created by Visual Studio 2017 version 15.5 and later versions. It is not set by default in earlier versions. When the option is set, the compiler generates diagnostic errors or warnings when non-standard language constructs are detected in your code, including some common bugs in pre-C++11 code.
 
diff --git a/docs/build/reference/qspectre.md b/docs/build/reference/qspectre.md
@@ -21,7 +21,7 @@ Specifies compiler generation of instructions to mitigate certain Spectre varian
 
 ## Remarks
 
-The **/Qspectre** option causes the compiler to insert instructions to mitigate certain [Spectre security vulnerabilities](https://spectreattack.com/spectre.pdf). These vulnerabilities, called *speculative execution side-channel attacks*, affect many operating systems and modern processors, including processors from Intel, AMD, and ARM.
+The **/Qspectre** option is available in Visual Studio 2017 version 15.7 and later. It causes the compiler to insert instructions to mitigate certain [Spectre security vulnerabilities](https://spectreattack.com/spectre.pdf). These vulnerabilities, called *speculative execution side-channel attacks*, affect many operating systems and modern processors, including processors from Intel, AMD, and ARM.
 
 The **/Qspectre** option is off by default.
 
diff --git a/docs/build/reference/std-specify-language-standard-version.md b/docs/build/reference/std-specify-language-standard-version.md
@@ -20,7 +20,7 @@ Enable supported C++ language features from the specified version of the C++ lan
 
 ## Remarks
 
-The **/std** option is used to control the version-specific ISO C++ programming language standard features enabled during compilation of your code. This option allows you to disable support for certain new language and library features that may break your existing code that conforms to a particular version of the language standard. By default, **/std:c++14** is specified, which disables language and standard library features found in later versions of the C++ language standard. Use  **/std:c++17** to enable C++17 standard-specific features and behavior. To explicitly enable the latest supported compiler and standard library features, use **/std:c++latest**.
+The **/std** option is is available in Visual Studio 2017 and later. It is used to control the version-specific ISO C++ programming language standard features enabled during compilation of your code. This option allows you to disable support for certain new language and library features that may break your existing code that conforms to a particular version of the language standard. By default, **/std:c++14** is specified, which disables language and standard library features found in later versions of the C++ language standard. Use  **/std:c++17** to enable C++17 standard-specific features and behavior. To explicitly enable the latest supported compiler and standard library features, use **/std:c++latest**.
 
 The default **/std:c++14** option enables the set of C++14 features implemented by the Visual C++ compiler. This option disables compiler and standard library support for features that are changed or new in more recent versions of the language standard, with the exception of some C++17 features already implemented in previous releases of the Visual C++ compiler. To avoid breaking changes for users who have already taken dependencies on the features available as of Visual Studio 2015 Update 2, these features remain enabled when the **/std:c++14** option is specified:
 
diff --git a/docs/cpp-conformance-improvements-2017.md b/docs/cpp-conformance-improvements-2017.md
@@ -1,7 +1,7 @@
 ---
 title: "C++ conformance improvements | Microsoft Docs"
 ms.custom: ""
-ms.date: "03/11/2018"
+ms.date: "06/01/2018"
 ms.technology: ["cpp-language"]
 ms.topic: "conceptual"
 ms.assetid: 8801dbdb-ca0b-491f-9e33-01618bff5ae9
@@ -47,31 +47,31 @@ Range-based for loops no longer require that begin() and end() return objects of
 
 ### constexpr lambdas
 
-Lambda expressions may now be used in constant expressions. For more information, see [Constexpr Lambda](http://open-std.org/JTC1/SC22/WG21/docs/papers/2015/n4487.pdf).
+Lambda expressions may now be used in constant expressions. For more information, see [constexpr lambda expressions in C++](cpp/lambda-expressions-constexpr.md).
 
 ### if constexpr in function templates
 
-A function template may contain `if constexpr` statements to enable compile-time branching. For more information, see [if constexpr](http://open-std.org/JTC1/SC22/WG21/docs/papers/2016/p0128r1.html).
+A function template may contain `if constexpr` statements to enable compile-time branching. For more information, see [if constexpr statements](cpp/if-else-statement-cpp.md#if_constexpr).
 
 ### Selection statements with initializers
 
-An `if` statement may include an initializer that introduces a variable at block scope within the statement itself. For more information, see [Selection statements with initializer](http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2016/p0305r1.html).
+An `if` statement may include an initializer that introduces a variable at block scope within the statement itself. For more information, see [if statements with initializer](cpp/if-else-statement-cpp.md#if_with_init).
 
 ### [[maybe_unused]] and [[nodiscard]] attributes
 
-New attributes to silence warnings when an entity is not used, or to create a warning if the return value of a function call is discarded. For more information, see [Wording for maybe_unused attribute](http://open-std.org/JTC1/SC22/WG21/docs/papers/2016/p0212r0.pdf) and [Proposal of unused,nodiscard and fallthrough attributes](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0068r0.pdf).
+New attributes to silence warnings when an entity is not used, or to create a warning if the return value of a function call is discarded. For more information, see [Attributes in C++](cpp/attributes.md).
 
 ### Using attribute namespaces without repetition
 
 New syntax to enable only a single namespace identifier in an attribute list. For more information, see [Attributes in C++](cpp/attributes.md).
 
 ### Structured bindings
 
-It is now possible in a single declaration to store a value with individual names for its components, when the value is an array, a std::tuple or std::pair, or has all public non-static data members. For more information, see [Structured Bindings](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0144r0.pdf).
+It is now possible in a single declaration to store a value with individual names for its components, when the value is an array, a std::tuple or std::pair, or has all public non-static data members. For more information, see [Structured Bindings](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0144r0.pdf) and [Returning multiple values from a function](cpp/functions-cpp.md#multi_val).
 
 ### Construction rules for enum class values
 
-There is now an implicit/non-narrowing conversion from a scoped enumeration's underlying type to the enumeration itself, when its definition introduces no enumerator and the source uses a list-initialization syntax. For more information, see [Construction Rules for enum class Values](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0138r2.pdf).
+There is now an implicit/non-narrowing conversion from a scoped enumeration's underlying type to the enumeration itself, when its definition introduces no enumerator and the source uses a list-initialization syntax. For more information, see [Construction Rules for enum class Values](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0138r2.pdf) and [Enumerations](cpp/enumerations-cpp.md#no_enumerators).
 
 ### Capturing *this by value
 
@@ -205,6 +205,8 @@ struct B : A {
 B b(42L); // now calls B(int)
 ```
 
+For more information, see [Constructors](cpp/constructors-cpp.md#inheriting_constructors).
+
 ### C++17 Extended aggregate initialization
 
 [P0017R1](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0017r1.html)
diff --git a/docs/cpp/attributes.md b/docs/cpp/attributes.md
@@ -1,7 +1,7 @@
 ---
-title: "C++ Standard Attributes | Microsoft Docs"
+title: "Attributes in C++ | Microsoft Docs"
 ms.custom: ""
-ms.date: "03/28/2017"
+ms.date: "06/01/2018"
 ms.topic: "language-reference"
 ms.assetid: 748340d9-8abf-4940-b0a0-91b6156a3ff8
 ---
diff --git a/docs/cpp/constructors-cpp.md b/docs/cpp/constructors-cpp.md
@@ -607,7 +607,7 @@ The object created by the constructors is fully initialized as soon as any const
 
 ## <a name="inheriting_constructors"></a> Inheriting constructors (C++11)
 
-A derived class can inherit the constructors from a direct base class by using a using declaration as shown in the following example:
+A derived class can inherit the constructors from a direct base class by using a **using** declaration as shown in the following example:
 
 ```cpp
 #include <iostream>
@@ -657,7 +657,7 @@ Derived d4 calls: Base()*/
 
 ```
 
-The using statement brings into scope all constructors from the base class except those that have an identical signature to constructors in the derived class. In general, it is best to use inheriting constructors when the derived class declares no new data members or constructors.
+**Visual Studio 2017 version 15.7 and later**: The **using** statement in **/std:C++17** mode brings into scope all constructors from the base class except those that have an identical signature to constructors in the derived class. In general, it is best to use inheriting constructors when the derived class declares no new data members or constructors. See also [Improvements in Visual Studio 2017 version 15.7](../cpp-conformance-improvements-2017.md#improvements_157).
 
 A class template can inherit all the constructors from a type argument if that type specifies a base class:
 
diff --git a/docs/cpp/enumerations-cpp.md b/docs/cpp/enumerations-cpp.md
@@ -1,7 +1,7 @@
 ---
 title: "Enumerations (C++) | Microsoft Docs"
 ms.custom: ""
-ms.date: "11/04/2016"
+ms.date: "06/01/2018"
 ms.technology: ["cpp-language"]
 ms.topic: "language-reference"
 f1_keywords: ["enum_cpp"]
@@ -137,7 +137,8 @@ namespace ScopedEnumConversions
   
  Notice that the line `hand = account_num;` still causes the error that occurs with unscoped enums, as shown earlier. It is allowed with an explicit cast. However, with scoped enums, the attempted conversion in the next statement, `account_num = Suit::Hearts;`, is no longer allowed without an explicit cast. 
 
-## Enums with no enumerators
+## <a name="no_enumerators"></a> Enums with no enumerators
+
 **Visual Studio 2017 version 15.3 and later** (available with [/std:c++17](../build/reference/std-specify-language-standard-version.md)): By defining an enum (regular or scoped) with an explicit underlying type and no enumerators, you can in effect introduce a new integral type that has no implicit conversion to any other type. By using this type instead of its built-in underlying type, you can eliminate the potential for subtle errors caused by inadvertent implicit conversions.  
 
 
diff --git a/docs/cpp/functions-cpp.md b/docs/cpp/functions-cpp.md
@@ -293,7 +293,7 @@ template<typename F, typename Tuple = tuple<T...>,
 }
 ```
 
-## Returning multiple values from a function
+## <a name="multi_val"></a> Returning multiple values from a function
 
 There are various ways to return more than one value from a function:
 
diff --git a/docs/cpp/if-else-statement-cpp.md b/docs/cpp/if-else-statement-cpp.md
@@ -104,7 +104,8 @@ int main()
 	}
 }
 ```  
-## if statement with an initializer
+## <a name="if_with_init></a> if statement with an initializer
+
 **Visual Studio 2017 version 15.3 and later** (available with [/std:c++17](../build/reference/std-specify-language-standard-version.md)): An **if** statement may also contain an expression that declares and initializes a named variable. Use this form of the if-statement when the variable is only needed within the scope of the if-block. 
 
 ```cpp
@@ -157,8 +158,8 @@ int main()
   
  The **else** clause of an `if...else` statement is associated with the closest previous **if** statement in the same scope that does not have a corresponding **else** statement.   
 
-## constexpr if statements
-**Visual Studio 2017 version 15.3 and later** (available with [/std:c++17](../build/reference/std-specify-language-standard-version.md)): In function templates, you can use a **constexpr if** statement to make compile-time branching decisions without having to resort to multiple function overloads. For example, you can write a single function that handles parameter unpacking (no zero-parameter overload is needed): 
+## <a name="if_constexpr"> if constexpr statements
+**Visual Studio 2017 version 15.3 and later** (available with [/std:c++17](../build/reference/std-specify-language-standard-version.md)): In function templates, you can use an **if constexpr** statement to make compile-time branching decisions without having to resort to multiple function overloads. For example, you can write a single function that handles parameter unpacking (no zero-parameter overload is needed): 
 
 ```cpp
 template <class T, class... Rest>
@@ -168,7 +169,7 @@ void f(T&& t, Rest&&... r)
    do_something(t);
 
    // handle r conditionally
-   constexpr if (sizeof...(r)) 
+   if constexpr (sizeof...(r)) 
    {
       
       f(r...); 
diff --git a/docs/cpp/lambda-expressions-constexpr.md b/docs/cpp/lambda-expressions-constexpr.md
@@ -1,5 +1,5 @@
 ---
-title: "constexpr Lambda Expressions in C++ | Microsoft Docs"
+title: "constexpr lambda expressions in C++ | Microsoft Docs"
 ms.custom: ""
 ms.date: "07/19/2017"
 ms.technology: ["cpp-language"]
@@ -11,7 +11,7 @@ author: "mikeblome"
 ms.author: "mblome"
 ms.workload: ["cplusplus"]
 ---
-# constexpr Lambda Expressions in C++
+# constexpr lambda expressions in C++
 **Visual Studio 2017 version 15.3 and later** (available with [/std:c++17](../build/reference/std-specify-language-standard-version.md)): A lambda expression may be declared as `constexpr` or used in a contant expression when the initialization of each data member that it captures or introduces is allowed within a constant expression.  
 
 ```cpp
diff --git a/docs/ide/non-msbuild-projects.md b/docs/ide/non-msbuild-projects.md
@@ -1,7 +1,7 @@
 ---
 title: "Open Folder projects in Visual C++ | Microsoft Docs"
 ms.custom: ""
-ms.date: "08/02/2017"
+ms.date: "06/01/2018"
 ms.technology: ["cpp-ide"]
 ms.topic: "conceptual"
 dev_langs: ["C++"]
@@ -12,7 +12,8 @@ ms.author: "mblome"
 ms.workload: ["cplusplus"]
 ---
 # Open Folder projects in Visual C++
-Visual Studio 2017 introduces the "Open Folder" feature, which enables you to open a folder of source files and immediately start coding with support for IntelliSense, browsing, refactoring, debugging, and so on. No .sln or .vcxproj files are loaded; if needed, you can specify custom tasks as well as build and launch parameters through simple .json files. 
+
+In Visual Studio 2017 and later, the "Open Folder" feature enables you to open a folder of source files and immediately start coding with support for IntelliSense, browsing, refactoring, debugging, and so on. No .sln or .vcxproj files are loaded; if needed, you can specify custom tasks as well as build and launch parameters through simple .json files. 
 Powered by Open Folder, Visual C++ can now support not only loose collections of files, but also virtually any build system, including CMake, Ninja, QMake (for Qt projects), gyp, SCons, Gradle, Buck, make and more. 
 
 To use Open Folder, from the main menu select *File | Open | Folder* or press *Ctrl + Shift + Alt + O*. 
@@ -22,7 +23,7 @@ Solution Explorer immediately displays all the files in the folder. You can clic
 CMake is integrated in the Visual Studio IDE as CMake Tools for Visual C++, a component of the C++ desktop workload. For more information, see [CMake Tools for Visual C++](cmake-tools-for-visual-cpp.md).
  
 ## QMake projects that target the Qt framework
-You can use CMake Tools for Visual C++ to target Qt to build Qt projects, or you can use the Qt Visual Studio Extension. Note: As of August 2017, the [Qt Visual Studio Extension support for Visual Studio 2017](https://download.qt.io/development_releases/vsaddin/) is available as a beta version.
+You can use CMake Tools for Visual C++ to target Qt to build Qt projects, or you can use the [Qt Visual Studio Extension](https://download.qt.io/development_releases/vsaddin/) for either Visual Studio 2015 or Visual Studio 2017.
 
 ## gyp, Cons, SCons, Buck, etc
 You can use any build system in Visual C++ and still enjoy the advantages of the Visual C++ IDE and debugger. When you open the root folder of your project, Visual C++ uses heuristics to index the source files for IntelliSense and browsing. You can provide hints about the structure of your code by editing the CppProperties.json file. In a similar way, you can configure your build program by editing the launch.vs.json file. 
diff --git a/docs/vs-2015/snippets/cpp/VS_Snippets_Cpp/NVC_ATL_Utilities/Cpp/NVC_ATL_Utilities.cpp b/docs/vs-2015/snippets/cpp/VS_Snippets_Cpp/NVC_ATL_Utilities/Cpp/NVC_ATL_Utilities.cpp
@@ -2270,7 +2270,7 @@ void DoMisc()
 
    // Define the array bound structure
    CComSafeArrayBound bound[2];
-   bound[0].SetCount(3);
+   bound[0].SetCount(2);
    bound[0].SetLowerBound(0);
    bound[1].SetCount(3);
    bound[1].SetLowerBound(0);   

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ template<typename F, typename Tuple = tuple<T...>,`
`293`	`293`	`}`
`294`	`294`	```
`295`	`295`
`296`		`-## Returning multiple values from a function`
	`296`	`+## <a name="multi_val"></a> Returning multiple values from a function`
`297`	`297`
`298`	`298`	`There are various ways to return more than one value from a function:`
`299`	`299`