fixed merge conflicts

Author: mikeblome

.openpublishing.redirection.json

@@ -6410,6 +6410,41 @@
             "redirect_url": "/cpp/windows/overview-of-windows-programming-in-cpp",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/windows/classfactory-addref-method.md",
+            "redirect_url": "/cpp/windows/classfactory-class#addref",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/windows/classfactory-classfactory-constructor.md",
+            "redirect_url": "/cpp/windows/classfactory-class#classfactory",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/windows/classfactory-lockserver-method.md",
+            "redirect_url": "/cpp/windows/classfactory-class#lockserver",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/windows/classfactory-queryinterface-method.md",
+            "redirect_url": "/cpp/windows/classfactory-class#queryinterface",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/windows/classfactory-release-method.md",
+            "redirect_url": "/cpp/windows/classfactory-class#release",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/windows/deferrableeventargs-getdeferral-method.md",
+            "redirect_url": "/cpp/windows/deferrableeventargs-class#getdeferral",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/windows/deferrableeventargs-invokeallfinished-method.md",
+            "redirect_url": "/cpp/windows/deferrableeventargs-class#invokeallfinished",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/windows/eventsource-add-method.md",
             "redirect_url": "/cpp/windows/eventsource-class#add",

docs/atl-mfc-shared/allocating-and-releasing-memory-for-a-bstr.md

@@ -36,8 +36,8 @@ In general, the rules for allocating and releasing memory allocated for `BSTR`s
 
 ## See Also
 
