merge to live (#341)

* Add _chkstk to list of internals

* Fixes for command line issues

* Minor tweak

* Update random.md (#322)

Fix broken fwlink to presentation on rand

* Update link names and instructions

* More link fixes, consolidation

* Another tweak

* Update x64 topics, topic names

* Fix C3861 issues.

* Fix link issues.

* Dang typoes.

* Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master) (MicrosoftDocs#323)

* Update random.md

Fix broken fwlink to presentation on rand

* Update arm-assembler-reference.md

Point to search engine to pick up latest results for ARM references on the ARM Developer Center.

* Update some egregious out-of-dateness

* Fix a link typo.

* Update to address user complaints

* Minor tweaks.

* Remove stray parens.

* updated info on mbcs dll (MicrosoftDocs#325)

* Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master) (MicrosoftDocs#326)

* Update random.md

Fix broken fwlink to presentation on rand

* Update arm-assembler-reference.md

Point to search engine to pick up latest results for ARM references on the ARM Developer Center.

* Update desktop-applications-visual-cpp.md

Fix space issue

* Fix some C1083 user complaints (MicrosoftDocs#332)

* First draft of fixes for user complaints

* More updates for common issues

* More consistency tweaks

* Fix link typo

* Make C2065 friendlier (#333)

* Try to address some user issues.

* Add a useful link.

* Updated namespaces topic (#329)

* updated namespaces topic

* udpated ms.date

* Updated content on MFC MBCS DLL (MicrosoftDocs#328)

* updated info on mbcs dll

* minor tweak

* udpated ms.date

* Update ms.date to match changes.

* Update more freshness dates

* Escape brackets, fix format

* Update .openpublishing.publish.config.json with pdf info (#336)

* Update .openpublishing.publish.config.json

* Update .openpublishing.publish.config.json

* Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master) (#335)

* Update random.md

Fix broken fwlink to presentation on rand

* Update arm-assembler-reference.md

Point to search engine to pick up latest results for ARM references on the ARM Developer Center.

* Update desktop-applications-visual-cpp.md

Fix space issue

* 📦 Enable PDF generation.

* zc-conformance.md: rvalueCast is off by default

rvalueCast is off by default according to the https://docs.microsoft.com/en-us/cpp/build/reference/zc-rvaluecast-enforce-type-conversion-rules

* Fix bad merge in storage-classes-cpp

Had merge conflict markers

* Update .openpublishing.publish.config.json

* Fix typographical error

The fix is for the file docs/windows/desktop-applications-visual-cpp.md
and adds the missing word "that" to a sentence.

* Correct .ERRDIF[[I]] title

* Fixed indentation

* Replace nonsense with correct statement

Replace nonsense with correct statement

* Update read.md

Fix some more formatting while we're at it.

* Correct build working directory

* Order link option alphabetically

Orders link option CLRUNMANAGEDCODECHECK alphabetically
in the table of contents for consistency.

* Updating timestamp

Worth getting this right, since otherwise it doesn't look like this page covers 15.3 (and it does!)

* Update cl-environment-variables.md

Line 65, fixed spelling of "setting".

* Update CONTRIBUTING.md

* Resolve syncing conflicts from FromPublicMasterBranch to master (#340)

* Update random.md

Fix broken fwlink to presentation on rand

* Update arm-assembler-reference.md

Point to search engine to pick up latest results for ARM references on the ARM Developer Center.

* Update desktop-applications-visual-cpp.md

Fix space issue

* 📦 Enable PDF generation.

* zc-conformance.md: rvalueCast is off by default

rvalueCast is off by default according to the https://docs.microsoft.com/en-us/cpp/build/reference/zc-rvaluecast-enforce-type-conversion-rules

* Fix bad merge in storage-classes-cpp

Had merge conflict markers

* Update .openpublishing.publish.config.json

* Fix typographical error

The fix is for the file docs/windows/desktop-applications-visual-cpp.md
and adds the missing word "that" to a sentence.

* Correct .ERRDIF[[I]] title

* Fixed indentation

* Replace nonsense with correct statement

Replace nonsense with correct statement

* Update read.md

Fix some more formatting while we're at it.

* Correct build working directory

* Order link option alphabetically

Orders link option CLRUNMANAGEDCODECHECK alphabetically
in the table of contents for consistency.

* Updating timestamp

Worth getting this right, since otherwise it doesn't look like this page covers 15.3 (and it does!)

* Update cl-environment-variables.md

Line 65, fixed spelling of "setting".

* Update CONTRIBUTING.md

Author: ghogen

.openpublishing.publish.config.json

@@ -1,56 +1,56 @@
-{
-  "build_entry_point": "docs",
-  "need_generate_pdf": false,
-  "need_generate_intellisense": false,
-  "branch_target_mapping": {
-    "live": [
-      "Publish",
-      "Pdf"
-    ],
-    "master": [
-      "Publish",
-      "Pdf"
-    ]
-  },
-  "Targets": {
-    "Pdf": {
-      "template_folder": "_themes.pdf"
-    }
-  },
-  "docsets_to_publish": [
-    {
-      "docset_name": "vcppdocs",
-      "build_source_folder": "docs",
-      "build_output_subfolder": "vcppdocs",
-      "locale": "en-us",
-      "version": 0,
-      "open_to_public_contributors": true,
-      "type_mapping": {
-        "Conceptual": "Content",
-        "ManagedReference": "Content",
-        "RestApi": "Content"
-      },
-      "template_folder": "_themes"
-    }
-  ],
-  "notification_subscribers": [],
-  "branches_to_filter": [],
-  "skip_source_output_uploading": false,
-  "git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/cpp-docs",
-  "git_repository_branch_open_to_public_contributors": "master",
-  "dependent_repositories": [
-    {
-      "path_to_root": "_themes",
-      "url": "https://github.com/Microsoft/templates.docs.msft",
-      "branch": "master",
-      "branch_mapping": {}
-    },
-    {
-      "path_to_root": "_themes.pdf",
-      "url": "https://github.com/Microsoft/templates.docs.msft.pdf",
-      "branch": "master"
-    }
-  ],
-  "need_generate_pdf_url_template": true,
-  "enable_incremental_build": true
-}
+{
+  "build_entry_point": "docs",
+  "need_generate_pdf": false,
+  "need_generate_intellisense": false,
+  "branch_target_mapping": {
+    "live": [
+      "Publish",
+      "Pdf"
+    ],
+    "master": [
+      "Publish",
+      "Pdf"
+    ]
+  },
+  "Targets": {
+    "Pdf": {
+      "template_folder": "_themes.pdf"
+    }
+  },
+  "docsets_to_publish": [
+    {
+      "docset_name": "vcppdocs",
+      "build_source_folder": "docs",
+      "build_output_subfolder": "vcppdocs",
+      "locale": "en-us",
+      "version": 0,
+      "open_to_public_contributors": true,
+      "type_mapping": {
+        "Conceptual": "Content",
+        "ManagedReference": "Content",
+        "RestApi": "Content"
+      },
+      "template_folder": "_themes"
+    }
+  ],
+  "notification_subscribers": [],
+  "branches_to_filter": [],
+  "skip_source_output_uploading": false,
+  "git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/cpp-docs",
+  "git_repository_branch_open_to_public_contributors": "master",
+  "dependent_repositories": [
+    {
+      "path_to_root": "_themes",
+      "url": "https://github.com/Microsoft/templates.docs.msft",
+      "branch": "master",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "_themes.pdf",
+      "url": "https://github.com/Microsoft/templates.docs.msft.pdf",
+      "branch": "master"
+    }
+  ],
+  "need_generate_pdf_url_template": true,
+  "enable_incremental_build": true
+}

docs/assembler/arm/arm-assembler-reference.md

@@ -1,7 +1,7 @@
 ---
 title: "ARM Assembler Reference | Microsoft Docs"
 ms.custom: ""
-ms.date: "11/04/2016"
+ms.date: "08/28/2017"
 ms.reviewer: ""
 ms.suite: ""
 ms.technology:  
@@ -31,6 +31,7 @@ translation.priority.ht:
   - "zh-tw"
 ---
 # ARM Assembler Reference
+
 The articles in this section of the documentation provide reference material for the Microsoft ARM assembler (armasm) and related tools.  
 
 ## Related Articles  
@@ -44,5 +45,6 @@ The articles in this section of the documentation provide reference material for
 |[ARM Compiler armasm User Guide](https://developer.arm.com/search#q=ARM%20Compiler%20armasm%20User%20Guide) on the ARM Developer website.|Choose a recent version to find up-to-date information about the ARM assembly language. **Note:**  The "armasm" assembler that is referred to on the ARM Developer website is not the Microsoft armasm assembler that is included in Visual Studio and is documented in this section.|  
 
 ## See Also  
+
  [ARM Intrinsics](../../intrinsics/arm-intrinsics.md)   
  [Compiler Intrinsics](../../intrinsics/compiler-intrinsics.md)

docs/assembler/masm/masm-for-x64-ml64-exe.md

@@ -11,8 +11,9 @@ ms.topic: "article"
 dev_langs: 
   - "C++"
 helpviewer_keywords: 
+  - "ml64"
   - "ml64.exe"
-  - "ml"
+  - "masm for x64"
 ms.assetid: 89059103-f372-4968-80ea-0c7f90bb9c91
 caps.latest.revision: 12
 author: "corob-msft"
@@ -34,14 +35,34 @@ translation.priority.ht:
   - "zh-tw"
 ---
 # MASM for x64 (ml64.exe)
-ml64.exe is the assembler that accepts x64 assembly language. For information on ml64.exe compiler options, see [ML and ML64 Command-Line Reference](../../assembler/masm/ml-and-ml64-command-line-reference.md).  
-  
- Inline ASM is not supported for x64. Use MASM or compiler intrinsics ([x64 (amd64) Intrinsics List](../../intrinsics/x64-amd64-intrinsics-list.md)).  
-  
- The two workarounds are separate assembly with MASM (which supports x64 fully) and compiler intrinsics. We’ve added a lot of intrinsics to allow customers to make use of special-function instructions (e.g. privileged, bit scan/test, interlocked, etc.) in as close to cross-platform a manner as possible.  
+
+Visual Studio includes both 32-bit and 64-bit hosted versions of MASM to target x64 code. Named ml64.exe, this is the assembler that accepts x64 assembler language. The MASM command-line tools are installed when you choose a C++ workload during Visual Studio installation. These tools are not available as a separate download. To download and install a copy of Visual Studio, see [https://www.visualstudio.com/](https://www.visualstudio.com/). If you do not want to install the Visual Studio IDE, but only want the command-line tools, see the **Build Tools for Visual Studio 2017** option on the [Visual Studio Downloads](https://www.visualstudio.com/downloads/) page.
+
+To use MASM to build code for x64 targets on the command line, you must use a developer command prompt for x64 targets, which sets the required path and other environment variables. For information on how to start a developer command prompt, see [Build C/C++ code on the command line](../../build/building-on-the-command-line.md).
+
+For information on ml64.exe command line options, see [ML and ML64 Command-Line Reference](../../assembler/masm/ml-and-ml64-command-line-reference.md).  
+  
+Inline assembler or use of the ASM keyword is not supported for x64 or ARM targets. To port your x86 code that uses inline assembler to x64 or ARM, you can convert your code to C++, use compiler intrinsics, or create assembler-language source files. The Visual C++ compiler supports intrinsics to allow you to use special-function instructions, for example, privileged, bit scan/test, interlocked, and so on, in as close to a cross-platform manner as possible. For information on available intrinsics, see [Compiler Intrinsics](../../intrinsics/compiler-intrinsics.md).  
+
+## Add an assembler-language file to a Visual C++ project  
+  
+The Visual Studio project system supports assembler-language files built by using MASM in your C++ projects. You can create x64 assembler-language source files and build them into object files by using MASM, which supports x64 fully. You can then link these object files to your C++ code built for x64 targets. This is one way to overcome the lack of an x64 inline assembler.  
+
+### To add an assembler-language file to an existing Visual C++ project
+
+1. Select the project in **Solution Explorer**. On the menu bar, choose **Project**, **Build Customizations**.
+
+1. In the **Visual C++ Build Customization Files** dialog box, check the checkbox next to **masm(.targets,.props)**. Choose **OK** to save your selection and close the dialog box.
+
+1. On the menu bar, choose **Project**, **Add New Item**. 
+
+1. In the **Add New Item** dialog box, select **C++ file (.cpp)** in the center pane. In the **Name** edit control, enter a new file name that has a **.asm** extension instead of .cpp. Choose **Add** to add the file to your project and close the dialog box.
+
+Create your assembler-language code in the .asm file you added. When you build your solution, the MASM assembler is invoked to assemble the .asm file into an object file that is then linked into your project. To make symbol access easier, declare your assembler functions as `extern "C"` in your C++ source code, rather than using the C++ name decoration conventions in your assembler-language source files.
 
 ## ml64-Specific Directives  
- Use the following directives with ml64.exe:  
+
+You can use the following ml64-specific directives in your assembler-language source code that targets x64:  
 
 -   [.ALLOCSTACK](../../assembler/masm/dot-allocstack.md)  
 
@@ -57,27 +78,29 @@ ml64.exe is the assembler that accepts x64 assembly language. For information on
 
 -   [.SETFRAME](../../assembler/masm/dot-setframe.md)  
 
- In addition, the [PROC](../../assembler/masm/proc.md) directive was updated for use with ml64.exe.  
+In addition, the [PROC](../../assembler/masm/proc.md) directive has been updated for use with ml64.exe.  
 
 ## 32-Bit Address Mode (Address Size Override)  
- MASM will emit the 0x67 address size override if a memory operand includes 32-bit registers. For example, the following examples cause the address size override to be emitted:  
+
+MASM emits the 0x67 address size override if a memory operand includes 32-bit registers. For example, the following examples cause the address size override to be emitted:  
 
-```  
+```MASM  
 mov rax, QWORD PTR [ecx]  
 mov eax, DWORD PTR [ecx*2+r10d]  
 mov eax, DWORD PTR [ecx*2+r10d+0100h]  
 prefetch [eax]  
 movnti rax, QWORD PTR [r8d]  
 ```  
 
- MASM assumes that if a 32-bit displacement appears alone as a memory operand, 64-bit addressing is intended. There is currently no support for 32-bit addressing with such operands.  
+MASM assumes that if a 32-bit displacement appears alone as a memory operand, 64-bit addressing is intended. There is currently no support for 32-bit addressing with such operands.  
 
- Finally, mixing register sizes within a memory operand, as demonstrated in the following code, will generate an error.  
+Finally, mixing register sizes within a memory operand, as demonstrated in the following code, generates an error.  
 
-```  
+```MASM  
 mov eax, DWORD PTR [rcx*2+r10d]  
 mov eax, DWORD PTR [ecx*2+r10+0100h]  
 ```  
 
 ## See Also  
- [Microsoft Macro Assembler Reference](../../assembler/masm/microsoft-macro-assembler-reference.md)
+
+[Microsoft Macro Assembler Reference](../../assembler/masm/microsoft-macro-assembler-reference.md)

docs/assembler/masm/operators-reference.md

@@ -1,5 +1,5 @@
 ---
-title: "Operators Reference | Microsoft Docs"
+title: "MASM Operators Reference | Microsoft Docs"
 ms.custom: ""
 ms.date: "11/04/2016"
 ms.reviewer: ""
@@ -33,16 +33,17 @@ translation.priority.ht:
   - "zh-cn"
   - "zh-tw"
 ---
-# Operators Reference
-**Arithmetic**  
+# MASM Operators Reference
+
+## Arithmetic  
 
 ||||  
 |-|-|-|  
 |[*](../../assembler/masm/operator-multiply.md)|[+](../../assembler/masm/operator-add.md)|[-](../../assembler/masm/operator-subtract-2.md)|  
 |[.](../../assembler/masm/operator-dot.md)|[/](../../assembler/masm/operator-subtract-1.md)|[[]](../../assembler/masm/operator-brackets.md)|  
 |[MOD](../../assembler/masm/operator-mod.md)|||  
 
-### Control Flow  
+## Control Flow  
 
 ||||  
 |-|-|-|  
@@ -51,21 +52,21 @@ translation.priority.ht:
 |[==](../../assembler/masm/operator-equal-masm-run-time.md)|[>](../../assembler/masm/operator-greater-than-masm-run-time.md)|[>=](../../assembler/masm/operator-greater-or-equal-masm-run-time.md)|  
 |[||](../../assembler/masm/operator-logical-or.md)|||  
 
-### Logical and Shift  
+## Logical and Shift  
 
 ||||  
 |-|-|-|  
 |[AND](../../assembler/masm/operator-and.md)|[NOT](../../assembler/masm/operator-not.md)|[OR](../../assembler/masm/operator-or.md)|  
 |[SHL](../../assembler/masm/operator-shl.md)|[SHR](../../assembler/masm/operator-shr.md)|[XOR](../../assembler/masm/operator-xor.md)|  
 
-### Macro  
+## Macro  
 
 ||||  
 |-|-|-|  
 |[!](../../assembler/masm/operator-logical-not-masm-run-time.md)|[%](../../assembler/masm/operator-percent.md)|[&](../../assembler/masm/operator-bitwise-and.md)|  
 |[;;](../../assembler/masm/operator-semicolons.md)|[<>](../../assembler/masm/operator-literal.md)||  
 
-### Miscellaneous  
+## Miscellaneous  
 
 ||||  
 |-|-|-|  
@@ -74,28 +75,28 @@ translation.priority.ht:
 |[DUP](../../assembler/masm/operator-dup.md)|[OVERFLOW?](../../assembler/masm/operator-overflow-q.md)|[PARITY?](../../assembler/masm/operator-parity-q.md)|  
 |[SIGN?](../../assembler/masm/operator-sign-q.md)|[ZERO?](../../assembler/masm/operator-zero-q.md)||  
 
-### Record  
+## Record  
 
 |||  
 |-|-|  
 |[MASK](../../assembler/masm/operator-mask.md)|[WIDTH](../../assembler/masm/operator-width.md)|  
 
-### Relational  
+## Relational  
 
 ||||  
 |-|-|-|  
 |[EQ](../../assembler/masm/operator-eq.md)|[GE](../../assembler/masm/operator-ge.md)|[GT](../../assembler/masm/operator-gt.md)|  
 |[LE](../../assembler/masm/operator-le.md)|[LT](../../assembler/masm/operator-lt.md)|[NE](../../assembler/masm/operator-ne.md)|  
 
-### Segment  
+## Segment  
 
 |||  
 |-|-|  
 |[:](../../assembler/masm/operator-colon.md)|[IMAGEREL](../../assembler/masm/operator-imagerel.md)|  
 |[LROFFSET](../../assembler/masm/operator-lroffset.md)|[OFFSET](../../assembler/masm/operator-offset.md)|  
 |[SECTIONREL](../../assembler/masm/operator-sectionrel.md)|[SEG](../../assembler/masm/operator-seg.md)|  
 
-### Type  
+## Type  
 
 ||||  
 |-|-|-|  
@@ -106,4 +107,5 @@ translation.priority.ht:
 |[SIZEOF](../../assembler/masm/operator-sizeof.md)|[THIS](../../assembler/masm/operator-this.md)|[TYPE](../../assembler/masm/operator-type.md)|  
 
 ## See Also  
- [Microsoft Macro Assembler Reference](../../assembler/masm/microsoft-macro-assembler-reference.md)
+
+[Microsoft Macro Assembler Reference](../../assembler/masm/microsoft-macro-assembler-reference.md)

docs/build/TOC.md

@@ -10,8 +10,8 @@
 ### [Manifest Generation at the Command Line](manifest-generation-at-the-command-line.md)
 ### [How to: Embed a Manifest Inside a C/C++ Application](how-to-embed-a-manifest-inside-a-c-cpp-application.md)
 ## [Troubleshooting C/C++ Isolated Applications and Side-by-side Assemblies](troubleshooting-c-cpp-isolated-applications-and-side-by-side-assemblies.md)
-# [Configuring Programs for 64-Bit (Visual C++)](configuring-programs-for-64-bit-visual-cpp.md)
-## [How to: Configure Visual C++ Projects to Target 64-Bit Platforms](how-to-configure-visual-cpp-projects-to-target-64-bit-platforms.md)
+# [Configure Visual C++ for 64-bit, x64 targets](configuring-programs-for-64-bit-visual-cpp.md)
+## [How to: Configure Visual C++ Projects to Target 64-Bit, x64 Platforms](how-to-configure-visual-cpp-projects-to-target-64-bit-platforms.md)
 ## [How to: Enable a 64-Bit Visual C++ Toolset on the Command Line](how-to-enable-a-64-bit-visual-cpp-toolset-on-the-command-line.md)
 ## [Common Visual C++ 64-bit Migration Issues](common-visual-cpp-64-bit-migration-issues.md)
 ## [x64 Software Conventions](x64-software-conventions.md)
@@ -55,7 +55,7 @@
 #### [Unwind Data Definitions in C](unwind-data-definitions-in-c.md)
 ### [Intrinsics and Inline Assembly](intrinsics-and-inline-assembly.md)
 ### [Image Format](image-format.md)
-# [Configuring Programs for ARM Processors (Visual C++)](configuring-programs-for-arm-processors-visual-cpp.md)
+# [Configure Visual C++ for ARM processors](configuring-programs-for-arm-processors-visual-cpp.md)
 ## [Common Visual C++ ARM Migration Issues](common-visual-cpp-arm-migration-issues.md)
 ## [Overview of ARM ABI Conventions](overview-of-arm-abi-conventions.md)
 ## [ARM Exception Handling](arm-exception-handling.md)
@@ -99,12 +99,12 @@
 ## [Naming Conventions for MFC DLLs](naming-conventions-for-mfc-dlls.md)
 ## [Calling DLL Functions from Visual Basic Applications](calling-dll-functions-from-visual-basic-applications.md)
 # [Compiler Intrinsics and Assembly Language](../intrinsics/TOC.md)
-# [Building on the Command Line](building-on-the-command-line.md)
+# [Build C/C++ code on the command line](building-on-the-command-line.md)
 ## [Walkthrough: Compiling a Native C++ Program on the Command Line](walkthrough-compiling-a-native-cpp-program-on-the-command-line.md)
 ## [Walkthrough: Compile a C program on the command line](walkthrough-compile-a-c-program-on-the-command-line.md)
 ## [Walkthrough: Compiling a C++/CLI Program on the Command Line](walkthrough-compiling-a-cpp-cli-program-on-the-command-line.md)
 ## [Walkthrough: Compiling a C++/CX Program on the Command Line](walkthrough-compiling-a-cpp-cx-program-on-the-command-line.md)
-## [Setting the Path and Environment Variables for Command-Line Builds](setting-the-path-and-environment-variables-for-command-line-builds.md)
+## [Set the Path and Environment Variables for Command-Line Builds](setting-the-path-and-environment-variables-for-command-line-builds.md)
 ## [NMAKE Reference](nmake-reference.md)
 ### [Running NMAKE](running-nmake.md)
 #### [NMAKE Options](nmake-options.md)