Skip to content

Commit 87df165

Browse files
author
Colin Robertson
authored
Merge pull request MicrosoftDocs#1776 from MicrosoftDocs/master637116014168039735
Fix git push error for protected CLA branch
2 parents 7d21793 + 573b36b commit 87df165

33 files changed

+127
-139
lines changed

‎.openpublishing.publish.config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"moniker_ranges": [
1111
">= vs-2015"
1212
],
13+
"xref_query_tags": ["/dotnet", "/uwp/api"],
1314
"open_to_public_contributors": true,
1415
"type_mapping": {
1516
"Conceptual": "Content",

‎.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -835,6 +835,16 @@
835835
"redirect_url": "/cpp/c-runtime-library/c-run-time-library-reference",
836836
"redirect_document_id": false
837837
},
838+
{
839+
"source_path": "docs/c-runtime-library/inp-inpw.md",
840+
"redirect_url": "/cpp/c-runtime-library/inp-inpw-inpd",
841+
"redirect_document_id": true
842+
},
843+
{
844+
"source_path": "docs/c-runtime-library/outp-outpw.md",
845+
"redirect_url": "/cpp/c-runtime-library/outp-outpw-outpd",
846+
"redirect_document_id": true
847+
},
838848
{
839849
"source_path": "docs/c-runtime-library/precision-specification.md",
840850
"redirect_url": "/cpp/c-runtime-library/format-specification-syntax-printf-and-wprintf-functions#precision",

‎docs/assembler/masm/comm.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "COMM"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: ["COMM"]
55
helpviewer_keywords: ["COMM directive"]
66
ms.assetid: a23548c4-ad04-41fa-91da-945f228de742
@@ -21,6 +21,8 @@ Each *definition* has the following form:
2121

2222
⟦*language-type*⟧ ⟦**NEAR** | **FAR**⟧ _label_**:**_type_⟦**:**_count_⟧
2323

24+
The *language-type*, **NEAR**, and **FAR** arguments are valid only in 32-bit MASM.
25+
2426
The optional *language-type* sets the naming conventions for the name that follows. It overrides any language specified by the **.MODEL** directive. The optional **NEAR** or **FAR** override the current memory model. The *label* is the name of the variable. The *type* can be any type specifier ([BYTE](../../assembler/masm/byte-masm.md), [WORD](../../assembler/masm/word.md), and so on) or an integer specifying the number of bytes. The optional *count* specifies the number of elements in the declared data object. The default *count* is one.
2527

2628
## Example

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: ".CODE"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: [".CODE"]
55
helpviewer_keywords: [".CODE directive"]
66
ms.assetid: 2b8c882c-c0d2-4fa3-8335-e6b12717a4f4
77
---
8-
# .CODE
8+
# .CODE (32-bit MASM)
99

1010
When used with [.MODEL](../../assembler/masm/dot-model.md), indicates the start of a code segment.
1111

‎docs/assembler/masm/dot-const.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: ".CONST"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: [".CONST"]
55
helpviewer_keywords: [".CONST directive"]
66
ms.assetid: d5c1d795-174c-48d2-8359-92fbbd7d4c6c
77
---
8-
# .CONST
8+
# .CONST (32-bit MASM)
99

1010
When used with [.MODEL](../../assembler/masm/dot-model.md), starts a constant data segment (with segment name **CONST**).
1111

‎docs/assembler/masm/dot-data-q.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: ".DATA?"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: [".DATA?"]
55
helpviewer_keywords: [".DATA? directive"]
66
ms.assetid: f454f8d7-e23b-458c-a2c4-8441f1afdc82
77
---
8-
# .DATA?
8+
# .DATA? (32-bit MASM)
99

1010
When used with [.MODEL](../../assembler/masm/dot-model.md), starts a near data segment for uninitialized data (segment name _BSS).
1111

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: ".DATA"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: [".DATA"]
55
helpviewer_keywords: [".DATA directive"]
66
ms.assetid: 32797935-9c79-46e0-bf6f-07d0c2bf1dc1
77
---
8-
# .DATA
8+
# .DATA (32-bit MASM)
99

1010
When used with [.MODEL](../../assembler/masm/dot-model.md), starts a near data segment for initialized data (segment name _DATA).
1111

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "END (MASM)"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: ["end"]
55
helpviewer_keywords: ["END directive"]
66
ms.assetid: 128d1c17-f4c4-4ac6-bdb7-d14b4a9a7f4c
@@ -13,6 +13,10 @@ Marks the end of a module and, optionally, sets the program entry point to *addr
1313

1414
> **END** ⟦*address*⟧
1515
16+
## Remarks
17+
18+
The *address* argument is valid in 32-bit MASM only.
19+
1620
## See also
1721

1822
[Directives reference](directives-reference.md)

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "EXTERN (MASM)"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: ["extern"]
55
helpviewer_keywords: ["EXTERN directive"]
66
ms.assetid: 667d703d-3aaf-4139-a586-29bc5dab1aff
@@ -15,6 +15,8 @@ Defines one or more external variables, labels, or symbols called *name* whose t
1515
1616
## Remarks
1717

18+
The *language-type* argument is valid in 32-bit MASM only.
19+
1820
The *type* can be [ABS](../../assembler/masm/operator-abs.md), which imports *name* as a constant. Same as [EXTRN](../../assembler/masm/extrn.md).
1921

2022
## See also

‎docs/assembler/masm/externdef.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "EXTERNDEF"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: ["EXTERNDEF"]
55
helpviewer_keywords: ["EXTERNDEF directive"]
66
ms.assetid: 95a10de6-c345-4428-a2f2-90f7d411dc86
@@ -15,6 +15,8 @@ Defines one or more external variables, labels, or symbols called *name* whose t
1515
1616
## Remarks
1717

18+
The *language-type* argument is valid in 32-bit MASM only.
19+
1820
If *name* is defined in the module, it is treated as [PUBLIC](../../assembler/masm/public-masm.md). If *name* is referenced in the module, it is treated as [EXTERN](../../assembler/masm/extern-masm.md). If *name* is not referenced, it is ignored. The *type* can be [ABS](../../assembler/masm/operator-abs.md), which imports *name* as a constant. Normally used in include files.
1921

2022
## See also

0 commit comments

Comments
 (0)