-[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)   
-[CStringT::AllocSysString](../atl-mfc-shared/reference/cstringt-class.md#allocsysstring)   
-[SysAllocString](/previous-versions/windows/desktop/api/oleauto/nf-oleauto-sysallocstring)   
+[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)<br/>
+[CStringT::AllocSysString](../atl-mfc-shared/reference/cstringt-class.md#allocsysstring)<br/>
+[SysAllocString](/previous-versions/windows/desktop/api/oleauto/nf-oleauto-sysallocstring)<br/>
 [SysFreeString](/previous-versions/windows/desktop/api/oleauto/nf-oleauto-sysfreestring)
 

docs/atl-mfc-shared/atl-mfc-concepts.md

@@ -17,7 +17,7 @@ This section provides conceptual and task-based topics to help you program using
 
 ## In This Section
 
-[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)  
+[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)<br/>
 Describes how to manage string data in applications.
 
 ## See Also

docs/atl-mfc-shared/atl-mfc-shared-classes.md

@@ -18,16 +18,16 @@ These utility classes can be used in any native C++ project without requiring an
 
 ## In This Section
 
-[Classes Shared Between MFC and ATL](../atl-mfc-shared/reference/classes-shared-by-mfc-and-atl.md)  
+[Classes Shared Between MFC and ATL](../atl-mfc-shared/reference/classes-shared-by-mfc-and-atl.md)<br/>
 Provides links to the classes shared between MFC and ATL.
 
 ## Related Sections
 
-[Active Template Library (ATL) Reference](../atl/atl-com-desktop-components.md)  
+[Active Template Library (ATL) Reference](../atl/atl-com-desktop-components.md)<br/>
 Provides reference material for the ATL Library, a set of template-based C++ classes that simplify the programming of COM objects.
 
-[Microsoft Foundation Class Library (MFC) Reference](../mfc/mfc-desktop-applications.md)  
+[Microsoft Foundation Class Library (MFC) Reference](../mfc/mfc-desktop-applications.md)<br/>
 Provides reference material for the MFC Library, a set of classes in that constitute an application framework, which is the framework of an application written for the Windows API.
 
-[Debugging](/visualstudio/debugger/debugging-in-visual-studio)  
+[Debugging](/visualstudio/debugger/debugging-in-visual-studio)<br/>
 Provides links to using the Visual Studio debugger to correct logic errors in your application or stored procedures.

docs/atl-mfc-shared/basic-cstring-operations.md

@@ -97,8 +97,8 @@ Without the cast, `cs` is treated as a `void*` and `wcout` prints the address of
 
 ## See Also
 
-[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)   
-[CStringT Class](../atl-mfc-shared/reference/cstringt-class.md)   
-[Template Specialization](../cpp/template-specialization-cpp.md)   
+[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)<br/>
+[CStringT Class](../atl-mfc-shared/reference/cstringt-class.md)<br/>
+[Template Specialization](../cpp/template-specialization-cpp.md)<br/>
 [How to: Convert Between Various String Types](../text/how-to-convert-between-various-string-types.md)
 

docs/atl-mfc-shared/cstring-exception-cleanup.md

@@ -19,6 +19,6 @@ Under the C++ exception handling mechanism that MFC now uses, you do not have to
 
 ## See Also
 
-[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)   
+[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)<br/>
 [Exception Handling](../mfc/exception-handling-in-mfc.md)
 

docs/atl-mfc-shared/cstring-operations-relating-to-c-style-strings.md

@@ -90,6 +90,6 @@ For most function results, you can simply return a `CString` object by value.
 
 ## See Also
 
-[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)   
+[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)<br/>
 [CString Argument Passing](../atl-mfc-shared/cstring-argument-passing.md)
 

docs/atl-mfc-shared/date-and-time.md

@@ -31,6 +31,6 @@ MFC supports several different ways of working with dates and times. These inclu
 
 ## See Also
 
-[Concepts](../mfc/mfc-concepts.md)   
+[Concepts](../mfc/mfc-concepts.md)<br/>
 [General MFC Topics](../mfc/general-mfc-topics.md)
 

docs/atl-mfc-shared/date-type.md

@@ -60,6 +60,6 @@ More information on issues related to the DATE and `COleDateTime` types can be f
 
 ## See Also
 
-[Date and Time](../atl-mfc-shared/date-and-time.md)   
+[Date and Time](../atl-mfc-shared/date-and-time.md)<br/>
 [COleDateTime Class](../atl-mfc-shared/reference/coledatetime-class.md)
 

docs/atl-mfc-shared/exporting-string-classes-using-cstringt.md

@@ -55,6 +55,6 @@ There are several caveats:
 
 ## See Also
 
-[Using CStringT](../atl-mfc-shared/using-cstringt.md)   
+[Using CStringT](../atl-mfc-shared/using-cstringt.md)<br/>
 [Using CString](../atl-mfc-shared/using-cstring.md)
 

docs/atl-mfc-shared/reference/cfiletime-class.md

@@ -460,8 +460,8 @@ See the example for [CFileTime::Millisecond](#millisecond).
 
 ## See Also
 
-[FILETIME](https://msdn.microsoft.com/library/windows/desktop/ms724284)   
-[CFileTimeSpan Class](../../atl-mfc-shared/reference/cfiletimespan-class.md)   
-[Hierarchy Chart](../../mfc/hierarchy-chart.md)   
+[FILETIME](https://msdn.microsoft.com/library/windows/desktop/ms724284)<br/>
+[CFileTimeSpan Class](../../atl-mfc-shared/reference/cfiletimespan-class.md)<br/>
+[Hierarchy Chart](../../mfc/hierarchy-chart.md)<br/>
 [ATL/MFC Shared Classes](../../atl-mfc-shared/atl-mfc-shared-classes.md)
 

docs/atl-mfc-shared/reference/cfiletimespan-class.md

@@ -301,8 +301,8 @@ The new value for the time span in milliseconds.
 
 ## See Also
 
-[FILETIME](https://msdn.microsoft.com/library/windows/desktop/ms724284)   
-[CFileTime Class](../../atl-mfc-shared/reference/cfiletime-class.md)   
-[Hierarchy Chart](../../mfc/hierarchy-chart.md)   
+[FILETIME](https://msdn.microsoft.com/library/windows/desktop/ms724284)<br/>
+[CFileTime Class](../../atl-mfc-shared/reference/cfiletime-class.md)<br/>
+[Hierarchy Chart](../../mfc/hierarchy-chart.md)<br/>
 [ATL/MFC Shared Classes](../../atl-mfc-shared/atl-mfc-shared-classes.md)
 

docs/atl-mfc-shared/reference/cfixedstringt-class.md

@@ -127,7 +127,7 @@ You should be aware that memory exceptions may occur whenever you use the assign
 
 ## See Also
 
-[CStringT Class](../../atl-mfc-shared/reference/cstringt-class.md)   
-[Hierarchy Chart](../../mfc/hierarchy-chart.md)   
+[CStringT Class](../../atl-mfc-shared/reference/cstringt-class.md)<br/>
+[Hierarchy Chart](../../mfc/hierarchy-chart.md)<br/>
 [ATL/MFC Shared Classes](../../atl-mfc-shared/atl-mfc-shared-classes.md)
 

docs/atl-mfc-shared/reference/cimage-class.md

@@ -1610,11 +1610,11 @@ BOOL TransparentBlt(CImage* pSrcImage, CImage* pDstImage,
 
 ## See Also
 
-[MMXSwarm Sample](../../visual-cpp-samples.md)   
-[SimpleImage Sample](../../visual-cpp-samples.md)   
-[Device-Independent Bitmaps](/windows/desktop/gdi/device-independent-bitmaps)   
-[CreateDIBSection](/windows/desktop/api/wingdi/nf-wingdi-createdibsection)   
-[ATL COM Desktop Components](../../atl/atl-com-desktop-components.md)
-[Device-Independent Bitmaps](/windows/desktop/gdi/device-independent-bitmaps)   
+[MMXSwarm Sample](../../visual-cpp-samples.md)<br/>
+[SimpleImage Sample](../../visual-cpp-samples.md)<br/>
+[Device-Independent Bitmaps](/windows/desktop/gdi/device-independent-bitmaps)<br/>
+[CreateDIBSection](/windows/desktop/api/wingdi/nf-wingdi-createdibsection)<br/>
+[ATL COM Desktop Components](../../atl/atl-com-desktop-components.md)<br/>
+[Device-Independent Bitmaps](/windows/desktop/gdi/device-independent-bitmaps)<br/>
 [CreateDIBSection](/windows/desktop/api/wingdi/nf-wingdi-createdibsection)   
 

docs/atl-mfc-shared/reference/coledatetime-class.md

@@ -1197,9 +1197,9 @@ See the example for [SetDate](#setdate).
 
 ## See Also
 
-[COleVariant Class](../../mfc/reference/colevariant-class.md)   
-[CTime Class](../../atl-mfc-shared/reference/ctime-class.md)   
-[CTimeSpan Class](../../atl-mfc-shared/reference/ctimespan-class.md)   
-[Hierarchy Chart](../../mfc/hierarchy-chart.md)   
+[COleVariant Class](../../mfc/reference/colevariant-class.md)<br/>
+[CTime Class](../../atl-mfc-shared/reference/ctime-class.md)<br/>
+[CTimeSpan Class](../../atl-mfc-shared/reference/ctimespan-class.md)<br/>
+[Hierarchy Chart](../../mfc/hierarchy-chart.md)<br/>
 [ATL/MFC Shared Classes](../../atl-mfc-shared/atl-mfc-shared-classes.md)
 

docs/atl-mfc-shared/reference/coledatetimespan-class.md

@@ -732,9 +732,9 @@ For a brief description of these status values, see the following list:
 
 ## See Also
 
-[COleDateTime Class](../../atl-mfc-shared/reference/coledatetime-class.md)   
-[CTime Class](../../atl-mfc-shared/reference/ctime-class.md)   
-[CTimeSpan Class](../../atl-mfc-shared/reference/ctimespan-class.md)   
-[Hierarchy Chart](../../mfc/hierarchy-chart.md)   
+[COleDateTime Class](../../atl-mfc-shared/reference/coledatetime-class.md)<br/>
+[CTime Class](../../atl-mfc-shared/reference/ctime-class.md)<br/>
+[CTimeSpan Class](../../atl-mfc-shared/reference/ctimespan-class.md)<br/>
+[Hierarchy Chart](../../mfc/hierarchy-chart.md)<br/>
 [ATL/MFC Shared Classes](../../atl-mfc-shared/atl-mfc-shared-classes.md)
 

docs/atl-mfc-shared/reference/cpoint-class.md

@@ -336,9 +336,9 @@ Use the unary operator to negate a point. For example, using the unary operator
 
 ## See Also
 
-[MFC Sample MDI](../../visual-cpp-samples.md)   
-[Hierarchy Chart](../../mfc/hierarchy-chart.md)   
-[POINT Structure](../../mfc/reference/point-structure1.md)   
-[CRect Class](../../atl-mfc-shared/reference/crect-class.md)   
+[MFC Sample MDI](../../visual-cpp-samples.md)<br/>
+[Hierarchy Chart](../../mfc/hierarchy-chart.md)<br/>
+[POINT Structure](../../mfc/reference/point-structure1.md)<br/>
+[CRect Class](../../atl-mfc-shared/reference/crect-class.md)<br/>
 [CSize Class](../../atl-mfc-shared/reference/csize-class.md)
 

docs/atl-mfc-shared/reference/crect-class.md

@@ -1547,7 +1547,7 @@ int nWid = rect.Width();
 ```
 ## See Also
 
-[CPoint Class](cpoint-class.md)   
-[CSize Class](csize-class.md)   
+[CPoint Class](cpoint-class.md)<br/>
+[CSize Class](csize-class.md)<br/>
 [RECT](../../mfc/reference/rect-structure1.md)
 

docs/atl-mfc-shared/reference/csimplestringt-class.md

@@ -1133,5 +1133,5 @@ Call this method to destroy the `CSimpleStringT` object.
 
 ## See Also
 
-[Hierarchy Chart](../../mfc/hierarchy-chart.md)   
+[Hierarchy Chart](../../mfc/hierarchy-chart.md)<br/>
 [ATL/MFC Shared Classes](../../atl-mfc-shared/atl-mfc-shared-classes.md)

docs/atl-mfc-shared/reference/csize-class.md

@@ -206,8 +206,8 @@ The fourth operator, the unary minus, changes the sign of the `CSize` value. See
 
 ## See Also
 
-[MFC Sample MDI](../../visual-cpp-samples.md)   
-[Hierarchy Chart](../../mfc/hierarchy-chart.md)   
-[CRect Class](../../atl-mfc-shared/reference/crect-class.md)   
+[MFC Sample MDI](../../visual-cpp-samples.md)<br/>
+[Hierarchy Chart](../../mfc/hierarchy-chart.md)<br/>
+[CRect Class](../../atl-mfc-shared/reference/crect-class.md)<br/>
 [CPoint Class](../../atl-mfc-shared/reference/cpoint-class.md)
 

docs/atl-mfc-shared/reference/cstrbuft-class.md

@@ -218,6 +218,6 @@ typedef CSimpleStringT<TCharType> StringType;
 
 ## See Also
 
-[Hierarchy Chart](../../mfc/hierarchy-chart.md)   
+[Hierarchy Chart](../../mfc/hierarchy-chart.md)<br/>
 [ATL/MFC Shared Classes](../../atl-mfc-shared/atl-mfc-shared-classes.md)
 

docs/atl-mfc-shared/reference/cstringdata-class.md

@@ -237,6 +237,6 @@ Locking and unlocking is used when the developer must ensure that the string dat
 
 ## See Also
 
-[Hierarchy Chart](../../mfc/hierarchy-chart.md)   
+[Hierarchy Chart](../../mfc/hierarchy-chart.md)<br/>
 [ATL/MFC Shared Classes](../../atl-mfc-shared/atl-mfc-shared-classes.md)
 

docs/atl-mfc-shared/reference/cstringt-class.md

@@ -1659,7 +1659,7 @@ The `CStringT& TrimRight()` version requires no parameters. It trims any trailin
 
 ## See Also
 
-[Hierarchy Chart](../../mfc/hierarchy-chart.md)   
-[ATL/MFC Shared Classes](../../atl-mfc-shared/atl-mfc-shared-classes.md)   
+[Hierarchy Chart](../../mfc/hierarchy-chart.md)<br/>
+[ATL/MFC Shared Classes](../../atl-mfc-shared/atl-mfc-shared-classes.md)<br/>
 [CSimpleStringT Class](../../atl-mfc-shared/reference/csimplestringt-class.md)
 

docs/atl-mfc-shared/reference/ctime-class.md

@@ -633,12 +633,12 @@ The updated `CArchive` object.
 
 ## See Also
 
-[asctime_s, _wasctime_s](../../c-runtime-library/reference/asctime-s-wasctime-s.md)   
-[_ftime_s, _ftime32_s, _ftime64_s](../../c-runtime-library/reference/ftime-s-ftime32-s-ftime64-s.md)   
-[gmtime_s, _gmtime32_s, _gmtime64_s](../../c-runtime-library/reference/gmtime-s-gmtime32-s-gmtime64-s.md)   
-[localtime_s, _localtime32_s, _localtime64_s](../../c-runtime-library/reference/localtime-s-localtime32-s-localtime64-s.md)   
-[strftime, wcsftime, _strftime_l, _wcsftime_l](../../c-runtime-library/reference/strftime-wcsftime-strftime-l-wcsftime-l.md)   
-[time, _time32, _time64](../../c-runtime-library/reference/time-time32-time64.md)   
-[CTimeSpan Class](../../atl-mfc-shared/reference/ctimespan-class.md)   
-[Hierarchy Chart](../../mfc/hierarchy-chart.md)   
+[asctime_s, _wasctime_s](../../c-runtime-library/reference/asctime-s-wasctime-s.md)<br/>
+[_ftime_s, _ftime32_s, _ftime64_s](../../c-runtime-library/reference/ftime-s-ftime32-s-ftime64-s.md)<br/>
+[gmtime_s, _gmtime32_s, _gmtime64_s](../../c-runtime-library/reference/gmtime-s-gmtime32-s-gmtime64-s.md)<br/>
+[localtime_s, _localtime32_s, _localtime64_s](../../c-runtime-library/reference/localtime-s-localtime32-s-localtime64-s.md)<br/>
+[strftime, wcsftime, _strftime_l, _wcsftime_l](../../c-runtime-library/reference/strftime-wcsftime-strftime-l-wcsftime-l.md)<br/>
+[time, _time32, _time64](../../c-runtime-library/reference/time-time32-time64.md)<br/>
+[CTimeSpan Class](../../atl-mfc-shared/reference/ctimespan-class.md)<br/>
+[Hierarchy Chart](../../mfc/hierarchy-chart.md)<br/>
 [ATL/MFC Shared Classes](../../atl-mfc-shared/atl-mfc-shared-classes.md)

docs/atl-mfc-shared/reference/ctimespan-class.md

@@ -390,12 +390,12 @@ The updated `CArchive` object.
 
 ## See Also
 
-[asctime, _wasctime](../../c-runtime-library/reference/asctime-wasctime.md)   
-[_ftime, _ftime32, _ftime64](../../c-runtime-library/reference/ftime-ftime32-ftime64.md)   
-[gmtime, _gmtime32, _gmtime64](../../c-runtime-library/reference/gmtime-gmtime32-gmtime64.md)   
-[localtime, _localtime32, _localtime64](../../c-runtime-library/reference/localtime-localtime32-localtime64.md)   
-[strftime, wcsftime, _strftime_l, _wcsftime_l](../../c-runtime-library/reference/strftime-wcsftime-strftime-l-wcsftime-l.md)   
-[time, _time32, _time64](../../c-runtime-library/reference/time-time32-time64.md)   
-[Hierarchy Chart](../../mfc/hierarchy-chart.md)   
+[asctime, _wasctime](../../c-runtime-library/reference/asctime-wasctime.md)<br/>
+[_ftime, _ftime32, _ftime64](../../c-runtime-library/reference/ftime-ftime32-ftime64.md)<br/>
+[gmtime, _gmtime32, _gmtime64](../../c-runtime-library/reference/gmtime-gmtime32-gmtime64.md)<br/>
+[localtime, _localtime32, _localtime64](../../c-runtime-library/reference/localtime-localtime32-localtime64.md)<br/>
+[strftime, wcsftime, _strftime_l, _wcsftime_l](../../c-runtime-library/reference/strftime-wcsftime-strftime-l-wcsftime-l.md)<br/>
+[time, _time32, _time64](../../c-runtime-library/reference/time-time32-time64.md)<br/>
+[Hierarchy Chart](../../mfc/hierarchy-chart.md)<br/>
 [ATL/MFC Shared Classes](../../atl-mfc-shared/atl-mfc-shared-classes.md)
 

docs/atl-mfc-shared/reference/iatlstringmgr-class.md

@@ -174,6 +174,6 @@ Call [IAtlStringMgr::Free](#free) to free the memory allocated by this method.
 
 ## See Also
 
-[Hierarchy Chart](../../mfc/hierarchy-chart.md)   
+[Hierarchy Chart](../../mfc/hierarchy-chart.md)<br/>
 [ATL/MFC Shared Classes](../../atl-mfc-shared/atl-mfc-shared-classes.md)
 

docs/atl-mfc-shared/strings-atl-mfc.md

@@ -17,18 +17,18 @@ Nearly all programs work with string data. Visual C++ provides several ways to m
 
 ## In This Section
 
-[Using CStringT](../atl-mfc-shared/using-cstringt.md)  
+[Using CStringT](../atl-mfc-shared/using-cstringt.md)<br/>
 Describes programming using the template class CStringT.
 
-[Using CString](../atl-mfc-shared/using-cstring.md)  
+[Using CString](../atl-mfc-shared/using-cstring.md)<br/>
 Describes programming using CString, the default implementation of CStringT.
 
 ## Related Sections
 
-[CStringT Overview](../atl-mfc-shared/reference/cstringt-class.md)  
+[CStringT Overview](../atl-mfc-shared/reference/cstringt-class.md)<br/>
 Provides reference information about the shared `CStringT` class.
 
-[MFC Concepts](../mfc/mfc-concepts.md)  
+[MFC Concepts](../mfc/mfc-concepts.md)<br/>
 Provides conceptual and task-based topics to help you program using the MFC Library.
 
 ## See Also

docs/atl-mfc-shared/unicode-and-multibyte-character-set-mbcs-support.md

@@ -88,5 +88,5 @@ Similarly, `CString` methods are implemented by using generic data type mappings
 
 ## See Also
 
-[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)  
+[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)<br/>
 [String Manipulation](../c-runtime-library/string-manipulation-crt.md)