Merge pull request MicrosoftDocs#866 from MicrosoftDocs/FromPublicMasterBranch

Colin Robertson · web-flow · commit bb963e09b7dd · 2018-06-04T15:28:44.000-07:00
Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master)
diff --git a/docs/build/loadlibrary-and-afxloadlibrary.md b/docs/build/loadlibrary-and-afxloadlibrary.md
@@ -25,7 +25,7 @@ For MFC applications that load MFC extension DLLs, we recommend that you use `Af
 If Windows cannot load the DLL, the process can attempt to recover from the error. For example, the process could notify the user of the error and ask the user to specify another path to the DLL.
 
 > [!IMPORTANT]  
-> Make sure to specify the full path of any DLLs. The current directory is searched first when files are loaded. If you do not qualify the path of the file, a file that is not the intended one might be loaded. Another way to prevent this is by using the [/DEPENDENTLOADFLAGS](../build/reference/dependentloadflags.md) linker option.
+> Make sure to specify the full path of any DLLs. The current directory is searched first when files are loaded. If you do not qualify the path of the file, a file that is not the intended one might be loaded. Another way to prevent this is by using the [/DEPENDENTLOADFLAG](../build/reference/dependentloadflag.md) linker option.
 
 ## What do you want to do?
 
diff --git a/docs/build/reference/TOC.md b/docs/build/reference/TOC.md
@@ -204,7 +204,7 @@
 ### [/DELAY (Delay Load Import Settings)](delay-delay-load-import-settings.md)
 ### [/DELAYLOAD (Delay Load Import)](delayload-delay-load-import.md)
 ### [/DELAYSIGN (Partially Sign an Assembly)](delaysign-partially-sign-an-assembly.md)
-### [/DEPENDENTLOADFLAGS (Set default dependent load flags)](dependentloadflags.md)
+### [/DEPENDENTLOADFLAG (Set default dependent load flags)](dependentloadflag.md)
 ### [/DLL (Build a DLL)](dll-build-a-dll.md)
 ### [/DRIVER (Windows NT Kernel Mode Driver)](driver-windows-nt-kernel-mode-driver.md)
 ### [/DYNAMICBASE (Use address space layout randomization)](dynamicbase-use-address-space-layout-randomization.md)
diff --git a/docs/build/reference/dependentloadflag.md b/docs/build/reference/dependentloadflag.md
@@ -1,24 +1,24 @@
 ---
-title: "/DEPENDENTLOADFLAGS (Set default dependent load flags)"
-description: "The /DEPENDENTLOADFLAGS option sets default flags for DLLs loaded using LoadLibrary"
+title: "/DEPENDENTLOADFLAG (Set default dependent load flags)"
+description: "The /DEPENDENTLOADFLAG option sets default flags for DLLs loaded using LoadLibrary"
 ms.custom: ""
 ms.date: "05/18/2018"
 ms.technology: ["cpp-tools"]
 ms.topic: "reference"
 f1_keywords: ["dependentloadflag"]
 dev_langs: ["C++"]
-helpviewer_keywords: ["LINK tool [C++], dependent load flags", "-DEPENDENTLOADFLAGS linker option", "linker [C++], DEPENDENTLOADFLAGS", "DEPENDENTLOADFLAGS linker option", "/DEPENDENTLOADFLAGS linker option"]
+helpviewer_keywords: ["LINK tool [C++], dependent load flags", "-DEPENDENTLOADFLAG linker option", "linker [C++], DEPENDENTLOADFLAG", "DEPENDENTLOADFLAG linker option", "/DEPENDENTLOADFLAG linker option"]
 author: "corob-msft"
 ms.author: "corob"
 ms.workload: ["cplusplus"]
 ---
-# /DEPENDENTLOADFLAGS (Set default dependent load flags)
+# /DEPENDENTLOADFLAG (Set default dependent load flags)
 
 Sets the default load flags used when `LoadLibrary` is used to load DLLs.
 
 ## Syntax
 
-> **/DEPENDENTLOADFLAGS**[**:**_loadflags_]
+> **/DEPENDENTLOADFLAG**[**:**_loadflags_]
 
 ### Arguments
 
@@ -34,9 +34,9 @@ On supported operating systems, this option has the effect of changing calls to
 
 This flag can be used to prevent DLL planting attacks. For example, if an app uses `LoadLibrary` to load a dependent DLL, an attacker could plant a DLL with the same name in the search path used by `LoadLibrary`, such as the current directory, which may be checked before system directories if safe DLL search mode is disabled. Safe DLL search mode places the user's current directory later in the search order, and is enabled by default on Windows XP SP2 and later versions. For more information, see [Dynamic-Link Library Search Order](https://msdn.microsoft.com/library/windows/desktop/ms682586.aspx).
 
-For example, if you specify the link option `/DEPENDENTLOADFLAGS:0xA00` (the value of the combined flags `LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32`), then even if safe DLL search mode is disabled on the user's computer, the DLL search path is limited to protected directories that are more difficult for an attacker to change. For information on the flags available, and their symbolic and numeric values, see the *dwFlags* parameter description in [LoadLibraryEx](https://go.microsoft.com/fwlink/p/?LinkID=236091).
+If you specify the link option `/DEPENDENTLOADFLAG:0xA00` (the value of the combined flags `LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32`), then even if safe DLL search mode is disabled on the user's computer, the DLL search path is limited to protected directories that are more difficult for an attacker to change. For information on the flags available, and their symbolic and numeric values, see the *dwFlags* parameter description in [LoadLibraryEx](https://go.microsoft.com/fwlink/p/?LinkID=236091).
 
-### To set the DEPENDENTLOADFLAGS linker option in the Visual Studio development environment
+### To set the DEPENDENTLOADFLAG linker option in the Visual Studio development environment
 
 1. Open the project's **Property Pages** dialog box. For details, see [Setting Visual C++ Project Properties](../../ide/working-with-project-properties.md).
 
diff --git a/docs/build/reference/linker-options.md b/docs/build/reference/linker-options.md
@@ -54,7 +54,7 @@ You can use the [comment](../../preprocessor/comment-c-cpp.md) pragma to specify
 |[/DELAY](../../build/reference/delay-delay-load-import-settings.md)|Controls the delayed loading of DLLs.|
 |[/DELAYLOAD](../../build/reference/delayload-delay-load-import.md)|Causes the delayed loading of the specified DLL.|
 |[/DELAYSIGN](../../build/reference/delaysign-partially-sign-an-assembly.md)|Partially signs an assembly.|
-|[/DEPENDENTLOADFLAGS](dependentloadflags.md)|Sets default flags on dependent DLL loads.|
+|[/DEPENDENTLOADFLAG](dependentloadflag.md)|Sets default flags on dependent DLL loads.|
 |[/DLL](../../build/reference/dll-build-a-dll.md)|Builds a DLL.|
 |[/DRIVER](../../build/reference/driver-windows-nt-kernel-mode-driver.md)|Creates a kernel mode driver.|
 |[/DYNAMICBASE](../../build/reference/dynamicbase-use-address-space-layout-randomization.md)|Specifies whether to generate an executable image that can be randomly rebased at load time by using the address space layout randomization (ASLR) feature.|
diff --git a/docs/cpp/codesnippet/CPP/how-to-create-and-use-unique-ptr-instances_3.cpp b/docs/cpp/codesnippet/CPP/how-to-create-and-use-unique-ptr-instances_3.cpp
@@ -7,12 +7,12 @@ class MyClass
 public:
 
     // Initialize by using make_unique with ClassFactory default constructor.
-    MyClass() : factory ( make_unique<ClassFactory>())
+    MyClass() : factory (make_unique<ClassFactory>())
     {
     }
 
     void MakeClass()
     {
         factory->DoSomething();
     }
-};
+};
diff --git a/docs/cpp/how-to-create-and-use-unique-ptr-instances.md b/docs/cpp/how-to-create-and-use-unique-ptr-instances.md
@@ -17,7 +17,7 @@ A [unique_ptr](../standard-library/unique-ptr-class.md) does not share its point
   
  ![Moving the ownership of a unique&#95;ptr](../cpp/media/unique_ptr.png "unique_ptr")  
   
- `unique_ptr` is defined in the `<memory>` header in the C++ Standard Library. It is exactly is efficient as a raw pointer and can be used in C++ Standard Library containers. The addition of `unique_ptr` instances to C++ Standard Library containers is efficient because the move constructor of the `unique_ptr` eliminates the need for a copy operation.  
+ `unique_ptr` is defined in the `<memory>` header in the C++ Standard Library. It is exactly as efficient as a raw pointer and can be used in C++ Standard Library containers. The addition of `unique_ptr` instances to C++ Standard Library containers is efficient because the move constructor of the `unique_ptr` eliminates the need for a copy operation.  
   
 ## Example  
  The following example shows how to create `unique_ptr` instances and pass them between functions.  
@@ -47,4 +47,4 @@ A [unique_ptr](../standard-library/unique-ptr-class.md) does not share its point
   
 ## See Also  
  [Smart Pointers](../cpp/smart-pointers-modern-cpp.md)   
- [make_unique](../standard-library/memory-functions.md#make_unique)
+ [make_unique](../standard-library/memory-functions.md#make_unique)

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,12 @@ class MyClass`
`7`	`7`	`public:`
`8`	`8`
`9`	`9`	`// Initialize by using make_unique with ClassFactory default constructor.`
`10`		`- MyClass() : factory ( make_unique<ClassFactory>())`
	`10`	`+ MyClass() : factory (make_unique<ClassFactory>())`
`11`	`11`	`{`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`void MakeClass()`
`15`	`15`	`{`
`16`	`16`	`factory->DoSomething();`
`17`	`17`	`}`
`18`		`-};`
	`18`	`+};`