Merge remote-tracking branch 'refs/remotes/origin/master' into cr-build-error

Author: Colin Robertson

docs/ide/add-member-function-wizard.md

@@ -80,9 +80,9 @@ This wizard adds a member function declaration to the header file and a stub mem
 
 |Option|Description|  
 |------------|-----------------|  
-|[Static](../misc/static-cpp.md)|Specifies that the function acts like a global and can be called outside of the class, even with no class instantiation. The member function has no access to non-static members. A member function specified as `Static` cannot be virtual.|  
+|[Static](../cpp/storage-classes-cpp.md)|Specifies that the function acts like a global and can be called outside of the class, even with no class instantiation. The member function has no access to non-static members. A member function specified as `Static` cannot be virtual.|  
 |[Virtual](../cpp/virtual-cpp.md)|Ensures that the correct member function is called for an object, regardless of the expression used to make the member function call. A member function specified as `Virtual` cannot be static.|  
-|**Pure**|Indicates that no implementation is supplied for the virtual member function being declared; therefore, **Pure** can be specified only on virtual member functions. See [Class-Member Declaration Syntax](../misc/class-member-declaration-syntax.md) for more information.<br /><br /> A class that contains at least one pure virtual member function is considered an abstract class. Classes derived from the abstract class must implement the pure virtual member function or they, too, are abstract classes.|  
+|**Pure**|Indicates that no implementation is supplied for the virtual member function being declared; therefore, **Pure** can be specified only on virtual member functions. A class that contains at least one pure virtual member function is considered an abstract class. Classes derived from the abstract class must implement the pure virtual member function or they, too, are abstract classes.|  
 |[Inline](../cpp/inline-functions-cpp.md)|Instructs the compiler to insert a copy of the member function body into each place the member function is called. A member function specified as **Inline** cannot be pure.|  
 
  **.cpp file**  

docs/ide/add-member-variable-wizard.md

@@ -69,7 +69,7 @@ This wizard adds a member variable declaration to the header file and, depending
  Sets the name of the member variable you are adding. Member variables typically begin with the identifying string "m_," which is provided for you by default.  
 
  **Control variable**  
