Merge branch 'master' of https://github.com/MicrosoftDocs/cpp-docs-pr into cr-sourcelink

Author: Colin Robertson

docs/build/reference/TOC.md

@@ -78,6 +78,7 @@
 #### [/hotpatch (Create Hotpatchable Image)](hotpatch-create-hotpatchable-image.md)
 #### [/I (Additional Include Directories)](i-additional-include-directories.md)
 #### [/J (Default char Type Is unsigned)](j-default-char-type-is-unsigned.md)
+#### [/JMC (Just My Code debugging)](jmc.md)
 #### [/kernel (Create Kernel Mode Binary)](kernel-create-kernel-mode-binary.md)
 #### [/link (Pass Options to Linker)](link-pass-options-to-linker.md)
 #### [/LN (Create MSIL Module)](ln-create-msil-module.md)

docs/build/reference/compiler-options-listed-alphabetically.md

@@ -1,7 +1,7 @@
 ---
 title: "Compiler Options Listed Alphabetically | Microsoft Docs"
 ms.custom: ""
-ms.date: "02/22/2018"
+ms.date: "08/20/2018"
 ms.technology: ["cpp-tools"]
 ms.topic: "reference"
 dev_langs: ["C++"]
@@ -79,6 +79,7 @@ The following is a comprehensive alphabetical list of compiler options. For a ca
 |[/hotpatch](hotpatch-create-hotpatchable-image.md)|Creates a hotpatchable image.|
 |[/I](i-additional-include-directories.md)|Searches a directory for include files.|
 |[/J](j-default-char-type-is-unsigned.md)|Changes the default `char` type.|
+|[/JMC](jmc.md)|Supports native C++ Just My Code debugging.|
 |[/kernel](kernel-create-kernel-mode-binary.md)|The compiler and linker will create a binary that can be executed in the Windows kernel.|
 |[/LD](md-mt-ld-use-run-time-library.md)|Creates a dynamic-link library.|
 |[/LDd](md-mt-ld-use-run-time-library.md)|Creates a debug dynamic-link library.|

docs/build/reference/compiler-options-listed-by-category.md

@@ -1,7 +1,7 @@
 ---
 title: "Compiler Options Listed by Category | Microsoft Docs"
 ms.custom: ""
-ms.date: "11/04/2016"
+ms.date: "08/20/2018"
 ms.technology: ["cpp-tools"]
 ms.topic: "reference"
 dev_langs: ["C++"]
@@ -159,6 +159,7 @@ This article contains a categorical list of compiler options. For an alphabetica
 |[/H](h-restrict-length-of-external-names.md)|Deprecated. Restricts the length of external (public) names.|
 |[/HELP](help-compiler-command-line-help.md)|Lists the compiler options.|
 |[/J](j-default-char-type-is-unsigned.md)|Changes the default `char` type.|
+|[/JMC](jmc.md)|Supports native C++ Just My Code debugging.|
 |[/kernel](kernel-create-kernel-mode-binary.md)|The compiler and linker will create a binary that can be executed in the Windows kernel.|
 |[/MP](mp-build-with-multiple-processes.md)|Builds multiple source files concurrently.|
 |[/nologo](nologo-suppress-startup-banner-c-cpp.md)|Suppresses display of sign-on banner.|

docs/build/reference/exports.md

@@ -1,7 +1,7 @@
 ---
 title: "EXPORTS | Microsoft Docs"
 ms.custom: ""
-ms.date: "07/11/2018"
+ms.date: "08/20/2018"
 ms.technology: ["cpp-tools"]
 ms.topic: "reference"
 f1_keywords: ["EXPORTS"]
