Skip to content

Commit 3c5a021

Browse files
opbld17opbld17
committed
Merging changes synced from https://github.com/MicrosoftDocs/cpp-docs-pr (branch live)
2 parents 24a01d3 + e9ce20a commit 3c5a021

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+858
-1191
lines changed

‎.openpublishing.redirection.json

Lines changed: 177 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -317,17 +317,32 @@
317317
},
318318
{
319319
"source_path": "docs/build/batch-mode-rules.md",
320-
"redirect_url": "/cpp/build/reference/batch-mode-rules",
320+
"redirect_url": "/cpp/build/reference/inference-rules#batch-mode-rules",
321+
"redirect_document_id": false
322+
},
323+
{
324+
"source_path": "docs/build/reference/batch-mode-rules.md",
325+
"redirect_url": "/cpp/build/reference/inference-rules#batch-mode-rules",
321326
"redirect_document_id": false
322327
},
323328
{
324329
"source_path": "docs/build/command-macros-and-options-macros.md",
325-
"redirect_url": "/cpp/build/reference/command-macros-and-options-macros",
330+
"redirect_url": "/cpp/build/reference/special-nmake-macros#command-macros-and-options-macros",
331+
"redirect_document_id": false
332+
},
333+
{
334+
"source_path": "docs/build/reference/command-macros-and-options-macros.md",
335+
"redirect_url": "/cpp/build/reference/special-nmake-macros#command-macros-and-options-macros",
326336
"redirect_document_id": false
327337
},
328338
{
329339
"source_path": "docs/build/command-modifiers.md",
330-
"redirect_url": "/cpp/build/reference/command-modifiers",
340+
"redirect_url": "/cpp/build/reference/commands-in-a-makefile#command-modifiers",
341+
"redirect_document_id": false
342+
},
343+
{
344+
"source_path": "docs/build/reference/command-modifiers.md",
345+
"redirect_url": "/cpp/build/reference/commands-in-a-makefile#command-modifiers",
331346
"redirect_document_id": false
332347
},
333348
{
@@ -337,7 +352,12 @@
337352
},
338353
{
339354
"source_path": "docs/build/comments-in-a-makefile.md",
340-
"redirect_url": "/cpp/build/reference/comments-in-a-makefile",
355+
"redirect_url": "/cpp/build/reference/contents-of-a-makefile#comments-in-a-makefile",
356+
"redirect_document_id": false
357+
},
358+
{
359+
"source_path": "docs/build/reference/comments-in-a-makefile.md",
360+
"redirect_url": "/cpp/build/reference/contents-of-a-makefile#comments-in-a-makefile",
341361
"redirect_document_id": false
342362
},
343363
{
@@ -347,7 +367,12 @@
347367
},
348368
{
349369
"source_path": "docs/build/creating-inline-file-text.md",
350-
"redirect_url": "/cpp/build/reference/creating-inline-file-text",
370+
"redirect_url": "/cpp/build/reference/inline-files-in-a-makefile#creating-inline-file-text",
371+
"redirect_document_id": false
372+
},
373+
{
374+
"source_path": "docs/build/reference/creating-inline-file-text.md",
375+
"redirect_url": "/cpp/build/reference/inline-files-in-a-makefile#creating-inline-file-text",
351376
"redirect_document_id": false
352377
},
353378
{
@@ -362,7 +387,12 @@
362387
},
363388
{
364389
"source_path": "docs/build/defining-a-rule.md",
365-
"redirect_url": "/cpp/build/reference/defining-a-rule",
390+
"redirect_url": "/cpp/build/reference/inference-rules#defining-a-rule",
391+
"redirect_document_id": false
392+
},
393+
{
394+
"source_path": "docs/build/reference/defining-a-rule.md",
395+
"redirect_url": "/cpp/build/reference/inference-rules#defining-a-rule",
366396
"redirect_document_id": false
367397
},
368398
{
@@ -397,12 +427,12 @@
397427
},
398428
{
399429
"source_path": "docs/build/environment-variable-macros.md",
400-
"redirect_url": "/cpp/build/reference/environment-variable-macros",
430+
"redirect_url": "/cpp/build/reference/special-nmake-macros#environment-variable-macros",
401431
"redirect_document_id": false
402432
},
403433
{
404-
"source_path": "docs/build/executing-a-program-in-preprocessing.md",
405-
"redirect_url": "/cpp/build/reference/executing-a-program-in-preprocessing",
434+
"source_path": "docs/build/reference/environment-variable-macros.md",
435+
"redirect_url": "/cpp/build/reference/special-nmake-macros#environment-variable-macros",
406436
"redirect_document_id": false
407437
},
408438
{
@@ -416,18 +446,23 @@
416446
"redirect_document_id": false
417447
},
418448
{
419-
"source_path": "docs/build/expressions-in-makefile-preprocessing.md",
420-
"redirect_url": "/cpp/build/reference/expressions-in-makefile-preprocessing",
449+
"source_path": "docs/build/filename-macros.md",
450+
"redirect_url": "/cpp/build/reference/special-nmake-macros#filename-macros",
421451
"redirect_document_id": false
422452
},
423453
{
424-
"source_path": "docs/build/filename-macros.md",
425-
"redirect_url": "/cpp/build/reference/filename-macros",
454+
"source_path": "docs/build/reference/filename-macros.md",
455+
"redirect_url": "/cpp/build/reference/special-nmake-macros#filename-macros",
426456
"redirect_document_id": false
427457
},
428458
{
429459
"source_path": "docs/build/filename-parts-syntax.md",
430-
"redirect_url": "/cpp/build/reference/filename-parts-syntax",
460+
"redirect_url": "/cpp/build/reference/commands-in-a-makefile#filename-parts-syntax",
461+
"redirect_document_id": false
462+
},
463+
{
464+
"source_path": "docs/build/reference/filename-parts-syntax.md",
465+
"redirect_url": "/cpp/build/reference/commands-in-a-makefile#filename-parts-syntax",
431466
"redirect_document_id": false
432467
},
433468
{
@@ -437,7 +472,12 @@
437472
},
438473
{
439474
"source_path": "docs/build/inferred-dependents-and-rules.md",
440-
"redirect_url": "/cpp/build/reference/inferred-dependents-and-rules",
475+
"redirect_url": "/cpp/build/reference/inference-rules#inferred-dependents-and-rules",
476+
"redirect_document_id": false
477+
},
478+
{
479+
"source_path": "docs/build/reference/inferred-dependents-and-rules.md",
480+
"redirect_url": "/cpp/build/reference/inference-rules#inferred-dependents-and-rules",
441481
"redirect_document_id": false
442482
},
443483
{
@@ -457,7 +497,17 @@
457497
},
458498
{
459499
"source_path": "docs/build/long-filenames-in-a-makefile.md",
460-
"redirect_url": "/cpp/build/reference/long-filenames-in-a-makefile",
500+
"redirect_url": "/cpp/build/reference/contents-of-a-makefile#long-filenames-in-a-makefile",
501+
"redirect_document_id": false
502+
},
503+
{
504+
"source_path": "docs/build/reference/long-filenames-in-a-makefile.md",
505+
"redirect_url": "/cpp/build/reference/contents-of-a-makefile#long-filenames-in-a-makefile",
506+
"redirect_document_id": false
507+
},
508+
{
509+
"source_path": "docs/build/reference/wildcards-and-nmake.md",
510+
"redirect_url": "/cpp/build/reference/contents-of-a-makefile#wildcards-and-nmake",
461511
"redirect_document_id": false
462512
},
463513
{
@@ -537,7 +587,12 @@
537587
},
538588
{
539589
"source_path": "docs/build/macro-substitution.md",
540-
"redirect_url": "/cpp/build/reference/macro-substitution",
590+
"redirect_url": "/cpp/build/reference/using-an-nmake-macro#macro-substitution",
591+
"redirect_document_id": false
592+
},
593+
{
594+
"source_path": "docs/build/reference/macro-substitution.md",
595+
"redirect_url": "/cpp/build/reference/using-an-nmake-macro#macro-substitution",
541596
"redirect_document_id": false
542597
},
543598
{
@@ -547,17 +602,47 @@
547602
},
548603
{
549604
"source_path": "docs/build/makefile-preprocessing-directives.md",
550-
"redirect_url": "/cpp/build/reference/makefile-preprocessing-directives",
605+
"redirect_url": "/cpp/build/reference/makefile-preprocessing#makefile-preprocessing-directives",
606+
"redirect_document_id": false
607+
},
608+
{
609+
"source_path": "docs/build/reference/makefile-preprocessing-directives.md",
610+
"redirect_url": "/cpp/build/reference/makefile-preprocessing#makefile-preprocessing-directives",
551611
"redirect_document_id": false
552612
},
553613
{
554614
"source_path": "docs/build/makefile-preprocessing-operators.md",
555-
"redirect_url": "/cpp/build/reference/makefile-preprocessing-operators",
615+
"redirect_url": "/cpp/build/reference/makefile-preprocessing#makefile-preprocessing-operators",
616+
"redirect_document_id": false
617+
},
618+
{
619+
"source_path": "docs/build/reference/makefile-preprocessing-operators.md",
620+
"redirect_url": "/cpp/build/reference/makefile-preprocessing#makefile-preprocessing-operators",
621+
"redirect_document_id": false
622+
},
623+
{
624+
"source_path": "docs/build/expressions-in-makefile-preprocessing.md",
625+
"redirect_url": "/cpp/build/reference/makefile-preprocessing#expressions-in-makefile-preprocessing",
626+
"redirect_document_id": false
627+
},
628+
{
629+
"source_path": "docs/build/reference/expressions-in-makefile-preprocessing.md",
630+
"redirect_url": "/cpp/build/reference/makefile-preprocessing#expressions-in-makefile-preprocessing",
631+
"redirect_document_id": false
632+
},
633+
{
634+
"source_path": "docs/build/executing-a-program-in-preprocessing.md",
635+
"redirect_url": "/cpp/build/reference/makefile-preprocessing#executing-a-program-in-preprocessing",
636+
"redirect_document_id": false
637+
},
638+
{
639+
"source_path": "docs/build/reference/executing-a-program-in-preprocessing.md",
640+
"redirect_url": "/cpp/build/reference/makefile-preprocessing#executing-a-program-in-preprocessing",
556641
"redirect_document_id": false
557642
},
558643
{
559644
"source_path": "docs/build/makefile-preprocessing.md",
560-
"redirect_url": "/cpp/build/reference/expressions-in-makefile-preprocessing",
645+
"redirect_url": "/cpp/build/reference/makefile-preprocessing",
561646
"redirect_document_id": false
562647
},
563648
{
@@ -567,7 +652,12 @@
567652
},
568653
{
569654
"source_path": "docs/build/multiple-inline-files.md",
570-
"redirect_url": "/cpp/build/reference/multiple-inline-files",
655+
"redirect_url": "/cpp/build/reference/inline-files-in-a-makefile#multiple-inline-files",
656+
"redirect_document_id": false
657+
},
658+
{
659+
"source_path": "docs/build/reference/multiple-inline-files.md",
660+
"redirect_url": "/cpp/build/reference/inline-files-in-a-makefile#multiple-inline-files",
571661
"redirect_document_id": false
572662
},
573663
{
@@ -597,22 +687,42 @@
597687
},
598688
{
599689
"source_path": "docs/build/null-and-undefined-macros.md",
600-
"redirect_url": "/cpp/build/reference/null-and-undefined-macros",
690+
"redirect_url": "/cpp/build/reference/defining-an-nmake-macro#null-and-undefined-macros",
691+
"redirect_document_id": false
692+
},
693+
{
694+
"source_path": "docs/build/reference/null-and-undefined-macros.md",
695+
"redirect_url": "/cpp/build/reference/defining-an-nmake-macro#null-and-undefined-macros",
601696
"redirect_document_id": false
602697
},
603698
{
604699
"source_path": "docs/build/precedence-in-inference-rules.md",
605-
"redirect_url": "/cpp/build/reference/precedence-in-inference-rules",
700+
"redirect_url": "/cpp/build/reference/inference-rules#precedence-in-inference-rules",
701+
"redirect_document_id": false
702+
},
703+
{
704+
"source_path": "docs/build/reference/precedence-in-inference-rules.md",
705+
"redirect_url": "/cpp/build/reference/inference-rules#precedence-in-inference-rules",
606706
"redirect_document_id": false
607707
},
608708
{
609709
"source_path": "docs/build/precedence-in-macro-definitions.md",
610-
"redirect_url": "/cpp/build/reference/precedence-in-macro-definitions",
710+
"redirect_url": "/cpp/build/reference/defining-an-nmake-macro#precedence-in-macro-definitions",
711+
"redirect_document_id": false
712+
},
713+
{
714+
"source_path": "docs/build/reference/precedence-in-macro-definitions.md",
715+
"redirect_url": "/cpp/build/reference/defining-an-nmake-macro#precedence-in-macro-definitions",
611716
"redirect_document_id": false
612717
},
613718
{
614719
"source_path": "docs/build/predefined-rules.md",
615-
"redirect_url": "/cpp/build/reference/predefined-rules",
720+
"redirect_url": "/cpp/build/reference/inference-rules#predefined-rules",
721+
"redirect_document_id": false
722+
},
723+
{
724+
"source_path": "docs/build/reference/predefined-rules.md",
725+
"redirect_url": "/cpp/build/reference/inference-rules#predefined-rules",
616726
"redirect_document_id": false
617727
},
618728
{
@@ -632,12 +742,22 @@
632742
},
633743
{
634744
"source_path": "docs/build/recursion-macros.md",
635-
"redirect_url": "/cpp/build/reference/recursion-macros",
745+
"redirect_url": "/cpp/build/reference/special-nmake-macros#recursion-macros",
746+
"redirect_document_id": false
747+
},
748+
{
749+
"source_path": "docs/build/reference/recursion-macros.md",
750+
"redirect_url": "/cpp/build/reference/special-nmake-macros#recursion-macros",
636751
"redirect_document_id": false
637752
},
638753
{
639754
"source_path": "docs/build/reusing-inline-files.md",
640-
"redirect_url": "/cpp/build/reference/reusing-inline-files",
755+
"redirect_url": "/cpp/build/reference/inline-files-in-a-makefile#reusing-inline-files",
756+
"redirect_document_id": false
757+
},
758+
{
759+
"source_path": "docs/build/reference/reusing-inline-files.md",
760+
"redirect_url": "/cpp/build/reference/inline-files-in-a-makefile#reusing-inline-files",
641761
"redirect_document_id": false
642762
},
643763
{
@@ -662,7 +782,12 @@
662782
},
663783
{
664784
"source_path": "docs/build/search-paths-in-rules.md",
665-
"redirect_url": "/cpp/build/reference/search-paths-in-rules",
785+
"redirect_url": "/cpp/build/reference/inference-rules#search-paths-in-rules",
786+
"redirect_document_id": false
787+
},
788+
{
789+
"source_path": "docs/build/reference/search-paths-in-rules.md",
790+
"redirect_url": "/cpp/build/reference/inference-rules#search-paths-in-rules",
666791
"redirect_document_id": false
667792
},
668793
{
@@ -672,12 +797,22 @@
672797
},
673798
{
674799
"source_path": "docs/build/special-characters-in-a-makefile.md",
675-
"redirect_url": "/cpp/build/reference/special-characters-in-a-makefile",
800+
"redirect_url": "/cpp/build/reference/contents-of-a-makefile#special-characters-in-a-makefile",
801+
"redirect_document_id": false
802+
},
803+
{
804+
"source_path": "docs/build/reference/special-characters-in-a-makefile.md",
805+
"redirect_url": "/cpp/build/reference/contents-of-a-makefile#special-characters-in-a-makefile",
676806
"redirect_document_id": false
677807
},
678808
{
679809
"source_path": "docs/build/special-characters-in-macros.md",
680-
"redirect_url": "/cpp/build/reference/special-characters-in-macros",
810+
"redirect_url": "/cpp/build/reference/defining-an-nmake-macro#special-characters-in-macros",
811+
"redirect_document_id": false
812+
},
813+
{
814+
"source_path": "docs/build/reference/special-characters-in-macros.md",
815+
"redirect_url": "/cpp/build/reference/defining-an-nmake-macro#special-characters-in-macros",
681816
"redirect_document_id": false
682817
},
683818
{
@@ -687,7 +822,12 @@
687822
},
688823
{
689824
"source_path": "docs/build/specifying-an-inline-file.md",
690-
"redirect_url": "/cpp/build/reference/specifying-an-inline-file",
825+
"redirect_url": "/cpp/build/reference/inline-files-in-a-makefile#specifying-an-inline-file",
826+
"redirect_document_id": false
827+
},
828+
{
829+
"source_path": "docs/build/reference/specifying-an-inline-file.md",
830+
"redirect_url": "/cpp/build/reference/inline-files-in-a-makefile#specifying-an-inline-file",
691831
"redirect_document_id": false
692832
},
693833
{
@@ -757,7 +897,12 @@
757897
},
758898
{
759899
"source_path": "docs/build/where-to-define-macros.md",
760-
"redirect_url": "/cpp/build/reference/where-to-define-macros",
900+
"redirect_url": "/cpp/build/reference/defining-an-nmake-macro#where-to-define-macros",
901+
"redirect_document_id": false
902+
},
903+
{
904+
"source_path": "docs/build/reference/where-to-define-macros.md",
905+
"redirect_url": "/cpp/build/reference/defining-an-nmake-macro#where-to-define-macros",
761906
"redirect_document_id": false
762907
},
763908
{

0 commit comments

Comments
 (0)