Skip to content

Commit 2567dc6

Browse files
opbld16opbld16
committed
Merging changes synced from https://github.com/MicrosoftDocs/cpp-docs-pr (branch live)
2 parents 9fc4516 + 069e383 commit 2567dc6

80 files changed

Lines changed: 617 additions & 624 deletions

File tree

Some content is hidden

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

‎.openpublishing.redirection.json‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@
5555
"redirect_url": "/cpp/overview/visual-cpp-tools-and-features-in-visual-studio-editions",
5656
"redirect_document_id": true
5757
},
58+
{
59+
"source_path": "docs/cpp/string-and-i-o-formatting-modern-cpp.md",
60+
"redirect_url": "/cpp/text/string-and-i-o-formatting-modern-cpp",
61+
"redirect_document_id": true
62+
},
5863
{
5964
"source_path": "docs/vcpkg.md",
6065
"redirect_url": "/cpp/build/vcpkg",
@@ -730,6 +735,21 @@
730735
"redirect_url": "/cpp/cpp/cpp-language-reference",
731736
"redirect_document_id": false
732737
},
738+
{
739+
"source_path": "docs/cpp/objects-own-resources-raii.md",
740+
"redirect_url": "/cpp/cpp/object-lifetime-and-resource-management-modern-cpp",
741+
"redirect_document_id": false
742+
},
743+
{
744+
"source_path": "docs/cpp/algorithms-modern-cpp.md",
745+
"redirect_url": "/cpp/cpp/welcome-back-to-cpp-modern-cpp",
746+
"redirect_document_id": false
747+
},
748+
{
749+
"source_path": "docs/cpp/containers-modern-cpp.md",
750+
"redirect_url": "/cpp/cpp/welcome-back-to-cpp-modern-cpp",
751+
"redirect_document_id": false
752+
},
733753
{
734754
"source_path": "docs/cpp/cpp-exception-handling.md",
735755
"redirect_url": "/cpp/cpp/exception-handling-in-visual-cpp",
@@ -872,17 +892,17 @@
872892
},
873893
{
874894
"source_path": "docs/c-runtime-library/reference/cos-cosf-cosl-cosh-coshf-coshl.md",
875-
"redirect_url": "/cpp/c-runtime-library/reference/cos-cosf-cosl.md",
895+
"redirect_url": "/cpp/c-runtime-library/reference/cos-cosf-cosl",
876896
"redirect_document_id": false
877897
},
878898
{
879899
"source_path": "docs/c-runtime-library/reference/sin-sinf-sinl-sinh-sinhf-sinhl.md",
880-
"redirect_url": "/cpp/c-runtime-library/reference/sin-sinf-sinl.md",
900+
"redirect_url": "/cpp/c-runtime-library/reference/sin-sinf-sinl",
881901
"redirect_document_id": false
882902
},
883903
{
884904
"source_path": "docs/c-runtime-library/reference/tan-tanf-tanl-tanh-tanhf-tanhl.md",
885-
"redirect_url": "/cpp/c-runtime-library/reference/tan-tanf-tanl.md",
905+
"redirect_url": "/cpp/c-runtime-library/reference/tan-tanf-tanl",
886906
"redirect_document_id": false
887907
},
888908
{
@@ -962,7 +982,7 @@
962982
},
963983
{
964984
"source_path": "docs/ide/cmakesettings-reference.md",
965-
"redirect_url": "/cpp/build/cmakesettings-reference.md",
985+
"redirect_url": "/cpp/build/cmakesettings-reference",
966986
"redirect_document_id": true
967987
},
968988
{
@@ -13256,4 +13276,4 @@
1325613276
"redirect_document_id": false
1325713277
}
1325813278
]
13259-
}
13279+
}

‎docs/assembler/masm/at-at.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ Defines a code label recognizable only between *label1* and *label2*, where *lab
1515
1616
## See also
1717

18-
[Symbols Reference](../../assembler/masm/symbols-reference.md)<br/>
18+
[Symbols Reference](../../assembler/masm/symbols-reference.md)

‎docs/assembler/masm/at-b.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ f1_keywords: ["@B"]
55
helpviewer_keywords: ["@B symbol"]
66
ms.assetid: ca17c71a-4a5d-4470-a098-484c781dbfa7
77
---
8-
# @B
8+
# \@B
99

10-
The location of the previous [@@:](../../assembler/masm/at-at.md) label.
10+
The location of the previous [\@\@:](../../assembler/masm/at-at.md) label.
1111

1212
## Syntax
1313

14-
> @B
14+
> **\@B**
1515
1616
## See also
1717

18-
[Symbols Reference](../../assembler/masm/symbols-reference.md)<br/>
18+
[Symbols Reference](../../assembler/masm/symbols-reference.md)

‎docs/assembler/masm/at-catstr.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ f1_keywords: ["@CatStr"]
55
helpviewer_keywords: ["@CatStr symbol"]
66
ms.assetid: 01fcc590-1ec2-42f6-b868-ed0433297c26
77
---
8-
# @CatStr
8+
# \@CatStr
99

