Skip to content

Commit f2674b9

Browse files
author
Colin Robertson
authored
Merge pull request #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

docs/build/reference/return-value-of-cl-exe.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ cl.exe returns zero for success (no errors) and non-zero otherwise.
1111

1212
The return value of cl.exe can be useful if you are compiling from a script, powershell, .cmd, or .bat file. We recommend that you capture the output of the compiler in case there are errors or warnings, so that you can resolve them.
1313

14-
There are too many possible error exit codes for cl.exe to list them all. You can look up an error code in the winerror.h or ntstatus.h files included in the Windows Software Development Kit in the %ProgramFiles(x86)%\Windows Kits\\<em>version</em>\Include\shared\ directory. Error codes returned in decimal must be converted to hexadecimal for search. For example, an error code of -1073741620 converted to hexadecimal is 0xC00000CC. This error is found in ntstatus.h, where the corresponding message is "The specified share name cannot be found on the remote server." For a downloadable list of Windows error codes, see [&#91;MS-ERREF&#93;: Windows Error Codes](/openspecs/windows_protocols/MS-ERREF).
14+
There are too many possible error exit codes for cl.exe to list them all. You can look up an error code in the winerror.h or ntstatus.h files included in the Windows Software Development Kit in the %ProgramFiles(x86)%\Windows Kits\\<em>version</em>\Include\shared\ directory. Error codes returned in decimal must be converted to hexadecimal for search. For example, an error code of -1073741620 converted to hexadecimal is 0xC00000CC. This error is found in ntstatus.h, where the corresponding message is "The specified share name cannot be found on the remote server." For a downloadable list of Windows error codes, see [`[MS-ERREF]` Windows Error Codes](/openspecs/windows_protocols/MS-ERREF).
1515

1616
You can also use the error lookup utility in Visual Studio to find out what a compiler error message means. In a Visual Studio command shell, enter **errlook.exe** to start the utility; or in the Visual Studio IDE, on the menu bar, choose **Tools**, **Error Lookup**. Enter the error value to find the descriptive text associated with the error. For more information see [ERRLOOK Reference](errlook-reference.md).
1717

docs/c-language/c-operators.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ C includes the following unary operators:
1616
|Symbol|Name|
1717
|------------|----------|
1818
|**-** **~** **!**|Negation and complement operators|
19-
|**&#42;** **&**|Indirection and address-of operators|
19+
|**`*`** **`&`**|Indirection and address-of operators|
2020
|**`sizeof`**|Size operator|
2121
|**+**|Unary plus operator|
2222
|**++** **--**|Unary increment and decrement operators|
@@ -25,7 +25,7 @@ Binary operators associate from left to right. C provides the following binary o
2525

2626
|Symbol|Name|
2727
|------------|----------|
28-
|**&#42;** **/** **%**|Multiplicative operators|
28+
|**`*`** **`/`** **`%`**|Multiplicative operators|
2929
|**+** **-**|Additive operators|
3030
|**\<\<** **>>**|Shift operators|
3131
|**\<** **>** **\<=** **>=** **==** **!=**|Relational operators|

docs/c-language/indirection-and-address-of-operators.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.assetid: 10d62b00-12ba-4ea9-a2d5-09ac29ca2232
77
---
88
# Indirection and Address-of Operators
99

10-
The unary indirection operator (__&#42;__) accesses a value indirectly, through a pointer. The operand must be a pointer type. The result of the operation is the value addressed by the operand; that is, the value at the address to which its operand points. The type of the result is the type that the operand addresses.
10+
The unary indirection operator (**`*`**) accesses a value indirectly, through a pointer. The operand must be a pointer type. The result of the operation is the value addressed by the operand; that is, the value at the address to which its operand points. The type of the result is the type that the operand addresses.
1111

1212
The result of the indirection operator is *type* if the operand is of type *pointer to type*. If the operand points to a function, the result is a function designator. If it points to an object, the result is an lvalue that designates the object.
1313

@@ -21,9 +21,9 @@ If the pointer value is not valid, the result of the indirection operator is und
2121

2222
- The pointer specifies an address not used by the executing program.
2323

24-
The unary address-of operator (**&**) gives the address of its operand. The operand must be either an lvalue that designates an object that is not declared __register__ and is not a bit-field, or the result of a unary __&#42;__ operator or an array dereference (__&#91;&#93;__) operator, or a function designator. The result is of type *pointer to type* for an operand of type *type*.
24+
The unary address-of operator (**`&`**) gives the address of its operand. The operand must be either an lvalue that designates an object that is not declared **`register`** and is not a bit-field, or the result of a unary **`*`** operator or an array dereference (**`[]`**) operator, or a function designator. The result is of type *pointer to type* for an operand of type *type*.
2525

26-
If the operand is the result of a unary __&#42;__ operator, neither operator is evaluated and the result is as if both were omitted. The result is not an lvalue, and the constraints on the operators still apply. If the operand is the result of a __&#91;&#93;__ operator, neither the __&__ operator nor the unary __&#42;__ implied by the __&#91;&#93;__ operator is evaluated. The result has the same effect as removing the __&__ operator and changing the __&#91;&#93;__ operator to a __+__ operator. Otherwise, the result is a pointer to the object or function designated by the operand.
26+
If the operand is the result of a unary **`*`** operator, neither operator is evaluated and the result is as if both were omitted. The result is not an lvalue, and the constraints on the operators still apply. If the operand is the result of a **`[]`** operator, neither the **`&`** operator nor the unary **`*`** implied by the **`[]`** operator is evaluated. The result has the same effect as removing the **`&`** operator and changing the **`[]`** operator to a **`+`** operator. Otherwise, the result is a pointer to the object or function designated by the operand.
2727

2828
## Examples
2929

@@ -35,13 +35,13 @@ int a[20];
3535
double d;
3636
```
3737

38-
This statement uses the address-of operator (**&**) to take the address of the sixth element of the array `a`. The result is stored in the pointer variable `pa`:
38+
This statement uses the address-of operator (**`&`**) to take the address of the sixth element of the array `a`. The result is stored in the pointer variable `pa`:
3939

4040
```C
4141
pa = &a[5];
4242
```
4343

44-
The indirection operator (__&#42;__) is used in this example to access the **`int`** value at the address stored in `pa`. The value is assigned to the integer variable `x`:
44+
The indirection operator (**`*`**) is used in this example to access the **`int`** value at the address stored in `pa`. The value is assigned to the integer variable `x`:
4545

4646
```C
4747
x = *pa;
@@ -67,5 +67,5 @@ Once the function `roundup` is declared, two pointers to `roundup` are declared
6767

6868
## See also
6969

70-
[Indirection Operator: &#42;](../cpp/indirection-operator-star.md)<br/>
70+
[Indirection Operator: `*`](../cpp/indirection-operator-star.md)<br/>
7171
[Address-of Operator: &](../cpp/address-of-operator-amp.md)

docs/c-language/return-statement-c.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ A **`return`** statement ends the execution of a function, and returns control t
1212
## Syntax
1313

1414
> *jump-statement*:\
15-
> &nbsp;&nbsp;&nbsp;&nbsp;**`return`** *expression*&#8203;<sub>opt</sub> **`;`**
15+
> &nbsp;&nbsp;&nbsp;&nbsp;**`return`** *expression*<sub>opt</sub> **`;`**
1616
1717
The value of *expression*, if present, is returned to the calling function. If *expression* is omitted, the return value of the function is undefined. The expression, if present, is evaluated and then converted to the type returned by the function. When a **`return`** statement contains an expression in functions that have a **`void`** return type, the compiler generates a warning, and the expression isn't evaluated.
1818

docs/c-runtime-library/debug-routines.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ To use these routines, the [_DEBUG](../c-runtime-library/debug.md) flag must be
4747
| [`_CrtSetReportHook`](../c-runtime-library/reference/crtsetreporthook.md) | Install a client-defined reporting function by hooking it into the C run-time debug reporting process |
4848
| [`_CrtSetReportHook2`, `_CrtSetReportHookW2`](../c-runtime-library/reference/crtsetreporthook2-crtsetreporthookw2.md) | Installs or uninstalls a client-defined reporting function by hooking it into the C run-time debug reporting process. |
4949
| [`_CrtSetReportMode`](../c-runtime-library/reference/crtsetreportmode.md) | Specify the general destination(s) for a specific report type generated by `_CrtDbgReport` |
50-
| [_RPT&#91;0,1,2,3,4&#93;](../c-runtime-library/reference/rpt-rptf-rptw-rptfw-macros.md) | Track the application's progress by generating a debug report by calling `_CrtDbgReport` with a format string and a variable number of arguments. Provides no source file and line number information. |
51-
| [_RPTF&#91;0,1,2,3,4&#93;](../c-runtime-library/reference/rpt-rptf-rptw-rptfw-macros.md) | Similar to the `_RPTn` macros, but provides the source file name and line number where the report request originated |
50+
| [`_RPT[0,1,2,3,4]`](../c-runtime-library/reference/rpt-rptf-rptw-rptfw-macros.md) | Track the application's progress by generating a debug report by calling `_CrtDbgReport` with a format string and a variable number of arguments. Provides no source file and line number information. |
51+
| [`_RPTF[0,1,2,3,4]`](../c-runtime-library/reference/rpt-rptf-rptw-rptfw-macros.md) | Similar to the `_RPTn` macros, but provides the source file name and line number where the report request originated |
5252
| [`_calloc_dbg`](../c-runtime-library/reference/calloc-dbg.md) | Allocate a specified number of memory blocks on the heap with additional space for a debugging header and overwrite buffers |
5353
| [`_expand_dbg`](../c-runtime-library/reference/expand-dbg.md) | Resize a specified block of memory on the heap by expanding or contracting the block |
5454
| [`_free_dbg`](../c-runtime-library/reference/free-dbg.md) | Free a block of memory on the heap |

docs/c-runtime-library/reference/chdir-wchdir.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ The **_chdir** function changes the current working directory to the directory s
4242
_chdir("c:\temp");
4343
```
4444
45-
When you use the optional backslash character (**&#92;**) in paths, you must place two backslashes (**&#92;&#92;**) in a C string literal to represent a single backslash (**&#92;**).
45+
When you use the optional backslash character (**`\`**) in paths, you must place two backslashes (**`\\`**) in a C string literal to represent a single backslash (**`\`**).
4646
4747
**_wchdir** is a wide-character version of **_chdir**; the *dirname* argument to **_wchdir** is a wide-character string. **_wchdir** and **_chdir** behave identically otherwise.
4848

docs/c-runtime-library/reference/fdopen-wfdopen.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ For more information about these and other error codes, see [_doserrno, errno, _
4545

4646
The **_fdopen** function associates an I/O stream with the file that is identified by *fd*, and thus allows a file that is opened for low-level I/O to be buffered and formatted. **_wfdopen** is a wide-character version of **_fdopen**; the *mode* argument to **_wfdopen** is a wide-character string. **_wfdopen** and **_fdopen** otherwise behave identically.
4747

48-
File descriptors passed into **_fdopen** are owned by the returned **FILE &#42;** stream. If **_fdopen** is successful, do not call [\_close](close.md) on the file descriptor. Calling [fclose](fclose-fcloseall.md) on the returned **FILE &#42;** also closes the file descriptor.
48+
File descriptors passed into **_fdopen** are owned by the returned `FILE *` stream. If **_fdopen** is successful, do not call [\_close](close.md) on the file descriptor. Calling [fclose](fclose-fcloseall.md) on the returned `FILE *` also closes the file descriptor.
4949

5050
By default, this function's global state is scoped to the application. To change this, see [Global state in the CRT](../global-state.md).
5151

0 commit comments

Comments
 (0)