Skip to content

Commit 09a4af4

Browse files
authored
Merge pull request #3155 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/visualstudio-docs (branch master)
2 parents d5e2fb1 + 4d246a7 commit 09a4af4

File tree

24 files changed

+25
-25
lines changed

24 files changed

+25
-25
lines changed

docs/code-quality/ca1720-identifiers-should-not-contain-type-names.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ In addition, the names of a parameter are also checked against the following lan
132132
Replace the language-specific data type identifier in the name of the member with a term that better describes its meaning, a language-independent equivalent, or a more generic term, such as 'value'.
133133

134134
## When to suppress warnings
135-
Occasional use of type-based parameter and member names might be appropriate. However, for new development, no known scenarios occur where you should suppress a warning from this rule. For libraries that have previous shipped, you might have to suppress a warning from this rule.
135+
Occasional use of type-based parameter and member names might be appropriate. However, for new development, no known scenarios occur where you should suppress a warning from this rule. For libraries that have previously shipped, you might have to suppress a warning from this rule.
136136

137137
## Related rules
138138
[CA1709: Identifiers should be cased correctly](../code-quality/ca1709-identifiers-should-be-cased-correctly.md)
@@ -141,4 +141,4 @@ In addition, the names of a parameter are also checked against the following lan
141141

142142
[CA1707: Identifiers should not contain underscores](../code-quality/ca1707-identifiers-should-not-contain-underscores.md)
143143

144-
[CA1719: Parameter names should not match member names](../code-quality/ca1719-parameter-names-should-not-match-member-names.md)
144+
[CA1719: Parameter names should not match member names](../code-quality/ca1719-parameter-names-should-not-match-member-names.md)

docs/code-quality/cpp-core-guidelines-warnings.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ These macros correspond to the rule sets and expand into a space-separated lists
122122
The Microsoft Visual C++ compiler has a limited support for the GSL suppress attribute. It can be used to suppress warnings on expression and block statements inside of a function.
123123

124124
```cpp
125-
// Supress only warnings from the 'r.11' rule in expression.
125+
// Suppress only warnings from the 'r.11' rule in expression.
126126
[[gsl::suppress(r.11)]] new int;
127127

128-
// Supress all warnings from the 'r' rule group (resource management) in block.
128+
// Suppress all warnings from the 'r' rule group (resource management) in block.
129129
[[gsl::suppress(r)]]
130130
{
131131
new int;

docs/code-quality/using-the-cpp-core-guidelines-checkers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ These macros correspond to the rule sets and expand into a space-separated list
129129
The Microsoft Visual C++ compiler has a limited support for the GSL suppress attribute. It can be used to suppress warnings on expression and block statements inside of a function.
130130

131131
```cpp
132-
// Supress only warnings from the 'r.11' rule in expression.
132+
// Suppress only warnings from the 'r.11' rule in expression.
133133
[[gsl::suppress(r.11)]] new int;
134134

