Skip to content

Commit 42f4bde

Browse files
author
Colin Robertson
committed
Fix unescaped angle bracket use
1 parent 6eeb20e commit 42f4bde

23 files changed

Lines changed: 458 additions & 451 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Generates an error if *textitem* is blank.
1818

1919
## Syntax
2020

21-
> .ERRB <textitem> [[, message]]
21+
> .ERRB *textitem* [[, *message*]]
2222
2323
## See also
2424

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Generates an error if the text items are different.
1818

1919
## Syntax
2020

21-
> .ERRDIF[[I]] <textitem1>, <textitem2> [[, message]]
21+
> .ERRDIF[[I]] *textitem1*, *textitem2* [[, *message*]]
2222
2323
## Remarks
2424

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Generates an error if the text items are identical.
1818

1919
## Syntax
2020

21-
> .ERRIDN[[I]] <textitem1>, <textitem2> [[, message]]
21+
> .ERRIDN[[I]] *textitem1*, *textitem2* [[, *message*]]
2222
2323
## Remarks
2424

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Generates an error if *textitem* is not blank.
1818

1919
## Syntax
2020

21-
> .ERRNB <textitem> [[, message]]
21+
> .ERRNB *textitem* [[, *message*]]
2222
2323
## See also
2424

‎docs/atl/modifying-the-atl-dhtml-control.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The ATL Control Wizard provides starter code so you can build and run the contro
3939

4040
You can use the **IWebBrowser2** methods because ATL provides a pointer to that interface for you in your .h file.
4141

42-
Next, modify the HTML resource to invoke the methods you created. You will add three buttons for invoking these methods.
42+
Next, modify the HTML resource to invoke the methods you created. You will add three buttons for invoking these methods.
4343

4444
#### To modify the HTML resource
4545

@@ -60,9 +60,9 @@ Next, modify the HTML resource to invoke the methods you created. You will add t
6060
3. Add the call to the `HelloHTML` method you created. For example:
6161

6262
```html
63-
<br>
64-
<br>
65-
<BUTTON onclick='window.external.HelloHTML();'>HelloHTML</BUTTON>
63+
<br>
64+
<br>
65+
<BUTTON onclick='window.external.HelloHTML();'>HelloHTML</BUTTON>
6666
```
6767

6868
This method will create a button, labeled **HelloHTML**, that the user can click to display the `HelloHTML` message box.

‎docs/atl/reference/atl-ole-db-consumer-wizard.md‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -93,23 +93,23 @@ This wizard sets up an OLE DB consumer class with the data bindings necessary to
9393

9494
After you select a data source, this box is populated with a default class name based on the table or stored procedure that you selected (see **Select a data source** below). You can edit the class name.
9595

96-
- **.h file**
96+
- **.h file**
9797

9898
After you select a data source, this box is populated with a default header class name based on the table or stored procedure that you selected (see **Select a data source** below). You can edit the header file's name or select an existing header file.
9999

100-
- **Attributed**
100+
- **Attributed**
101101

102102
This option specifies whether the wizard will create consumer classes using attributes or template declarations. When you select this option, the wizard uses attributes instead of template declarations (this is the default option). When you deselect this option, the wizard uses template declarations instead of attributes.
103103

104104
- If you select a consumer **Type** of **Table**, the wizard uses the `db_source` and `db_table` attributes to create the table and table accessor class declarations, and uses `db_column` to create the column map. For example, it creates this map:
105105

106106
```cpp
107-
// Inject table class and table accessor class declarations
108-
[db_source("<initialization_string>"), db_table("dbo.Orders")]
109-
...
110-
// Column map
111-
[ db_column(1, status=m_dwOrderIDStatus, length=m_dwOrderIDLength) ] LONG m_OrderID;
112-
[ db_column(2, status=m_dwCustomerIDStatus, length=m_dwCustomerIDLength) ] TCHAR m_CustomerID[6];
107+
// Inject table class and table accessor class declarations
108+
[db_source("<initialization_string>"), db_table("dbo.Orders")]
109+
...
110+
// Column map
111+
[ db_column(1, status=m_dwOrderIDStatus, length=m_dwOrderIDLength) ] LONG m_OrderID;
112+
[ db_column(2, status=m_dwCustomerIDStatus, length=m_dwCustomerIDLength) ] TCHAR m_CustomerID[6];
113113
...
114114
```
115115