1010
Macro function that concatenates one or more strings. Returns a string.
1111

1212
## Syntax
1313

14-
> @CatStr( string1 [[, string2...]] )
14+
> **\@CatStr(** *string1* ⟦__,__ *string2*...⟧ **)**
1515
1616
## See also
1717

18-
[Symbols Reference](../../assembler/masm/symbols-reference.md)<br/>
18+
[Symbols Reference](../../assembler/masm/symbols-reference.md)

‎docs/assembler/masm/at-code.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ f1_keywords: ["@code"]
55
helpviewer_keywords: ["@code symbol"]
66
ms.assetid: 44e050e6-d254-4157-9022-cf6afbaa0515
77
---
8-
# @code
8+
# \@code
99

1010
The name of the code segment (text macro).
1111

1212
## Syntax
1313

14-
> @code
14+
> **\@code**
1515
1616
## See also
1717

18-
[Symbols Reference](../../assembler/masm/symbols-reference.md)<br/>
18+
[Symbols Reference](../../assembler/masm/symbols-reference.md)

‎docs/assembler/masm/at-codesize.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
22
title: "@CodeSize"
3-
ms.date: "08/30/2018"
3+
ms.date: "11/21/2019"
44
f1_keywords: ["@CodeSize"]
55
helpviewer_keywords: ["@CodeSize symbol"]
66
ms.assetid: 6e18d99f-9999-41fe-9330-b80de8f735d5
77
---
8-
# @CodeSize
8+
# \@CodeSize
99

1010
0 for **TINY**, **SMALL**, **COMPACT**, and **FLAT** models, and 1 for **MEDIUM**, **LARGE**, and **HUGE** models (numeric equate).
1111

1212
## Syntax
1313

14-
> @CodeSize
14+
> **\@CodeSize**
1515
1616
## See also
1717

18-
[Symbols Reference](../../assembler/masm/symbols-reference.md)<br/>
18+
[Symbols Reference](../../assembler/masm/symbols-reference.md)

‎docs/assembler/masm/at-cpu.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ f1_keywords: ["@Cpu"]
55
helpviewer_keywords: ["@Cpu symbol"]
66
ms.assetid: 04f9fdf6-9772-407e-9c09-c12bed29087b
77
---
8-
# @Cpu
8+
# \@Cpu
99

1010
A bit mask specifying the processor mode (numeric equate).
1111

1212
## Syntax
1313

14-
> @Cpu
14+
> **\@Cpu**
1515
1616
## See also
1717

18-
[Symbols Reference](../../assembler/masm/symbols-reference.md)<br/>
18+
[Symbols Reference](../../assembler/masm/symbols-reference.md)

‎docs/assembler/masm/at-curseg.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ f1_keywords: ["@CurSeg"]
55
helpviewer_keywords: ["@CurSeg symbol"]
66
ms.assetid: 8fbf90c1-7734-4113-9ba2-6ec664b3b59f
77
---
8-
# @CurSeg
8+
# \@CurSeg
99

1010
The name of the current segment (text macro).
1111

1212
## Syntax
1313

14-
> @CurSeg
14+
> **\@CurSeg**
1515
1616
## See also
1717

18-
[Symbols Reference](../../assembler/masm/symbols-reference.md)<br/>
18+
[Symbols Reference](../../assembler/masm/symbols-reference.md)

‎docs/assembler/masm/at-data.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ f1_keywords: ["@data"]
55
helpviewer_keywords: ["@data symbol"]
66
ms.assetid: d3e99fb0-4c9e-40a8-9e2d-15de3b01a2fe
77
---
8-
# @data
8+
# \@data
99

1010
The name of the default data group. Evaluates to DGROUP for all models except **FLAT**. Evaluates to **FLAT** under the **FLAT** memory model (text macro).
1111

1212
## Syntax
1313

14-
> @data
14+
> **\@data**
1515
1616
## See also
1717

18-
[Symbols Reference](../../assembler/masm/symbols-reference.md)<br/>
18+
[Symbols Reference](../../assembler/masm/symbols-reference.md)

‎docs/assembler/masm/at-datasize.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ f1_keywords: ["@DataSize"]
55
helpviewer_keywords: ["@DataSize symbol"]
66
ms.assetid: c31dd6ab-0706-43ed-9a5d-024730f7931b
77
---
8-
# @DataSize
8+
# \@DataSize
99

1010
0 for **TINY**, **SMALL**, **MEDIUM**, and **FLAT** models, 1 for **COMPACT** and **LARGE** models, and 2 for **HUGE** model (numeric equate).
1111

1212
## Syntax
1313

14-
> @DataSize
14+
> **\@DataSize**
1515
1616
## See also
1717

18-
[Symbols Reference](../../assembler/masm/symbols-reference.md)<br/>
18+
[Symbols Reference](../../assembler/masm/symbols-reference.md)

0 commit comments

Comments
 (0)