Skip to content

Commit bc85ab9

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/cpp-docs-pr (branch live)
2 parents 24943b8 + b53eff3 commit bc85ab9

8 files changed

+383
-404
lines changed

.openpublishing.redirection.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -860,6 +860,21 @@
860860
"redirect_url": "/cpp/build/reference/running-nmake",
861861
"redirect_document_id": false
862862
},
863+
{
864+
"source_path": "docs/build/manifest-generation-in-visual-studio.md",
865+
"redirect_url": "/cpp/build/understanding-manifest-generation-for-c-cpp-programs#manifest-generation-in-visual-studio",
866+
"redirect_document_id": false
867+
},
868+
{
869+
"source_path": "docs/build/manifest-generation-at-the-command-line.md",
870+
"redirect_url": "/cpp/build/understanding-manifest-generation-for-c-cpp-programs#manifest-generation-at-the-command-line",
871+
"redirect_document_id": false
872+
},
873+
{
874+
"source_path": "docs/build/how-to-embed-a-manifest-inside-a-c-cpp-application.md",
875+
"redirect_url": "/cpp/build/understanding-manifest-generation-for-c-cpp-programs#how-to-embed-a-manifest-inside-a-c-cpp-application",
876+
"redirect_document_id": false
877+
},
863878
{
864879
"source_path": "docs/build/unwind-data-for-exception-handling-debugger-support.md",
865880
"redirect_url": "/cpp/build/exception-handling-x64",

docs/build/how-to-embed-a-manifest-inside-a-c-cpp-application.md

Lines changed: 0 additions & 254 deletions
This file was deleted.

docs/build/manifest-generation-at-the-command-line.md

Lines changed: 0 additions & 18 deletions
This file was deleted.

docs/build/manifest-generation-in-visual-studio.md

Lines changed: 0 additions & 28 deletions
This file was deleted.

docs/build/toc.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -285,16 +285,7 @@ items:
285285
- name: "How to: Build isolated applications to consume COM components"
286286
href: ../build/how-to-build-isolated-applications-to-consume-com-components.md
287287
- name: Understanding manifest generation for C/C++ programs
288-
expanded: false
289-
items:
290-
- name: Understanding manifest generation for C/C++ programs
291-
href: ../build/understanding-manifest-generation-for-c-cpp-programs.md
292-
- name: Manifest generation in Visual Studio
293-
href: ../build/manifest-generation-in-visual-studio.md
294-
- name: Manifest generation at the command line
295-
href: ../build/manifest-generation-at-the-command-line.md
296-
- name: "How to: Embed a manifest inside a C/C++ application"
297-
href: ../build/how-to-embed-a-manifest-inside-a-c-cpp-application.md
288+
href: ../build/understanding-manifest-generation-for-c-cpp-programs.md
298289
- name: Troubleshooting C/C++ isolated applications and side-by-side assemblies
299290
href: ../build/troubleshooting-c-cpp-isolated-applications-and-side-by-side-assemblies.md
300291
- name: Configure MSVC for 64-bit, x64 targets

0 commit comments

Comments
 (0)