Skip to content

Commit fe82fe4

Browse files
author
Colin Robertson
authored
Merge pull request #1533 from MicrosoftDocs/FromPublicMasterBranch
Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master)
2 parents a5c626c + 072e12d commit fe82fe4

14 files changed

+35
-28
lines changed

‎.openpublishing.redirection.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,11 @@
170170
"redirect_url": "/cpp/build/dlls-in-visual-cpp",
171171
"redirect_document_id": false
172172
},
173+
{
174+
"source_path": "docs/build/reference/clrunmanagedcodecheck-add-supressunmanagedcodesecurityattribute.md",
175+
"redirect_url": "/cpp/build/reference/clrunmanagedcodecheck-add-suppressunmanagedcodesecurityattribute",
176+
"redirect_document_id": true
177+
},
173178
{
174179
"source_path": "docs/build/reference/consistency-rules-for-per-file-use-of-precompiled-headers.md",
175180
"redirect_url": "/cpp/build/reference/creating-precompiled-header-files#consistency-rules-for-per-file-use-of-precompiled-headers",
@@ -8826,4 +8831,4 @@
88268831
"redirect_document_id": true
88278832
}
88288833
]
8829-
}
8834+
}

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ The Visual Studio team will review your PR and let you know if the change looks
5252

5353
The maintainers will merge your PR into the master branch once feedback has been applied and your change looks good.
5454

55-
On a certain cadence, we push all commits from master branch into the live branch and then you'll be able to see your contribution live on [docs.microsoft.com](https://docs.microsoft.com/en-us/cpp/).
55+
On a certain cadence, we push all commits from master branch into the live branch and then you'll be able to see your contribution live on [docs.microsoft.com](https://docs.microsoft.com/cpp/).
5656

5757
## DOs and DON'Ts
5858

‎docs/build/reference/TOC.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
### [/CLRIMAGETYPE (Specify Type of CLR Image)](clrimagetype-specify-type-of-clr-image.md)
198198
### [/CLRSUPPORTLASTERROR (Preserve Last Error Code for PInvoke Calls)](clrsupportlasterror-preserve-last-error-code-for-pinvoke-calls.md)
199199
### [/CLRTHREADATTRIBUTE (Set CLR Thread Attribute)](clrthreadattribute-set-clr-thread-attribute.md)
200-
### [/CLRUNMANAGEDCODECHECK (Remove SuppressUnmanagedCodeSecurityAttribute)](clrunmanagedcodecheck-add-supressunmanagedcodesecurityattribute.md)
200+
### [/CLRUNMANAGEDCODECHECK (Remove SuppressUnmanagedCodeSecurityAttribute)](clrunmanagedcodecheck-add-suppressunmanagedcodesecurityattribute.md)
201201
### [/DEBUG (Generate Debug Info)](debug-generate-debug-info.md)
202202
### [/DEBUGTYPE (Debug Info Options)](debugtype-debug-info-options.md)
203203
### [/DEF (Specify Module-Definition File)](def-specify-module-definition-file.md)

docs/build/reference/clrunmanagedcodecheck-add-supressunmanagedcodesecurityattribute.md renamed to docs/build/reference/clrunmanagedcodecheck-add-suppressunmanagedcodesecurityattribute.md

File renamed without changes.

‎docs/build/reference/linker-options.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ You can use the [comment](../../preprocessor/comment-c-cpp.md) pragma to specify
4646
|[/CLRIMAGETYPE](../../build/reference/clrimagetype-specify-type-of-clr-image.md)|Sets the type (IJW, pure, or safe) of a CLR image.|
4747
|[/CLRSUPPORTLASTERROR](../../build/reference/clrsupportlasterror-preserve-last-error-code-for-pinvoke-calls.md)|Preserves the last error code of functions that are called through the P/Invoke mechanism.|
4848
|[/CLRTHREADATTRIBUTE](../../build/reference/clrthreadattribute-set-clr-thread-attribute.md)|Specifies the threading attribute to apply to the entry point of your CLR program.|
49-
|[/CLRUNMANAGEDCODECHECK](../../build/reference/clrunmanagedcodecheck-add-supressunmanagedcodesecurityattribute.md)|Specifies whether the linker will apply the SuppressUnmanagedCodeSecurity attribute to linker-generated PInvoke stubs that call from managed code into native DLLs.|
49+
|[/CLRUNMANAGEDCODECHECK](../../build/reference/clrunmanagedcodecheck-add-suppressunmanagedcodesecurityattribute.md)|Specifies whether the linker will apply the SuppressUnmanagedCodeSecurity attribute to linker-generated PInvoke stubs that call from managed code into native DLLs.|
5050
|[/DEBUG](../../build/reference/debug-generate-debug-info.md)|Creates debugging information.|
5151
|[/DEBUGTYPE](../../build/reference/debugtype-debug-info-options.md)|Specifies which data to include in debugging information.|
5252
|[/DEF](../../build/reference/def-specify-module-definition-file.md)|Passes a module-definition (.def) file to the linker.|

