Merge pull request MicrosoftDocs#1506 from MicrosoftDocs/master637014…

…881832856232 Fix git push error for protected CLA branch
luisangelsm · Aug 15, 2019 · f65ccfb · f65ccfb
2 parents 1ed1dba + fcb4882
commit f65ccfb
Show file tree

Hide file tree

Showing 834 changed files with 4,330 additions and 4,433 deletions.
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -62,7 +62,7 @@
       },
       {
          "source_path": "docs/windows/universal-windows-apps-cpp.md",
-         "redirect_url": "/cpp/cppcx/universal-windows-apps-cppwrl",
+         "redirect_url": "/cpp/cppcx/universal-windows-apps-cpp",
          "redirect_document_id": true
       },
       {
@@ -250,11 +250,56 @@
          "redirect_url": "/cpp/atl-mfc-shared/atl-mfc-shared-classes",
          "redirect_document_id": false
       },
+      {
+         "source_path": "docs/atl-mfc-shared/current-time-automation-classes.md",
+         "redirect_url": "/cpp/atl-mfc-shared/date-and-time",
+         "redirect_document_id": false
+      },
+      {
+         "source_path": "docs/atl-mfc-shared/current-time-general-purpose-classes.md",
+         "redirect_url": "/cpp/atl-mfc-shared/date-and-time",
+         "redirect_document_id": false
+      },
+      {
+         "source_path": "docs/atl-mfc-shared/date-and-time-automation-support.md",
+         "redirect_url": "/cpp/atl-mfc-shared/date-and-time",
+         "redirect_document_id": false
+      },
+      {
+         "source_path": "docs/atl-mfc-shared/date-and-time-database-support.md",
+         "redirect_url": "/cpp/atl-mfc-shared/date-and-time",
+         "redirect_document_id": false
+      },
       {
          "source_path": "docs/atl-mfc-shared/date-and-time-general-purpose-classes.md",
          "redirect_url": "/cpp/atl-mfc-shared/date-and-time",
          "redirect_document_id": false
       },
+      {
+         "source_path": "docs/atl-mfc-shared/date-and-time-systemtime-support.md",
+         "redirect_url": "/cpp/atl-mfc-shared/date-and-time",
+         "redirect_document_id": false
+      },
+      {
+         "source_path": "docs/atl-mfc-shared/elapsed-time-automation-classes.md",
+         "redirect_url": "/cpp/atl-mfc-shared/date-and-time",
+         "redirect_document_id": false
+      },
+      {
+         "source_path": "docs/atl-mfc-shared/elapsed-time-general-purpose-classes.md",
+         "redirect_url": "/cpp/atl-mfc-shared/date-and-time",
+         "redirect_document_id": false
+      },
+      {
+         "source_path": "docs/atl-mfc-shared/formatting-time-automation-classes.md",
+         "redirect_url": "/cpp/atl-mfc-shared/date-and-time",
+         "redirect_document_id": false
+      },
+      {
+         "source_path": "docs/atl-mfc-shared/formatting-time-values-general-purpose-classes.md",
+         "redirect_url": "/cpp/atl-mfc-shared/date-and-time",
+         "redirect_document_id": false
+      },
       {
          "source_path": "docs/atl-mfc-shared/reference/index.md",
          "redirect_url": "/cpp/atl-mfc-shared/reference/classes-shared-by-mfc-and-atl",
@@ -675,6 +720,11 @@
          "redirect_url": "/cpp/cppcx/operator-windows-ui-xaml-interop-typename",
          "redirect_document_id": false
       },
+      {
+         "source_path": "docs/cppcx/uwp-development.md",
+         "redirect_url": "/cpp/cppcx/universal-windows-apps-cpp",
+         "redirect_document_id": false
+      },
       {
          "source_path": "docs/c-runtime-library/flag-directives.md",
          "redirect_url": "/cpp/c-runtime-library/format-specification-syntax-printf-and-wprintf-functions#flags",
@@ -7912,7 +7962,7 @@
       },
       {
          "source_path": "docs/top/index.md",
-         "redirect_url": "/cpp/visual-cpp-in-visual-studio",
+         "redirect_url": "/cpp/overview/visual-cpp-in-visual-studio",
          "redirect_document_id": false
       },
       {

diff --git a/docs/assembler/masm/dot-fpo.md b/docs/assembler/masm/dot-fpo.md
@@ -31,7 +31,7 @@ Number registers saved.
 Indicates whether the EBP register has been allocated. either 0 or 1.
 
 *cbFrame*<br/>
-Indicates the frame type.  See [FPO_DATA](/windows/desktop/api/winnt/ns-winnt-fpo_data) for more information.
+Indicates the frame type.  See [FPO_DATA](/windows/win32/api/winnt/ns-winnt-fpo_data) for more information.
 
 ## See also
 

diff --git a/docs/atl-mfc-shared/allocating-and-releasing-memory-for-a-bstr.md b/docs/atl-mfc-shared/allocating-and-releasing-memory-for-a-bstr.md
@@ -31,5 +31,5 @@ In general, the rules for allocating and releasing memory allocated for `BSTR`s
 
 [Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)<br/>
 [CStringT::AllocSysString](../atl-mfc-shared/reference/cstringt-class.md#allocsysstring)<br/>
-[SysAllocString](/windows/desktop/api/oleauto/nf-oleauto-sysallocstring)<br/>
-[SysFreeString](/windows/desktop/api/oleauto/nf-oleauto-sysfreestring)
+[SysAllocString](/windows/win32/api/oleauto/nf-oleauto-sysallocstring)<br/>
+[SysFreeString](/windows/win32/api/oleauto/nf-oleauto-sysfreestring)
diff --git a/docs/atl-mfc-shared/codesnippet/CPP/current-time-general-purpose-classes_1.cpp b/docs/atl-mfc-shared/codesnippet/CPP/current-time-general-purpose-classes_1.cpp
diff --git a/docs/atl-mfc-shared/codesnippet/CPP/current-time-general-purpose-classes_2.cpp b/docs/atl-mfc-shared/codesnippet/CPP/current-time-general-purpose-classes_2.cpp
diff --git a/docs/atl-mfc-shared/codesnippet/CPP/current-time-general-purpose-classes_3.cpp b/docs/atl-mfc-shared/codesnippet/CPP/current-time-general-purpose-classes_3.cpp
diff --git a/docs/atl-mfc-shared/codesnippet/CPP/elapsed-time-general-purpose-classes_1.cpp b/docs/atl-mfc-shared/codesnippet/CPP/elapsed-time-general-purpose-classes_1.cpp
diff --git a/docs/atl-mfc-shared/codesnippet/CPP/formatting-time-values-general-purpose-classes_1.cpp b/docs/atl-mfc-shared/codesnippet/CPP/formatting-time-values-general-purpose-classes_1.cpp
diff --git a/docs/atl-mfc-shared/current-time-automation-classes.md b/docs/atl-mfc-shared/current-time-automation-classes.md
diff --git a/docs/atl-mfc-shared/current-time-general-purpose-classes.md b/docs/atl-mfc-shared/current-time-general-purpose-classes.md
diff --git a/docs/atl-mfc-shared/date-and-time-automation-support.md b/docs/atl-mfc-shared/date-and-time-automation-support.md
diff --git a/docs/atl-mfc-shared/date-and-time-database-support.md b/docs/atl-mfc-shared/date-and-time-database-support.md
diff --git a/docs/atl-mfc-shared/date-and-time-systemtime-support.md b/docs/atl-mfc-shared/date-and-time-systemtime-support.md