Merge branch 'master' into mb-morelinks

Author: mikeblome

CONTRIBUTING.md

@@ -7,10 +7,10 @@ In this topic, you'll see the basic process for adding or updating content in th
 In this topic, we'll cover:
 
 * [Process for contributing](#process-for-contributing)
-* [Guidance checklist](#guidance-checklist)
+* [DOs and DON'Ts](#dos-and-donts)
 * [Building the docs](#building-the-docs)
 * [Contributing to samples](#contributing-to-samples)
-* [Contributor License Agreement](#contributor-license-agreement)
+* [Contributor license agreement](#contributor-license-agreement)
 
 ## Process for contributing
 
@@ -19,7 +19,7 @@ The content inside the **docs** folder is organized into sections that are organ
 
 You can skip this first step for small changes.
 
-**Step 2:** Fork the `MicrosoftDocs/cpp-docs` repo.
+**Step 2:** Fork the `MicrosoftDocs/cpp-docs` repository.
 
 **Step 3:** Create a `branch` for your article.
 
@@ -30,17 +30,17 @@ If it's a new topic, you can use this [template file](./styleguide/template.md)
 Navigate to the folder that corresponds to the TOC location determined for your article in step 1.
 That folder contains the Markdown files for all articles in that section. If necessary, create a new folder to place the files for your content.
 
-For images and other static resources, add them to the subfolder called **media**. If you are creating a new folder for content, add a media folder to the new folder.
+For images and other static resources, add them to the subfolder called `media`. If you are creating a new folder for content, add a media folder to the new folder.
 
 Be sure to follow the proper Markdown syntax. See the [style guide](./styleguide/template.md) for more information.
 
 ### Example structure
 
     docs
-      /standard-library
-          wstring-convert-class.md
-          /media
-              wstring-conversion.png
+        /standard-library
+            wstring-convert-class.md
+            /media
+                wstring-conversion.png
 
 **Step 5:** Submit a Pull Request (PR) from your branch to `MicrosoftDocs/cpp-docs/master`.
 
@@ -70,30 +70,28 @@ Below is a short list of guiding rules that you should keep in mind when you are
 
 ## Building the docs
 
-The documentation is written in [GitHub Flavored Markdown](https://help.github.com/categories/writing-on-github/) and built using [DocFX](http://dotnet.github.io/docfx/) and other internal publishing/building tools. It is hosted at [docs.microsoft.com](https://docs.microsoft.com/).
+The documentation is written in [GitHub Flavored Markdown](https://help.github.com/categories/writing-on-github/) and built using [DocFX](https://dotnet.github.io/docfx/) and other internal publishing/building tools. It is hosted at [docs.microsoft.com](https://docs.microsoft.com/).
 
 If you want to build the docs locally, you need to install [DocFX](https://dotnet.github.io/docfx/); latest versions are the best.
 
-There are several ways to use DocFX, and most of them are covered in the [DocFX getting started guide](https://dotnet.github.io/docfx/tutorial/docfx_getting_started.html).
-The following instructions use the [command-line based](https://dotnet.github.io/docfx/tutorial/docfx_getting_started.html#2-use-docfx-as-a-command-line-tool) version of the tool.
-If you are comfortable with other ways listed on the link above, feel free to use those.
+There are several ways to use DocFX, and most of them are covered in the [DocFX getting started guide](https://dotnet.github.io/docfx/tutorial/docfx_getting_started.html). The following instructions use the [command-line based](https://dotnet.github.io/docfx/tutorial/docfx_getting_started.html#2-use-docfx-as-a-command-line-tool) version of the tool. If you are comfortable with other ways listed on the link above, feel free to use those.
 
 **Note:** Currently DocFX requires the .NET Framework on Windows or Mono (for Linux or macOS). We hope to port it to .NET Core in the future.
 
 You can build and preview the resulting site locally using a built-in web server. Navigate to the `cpp-docs\docs` folder on your machine and type the following command:
 
-`docfx -t default --serve`
+> docfx -t default --serve
 
 This starts the local preview on [localhost:8080](http://localhost:8080). You can then view the changes by going to `http://localhost:8080/[path]`, such as `http://localhost:8080/cpp/visual-cpp-in-visual-studio.html`.
 
 **Note:** the local preview currently doesn't contain any themes at the moment so the look and feel won't be the same as in the documentation site. We're working towards fixing that experience. We also use some custom extensions for embedded video, notes, and included documents, that won't be visible in the preview.
 
 ## Contributing to samples
 
-For now, include required sample code as inline code blocks in your article. The repo has a codesnippets folder, but this is not ready for public contributions.
+For now, include required sample code as inline code blocks in your article. The repository has a `codesnippets` folder, but this is not ready for public contributions.
 
 ## Contributor license agreement
 
-You must sign the [Contribution License Agreement (CLA)](LICENSE) before your PR is merged. This is a one-time requirement for projects in docs.microsoft.com. You can read more about [Contribution License Agreements (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) on Uncyclopedia.
+You must sign the [Contribution License Agreement (CLA)](LICENSE) before your PR is merged. This is a one-time requirement for projects in docs.microsoft.com. You can read more about [Contribution License Agreements (CLA)](https://en.wikipedia.org/wiki/Contributor_License_Agreement) on Uncyclopedia.
 
-You don't have to sign the agreement up-front. You can clone, fork, and submit your PR as usual. When your PR is created, it is classified by a CLA bot. If the change is trivial (for example, you fixed a typo), then the PR is labeled with cla-not-required. Otherwise, it's classified as cla-required. Once you signed the CLA, the current and all future pull requests are labeled as cla-signed.
+You don't have to sign the agreement up-front. You can clone, fork, and submit your PR as usual. When your PR is created, it is classified by a CLA bot. If the change is trivial (for example, you fixed a typo), then the PR is labeled with CLA-not-required. Otherwise, it's classified as CLA-required. Once you signed the CLA, the current and all future pull requests are labeled as CLA-signed.

README.md

@@ -1,21 +1,18 @@
- ## Microsoft Open Source Code of Conduct
-
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
-For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
-
 # Visual Studio 2017 documentation for Visual C++
 
-Welcome! This repo contains source files for the work-in-progress Visual C++ technical documentation. The topics are published on the [Visual C++ documentation site](https://docs.microsoft.com/cpp).
+Welcome! This repository contains source files for the work-in-progress Visual C++ technical documentation. The topics are published on the [Visual C++ documentation site](https://docs.microsoft.com/cpp).
 
-This repo was moved from Microsoft/vcppdocs to MicrosoftDocs/cpp-docs-pr on June 23, 2017.
+This repository was moved from Microsoft/vcppdocs to MicrosoftDocs/cpp-docs-pr on June 23, 2017.
 
-The documentation for Visual Basic and Visual C# are located in a separate repo at [http://github.com/dotnet/core-docs](http://github.com/dotnet/core-docs), and the Visual Studio 2017 documentation is located in the repo located at [http://github.com/Microsoft/visualstudio-docs](http://github.com/Microsoft/visualstudio-docs).
+The documentation for Visual Basic and Visual C# are located in a separate repository at [http://github.com/dotnet/core-docs](http://github.com/dotnet/core-docs), and the Visual Studio 2017 documentation is located in the repository located at [http://github.com/Microsoft/visualstudio-docs](http://github.com/Microsoft/visualstudio-docs).
 
 ## Contributing to the documentation
 
 To contribute to this documentation, please see the [Contributing guide](CONTRIBUTING.md).
 We welcome your contributions to help us improve the Visual C++ docs. All the articles in this repository use GitHub flavored markdown.
 
-Several feature areas of Visual Studio have their own folders in this repo, such as **standard-library** for topics on the C++ Standard Library, **ide** for topics on the Visual Studio interactive development environment (IDE), and so forth. The **/media** subfolder in each folder contains art files for the topics. The [Contributing guide](CONTRIBUTING.md) has more information.
+Several feature areas of Visual Studio have their own folders in this repository, such as `standard-library` for topics on the C++ Standard Library, `ide` for topics on the Visual Studio interactive development environment (IDE), and so forth. The `/media` subfolder in each folder contains art files for the topics. The [Contributing guide](CONTRIBUTING.md) has more information.
+
+## Microsoft Open Source Code of Conduct
 
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.

docs/assembler/inline/inline-assembler.md

@@ -19,7 +19,7 @@ ms.workload: ["cplusplus"]
 > [!NOTE]
 >  Programs with inline assembler code are not fully portable to other hardware platforms. If you are designing for portability, avoid using inline assembler.  
   
- Inline assembly is not supported on the ARM and [!INCLUDE[vcprx64](../../assembler/inline/includes/vcprx64_md.md)] processors.  The following topics explain how to use the Visual C/C++ inline assembler with x86 processors:  
+ Inline assembly is not supported on the ARM and x64 processors.  The following topics explain how to use the Visual C/C++ inline assembler with x86 processors:  
 
 -   [Inline Assembler Overview](../../assembler/inline/inline-assembler-overview.md)  
 

docs/assembler/masm/microsoft-macro-assembler-reference.md

@@ -34,7 +34,7 @@ The Microsoft Macro Assembler (MASM) provides several advantages over inline ass
  Provides links to websites that may contain programming information about processors that are not manufactured, sold, or supported by Microsoft.  
 
  [MASM for x64 (ml64.exe)](../../assembler/masm/masm-for-x64-ml64-exe.md)  
- Information about how to create output files for [!INCLUDE[vcprx64](../../assembler/inline/includes/vcprx64_md.md)].  
+ Information about how to create output files for x64.  
 
 ## Related Sections  
  [Visual C++](../../visual-cpp-in-visual-studio.md)  

docs/atl-mfc-shared/reference/csimplestringt-class.md

@@ -426,7 +426,7 @@ PXSTR GetBufferSetLength(int nLength);
   
  The buffer memory is automatically freed when the `CSimpleStringT` object is destroyed.  
   
- If you keep track of the string length yourself, do not not append the terminating null character. You must specify the final string length when you release the buffer by using `ReleaseBuffer`. If you do append a terminating null character when you call `ReleaseBuffer`, pass -1 (the default) for the length to `ReleaseBuffer`, and `ReleaseBuffer` will perform a `strlen` on the buffer to determine its length.  
+ If you keep track of the string length yourself, do not append the terminating null character. You must specify the final string length when you release the buffer by using `ReleaseBuffer`. If you do append a terminating null character when you call `ReleaseBuffer`, pass -1 (the default) for the length to `ReleaseBuffer`, and `ReleaseBuffer` will perform a `strlen` on the buffer to determine its length.  
   
  For more information about reference counting, see the following articles:  
   

docs/atl/atl-com-property-pages.md

@@ -18,7 +18,7 @@ COM property pages provide a user interface for setting the properties (or calli
 
  Each property page can be built completely independently of the objects whose properties can be set. All that a property page needs is to understand a particular interface (or set of interfaces) and to provide a user interface for calling methods on that interface.  
 
- For more information, see [Property Sheets and Property Pages](http://msdn.microsoft.com/library/windows/desktop/ms686577) in the [!INCLUDE[winSDK](../atl/includes/winsdk_md.md)].  
+ For more information, see [Property Sheets and Property Pages](http://msdn.microsoft.com/library/windows/desktop/ms686577) in the Windows SDK.  
 
 ## In This Section  
  [Specifying Property Pages](../atl/specifying-property-pages.md)  

docs/atl/introduction-to-com-and-atl.md

@@ -23,7 +23,7 @@ This section provides a brief introduction to COM and ATL.
 
 ## Related Sections  
  [The Component Object Model](http://msdn.microsoft.com/library/windows/desktop/ms694363)  
- The [!INCLUDE[winSDK](../atl/includes/winsdk_md.md)] material on COM.  
+ The Windows SDK material on COM.  
 
  [ATL](../atl/active-template-library-atl-concepts.md)  
  Provides links to conceptual topics on how to program using the Active Template Library.  

docs/atl/reference/cwindow-class.md

@@ -818,7 +818,7 @@ DWORD GetHotKey() const throw();
 ```  
 
 ### Return Value  
- The virtual key code and modifiers for the hot key associated with the window. For a list of possible modifiers, see [WM_GETHOTKEY](http://msdn.microsoft.com/library/windows/desktop/ms646278) in the Windows SDK. For a list of of standard virtual key codes, see Winuser.h.  
+ The virtual key code and modifiers for the hot key associated with the window. For a list of possible modifiers, see [WM_GETHOTKEY](http://msdn.microsoft.com/library/windows/desktop/ms646278) in the Windows SDK. For a list of standard virtual key codes, see Winuser.h.  
 
 ##  <a name="geticon"></a>  CWindow::GetIcon  
  Retrieves the handle to the window's large or small icon.  
@@ -1933,7 +1933,7 @@ int SetHotKey(WORD wVirtualKeyCode, WORD wModifiers) throw();
 
 ### Parameters  
  *wVirtualKeyCode*  
- [in] The virtual key code of the hot key. For a list of of standard virtual key codes, see Winuser.h.  
+ [in] The virtual key code of the hot key. For a list of standard virtual key codes, see Winuser.h.  
 
  *wModifiers*  
  [in] The modifiers of the hot key. For a list of possible values, see WM_SETHOTKEY in the Windows SDK.  

docs/build/building-c-cpp-programs.md

@@ -14,7 +14,7 @@ ms.workload: ["cplusplus"]
 ---
 # Building C/C++ Programs
 
-You can build Visual C++ projects either in Visual Studio or on the command line. The Visual Studio IDE uses [MSBuild](../build/msbuild-visual-cpp.md) to build projects and solutions. On the command line, you can use the C/C++ compiler (cl.exe) and linker (link.exe) to build simple projects. To build more complex projects on the command line, you can use MSBuild or [NMAKE](../build/nmake-reference.md). For an overview about how to use [!INCLUDE[vsprvs](../assembler/masm/includes/vsprvs_md.md)] to build projects and solutions, see [Compiling and Building](/visualstudio/ide/compiling-and-building-in-visual-studio).  
+You can build Visual C++ projects either in Visual Studio or on the command line. The Visual Studio IDE uses [MSBuild](../build/msbuild-visual-cpp.md) to build projects and solutions. On the command line, you can use the C/C++ compiler (cl.exe) and linker (link.exe) to build simple projects. To build more complex projects on the command line, you can use MSBuild or [NMAKE](../build/nmake-reference.md). For an overview about how to use Visual Studio to build projects and solutions, see [Compiling and Building](/visualstudio/ide/compiling-and-building-in-visual-studio).  
 
 ## In This Section  
 

docs/build/common-visual-cpp-arm-migration-issues.md

@@ -64,7 +64,7 @@ On the ARM architecture, parameters from the variable arguments list that are pa
 printf("%d\n", 1LL);
 ```
 
-In this case, the bug can be fixed by making sure that the correct format specification is used so that that the alignment of the argument is considered. This code is correct:
+In this case, the bug can be fixed by making sure that the correct format specification is used so that the alignment of the argument is considered. This code is correct:
 
 ```C
 // CORRECT: use %I64d for 64-bit integers

docs/build/configuring-programs-for-windows-xp.md

@@ -19,7 +19,7 @@ To get the platform toolset and components to target [!INCLUDE[winxp](../build/i
 
 ## Windows XP targeting experience
 
-The Windows XP platform toolset that's included in Visual Studio is a version of the [!INCLUDE[win7](../build/includes/win7_md.md)] SDK, but it uses the current C++ compiler. It also configures project properties to appropriate default values, for example, the specification of a compatible linker for down-level targeting. Only Windows desktop apps that are created by using a Windows XP platform toolset run on [!INCLUDE[winxp](../build/includes/winxp_md.md)] and [!INCLUDE[WinXPSvr](../build/includes/winxpsvr_md.md)], but those apps can also run on more recent Windows operating systems.
+The Windows XP platform toolset that's included in Visual Studio is a version of the Windows 7 SDK, but it uses the current C++ compiler. It also configures project properties to appropriate default values, for example, the specification of a compatible linker for down-level targeting. Only Windows desktop apps that are created by using a Windows XP platform toolset run on [!INCLUDE[winxp](../build/includes/winxp_md.md)] and [!INCLUDE[WinXPSvr](../build/includes/winxpsvr_md.md)], but those apps can also run on more recent Windows operating systems.
 
 #### To target Windows XP
 
@@ -59,7 +59,7 @@ Due to differences in platform and library support, the development experience f
 
 - **Static analysis**
 
-   The Windows XP platform toolsets don't support static analysis because the SAL annotations for the [!INCLUDE[win7](../build/includes/win7_md.md)] SDK and the runtime libraries are incompatible. When you want to perform static analysis on an app that supports [!INCLUDE[winxp](../build/includes/winxp_md.md)] or [!INCLUDE[WinXPSvr](../build/includes/winxpsvr_md.md)], you can temporarily switch the solution to target the default platform toolset to perform the analysis, and then switch back to the Windows XP platform toolset to build the app.
+   The Windows XP platform toolsets don't support static analysis because the SAL annotations for the Windows 7 SDK and the runtime libraries are incompatible. When you want to perform static analysis on an app that supports [!INCLUDE[winxp](../build/includes/winxp_md.md)] or [!INCLUDE[WinXPSvr](../build/includes/winxpsvr_md.md)], you can temporarily switch the solution to target the default platform toolset to perform the analysis, and then switch back to the Windows XP platform toolset to build the app.
 
 - **Debugging of DirectX graphics**
 

docs/build/dynamic-parameter-stack-area-construction.md

@@ -11,7 +11,7 @@ ms.author: "corob"
 ms.workload: ["cplusplus"]
 ---
 # Dynamic Parameter Stack Area Construction
-If a frame pointer is used, the option exists to dynamically create the parameter stack area. This is not currently done in the [!INCLUDE[vcprx64](../assembler/inline/includes/vcprx64_md.md)] compiler.  
+If a frame pointer is used, the option exists to dynamically create the parameter stack area. This is not currently done in the x64 compiler.  
 
 ## See Also  
  [Stack Usage](../build/stack-usage.md)

docs/build/exception-handling-x64.md

@@ -12,7 +12,7 @@ ms.author: "corob"
 ms.workload: ["cplusplus"]
 ---
 # Exception Handling (x64)
-This section discusses structured exception handling and C++ exception handling behavior on the [!INCLUDE[vcprx64](../assembler/inline/includes/vcprx64_md.md)].  
+This section discusses structured exception handling and C++ exception handling behavior on the x64.  
 
 -   [Unwind Data for Exception Handling, Debugger Support](../build/unwind-data-for-exception-handling-debugger-support.md)