Skip to content

Commit f2674b9

Browse files
author
Colin Robertson
authored
Merge pull request MicrosoftDocs#3515 from MicrosoftDocs/FromPrivateLiveToMaster
Resolve syncing conflicts from FromPrivateLiveToMaster to master
2 parents c294c68 + c9af120 commit f2674b9

File tree

83 files changed

+330
-298
lines changed

Some content is hidden

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

83 files changed

+330
-298
lines changed

‎docs/assembler/inline/intel-s-mmx-instruction-set.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
2-
description: "Learn more about: Intel's MMX Instruction Set"
3-
title: "Intel's MMX Instruction Set"
2+
description: "Learn more about: Intel's MMX Instruction Set"
3+
title: "Intel's MMX Instruction Set"
44
ms.date: "08/30/2018"
55
ms.topic: "reference"
66
helpviewer_keywords: ["MMX instruction set"]
77
ms.assetid: 705deb2d-c3fd-4696-9e22-8bcf25866daf
88
---
9-
# Intel's MMX Instruction Set
9+
# Intel's MMX Instruction Set
1010

1111
**Microsoft Specific**
1212

‎docs/assembler/masm/operator-double-quote.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
2-
description: "Learn more about: operator " ""
3-
title: "operator " ""
2+
description: 'Learn more about: operator " "'
3+
title: 'operator " "'
44
ms.date: "12/17/2019"
5-
f1_keywords: ["" "", "operator " ""]
6-
helpviewer_keywords: ["" " operator", "operator " ""]
5+
f1_keywords: ['operator " "']
6+
helpviewer_keywords: ['" " operator', 'operator " "']
77
ms.assetid: e96fd419-06d4-4989-b65b-7d3754f00f81
88
---
9-
# operator " "
9+
# operator " "
1010

1111
Treats "*text*" as a string.
1212

‎docs/assembler/masm/operator-single-quote.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
2-
description: "Learn more about: operator ' '"
3-
title: "operator ' '"
2+
description: "Learn more about: operator ' '"
3+
title: "operator ' '"
44
ms.date: "12/17/2019"
55
f1_keywords: ["operator ' '", "' '"]
66
helpviewer_keywords: ["operator ' '", "' ' operator"]
77
ms.assetid: 62a5d993-3d9b-470d-ba8a-53d76afd29b1
88
---
9-
# operator ' '
9+
# operator ' '
1010

1111
Treats '*text*' as a string.
1212

‎docs/atl/reference/atl-text-encoding-functions.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -335,13 +335,13 @@ The length in characters of the converted string.
335335
336336
Possible conversions performed by this function are shown in the table:
337337
338-
|Source|Destination|
339-
|------------|-----------------|
340-
|\<|&lt;|
341-
|>|&gt;|
342-
|&|&amp;|
343-
|'|&apos;|
344-
|"|&quot;|
338+
| Source | Destination |
339+
|--|--|
340+
| \< | \&lt; |
341+
| > | \&gt; |
342+
| & | \&amp; |
343+
| ' | \&apos; |
344+
| " | \&quot; |
345345
346346
## <a name="getextendedchars"></a> GetExtendedChars
347347