135-
// Supress all warnings from the 'r' rule group (resource management) in block.
135+
// Suppress all warnings from the 'r' rule group (resource management) in block.
136136
[[gsl::suppress(r)]]
137137
{
138138
new int;

docs/ide/walkthrough-building-an-application.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ You can temporarily hide certain warning messages during a build rather than hav
9494

9595
1. Choose the **Build** page and then, in the **Suppress warnings** box, specify the warning number **0168**.
9696

97-
![Build page, Project Designer](../ide/media/buildwalk_csharpsupresswarnings.png)
97+
![Build page, Project Designer](../ide/media/buildwalk_csharpsuppresswarnings.png)
9898

9999
For more information, see [Build Page, Project Designer (C#)](../ide/reference/build-page-project-designer-csharp.md).
100100

@@ -114,7 +114,7 @@ You can temporarily hide certain warning messages during a build rather than hav
114114

115115
3. On the **Compile** page, select the **Disable all warnings** check box.
116116

117-
![Compile page, Project Designer](../ide/media/buildwalk_vbsupresswarnings.png)
117+
![Compile page, Project Designer](../ide/media/buildwalk_vbsuppresswarnings.png)
118118

119119
For more information, see [Configure warnings in Visual Basic](../ide/configuring-warnings-in-visual-basic.md).
120120

docs/msbuild/link-task.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ Wraps the Visual C++ linker tool, *link.exe*. The linker tool links Common Objec
181181

182182
Specifies whether the linker will apply **SuppressUnmanagedCodeSecurityAttribute** to linker-generated P/Invoke calls from managed code into native DLLs.
183183

184-
For more information, see [/CLRUNMANAGEDCODECHECK (Add SupressUnmanagedCodeSecurityAttribute)](/cpp/build/reference/clrunmanagedcodecheck-add-supressunmanagedcodesecurityattribute).
184+
For more information, see [/CLRUNMANAGEDCODECHECK (Add SuppressUnmanagedCodeSecurityAttribute)](/cpp/build/reference/clrunmanagedcodecheck-add-suppressunmanagedcodesecurityattribute).
185185

186186
- **CreateHotPatchableImage**
187187

docs/vs-2015/ide/walkthrough-building-an-application.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ By completing this walkthrough, you’ll become more familiar with several opti
136136

137137
3. Choose the **Build** page and then, in the **Suppress warnings** box, specify the warning number `1762`.
138138

139-
![Build page, Project Designer](../ide/media/buildwalk-csharpsupresswarnings.png "BuildWalk_CsharpSupressWarnings")
139+
![Build page, Project Designer](../ide/media/buildwalk-csharpsuppresswarnings.png "BuildWalk_CsharpSuppressWarnings")
140140

141141
For more information, see [Build Page, Project Designer (C#)](../ide/reference/build-page-project-designer-csharp.md).
142142

@@ -156,7 +156,7 @@ By completing this walkthrough, you’ll become more familiar with several opti
156156

157157
3. On the **Compile** page, select the **Disable all warnings** check box.
158158

159-
![Compile page, Project Designer](../ide/media/buildwalk-vbsupresswarnings.png "BuildWalk_VBSupressWarnings")
159+
![Compile page, Project Designer](../ide/media/buildwalk-vbsuppresswarnings.png "BuildWalk_VBSuppressWarnings")
160160

161161
For more information, see [Configuring Warnings in Visual Basic](../ide/configuring-warnings-in-visual-basic.md).
162162

docs/vs-2015/msbuild/link-task.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ Wraps the Visual C++ linker tool, link.exe. The linker tool links Common Object
188188

189189
Specifies whether the linker will apply **SuppressUnmanagedCodeSecurityAttribute** to linker-generated P/Invoke calls from managed code into native DLLs.
190190

191-
For more information, see [/CLRUNMANAGEDCODECHECK (Add SupressUnmanagedCodeSecurityAttribute)](http://msdn.microsoft.com/library/73abc426-dab0-45e2-be85-0f9a14206cc2).
191+
For more information, see [/CLRUNMANAGEDCODECHECK (Add SuppressUnmanagedCodeSecurityAttribute)](http://msdn.microsoft.com/library/73abc426-dab0-45e2-be85-0f9a14206cc2).
192192

193193
- **CreateHotPatchableImage**
194194

docs/vs-2015/msbuild/vbc-task.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Wraps vbc.exe, which produces executables (.exe), dynamic-link libraries (.dll),
6060
|`NoLogo`|Optional `Boolean` parameter.<br /><br /> If `true`, suppresses display of compiler banner information. This parameter corresponds to the [/nologo](http://msdn.microsoft.com/library/25ef54b6-d676-4639-a2d2-a747a158bc07) switch of the vbc.exe compiler.|
6161
|`NoStandardLib`|Optional `Boolean` parameter.<br /><br /> Causes the compiler not to reference the standard libraries. This parameter corresponds to the [/nostdlib](http://msdn.microsoft.com/library/140381b8-dc96-4ad5-ae11-792c9ed0be4d) switch of the vbc.exe compiler.|
6262
|`NoVBRuntimeReference`|Optional `Boolean` parameter.<br /><br /> Internal use only. If true, prevents the automatic reference to Microsoft.VisualBasic.dll..|
63-
|`NoWarnings`|Optional `Boolean` parameter.<br /><br /> If `true`, the task supresses all warnings. For more information, see [/nowarn](http://msdn.microsoft.com/library/7ebf2106-0652-4fdc-bf60-70fc86465d83).|
63+
|`NoWarnings`|Optional `Boolean` parameter.<br /><br /> If `true`, the task suppresses all warnings. For more information, see [/nowarn](http://msdn.microsoft.com/library/7ebf2106-0652-4fdc-bf60-70fc86465d83).|
6464
|`Optimize`|Optional `Boolean` parameter.<br /><br /> If `true`, enables compiler optimizations. This parameter corresponds to the [/optimize](http://msdn.microsoft.com/library/fcba4a97-3622-4b87-a891-0f77deab4998) switch of the vbc.exe compiler.|
6565
|`OptionCompare`|Optional `String` parameter.<br /><br /> Specifies how string comparisons are made. This parameter can have the following values:<br /><br /> - `binary`<br />- `text`<br /><br /> The value `binary` specifies that the task uses binary string comparisons. The value `text` specifies that the task uses text string comparisons. The default value of this parameter is `binary`. This parameter corresponds to the [/optioncompare](http://msdn.microsoft.com/library/7237b766-b44d-4cc5-9a3c-885348a7d9e4) switch of the vbc.exe compiler.|
6666
|`OptionExplicit`|Optional `Boolean` parameter.<br /><br /> If `true`, explicit declaration of variables is required. This parameter corresponds to the [/optionexplicit](http://msdn.microsoft.com/library/5d296ab3-bafe-4c4d-9887-78f162ed86c7) switch of the vbc.exe compiler.|

docs/vs-2015/snippets/cpp/VS_Snippets_Winforms/TreeNodeCollection_Clear/CPP/treenodecollection_clear.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public ref class myTreeNodeCollectionForm: public Form
148148
}
149149
}
150150

151-
// Supress repainting until all the objects have been created.
151+
// Suppress repainting until all the objects have been created.
152152
myTreeViewBase->BeginUpdate();
153153

154154
// Clear the 'TreeView' each time the method is called.

docs/vs-2015/snippets/cpp/VS_Snippets_Winforms/TreeNode_Parent/CPP/treenode_parent.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ public ref class MyTreeNodeForm: public System::Windows::Forms::Form
179179
}
180180

181181

182-
// Supress repainting until all the objects have been created.
182+
// Suppress repainting until all the objects have been created.
183183
myTreeView->BeginUpdate();
184184

185185
// Clear the 'TreeView' each time the method is called.

docs/vs-2015/snippets/csharp/VS_Snippets_Winforms/TreeNodeCollection_Clear/CS/treenodecollection_clear.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ private void FillMyTreeView()
9595
}
9696
}
9797

98-
// Supress repainting until all the objects have been created.
98+
// Suppress repainting until all the objects have been created.
9999
myTreeViewBase.BeginUpdate();
100100

101101
// Clear the 'TreeView' each time the method is called.

docs/vs-2015/snippets/csharp/VS_Snippets_Winforms/TreeNode_Bounds/CS/treenode_bounds.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ private void FillMyTreeView()
5252
customer1.CustomerOrders.Add(new Order("Order" + yIndex.ToString()));
5353
}
5454
}
55-
// Supress repainting of the TreeView.
55+
// Suppress repainting of the TreeView.
5656
myTreeView.BeginUpdate();
5757

5858
// Clear the TreeView each time the method is called.

docs/vs-2015/snippets/csharp/VS_Snippets_Winforms/TreeNode_Checked/CS/treenode_checked.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ private void FillMyTreeView()
6060
customer1.CustomerOrders.Add(new Order("Order" + y.ToString()));
6161
}
6262
}
63-
// Supress repainting of the TreeView.
63+
// Suppress repainting of the TreeView.
6464
myTreeView.BeginUpdate();
6565

6666
// Clear the TreeView each time the method is called.

docs/vs-2015/snippets/csharp/VS_Snippets_Winforms/TreeNode_Parent/CS/treenode_parent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ private void FillMyTreeView()
134134
}
135135
}
136136

137-
// Supress repainting until all the objects have been created.
137+
// Suppress repainting until all the objects have been created.
138138
myTreeView.BeginUpdate();
139139

140140
// Clear the 'TreeView' each time the method is called.

docs/vs-2015/snippets/csharp/VS_Snippets_Winforms/TreeNode_TreeNode/CS/treenode_treenode.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private void FillMyTreeView()
5353
customer1.CustomerOrders.Add(new Order("Order" + yIndex.ToString()));
5454
}
5555
}
56-
// Supress repainting of the TreeView.
56+
// Suppress repainting of the TreeView.
5757
myTreeView.BeginUpdate();
5858

5959
// Clear the TreeView each time the method is called.

docs/vs-2015/snippets/visualbasic/VS_Snippets_Winforms/TreeNodeCollection_Clear/VB/treenodecollection_clear.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ End Sub
9090
Next y
9191
Next myCustomerClass1
9292

93-
' Supress repainting until all the objects have been created.
93+
' Suppress repainting until all the objects have been created.
9494
myTreeViewBase.BeginUpdate()
9595

9696
' Clear the 'TreeView' each time the method is called.

docs/vs-2015/snippets/visualbasic/VS_Snippets_Winforms/TreeNode_Bounds/VB/treenode_bounds.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Public Class TreeNode_Bounds
5252
customer1.CustomerOrders.Add(New Order("Order" + yIndex.ToString()))
5353
Next yIndex
5454
Next customer1
55-
' Supress repainting of the TreeView.
55+
' Suppress repainting of the TreeView.
5656
myTreeView.BeginUpdate()
5757

5858
' Clear the TreeView each time the method is called.

docs/vs-2015/snippets/visualbasic/VS_Snippets_Winforms/TreeNode_Checked/VB/treenode_checked.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Public Class TreeNode_Bounds
5656
customer1.CustomerOrders.Add(New Order("Order" + y.ToString()))
5757
Next y
5858
Next customer1
59-
' Supress repainting of the TreeView.
59+
' Suppress repainting of the TreeView.
6060
myTreeView.BeginUpdate()
6161

6262
' Clear the TreeView each time the method is called.

docs/vs-2015/snippets/visualbasic/VS_Snippets_Winforms/TreeNode_Parent/VB/treenode_parent.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ End Sub
116116
Next y
117117
Next myCustomerClass1
118118

119-
' Supress repainting until all the objects have been created.
119+
' Suppress repainting until all the objects have been created.
120120
myTreeView.BeginUpdate()
121121

122122
' Clear the 'TreeView' each time the method is called.

docs/vs-2015/snippets/visualbasic/VS_Snippets_Winforms/TreeNode_TreeNode/VB/treenode_treenode.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Public Class TreeNode_Checked
5555
customer1.CustomerOrders.Add(New Order("Order" + yIndex.ToString()))
5656
Next yIndex
5757
Next customer1
58-
' Supress repainting of the TreeView.
58+
' Suppress repainting of the TreeView.
5959
myTreeView.BeginUpdate()
6060

6161
' Clear the TreeView each time the method is called.

0 commit comments

Comments
 (0)