@@ -38,13 +38,20 @@ EXPORTS
    func2=func1
 ```
 
-If the name that you export is from other module, specify the export's name in the DLL by using *other_module.exported_name*. For example, if your DLL exports a function `other_module.func1` and you want callers to use it as `func2`, you would specify:
+If the name that you export is from some other module, specify the export's name in the DLL by using *other_module.exported_name*. For example, if your DLL exports a function `other_module.func1` and you want callers to use it as `func2`, you would specify:
 
 ```DEF
 EXPORTS
    func2=other_module.func1
 ```
 
+If the name that you export is from another module that exports by ordinal, specify the export's ordinal in the DLL by using *other_module.#ordinal_number*. For example, if your DLL exports a function from the other module where it is ordinal 42, and you want callers to use it as `func2`, you would specify:
+
+```DEF
+EXPORTS
+   func2=other_module.#42
+```
+
 Because the Visual C++ compiler uses name decoration for C++ functions, you must either use the decorated name internal_name or define the exported functions by using extern "C" in the source code. The compiler also decorates C functions that use the [__stdcall](../../cpp/stdcall.md) calling convention with an underscore (_) prefix and a suffix composed of the at sign (@) followed by the number of bytes (in decimal) in the argument list.  
 
 To find the decorated names produced by the compiler, use the [DUMPBIN](../../build/reference/dumpbin-reference.md) tool or the linker [/MAP](../../build/reference/map-generate-mapfile.md) option. The decorated names are compiler-specific. If you export the decorated names in the .DEF file, executables that link to the DLL must also be built by using the same version of the compiler. This ensures that the decorated names in the caller match the exported names in the .DEF file.  

docs/build/reference/jmc.md

@@ -0,0 +1,46 @@
+---
+title: "/JMC (Just My Code debugging) | Microsoft Docs"
+ms.custom: "08/20/2018"
+ms.technology: ["cpp-tools"]
+ms.topic: "reference"
+f1_keywords: ["/JMC"]
+dev_langs: ["C++"]
+helpviewer_keywords: ["/JMC compiler option [C++]", "Just my code [C++]", "-JMC compiler option [C++]", "User code, debugging", "JMC compiler option [C++]"]
+author: "corob-msft"
+ms.author: "corob"
+ms.workload: ["cplusplus"]
+---
+# /JMC (Just My Code debugging)
+
+Specifies compiler support for native *Just My Code* debugging in the Visual Studio debugger. This option allows Visual Studio to automatically step over system, framework, library, and other non-user calls, and to collapse those calls in the call stack window. The **/JMC** compiler option is available starting in Visual Studio 2017 version 15.8.
+
+## Syntax
+
+> **/JMC**\[**-**]
+
+## Remarks
+
+The Visual Studio [Just My Code](/visualstudio/debugger/just-my-code) option allows the Visual Studio debugger to step over system, framework, library, and other non-user calls. The **/JMC** compiler option enables support for Just My Code debugging in your native C++ code. When **/JMC** is enabled, the compiler inserts calls to a helper function, `__CheckForDebuggerJustMyCode`, in the function prolog. The Visual Studio debugger uses this information to check whether the debugger step operation should skip this function call. To enable Just My Code in the Visual Studio debugger, on the menu bar, choose **Tools** > **Options**, and then set the option in **Debugging** > **General** > **Enable Just My Code**.
+
+The Just My Code feature requires that your code links to the Universal C Runtime Library (CRT) by use of the [/MT, /MTd, /MD, or /MDd](md-mt-ld-use-run-time-library.md) compiler option, or the [/DEFAULTLIB](defaultlib-specify-default-library.md) linker option. If you project does not link to the CRT, you may see linker error **LNK2019: unresolved external symbol __CheckForDebuggerJustMyCode**. To resolve this error, either link to the CRT, or disable the **/JMC** option.
+
+By default, the **/JMC** compiler option is off. However, starting in Visual Studio 2017 version 15.8 this option is enabled in most Visual Studio project templates. To explicitly disable this option, use the **/JMC-** option on the command line. In Visual Studio, open the project Property Pages dialog box, and change the **Support Just My Code Debugging** property in the **Configuration Properties** > **C/C++** > **General** property page to **No**.
+
+For more information, see [C++ Just My Code](/visualstudio/debugger/just-my-code#BKMK_C___Just_My_Code) in [Specify whether to debug only user code using Just My Code in Visual Studio](/visualstudio/debugger/just-my-code), and the Visual C++ Team Blog post [Announcing C++ Just My Code Stepping in Visual Studio](https://blogs.msdn.microsoft.com/vcblog/2018/06/29/announcing-jmc-stepping-in-visual-studio/).
+
+### To set this compiler option in the Visual Studio development environment
+
+1. Open the project's **Property Pages** dialog box. For details, see [Working with Project Properties](../../ide/working-with-project-properties.md).
+
+1. Select the **Configuration Properties** > **C/C++** > **General** property page.
+
+1. Modify the **Support Just My Code Debugging** property.
+
+### To set this compiler option programmatically
+
+- See <xref:Microsoft.VisualStudio.VCProjectEngine.VCCLCompilerTool.AdditionalOptions%2A>.
+
+## See Also
+
+[Compiler Options](../../build/reference/compiler-options.md)<br/>
+[Setting Compiler Options](../../build/reference/setting-compiler-options.md)<br/>