Merge pull request #251 from Microsoft/master

merge to live

Author: ghogen

docs/atl/reference/atl-http-utility-functions.md

@@ -96,7 +96,7 @@ inline BOOL AtlCombineUrl(
  Pointer to a variable that contains the length in characters of `szBuffer`. If the function succeeds, the variable receives the number of characters written to the buffer not including the terminating null character. If the function fails, the variable receives the required length in bytes of the buffer including space for the terminating null character.  
 
  `dwFlags`  
- Flags controlling the behavior of this function. See [ATL_URL Flags](http://msdn.microsoft.com/library/76e8cc5c-4e17-4eb1-ac29-a94d5256c4a7).  
+ Flags controlling the behavior of this function. See [AtlCanonicalizeUrl](#atlcanonicalizeurl).  
 
 ### Return Value  
  Returns **TRUE** on success, **FALSE** on failure.  

docs/atl/reference/string-conversion-macros.md

@@ -33,11 +33,7 @@ translation.priority.ht:
 # String Conversion Macros
 These macros provide string conversion features.  
 
-|||  
-|-|-|  
-|[ATL and MFC String Conversion Macros](string-conversion-macros.md)|Set of macros that convert between string types.|  
-|[DEVMODE and TEXTMETRIC String Conversion Macros](http://msdn.microsoft.com/library/85cebec0-2a18-48e5-9c1c-99d5b7f15425)|Set of macros that convert the strings within `DEVMODE` and `TEXTMETRIC` structures.|  
-  
+ 
 ##  <a name="atl_and_mfc_string_conversion_macros"></a>  ATL and MFC String Conversion Macros  
  The string conversion macros discussed here are valid for both ATL and MFC. For more information on MFC string conversion, see [TN059: Using MFC MBCS/Unicode Conversion Macros](../../mfc/tn059-using-mfc-mbcs-unicode-conversion-macros.md) and [MFC Macros and Globals](../../mfc/reference/mfc-macros-and-globals.md).  
 
@@ -76,8 +72,6 @@ MACRONAME( address_of_structure )
 
  The following table lists the `DEVMODE` and `TEXTMETRIC` string conversion macros.  
 
-### DEVMODE and TEXTMETRIC String Conversion Macros  
-  
 |||  
 |-|-|  
 |`DEVMODEA2W`|`TEXTMETRICA2W`|  

docs/build/TOC.md

@@ -111,8 +111,8 @@
 # [Building 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)
+## [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)
 ## [NMAKE Reference](nmake-reference.md)
 ### [Running NMAKE](running-nmake.md)

docs/build/freelibrary-and-afxfreelibrary.md

@@ -45,7 +45,7 @@ translation.priority.mt:
 # FreeLibrary and AfxFreeLibrary
 Processes that explicitly link to a DLL call the [FreeLibrary](http://go.microsoft.com/fwlink/p/?LinkID=259188) function when the DLL module is no longer needed. This function decrements the module's reference count and, if the reference count is zero, unmaps it from the address space of the process.  
 
- In an MFC application, use [AfxFreeLibrary](http://msdn.microsoft.com/Library/0e06e292-710b-402f-9692-2cdcbab306f9) instead of `FreeLibrary` to unload an extension DLL. The interface (function prototype) for `AfxFreeLibrary` is the same as `FreeLibrary`.  
+ In an MFC application, use [AfxFreeLibrary](../mfc/reference/application-information-and-management.md#afxfreelibrary) instead of `FreeLibrary` to unload an extension DLL. The interface (function prototype) for `AfxFreeLibrary` is the same as `FreeLibrary`.  
 
 ## What do you want to do?  
 
@@ -62,4 +62,4 @@ Processes that explicitly link to a DLL call the [FreeLibrary](http://go.microso
 ## See Also  
  [DLLs in Visual C++](../build/dlls-in-visual-cpp.md)   
  [FreeLibrary](http://go.microsoft.com/fwlink/p/?LinkID=259188)   
- [AfxFreeLibrary](http://msdn.microsoft.com/Library/0e06e292-710b-402f-9692-2cdcbab306f9)
+ [AfxFreeLibrary](../mfc/reference/application-information-and-management.md#afxfreelibrary)

docs/build/loadlibrary-and-afxloadlibrary.md

@@ -39,7 +39,7 @@ translation.priority.ht:
   - "zh-tw"
 ---
 # LoadLibrary and AfxLoadLibrary
-Processes call [LoadLibrary](http://go.microsoft.com/fwlink/p/?LinkID=259187) (or [AfxLoadLibrary](http://msdn.microsoft.com/Library/1339678b-c843-4474-b9c9-8f3bd9905e2e)) to explicitly link to a DLL. If the function succeeds, it maps the specified DLL into the address space of the calling process and returns a handle to the DLL that can be used with other functions in explicit linking—for example, `GetProcAddress` and `FreeLibrary`.  
+Processes call [LoadLibrary](http://go.microsoft.com/fwlink/p/?LinkID=259187) (or [AfxLoadLibrary](../mfc/reference/application-information-and-management.md#afxloadlibrary)) to explicitly link to a DLL. If the function succeeds, it maps the specified DLL into the address space of the calling process and returns a handle to the DLL that can be used with other functions in explicit linking—for example, `GetProcAddress` and `FreeLibrary`.  
 
  `LoadLibrary` attempts to locate the DLL by using the same search sequence that is used for implicit linking. If the system cannot find the DLL or if the entry-point function returns FALSE, `LoadLibrary` returns NULL. If the call to `LoadLibrary` specifies a DLL module that is already mapped into the address space of the calling process, the function returns a handle of the DLL and increments the reference count of the module.  
 
@@ -69,4 +69,4 @@ Processes call [LoadLibrary](http://go.microsoft.com/fwlink/p/?LinkID=259187) (o
 ## See Also  
  [DLLs in Visual C++](../build/dlls-in-visual-cpp.md)   
  [LoadLibrary](http://go.microsoft.com/fwlink/p/?LinkID=259187)   
- [AfxLoadLibrary](http://msdn.microsoft.com/Library/1339678b-c843-4474-b9c9-8f3bd9905e2e)
+ [AfxLoadLibrary](../mfc/reference/application-information-and-management.md#afxloadlibrary)

docs/build/reference/optimizing-your-code.md

@@ -87,7 +87,7 @@ By optimizing an executable, you can achieve a balance between fast execution sp
 
  The following topics provide more advanced information about how to debug.  
 
--   [How to: Debug Optimized Code](http://msdn.microsoft.com/Library/fc8eeeb8-6629-4c9b-99f7-2016aee81dff)  
+-   [How to: Debug Optimized Code](/visualstudio/debugger/how-to-debug-optimized-code)  
 
 -   [Why Floating-Point Numbers May Lose Precision](../../build/reference/why-floating-point-numbers-may-lose-precision.md)  
 

docs/build/reference/using-verify-instead-of-assert.md

@@ -44,7 +44,7 @@ Suppose that when you run the debug version of your MFC application, there are n
 
  This problem can be caused when you place important code in an ASSERT statement to verify that it performs correctly. Because ASSERT statements are commented out in a release build of an MFC program, the code does not run in a release build.  
 
- If you are using ASSERT to confirm that a function call succeeded, consider using [VERIFY](http://msdn.microsoft.com/Library/3e1ab4ee-cbc7-4290-a777-c92f42ce7b96) instead. The VERIFY macro evaluates its own arguments in both debug and release builds of the application.  
+ If you are using ASSERT to confirm that a function call succeeded, consider using [VERIFY](../../mfc/reference/diagnostic-services.md#verify) instead. The VERIFY macro evaluates its own arguments in both debug and release builds of the application.  
 
  Another preferred technique is to assign the function's return value to a temporary variable and then test the variable in an ASSERT statement.  
 

docs/build/regular-dlls-dynamically-linked-to-mfc.md

@@ -63,7 +63,7 @@ AFX_MANAGE_STATE(AfxGetStaticModuleState( ))
 
 -   This type of DLL uses the `DllMain` provided by MFC. Place all DLL-specific initialization code in the `InitInstance` member function and termination code in `ExitInstance` as in a normal MFC application.  
 
- Because this kind of DLL uses the dynamic-link library version of MFC, you must explicitly set the current module state to the one for the DLL. To do this, use the [AFX_MANAGE_STATE](http://msdn.microsoft.com/Library/620cb840-4227-4a75-b36d-f7d507f44606) macro at the beginning of every function exported from the DLL.  
+ Because this kind of DLL uses the dynamic-link library version of MFC, you must explicitly set the current module state to the one for the DLL. To do this, use the [AFX_MANAGE_STATE](../mfc/reference/extension-dll-macros.md#afx_manage_state) macro at the beginning of every function exported from the DLL.  
 
  Regular DLLs must have a `CWinApp`-derived class and a single object of that application class, as does an MFC application. However, the `CWinApp` object of the DLL does not have a main message pump, as does the `CWinApp` object of an application.  
 
@@ -91,7 +91,7 @@ extern "C" __declspec(dllexport) MyExportedFunction( );
 
  It is safe to pass pointers to memory that were allocated by the C run-time libraries between an application and a DLL only if you make a copy of the data. You must not delete or resize these pointers or use them without making a copy of the memory.  
 
- When building a regular DLL that dynamically links to MFC, you need to use the macro [AFX_MANAGE_STATE](http://msdn.microsoft.com/Library/620cb840-4227-4a75-b36d-f7d507f44606) to switch the MFC module state correctly. This is done by adding the following line of code to the beginning of functions exported from the DLL:  
+ When building a regular DLL that dynamically links to MFC, you need to use the macro [AFX_MANAGE_STATE](../mfc/reference/extension-dll-macros.md#afx_manage_state) to switch the MFC module state correctly. This is done by adding the following line of code to the beginning of functions exported from the DLL:  
 
 ```  
 AFX_MANAGE_STATE(AfxGetStaticModuleState( ))  

docs/build/walkthrough-compiling-a-cpp-cli-program-on-the-command-line.md

@@ -1,5 +1,5 @@
 ---
-title: "Walkthrough: Compiling a C++-CLI Program on the Command Line | Microsoft Docs"
+title: "Walkthrough: Compiling a C++/CLI Program on the Command Line | Microsoft Docs"
 ms.custom: ""
 ms.date: "11/04/2016"
 ms.reviewer: ""

docs/build/walkthrough-compiling-a-cpp-cx-program-on-the-command-line.md

@@ -1,5 +1,5 @@
 ---
-title: "Walkthrough: Compiling a C++-CX Program on the Command Line | Microsoft Docs"
+title: "Walkthrough: Compiling a C++/CX Program on the Command Line | Microsoft Docs"
 ms.custom: ""
 ms.date: "11/04/2016"
 ms.reviewer: ""

docs/data/data-access-programming-mfc-atl.md

@@ -52,6 +52,6 @@ If you use C++/CLI, you can continue to use ADO.NET as always. For more informat
 For more information about the history of data access technologies on Microsoft Windows, see [Microsoft Data Access Components (Uncyclopedia)](https://en.wikipedia.org/wiki/Microsoft_Data_Access_Components).  
 
 ## See Also  
- [Data Access](http://msdn.microsoft.com/library/a9455752-39c4-4457-b14e-197772d3df0b)
+ [Data Access](data-access-in-cpp.md)
  [Microsoft Open Database Connectivity (ODBC)](https://docs.microsoft.com/sql/odbc/microsoft-open-database-connectivity-odbc)
  [Data Access Technologies Road Map](https://msdn.microsoft.com/en-us/library/ms810810.aspx)

docs/data/installing-database-support-mfc-atl.md

@@ -40,4 +40,4 @@ Visual C++ does not include any database products. To
 
 
 ## See Also  
- [Data Access](http://msdn.microsoft.com/library/a9455752-39c4-4457-b14e-197772d3df0b)
+ [Data Access](data-access-in-cpp.md)

docs/data/odbc/odbc-calling-odbc-api-functions-directly.md

@@ -51,7 +51,7 @@ The database classes provide a simpler interface to a [data source](../../data/o
 
 -   Allocate storage for any results the call returns.  
 
--   Pass an ODBC **HDBC** or **HSTMT** handle, depending on the parameter signature of the function. Use the [AFXGetHENV](http://msdn.microsoft.com/library/d8be2a8e-b93a-460f-affb-cf65b2f3dc10) macro to retrieve the ODBC handle.  
+-   Pass an ODBC **HDBC** or **HSTMT** handle, depending on the parameter signature of the function. Use the [AFXGetHENV](../../mfc/reference/database-macros-and-globals.md#afxgethenv) macro to retrieve the ODBC handle.  
 
      Member variables **CDatabase::m_hdbc** and **CRecordset::m_hstmt** are available so that you do not need to allocate and initialize these yourself.  
 
@@ -65,4 +65,4 @@ The database classes provide a simpler interface to a [data source](../../data/o
 
 
 ## See Also  
- [ODBC Basics](../../data/odbc/odbc-basics.md)
+ [ODBC Basics](../../data/odbc/odbc-basics.md)

docs/data/oledb/consumer-wizard-generated-classes.md

@@ -43,7 +43,7 @@ When you use the ATL OLE DB Consumer Wizard to generate a consumer, you have the
 
 -   If you select a templated consumer, the wizard generates a command class and a user record class. The command class will have the name that you enter in the Class box in the wizard (for example, `CProducts`), and the user record class will have a name of the form "*ClassName*Accessor" (for example, `CProductsAccessor`). Both classes are placed in the consumer's header file.  
 
--   If you select an attributed consumer, the user record class will have a name of the form "_*ClassName*Accessor" and will be injected. That is, you will be able to view only the command class in the text editor; you can only view the user record class as injected code. For information about viewing injected code, see [Debugging Injected Code](http://msdn.microsoft.com/library/a1b4104d-d49e-451f-a91e-e39ceaf35875).  
+-   If you select an attributed consumer, the user record class will have a name of the form "_*ClassName*Accessor" and will be injected. That is, you will be able to view only the command class in the text editor; you can only view the user record class as injected code. For information about viewing injected code, see [Debugging Injected Code](/visualstudio/debugger/how-to-debug-injected-code).  
 
  The following examples use a command class created on the Products table of the Northwind database to demonstrate the wizard-generated consumer code for the command class and user record class.  
 
@@ -195,7 +195,7 @@ class CProducts : public CCommand<CAccessor<_CProductsAccessor> >
 
  Most of the injected code is the same as or similar to the templated version. The main differences are in the injected methods, which are described in [Consumer Wizard-Generated Methods](../../data/oledb/consumer-wizard-generated-methods.md).  
 
- For information about viewing injected code, see [Debugging Injected Code](http://msdn.microsoft.com/library/a1b4104d-d49e-451f-a91e-e39ceaf35875).  
+ For information about viewing injected code, see [Debugging Injected Code](/visualstudio/debugger/how-to-debug-injected-code).  
 
 ## See Also  
  [Creating an OLE DB Consumer Using a Wizard](../../data/oledb/creating-an-ole-db-consumer-using-a-wizard.md)

docs/data/oledb/consumer-wizard-generated-methods.md

@@ -43,7 +43,7 @@ translation.priority.ht:
   - "zh-tw"
 ---
 # Consumer Wizard-Generated Methods
-The ATL OLE DB Consumer Wizard and the MFC Application Wizard generate certain functions of which you should be aware. Note that some methods are implemented differently in attributed projects, so there are a few caveats; each case is covered below. For information about viewing injected code, see [Debugging Injected Code](http://msdn.microsoft.com/library/a1b4104d-d49e-451f-a91e-e39ceaf35875).  
+The ATL OLE DB Consumer Wizard and the MFC Application Wizard generate certain functions of which you should be aware. Note that some methods are implemented differently in attributed projects, so there are a few caveats; each case is covered below. For information about viewing injected code, see [Debugging Injected Code](/visualstudio/debugger/how-to-debug-injected-code).  
 
 -   `OpenAll` opens the data source, rowsets, and turns on bookmarks if they are available.  
 

docs/data/oledb/irowsetnotifycp-class.md

@@ -90,8 +90,7 @@ class IRowsetNotifyCP :
  [OLE DB Provider Templates](../../data/oledb/ole-db-provider-templates-cpp.md)   
  [OLE DB Provider Template Architecture](../../data/oledb/ole-db-provider-template-architecture.md)   
  [Notifications (COM)](http://msdn.microsoft.com/library/windows/desktop/ms678433)   
- [Overview of Notifications (OLE DB)](https://msdn.microsoft.com/en-us/library/ms725406.aspx)   
- [BEGIN_CONNECTION_POINT_MAP](http://msdn.microsoft.com/library/3896cda6-a8e2-4ed1-ac38-befbe2352034)   
- [END_CONNECTION_POINT_MAP](http://msdn.microsoft.com/library/807c5233-b58c-49a2-a34f-3b5f4a7b1b82)   
- [CONNECTION_POINT_ENTRY](http://msdn.microsoft.com/library/0a7f3053-6433-49b2-a9b5-8a307e8efe14)   
+ [BEGIN_CONNECTION_POINT_MAP](../../atl/reference/connection-point-macros.md#begin_connection_point_map)   
+ [END_CONNECTION_POINT_MAP](../../atl/reference/connection-point-macros.md#end_connection_point_map)   
+ [CONNECTION_POINT_ENTRY](../../atl/reference/connection-point-macros.md#connection_point_entry)   
  [Creating an Updatable Provider](../../data/oledb/creating-an-updatable-provider.md)

docs/data/oledb/ole-db-consumer-templates-cpp.md

@@ -78,6 +78,6 @@ The OLE DB Consumer Templates support the OLE DB version 2.6 specification. (The
 
 ## See Also  
  [OLE DB Programming](../../data/oledb/ole-db-programming.md)   
- [Data Access](http://msdn.microsoft.com/library/a9455752-39c4-4457-b14e-197772d3df0b)   
+ [Data Access](../data-access-in-cpp.md)   
  [OLE DB SDK Documentation](https://msdn.microsoft.com/en-us/library/ms722784.aspx)   
  [OLE DB Programmer's Reference](https://msdn.microsoft.com/en-us/library/ms713643.aspx)

docs/data/oledb/ole-db-programming.md

@@ -56,4 +56,4 @@ Microsoft OLE DB is a legacy technology; for new applications it is the required
 
 
 ## See Also  
- [Data Access](http://msdn.microsoft.com/library/a9455752-39c4-4457-b14e-197772d3df0b)
+ [Data Access](../data-access-in-cpp.md)

docs/data/oledb/ole-db-provider-templates-cpp.md

@@ -85,6 +85,6 @@ OLE DB is an important part of the Microsoft Universal Data Access strategy. The
 -   [OLE DB Programming](../../data/oledb/ole-db-programming.md)  
 
 ## See Also  
- [Data Access](http://msdn.microsoft.com/library/a9455752-39c4-4457-b14e-197772d3df0b)   
+ [Data Access](../data-access-in-cpp.md)   
  [OLE DB SDK Documentation](https://msdn.microsoft.com/en-us/library/ms722784.aspx)   
  [OLE DB Programmer's Reference](https://msdn.microsoft.com/en-us/library/ms713643.aspx)