- Indicates that the member variable manages a control within a dialog box with [data exchange and data validation](../mfc/dialog-data-exchange-and-validation.md) support. See [DoDataExchange](../Topic/CWnd::DoDataExchange.md) for more information. This option is available only for member variables added to classes derived from [CDialog](../mfc/reference/cdialog-class.md). Select this box to activate the **Control ID** and **Control type** options.  
+ Indicates that the member variable manages a control within a dialog box with [data exchange and data validation](../mfc/dialog-data-exchange-and-validation.md) support. See [DoDataExchange](../mfc/reference/cwnd-class.md#dodataexchange) for more information. This option is available only for member variables added to classes derived from [CDialog](../mfc/reference/cdialog-class.md). Select this box to activate the **Control ID** and **Control type** options.  
 
  **Control ID**  
  Sets the ID for the control variable you are adding. Select from the list the ID for the type of control for which you are adding the member variable. The list is active only when the **Control variable** box is selected, and it is limited to IDs for the controls already added to the dialog box. For example, for the standard **OK** button, the Control ID is **IDOK**.  

docs/ide/add-method-wizard.md

@@ -57,7 +57,7 @@ Use this wizard to add a method to an interface. Depending on the project type o
 |--------------------|-----------------|  
 |ATL dual interface, custom interface, and local custom interface|Provide your own method name.|  
 |MFC dispinterface|Provide your own method name or select a suggested method name from the list. If you select a name from the list, the appropriate value appears in the **Return type** box, and it is unchangeable.|  
-|MFC ActiveX control dispinterface|Provide your own or select either of the stock methods [DoClick](../Topic/COleControl::DoClick.md) and [Refresh](../Topic/COleControl::Refresh.md). See [MFC ActiveX Controls: Adding Stock Methods](../mfc/mfc-activex-controls-adding-stock-methods.md) for more information.|  
+|MFC ActiveX control dispinterface|Provide your own or select either of the stock methods [DoClick](../mfc/reference/colecontrol-class.md#doclick) and [Refresh](../mfc/reference/colecontrol-class.md#refresh). See [MFC ActiveX Controls: Adding Stock Methods](../mfc/mfc-activex-controls-adding-stock-methods.md) for more information.|  
 
  **Method type**  
  Available only for MFC ActiveX controls. If you provide a method name in the **Method name** box, rather than selecting a method from the list, this box is unavailable.  

docs/ide/adding-references-in-visual-cpp-projects.md

@@ -47,9 +47,7 @@ It is very common for programs to call into APIs in other binaries such as DLLs,
 
  ![Visual C++ Reference Manager (ATL Projects)](../ide/media/visual-c---reference-manager--atl-projects-.png "Visual C++ Reference Manager (ATL Projects)")  
 
- In a C++/CLI or Universal Windows Platform project,  the concept of references applies to more kinds of binaries in addition to other projects in the solution.  These are all exposed in **Reference Manager**:  
-  
- ![Visual C++ Reference Manager for C++/CLI projects](../Image/Visual%20C++%20Reference%20Manager%20for%20C++/CLI%20projects.png "Visual C++ Reference Manager for C++/CLI projects")  
+ In a C++/CLI or Universal Windows Platform project,  the concept of references applies to more kinds of binaries in addition to other projects in the solution.  These are all exposed in **Reference Manager**.
 
 ## Reference properties  
  Each kind of reference has properties. You can view the properties by selecting the reference in Solution Explorer and pressing **Alt + Enter**, or else right-clicking and choosing **Properties**. Some properties are read-only and some can be modified. However, typically you don't have to manually modify these properties.  

docs/ide/clickonce-deployment-for-visual-cpp-applications.md

@@ -61,7 +61,7 @@ translation.priority.mt:
 ## See Also  
  [Mage.exe (Manifest Generation and Editing Tool)](http://msdn.microsoft.com/Library/77dfe576-2962-407e-af13-82255df725a1)   
  [MageUI.exe (Manifest Generation and Editing Tool, Graphical Client)](http://msdn.microsoft.com/Library/f9e130a6-8117-49c4-839c-c988f641dc14)   
- [Makecert.exe (Certificate Creation Tool)](../Topic/Makecert.exe%20\(Certificate%20Creation%20Tool\).md)   
+ [Makecert.exe (Certificate Creation Tool)](https://msdn.microsoft.com/library/windows/desktop/aa386968)   
  [Deploying Desktop Applications](../ide/deploying-native-desktop-applications-visual-cpp.md)   
  [Deploying Applications, Services, and Components](/visualstudio/deployment/deploying-applications-services-and-components)   
  [Windows Installer Deployment](http://msdn.microsoft.com/en-us/121be21b-b916-43e2-8f10-8b080516d2a0)   

docs/ide/getcodeforexitinstance.md

@@ -35,7 +35,7 @@ translation.priority.ht:
   - "zh-tw"
 ---
 # GetCodeForExitInstance
-Gets the [ExitInstance](../Topic/CWinApp::ExitInstance.md) code for terminating the wizard.  
+Gets the [ExitInstance](../mfc/reference/cwinapp-class.md#exitinstance) code for terminating the wizard.  
 
 ## Syntax  
 

docs/ide/getcodeforinitinstance.md

@@ -35,7 +35,7 @@ translation.priority.ht:
   - "zh-tw"
 ---
 # GetCodeForInitInstance
-Retrieves the specified code for [InitInstance](../Topic/CWinApp::InitInstance.md).  
+Retrieves the specified code for [InitInstance](../mfc/reference/cwinapp-class.md#initinstance).  
 
 ## Syntax  
 

docs/ide/getuniquefilename.md

@@ -39,8 +39,7 @@ Returns a unique file name.
 
 ## Syntax  
 
-```  
-  
+```    
       function GetUniqueFileName(   
    strDirectory,   
    strFileName    
@@ -55,7 +54,7 @@ Returns a unique file name.
  File name to check.  
 
 ## Return Value  
- The file name indicated in `strFileName` if unique; otherwise this function returns `strFileName`, appended with a number from 1 to 9999999, to make it unique. If `strFileName` is not provided, this function returns a unique file name by using [GetTempName Method](jsmthGetTempName).  
+ The file name indicated in `strFileName` if unique; otherwise this function returns `strFileName`, appended with a number from 1 to 9999999, to make it unique. If `strFileName` is not provided, this function returns a unique file name by using the `GetTempName` method.  
 
 ## Remarks  
  Returns a unique file name.  

docs/ide/insertintofunction.md

@@ -35,7 +35,7 @@ translation.priority.ht:
   - "zh-tw"
 ---
 # InsertIntoFunction
-Used by [AddATLSupportToProject](../ide/addatlsupporttoproject.md) to insert code into [InitInstance](../Topic/CWinApp::InitInstance.md).  
+Used by [AddATLSupportToProject](../ide/addatlsupporttoproject.md) to insert code into [InitInstance](../mfc/reference/cwinapp-class.md#initinstance).  
 
 ## Syntax  
 

docs/ide/isolated-com-manifest-tool.md

@@ -59,7 +59,6 @@ Use this dialog box to specify **Isolated COM** options for [Mt.exe](http://msdn
 
 ## See Also  
  [Isolated Applications](http://msdn.microsoft.com/library/aa375190)   
- [Side-by-side Assemblies](_win32_side_by_side_assemblies)   
  [ClickOnce Application Manifest](/visualstudio/deployment/clickonce-application-manifest)   
  [Manifest Tool Property Pages](../ide/manifest-tool-property-pages.md)   
  [Working with Project Properties](../ide/working-with-project-properties.md)   

docs/ide/jscript-functions-for-cpp-wizards.md

@@ -57,7 +57,7 @@ translation.priority.ht:
 |[GetCodeForDllRegisterServer](../ide/getcodefordllregisterserver.md)|Retrieves the code to register a server.|  
 |[GetCodeForDllUnregisterServer](../ide/getcodefordllunregisterserver.md)|Retrieves the code to unregister a server.|  
 |[GetCodeForExitInstance](../ide/getcodeforexitinstance.md)|Helper function to get the text for `ExitInstance`.|  
-|[GetCodeForInitInstance](../ide/getcodeforinitinstance.md)|Helper function to get the text for [InitInstance](../Topic/CWinApp::InitInstance.md).|  
+|[GetCodeForInitInstance](../ide/getcodeforinitinstance.md)|Helper function to get the text for [InitInstance](../mfc/reference/cwinapp-class.md#initinstance).|  
 |[GetExportPragmas](../ide/getexportpragmas.md)|Retrieves the pragmas for exporting functions.|  
 |[GetInterfaceClasses](../ide/getinterfaceclasses.md)|Returns the `VCCodeClass` object associated with an interface.|  
 |[GetInterfaceType](../ide/getinterfacetype.md)|Returns the type of interface (for example, custom, dual, dispinterface, oleautomation).|  

docs/ide/names-add-property-wizard.md

@@ -56,10 +56,10 @@ Use this wizard to add a property to an interface.
  MFC dispinterfaces only. Available only if you specify **Member variable** under **Implementation type**. Sets the name of the notification function called if the property changes. By default, the name of the notification function is set to On*PropertyName*Changed. You can edit this name.  
 
  **Get function**  
- For MFC dispinterfaces. Available only if you specify **Get/Set methods** under **Implementation type**. Sets the name of the function to get the property. By default, the name of the Get function is set to Get*PropertyName*. You can edit this name. If you delete the name, the function [GetNotSupported](../Topic/COleControl::GetNotSupported.md) is inserted into the interface dispatch map. The Get*PropertyName* function specifies that the property as readable.  
+ For MFC dispinterfaces. Available only if you specify **Get/Set methods** under **Implementation type**. Sets the name of the function to get the property. By default, the name of the Get function is set to Get*PropertyName*. You can edit this name. If you delete the name, the function [GetNotSupported](../mfc/reference/colecontrol-class.md#getnotsupported) is inserted into the interface dispatch map. The Get*PropertyName* function specifies that the property as readable.  
 
  **Set function**  
- MFC dispinterfaces only. Available only if you specify **Get/Set methods** under **Implementation type**. Sets the name of the function to set the property. By default, the name of the Set function is set to Set*PropertyName*. You can edit this name. If you delete the name, the function [SetNotSupported](../Topic/COleControl::SetNotSupported.md) is inserted into the interface dispatch map. The Set*PropertyName* function specifies that the property is writable.  
+ MFC dispinterfaces only. Available only if you specify **Get/Set methods** under **Implementation type**. Sets the name of the function to set the property. By default, the name of the Set function is set to Set*PropertyName*. You can edit this name. If you delete the name, the function [SetNotSupported](../mfc/reference/colecontrol-class.md#setnotsupported) is inserted into the interface dispatch map. The Set*PropertyName* function specifies that the property is writable.  
 
  **Implementation type**  
  MFC dispinterfaces only. Specifies how to implement the property you are adding.  

docs/ide/preparing-a-test-machine-to-run-a-debug-executable.md

@@ -47,12 +47,13 @@ To prepare a computer to test the debug version of an application that is built
     > [!NOTE]
     >  For remote debugging of your application built by using Visual C++ 2005 or Visual C++ 2008 on another computer, you have to deploy debug versions of Visual C++ library DLLs as shared side-by-side assemblies. You can use either a Setup project or Windows Installer to install corresponding merge modules.  
   
--   Use the_**Deploy** option in the **Configuration Manager** dialog box in Visual Studio to copy the project output and other files to the remote computer. An example of this deployment may be found in [Set Up Remote Debugging for a Visual Studio Project](../Topic/Set%20Up%20Remote%20Debugging%20for%20a%20Visual%20Studio%20Project.md).  
+-   Use the_**Deploy** option in the **Configuration Manager** dialog box in Visual Studio to copy the project output and other files to the remote computer. 
 
- After Visual C++ DLLs are installed, you can run a remote debugger on a network share. For more information about remote debugging, see [Set Up the Remote Tools on the Device](../Topic/Set%20Up%20the%20Remote%20Tools%20on%20the%20Device.md).  
+ After Visual C++ DLLs are installed, you can run a remote debugger on a network share. For more information about remote debugging, see [Remote Debugging](/visualstudio/debugger/remote-debugging.md).  
 
 ## See Also  
- [Set Up the Remote Tools on the Device](../Topic/Set%20Up%20the%20Remote%20Tools%20on%20the%20Device.md)   
+ 
  [Deployment in Visual C++](../ide/deployment-in-visual-cpp.md)   
  [Windows Installer Command line options](http://msdn.microsoft.com/library/windows/desktop/aa367988.aspx)   
- [Deployment Examples](../ide/deployment-examples.md)
+ [Deployment Examples](../ide/deployment-examples.md)
+ [Remote Debugging](/visualstudio/debugger/remote-debugging.md)

docs/ide/providing-context-sensitive-help.md

@@ -44,7 +44,7 @@ When you use the [Custom Wizard](../ide/application-settings-custom-wizard.md) t
  onClick="window.external.OnHelp('vc.appwiz.custom.overview');">  
 ```  
 
- The <xref:Microsoft.VisualStudio.VsWizard.VCWizCtlClass.OnHelp%2A> specifies the keyword of the HTML Help file associated with that page of your wizard. For more information about creating HTML Help files to associate with the page, see [HTML Help Start Page](vsconhh1start). To provide your own help for this wizard page, you must replace the string `'vc.appwiz.custom.overview'` with the keyword that identifies the HTML Help topic for the page.  
+ The `Microsoft.VisualStudio.VsWizard.VCWizCtlClass.OnHelp` method specifies the keyword of the HTML Help file associated with that page of your wizard. To provide your own help for this wizard page, you must replace the string `'vc.appwiz.custom.overview'` with the keyword that identifies the HTML Help topic for the page.  
 
  **Note** This .htm file cannot be integrated into the compiled MSDN Help.  
 

docs/ide/walkthrough-working-with-projects-and-solutions-cpp.md

@@ -108,7 +108,7 @@ Here's how to create a C++ project in Visual Studio, add code, and then build an
 
      The line `#pragma once` tells the compiler to include the file only one time. For more information, see [once](../preprocessor/once.md).  
 
-     For information about other C++ keywords in this header file, see [class](../cpp/class-cpp.md), [int](../cpp/fundamental-types-cpp.md), [static](../misc/static-cpp.md), and [public](../cpp/public-cpp.md).  
+     For information about other C++ keywords in this header file, see [class](../cpp/class-cpp.md), [int](../cpp/fundamental-types-cpp.md), [static](../cpp/storage-classes-cpp.md), and [public](../cpp/public-cpp.md).  
 
 6.  Choose the **Cardgame.cpp** tab in the editing pane to open it for editing.