@@ -120,20 +120,20 @@ This wizard sets up an OLE DB consumer class with the data bindings necessary to
120120
class COrdersAccessor; // Table class
121121
class COrders : public CTable<CAccessor<COrdersAccessor>>;
122122
// ...
123-
// Column map
123+
// Column map
124124
BEGIN_COLUMN_MAP(COrderDetailsAccessor)
125125
COLUMN_ENTRY_LENGTH_STATUS(1, m_OrderID, m_dwOrderIDLength, m_dwOrderIDStatus)
126126
COLUMN_ENTRY_LENGTH_STATUS(2, m_CustomerID, m_dwCustomerIDLength, m_dwCustomerIDStatus)
127-
// ...
127+
// ...
128128
END_COLUMN_MAP()
129129
```
130130

131131
- If you select a consumer **Type** of **Command**, the wizard uses the `db_source` and `db_command` attributes, and uses `db_column` to create the column map. For example, it creates this map:
132132

133133
```cpp
134-
[db_source("<initialization_string>"), db_command("SQL_command")]
135-
...
136-
// Column map using db_column is the same as for consumer type of 'table'
134+
[db_source("<initialization_string>"), db_command("SQL_command")]
135+
...
136+
// Column map using db_column is the same as for consumer type of 'table'
137137
```
138138

139139
instead of using the command and command accessor class declarations in the command class' .h file, for example:
@@ -180,6 +180,6 @@ This wizard sets up an OLE DB consumer class with the data bindings necessary to
180180

181181
## See also
182182

183-
[ATL OLE DB Consumer](../../atl/reference/adding-an-atl-ole-db-consumer.md)
184-
[Adding Functionality with Code Wizards](../../ide/adding-functionality-with-code-wizards-cpp.md)
183+
[ATL OLE DB Consumer](../../atl/reference/adding-an-atl-ole-db-consumer.md)
184+
[Adding Functionality with Code Wizards](../../ide/adding-functionality-with-code-wizards-cpp.md)
185185
[Connection Strings and Data Links (OLE DB)](/previous-versions/windows/desktop/ms718376\(v=vs.85\))

‎docs/build/manifest-generation-at-the-command-line.md‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@ ms.author: "corob"
1212
ms.workload: ["cplusplus"]
1313
---
1414
# Manifest Generation at the Command Line
15-
When building C/C++ applications from the command line using nmake or similar tools, the manifest is generated after the linker has processed all object files and built the final binary. The linker collects assembly information stored in the object files and combines this information into a final manifest file. By default the linker will generate a file named <binary_name>.\<extension>.manifest to describe the final binary. The linker does not embed a manifest file inside the binary and can only generate a manifest as an external file. There are several ways to embed a manifest inside the final binary, such as using the [Manifest Tool (mt.exe)](https://msdn.microsoft.com/library/aa375649) or compiling the manifest into a resource file. It is important to keep in mind that specific rules have to be followed when embedding a manifest inside the final binary to enable such features as incremental linking, signing, and edit and continue. These and other options are discussed in [How to: Embed a Manifest Inside a C/C++ Application](../build/how-to-embed-a-manifest-inside-a-c-cpp-application.md) when building on the command line.
16-
17-
## See Also
18-
[Manifests](https://msdn.microsoft.com/library/aa375365)
19-
[/INCREMENTAL (Link Incrementally)](../build/reference/incremental-link-incrementally.md)
20-
[Strong Name Assemblies (Assembly Signing) (C++/CLI)](../dotnet/strong-name-assemblies-assembly-signing-cpp-cli.md)
21-
[Edit and Continue](/visualstudio/debugger/edit-and-continue)
22-
[Understanding Manifest Generation for C/C++ Programs](../build/understanding-manifest-generation-for-c-cpp-programs.md)
15+
16+
When building C/C++ applications from the command line using nmake or similar tools, the manifest is generated after the linker has processed all object files and built the final binary. The linker collects assembly information stored in the object files and combines this information into a final manifest file. By default the linker will generate a file named *binary_name*.*extension*.manifest to describe the final binary. The linker does not embed a manifest file inside the binary and can only generate a manifest as an external file. There are several ways to embed a manifest inside the final binary, such as using the [Manifest Tool (mt.exe)](https://msdn.microsoft.com/library/aa375649) or compiling the manifest into a resource file. It is important to keep in mind that specific rules have to be followed when embedding a manifest inside the final binary to enable such features as incremental linking, signing, and edit and continue. These and other options are discussed in [How to: Embed a Manifest Inside a C/C++ Application](../build/how-to-embed-a-manifest-inside-a-c-cpp-application.md) when building on the command line.
17+
18+
## See Also
19+
20+
[Manifests](https://msdn.microsoft.com/library/aa375365)<br/>
21+
[/INCREMENTAL (Link Incrementally)](../build/reference/incremental-link-incrementally.md)<br/>
22+
[Strong Name Assemblies (Assembly Signing) (C++/CLI)](../dotnet/strong-name-assemblies-assembly-signing-cpp-cli.md)<br/>
23+
[Edit and Continue](/visualstudio/debugger/edit-and-continue)<br/>
24+
[Understanding Manifest Generation for C/C++ Programs](../build/understanding-manifest-generation-for-c-cpp-programs.md)<br/>

‎docs/build/reference/allowisolation-manifest-lookup.md‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -13,37 +13,36 @@ ms.author: "corob"
1313
ms.workload: ["cplusplus"]
1414
---
1515
# /ALLOWISOLATION (Manifest Lookup)
16-
Specifies behavior for manifest lookup.
17-
18-
## Syntax
19-
20-
```
21-
/ALLOWISOLATION[:NO]
22-
```
23-
24-
## Remarks
25-
**/ALLOWISOLATION:NO** indicates DLLs are loaded as if there was no manifest and causes the linker to set the `IMAGE_DLLCHARACTERISTICS_NO_ISOLATION` bit in the optional header's `DllCharacteristics` field.
26-
27-
**/ALLOWISOLATION** causes the operating system to do manifest lookups and loads.
28-
29-
**/ALLOWISOLATION** is the default.
30-
31-
When isolation is disabled for an executable, the Windows loader will not attempt to find an application manifest for the newly created process. The new process will not have a default activation context, even if there is a manifest inside the executable or placed in the same directory as the executable with name <em>executable-name</em>**.exe.manifest**.
32-
33-
For more information, see [Manifest Files Reference](/windows/desktop/SbsCs/manifest-files-reference).
34-
35-
### To set this linker option in the Visual Studio development environment
36-
37-
1. Open the project's **Property Pages** dialog box. For details, see [Working with Project Properties](../../ide/working-with-project-properties.md).
38-
39-
2. Expand the **Configuration Properties** node.
40-
41-
3. Expand the **Linker** node.
42-
43-
4. Select the **Manifest File** property page.
44-
45-
5. Modify the **Allow Isolation** property.
46-
47-
## See Also
48-
[Setting Linker Options](../../build/reference/setting-linker-options.md)
49-
[Linker Options](../../build/reference/linker-options.md)
16+
17+
Specifies behavior for manifest lookup.
18+
19+
## Syntax
20+
21+
```
22+
/ALLOWISOLATION[:NO]
23+
```
24+
25+
## Remarks
26+
27+
**/ALLOWISOLATION:NO** indicates DLLs are loaded as if there was no manifest and causes the linker to set the `IMAGE_DLLCHARACTERISTICS_NO_ISOLATION` bit in the optional header's `DllCharacteristics` field.
28+
29+
**/ALLOWISOLATION** causes the operating system to do manifest lookups and loads.
30+
31+
**/ALLOWISOLATION** is the default.
32+
33+
When isolation is disabled for an executable, the Windows loader will not attempt to find an application manifest for the newly created process. The new process will not have a default activation context, even if there is a manifest inside the executable or placed in the same directory as the executable with name <em>executable-name</em>**.exe.manifest**.
34+
35+
For more information, see [Manifest Files Reference](/windows/desktop/SbsCs/manifest-files-reference).
36+
37+
### To set this linker option in the Visual Studio development environment
38+
39+
1. Open the project's **Property Pages** dialog box. For details, see [Working with Project Properties](../../ide/working-with-project-properties.md).
40+
41+
1. Select the **Configuration Properties** > **Linker** > **Manifest File** property page.
42+
43+
1. Modify the **Allow Isolation** property.
44+
45+
## See Also
46+
47+
[Setting Linker Options](../../build/reference/setting-linker-options.md)<br/>
48+
[Linker Options](../../build/reference/linker-options.md)

‎docs/build/reference/manifestdependency-specify-manifest-dependencies.md‎

Lines changed: 59 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -13,63 +13,62 @@ ms.author: "corob"
1313
ms.workload: ["cplusplus"]
1414
---
1515
# /MANIFESTDEPENDENCY (Specify Manifest Dependencies)
16-
```
17-
/MANIFESTDEPENDENCY:manifest_dependency
18-
```
19-
20-
## Remarks
21-
/MANIFESTDEPENDENCY lets you specify attributes that will be placed in the \<dependency> section of the manifest file.
22-
23-
See [/MANIFEST (Create Side-by-Side Assembly Manifest)](../../build/reference/manifest-create-side-by-side-assembly-manifest.md) for information on how to create a manifest file.
24-
25-
For more information on the \<dependency> section of the manifest file, see [Publisher Configuration Files](/windows/desktop/SbsCs/publisher-configuration-files).
26-
27-
/MANIFESTDEPENDENCY information can be passed to the linker in one of two ways:
28-
29-
- Directly on the command line (or in a response file) with /MANIFESTDEPENDENCY.
30-
31-
- Via the [comment](../../preprocessor/comment-c-cpp.md) pragma.
32-
33-
The following example shows a /MANIFESTDEPENDENCY comment passed via pragma,
34-
35-
```
36-
#pragma comment(linker, "\"/manifestdependency:type='Win32' name='Test.Research.SampleAssembly' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='0000000000000000' language='*'\"")
37-
```
38-
39-
which results in the following entry in the manifest file:
40-
41-
```
42-
<dependency>
43-
<dependentAssembly>
44-
<assemblyIdentity type='Win32' name='Test.Research.SampleAssembly' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='0000000000000000' language='*' />
45-
</dependentAssembly>
46-
</dependency>
47-
```
48-
49-
The same /MANIFESTDEPENDENCY comments can be passed at the command line as follows:
50-
51-
```
52-
"/manifestdependency:type='Win32' name='Test.Research.SampleAssembly' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='0000000000000000' language='*'\"
53-
```
54-
55-
The linker will collect /MANIFESTDEPENDENCY comments, eliminate duplicate entries, and then add the resulting XML string to the manifest file. If the linker finds conflicting entries, the manifest file will become corrupt and the application will fail to launch (an entry may be added to the event log, indicating the source of the failure).
56-
57-
### To set this linker option in the Visual Studio development environment
58-
59-
1. Open the project's **Property Pages** dialog box. For details, see [Working with Project Properties](../../ide/working-with-project-properties.md).
60-
61-
2. Expand the **Configuration Properties** node.
62-
63-
3. Expand the **Linker** node.
64-
65-
4. Select the **Manifest File** property page.
66-
67-
5. Modify the **Additional Manifest Dependencies** property.
68-
69-
### To set this linker option programmatically
70-
71-
1. See <xref:Microsoft.VisualStudio.VCProjectEngine.VCLinkerTool.AdditionalManifestDependencies%2A>.
72-
73-
## See Also
74-
[Setting Linker Options](../../build/reference/setting-linker-options.md)
75-
[Linker Options](../../build/reference/linker-options.md)
16+
17+
```
18+
/MANIFESTDEPENDENCY:manifest_dependency
19+
```
20+
21+
## Remarks
22+
23+
/MANIFESTDEPENDENCY lets you specify attributes that will be placed in the \<dependency> section of the manifest file.
24+
25+
See [/MANIFEST (Create Side-by-Side Assembly Manifest)](../../build/reference/manifest-create-side-by-side-assembly-manifest.md) for information on how to create a manifest file.
26+
27+
For more information on the \<dependency> section of the manifest file, see [Publisher Configuration Files](/windows/desktop/SbsCs/publisher-configuration-files).
28+
29+
/MANIFESTDEPENDENCY information can be passed to the linker in one of two ways:
30+
31+
- Directly on the command line (or in a response file) with /MANIFESTDEPENDENCY.
32+
33+
- Via the [comment](../../preprocessor/comment-c-cpp.md) pragma.
34+
35+
The following example shows a /MANIFESTDEPENDENCY comment passed via pragma,
36+
37+
```cpp
38+
#pragma comment(linker, "\"/manifestdependency:type='Win32' name='Test.Research.SampleAssembly' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='0000000000000000' language='*'\"")
39+
```
40+
41+
which results in the following entry in the manifest file:
42+
43+
```xml
44+
<dependency>
45+
<dependentAssembly>
46+
<assemblyIdentity type='Win32' name='Test.Research.SampleAssembly' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='0000000000000000' language='*' />
47+
</dependentAssembly>
48+
</dependency>
49+
```
50+
51+
The same /MANIFESTDEPENDENCY comments can be passed at the command line as follows:
52+
53+
```cmd
54+
"/manifestdependency:type='Win32' name='Test.Research.SampleAssembly' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='0000000000000000' language='*'\"
55+
```
56+
57+
The linker will collect /MANIFESTDEPENDENCY comments, eliminate duplicate entries, and then add the resulting XML string to the manifest file. If the linker finds conflicting entries, the manifest file will become corrupt and the application will fail to launch (an entry may be added to the event log, indicating the source of the failure).
58+
59+
### To set this linker option in the Visual Studio development environment
60+
61+
1. Open the project's **Property Pages** dialog box. For details, see [Working with Project Properties](../../ide/working-with-project-properties.md).
62+
63+
1. Select the **Configuration Properties** > **Linker** > **Manifest File** property page.
64+
65+
1. Modify the **Additional Manifest Dependencies** property.
66+
67+
### To set this linker option programmatically
68+
69+
1. See <xref:Microsoft.VisualStudio.VCProjectEngine.VCLinkerTool.AdditionalManifestDependencies%2A>.
70+
71+
## See Also
72+
73+
[Setting Linker Options](../../build/reference/setting-linker-options.md)<br/>
74+
[Linker Options](../../build/reference/linker-options.md)

0 commit comments

Comments
 (0)