Skip to content

Commit e681115

Browse files
author
Colin Robertson
authored
Merge branch 'master' into docs/corob/bad-ticks-part-1-of-n
2 parents f9b669f + 00e9d2b commit e681115

File tree

8 files changed

+82
-67
lines changed

8 files changed

+82
-67
lines changed

docs/assembler/masm/masm-bnf-grammar.md

+72-57
Large diffs are not rendered by default.

docs/build/cmake-presets-vs.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,15 @@ In the example above:
123123
- **192.168.0.5** is a remote Linux system that was added to the **Connection Manager**.
124124
- **ubuntu2004** and **debian** are WSL installations.
125125

126-
Select **Manage Connections** to open the **Connection Manager**.
126+
Select **Manage Connections** to open the **Connection Manager**.
127127

128128
### Select a Configure Preset
129129

130130
The dropdown in the middle indicates the active **Configure Preset**. It's the `configurePreset` that's used when CMake is invoked to generate the project build system. This dropdown lists the union of non-hidden Configure Presets defined in `CMakePresets.json` and `CMakeUserPresets.json`.
131131

132132
Visual Studio will use the value of `hostOS` in the Microsoft Visual Studio Settings vendor map to hide Configure Presets that don't apply to the active Target System. For more information, see the entry for `hostOS` in the table under [Visual Studio Settings vendor map](cmake-presets-json-reference.md#visual-studio-settings-vendor-map).
133133

134-
Select **Manage Configurations** to open the `CMakePresets.json` file located at the root of the project. `CMakePresets.json` is created if it doesn't already exist.
134+
Select **Manage Configurations** to open the `CMakePresets.json` file located at the root of the project. `CMakePresets.json` is created if it doesn't already exist.
135135

136136
### Select a Build Preset
137137

@@ -169,7 +169,7 @@ Use a forward slash (`/`) for paths in `CMakePresets.json` and `CMakeUserPresets
169169

170170
### Add new Configure Presets
171171

172-
To add a new Configure Preset to `CMakePresets.json`, from **Solution Explorer** right-click `CMakePresets.json` from **Folder View** and select **Add Configure Preset** from the context menu. The dialog to select a Configure Preset template appears:
172+
To add a new Configure Preset to `CMakePresets.json`, from **Solution Explorer** right-click `CMakePresets.json` from **Folder View** and select **Add Configure Preset** from the context menu. The dialog to select a Configure Preset template appears:
173173

174174
![Add configure preset to `CMakePresets.json` dialog](./media/add-configure-preset-to-cmakepresets.png)
175175

docs/build/reference/module-exportheader.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ You may find it helpful to use the complementary option **`/showResolvedHeader`*
4242
To build a header unit such as `<vector>` might look like:
4343

4444
```cmd
45-
cl /std:c++latest /exportHeader /headerName:angle vector
45+
cl . . . /std:c++latest /exportHeader /headerName:angle vector
4646
```
4747

4848
Building a local project header such as `"utils/util.h"` might look like:
4949

5050
```cmd
51-
cl /std:c++latest /exportHeader /headerName:quote util/util.h
51+
cl . . . /std:c++latest /exportHeader /headerName:quote util/util.h
5252
```
5353

5454
### To set this compiler option in the Visual Studio development environment

docs/c-runtime-library/reference/strcpy-s-wcscpy-s-mbscpy-s.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ f1_keywords: ["strcpy_s", "_mbscpy_s", "_mbscpy_s_l", "_tcscpy_s", "wcscpy_s"]
1010
helpviewer_keywords: ["strcpy_s function", "_tcscpy_s function", "_mbscpy_s function", "_mbscpy_s_l function", "copying strings", "strings [C++], copying", "tcscpy_s function", "wcscpy_s function"]
1111
ms.assetid: 611326f3-7929-4a5d-a465-a4683af3b053
1212
---
13-
# `strcpy_s`, `wcscpy_`s, `_mbscpy_s`, `_mbscpy_s_l`
13+
# `strcpy_s`, `wcscpy_s`, `_mbscpy_s`, `_mbscpy_s_l`
1414

1515
Copies a string. These versions of [`strcpy`, `wcscpy`, `_mbscpy`](strcpy-wcscpy-mbscpy.md) have security enhancements, as described in [Security Features in the CRT](../../c-runtime-library/security-features-in-the-crt.md).
1616

docs/code-quality/c6273.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ This warning is not applicable on Windows 9x and Windows NT version 4 because %p
6464

6565
## See also
6666

67-
[sprintf, _sprintf_l, swprintf, _swprintf_l, \__swprintf_l](../c-runtime-library/reference/sprintf-sprintf-l-swprintf-swprintf-l-swprintf-l.md)
67+
[`sprintf, _sprintf_l, swprintf, _swprintf_l, __swprintf_l`](../c-runtime-library/reference/sprintf-sprintf-l-swprintf-swprintf-l-swprintf-l.md)

docs/cpp/import-export-module.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ In Microsoft C++, the tokens **import** and **module** are always identifiers an
105105
### Example
106106

107107
```cpp
108-
#define foo() __VA_ARGS__
108+
#define foo(...) __VA_ARGS__
109109
foo(
110110
import // Always an identifier, never a keyword
111111
)

docs/mfc/activex-controls.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.assetid: 52aaec4d-3889-402e-b57d-758078f8ac57
1010
In Visual C++ you can create ActiveX controls using MFC or ATL.
1111

1212
>[!IMPORTANT]
13-
> ActiveX is a legacy technology that should not be used for new development. Many capabilities of ActiveX controls can be performed in a simpler and much more secure way with modern technologies such as HTML5 and JavaScript, modern browser extensions, or WebAssembly modules. For more information, see [A break from the past, part 2: Saying goodbye to ActiveX, VBScript, attachEvent](https://blogs.windows.com/msedgedev/2015/05/06/a-break-from-the-past-part-2-saying-goodbye-to-activex-vbscript-attachevent/) and [Native Messaging](/microsoft-edge/extensions/guides/native-messaging) and [Microsoft Edge extensions](/microsoft-edge/extensions) and [WebAssembly](https://webassembly.org/).
13+
> ActiveX is a legacy technology that should not be used for new development. Many capabilities of ActiveX controls can be performed in a simpler and much more secure way with modern technologies such as HTML5 and JavaScript, modern browser extensions, or WebAssembly modules. For more information, see [A break from the past, part 2: Saying goodbye to ActiveX, VBScript, attachEvent](https://blogs.windows.com/msedgedev/2015/05/06/a-break-from-the-past-part-2-saying-goodbye-to-activex-vbscript-attachevent/) and [Native Messaging](/microsoft-edge/extensions/guides/native-messaging) and [Microsoft Edge extensions](/microsoft-edge/extensions) and [WebAssembly](https://webassembly.org/).
1414
1515
- [MFC ActiveX Controls](mfc-activex-controls.md)
1616

docs/overview/cpp-conformance-improvements.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ To avoid the error, remove the **`constexpr`** modifier from the function declar
173173
In Visual Studio 2019, the `basic_string` range constructor no longer suppresses compiler diagnostics with **`static_cast`**. The following code compiles without warnings in Visual Studio 2017, despite the possible loss of data from **`wchar_t`** to **`char`** when initializing `out`:
174174

175175
```cpp
176-
std::wstring ws = /* */;
176+
std::wstring ws = /* . . . */;
177177
std::string out(ws.begin(), ws.end()); // VS2019 C4244: 'argument': conversion from 'wchar_t' to 'const _Elem', possible loss of data.
178178
```
179179

0 commit comments

Comments
 (0)