‎docs/atl/reference/catlarray-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ The code used to copy or move elements.
5454
5555
|Operator|Description|
5656
|-|-|
57-
|[operator &#91;&#93;](#operator_at)|Call this operator to return a reference to an element in the array.|
57+
|[`operator []`](#operator_at)|Call this operator to return a reference to an element in the array.|
5858
5959
### Typedefs
6060

‎docs/atl/reference/cautovectorptr-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ The pointer type.
5858

5959
## Remarks
6060

61-
This class provides methods for creating and managing a smart pointer, which will help protect against memory leaks by automatically freeing resources when it falls out of scope. `CAutoVectorPtr` is similar to `CAutoPtr`, the only difference being that `CAutoVectorPtr` uses [vector new&#91;&#93;](../../standard-library/new-operators.md#op_new_arr) and [vector delete&#91;&#93;](../../standard-library/new-operators.md#op_delete_arr) to allocate and free memory instead of the C++ **`new`** and **`delete`** operators. See [CAutoVectorPtrElementTraits](../../atl/reference/cautovectorptrelementtraits-class.md) if collection classes of `CAutoVectorPtr` are required.
61+
This class provides methods for creating and managing a smart pointer, which will help protect against memory leaks by automatically freeing resources when it falls out of scope. `CAutoVectorPtr` is similar to `CAutoPtr`, the only difference being that `CAutoVectorPtr` uses [`vector new[]`](../../standard-library/new-operators.md#op_new_arr) and [`vector delete[]`](../../standard-library/new-operators.md#op_delete_arr) to allocate and free memory instead of the C++ **`new`** and **`delete`** operators. See [CAutoVectorPtrElementTraits](../../atl/reference/cautovectorptrelementtraits-class.md) if collection classes of `CAutoVectorPtr` are required.
6262

6363
See [CAutoPtr](../../atl/reference/cautoptr-class.md) for an example of using a smart pointer class.
6464

‎docs/atl/using-replaceable-parameters-the-registrar-s-preprocessor.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
description: "Learn more about: Using Replaceable Parameters (The Registrar&#39;s Preprocessor)"
2+
description: "Learn more about: Using Replaceable Parameters (The Registrar's Preprocessor)"
33
title: "Using Replaceable Parameters (ATL Registrar)"
44
ms.date: "11/04/2016"
55
helpviewer_keywords: ["%MODULE%"]
66
ms.assetid: 0b376994-84a6-4967-8d97-8c01dfc94efe
77
---
8-
# Using Replaceable Parameters (The Registrar&#39;s Preprocessor)
8+
# Using Replaceable Parameters (The Registrar's Preprocessor)
99

1010
Replaceable parameters allow a Registrar's client to specify run-time data. To do this, the Registrar maintains a replacement map into which it enters the values associated with the replaceable parameters in your script. The Registrar makes these entries at run time.
1111

‎docs/build/reference/fe-name-exe-file.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The relative or absolute path and base file name, or relative or absolute path t
2222

2323
## Remarks
2424

25-
The **/Fe** option allows you to specify the output directory, output executable name, or both, for the generated executable file. If *pathname* ends in a path separator (**&#92;**), it is assumed to specify only the output directory. Otherwise, the last component of *pathname* is used as the output file base name, and the rest of *pathname* specifies the output directory. If *pathname* does not have any path separators, it's assumed to specify the output file name in the current directory. The *pathname* must be enclosed in double quotes (**"**) if it contains any characters that can't be in a short path, such as spaces, extended characters, or path components more than eight characters long.
25+
The **/Fe** option allows you to specify the output directory, output executable name, or both, for the generated executable file. If *pathname* ends in a path separator (**`\`**), it is assumed to specify only the output directory. Otherwise, the last component of *pathname* is used as the output file base name, and the rest of *pathname* specifies the output directory. If *pathname* does not have any path separators, it's assumed to specify the output file name in the current directory. The *pathname* must be enclosed in double quotes (**"**) if it contains any characters that can't be in a short path, such as spaces, extended characters, or path components more than eight characters long.
2626

2727
When the **/Fe** option is not specified, or when a file base name is not specified in *pathname*, the compiler gives the output file a default name using the base name of the first source or object file specified on the command line and the extension .exe or .dll.
2828

‎docs/build/reference/hint-files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ The illustration shows some of the physical directories in a Visual Studio C++ p
155155

156156
### Hint File Directories
157157

158-
![Common and project&#45;specific hint file directories.](media/hintfile.png "HintFile")
158+
![Diagram showing the common and project specific hint file directories.](media/hintfile.png)
159159

160160
### Directories and Hint File Contents
161161

‎docs/build/reference/ignoreidl-don-t-process-attributes-into-midl.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
2-
description: "Learn more about: /IGNOREIDL (Don&#39;t Process Attributes into MIDL)"
3-
title: "/IGNOREIDL (Don&#39;t Process Attributes into MIDL)"
2+
description: "Learn more about: /IGNOREIDL (Don't Process Attributes into MIDL)"
3+
title: "/IGNOREIDL (Don't Process Attributes into MIDL)"
44
ms.date: "11/04/2016"
55
f1_keywords: ["VC.Project.VCLinkerTool.IgnoreEmbeddedIDL", "/ignoreidl"]
66
helpviewer_keywords: ["IGNOREIDL linker option", "-IGNOREIDL linker option", "/IGNOREIDL linker option"]
77
ms.assetid: 29514098-6a1c-4317-af2f-1dc268972780
88
---
9-
# /IGNOREIDL (Don&#39;t Process Attributes into MIDL)
9+
# /IGNOREIDL (Don't Process Attributes into MIDL)
1010

1111
```
1212
/IGNOREIDL

0 commit comments

Comments
 (0)