‎docs/build/reference/std-specify-language-standard-version.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Enable supported C++ language features from the specified version of the C++ lan
2020
2121
## Remarks
2222

23-
The **/std** option is is available in Visual Studio 2017 and later. It is used to control the version-specific ISO C++ programming language standard features enabled during compilation of your code. This option allows you to disable support for certain new language and library features that may break your existing code that conforms to a particular version of the language standard. By default, **/std:c++14** is specified, which disables language and standard library features found in later versions of the C++ language standard. Use **/std:c++17** to enable C++17 standard-specific features and behavior. To explicitly enable the latest supported compiler and standard library features, use **/std:c++latest**.
23+
The **/std** option is available in Visual Studio 2017 and later. It is used to control the version-specific ISO C++ programming language standard features enabled during compilation of your code. This option allows you to disable support for certain new language and library features that may break your existing code that conforms to a particular version of the language standard. By default, **/std:c++14** is specified, which disables language and standard library features found in later versions of the C++ language standard. Use **/std:c++17** to enable C++17 standard-specific features and behavior. To explicitly enable the latest supported compiler and standard library features, use **/std:c++latest**.
2424

2525
The default **/std:c++14** option enables the set of C++14 features implemented by the Visual C++ compiler. This option disables compiler and standard library support for features that are changed or new in more recent versions of the language standard, with the exception of some C++17 features already implemented in previous releases of the Visual C++ compiler. To avoid breaking changes for users who have already taken dependencies on the features available as of Visual Studio 2015 Update 2, these features remain enabled when the **/std:c++14** option is specified:
2626

‎docs/error-messages/compiler-errors-2/compiler-error-c2872.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The compiler cannot determine which symbol you are referring to. More than one s
2020

2121
C2872 can occur if a header file includes a [using directive](../../cpp/namespaces-cpp.md#using_directives), and a subsequent header file is included that contains a type that is also in the namespace specified in the `using` directive. Specify a `using` directive only after all your header files are specified with `#include`.
2222

23-
C2872 can occur in Visual Studio 2013 due to a conflict between the the `Windows::Foundation::Metadata::Platform` enum type and the C++/CX-defined `Platform` namespace. To work around this problem, follow these steps:
23+
C2872 can occur in Visual Studio 2013 due to a conflict between the `Windows::Foundation::Metadata::Platform` enum type and the C++/CX-defined `Platform` namespace. To work around this problem, follow these steps:
2424

2525
- Remove the "using namespace Windows::Foundation::Metadata" clause from the project files.
2626

@@ -46,4 +46,4 @@ int main() {
4646
// To fix this issue, use the fully qualified name
4747
// for the intended variable.
4848
}
49-
```
49+
```

‎docs/ide/ide-and-tools-for-visual-cpp-development.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Source control enables you to coordinate work among multiple developers, isolate
4141

4242
![Team Explorer](media/vs2017-team-explorer.png "Visual Studio 2017 Team Explorer")
4343

44-
For more information about Git integration with repos in Azure, see [Share your code with Visual Studio 2017 and Azure Repos Git](/azure/devops/repos/git/share-your-code-in-git-vs-2017). For information about about Git integration with GitHub, see [GitHub Extension for Visual Studio](https://visualstudio.github.com/).
44+
For more information about Git integration with repos in Azure, see [Share your code with Visual Studio 2017 and Azure Repos Git](/azure/devops/repos/git/share-your-code-in-git-vs-2017). For information about Git integration with GitHub, see [GitHub Extension for Visual Studio](https://visualstudio.github.com/).
4545

4646
## Create user interfaces with designers
4747

‎docs/ide/refactoring/extract-function.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ ms.workload: ["cplusplus"]
3434

3535
1. In the **Extract Function/Method (Experimental)** window, enter the new function name, select where you want the code to be placed, and click the **OK** button.
3636

37-
![Extract function function](images/extractfunction_dialog.png)
37+
![Extract function dialog](images/extractfunction_dialog.png)
3838

3939
1. The new function will be created where you specified, a function prototype in the corresponding header file, and the original code will be changed to call that function.
4040

41-
![Extract function result](images/extractfunction_result.png)
41+
![Extract function result](images/extractfunction_result.png)

‎docs/ide/xml-data-generator-tool-property-page.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.technology: ["cpp-ide"]
66
ms.topic: "conceptual"
7-
f1_keywords: ["VC.Project.VCXMLDataGeneratorTool.GeneratedProxyLanguage", "VC.Project.VCXMLDataGeneratorTool.Output", "VC.Project.VCXMLDataGeneratorTool.SupressStartupBanner"]
7+
f1_keywords: ["VC.Project.VCXMLDataGeneratorTool.GeneratedProxyLanguage", "VC.Project.VCXMLDataGeneratorTool.Output", "VC.Project.VCXMLDataGeneratorTool.SuppressStartupBanner"]
88
dev_langs: ["C++"]
99
helpviewer_keywords: ["XML Data Generator Tool property page"]
1010
ms.assetid: b2ef1c12-3419-429d-bb9d-bd7d9ffe1ffb

0 commit comments

Comments
 (0)