Skip to content

Commit 2273faf

Browse files
author
Colin Robertson
authored
Merge pull request #1284 from corob-msft/cr-markdig-stars
Fix Markdig issues with asterisk ambiguity
2 parents 3bde588 + e232201 commit 2273faf

File tree

186 files changed

+10503
-9759
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+10503
-9759
lines changed

‎docs/assembler/masm/option-masm.md‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
---
2-
title: "OPTION (MASM) | Microsoft Docs"
3-
ms.custom: ""
4-
ms.date: "11/04/2016"
5-
ms.technology: ["cpp-masm"]
6-
ms.topic: "reference"
7-
f1_keywords: ["option"]
8-
dev_langs: ["C++"]
9-
helpviewer_keywords: ["OPTION directive"]
10-
ms.assetid: 8e10dabd-e36f-4586-ab01-ada96736b0bd
11-
author: "corob-msft"
12-
ms.author: "corob"
13-
ms.workload: ["cplusplus"]
1+
---
2+
title: "OPTION (MASM) | Microsoft Docs"
3+
ms.custom: ""
4+
ms.date: "11/04/2016"
5+
ms.technology: ["cpp-masm"]
6+
ms.topic: "reference"
7+
f1_keywords: ["option"]
8+
dev_langs: ["C++"]
9+
helpviewer_keywords: ["OPTION directive"]
10+
ms.assetid: 8e10dabd-e36f-4586-ab01-ada96736b0bd
11+
author: "corob-msft"
12+
ms.author: "corob"
13+
ms.workload: ["cplusplus"]
1414
---
1515
# OPTION (MASM)
1616
Enables and disables features of the assembler.
@@ -37,7 +37,7 @@ optionlist
3737
|**PROC**|**PROLOGUE**|**READONLY**|**NOREADONLY**|
3838
|**SCOPED**|**NOSCOPED**|**SEGMENT**|**SETIF2**.|
3939

40-
The syntax for LANGUAGE is **OPTION LANGUAGE:***x*, where *x* is one of C, SYSCALL, STDCALL, PASCAL, FORTRAN, or BASIC. SYSCALL, PASCAL, FORTRAN, and BASIC are not supported with used with [.MODEL](../../assembler/masm/dot-model.md) FLAT.
40+
The syntax for LANGUAGE is **OPTION LANGUAGE:**<em>x</em>, where *x* is one of C, SYSCALL, STDCALL, PASCAL, FORTRAN, or BASIC. SYSCALL, PASCAL, FORTRAN, and BASIC are not supported with used with [.MODEL](../../assembler/masm/dot-model.md) FLAT.
4141

4242
## See Also
4343
[Directives Reference](../../assembler/masm/directives-reference.md)

‎docs/assembler/masm/segment.md‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
---
2-
title: "SEGMENT | Microsoft Docs"
3-
ms.custom: ""
4-
ms.date: "11/04/2016"
5-
ms.technology: ["cpp-masm"]
6-
ms.topic: "reference"
7-
f1_keywords: ["SEGMENT"]
8-
dev_langs: ["C++"]
9-
helpviewer_keywords: ["SEGMENT directive"]
10-
ms.assetid: e6f68367-6714-4f06-a79c-edfa88014430
11-
author: "corob-msft"
12-
ms.author: "corob"
13-
ms.workload: ["cplusplus"]
1+
---
2+
title: "SEGMENT | Microsoft Docs"
3+
ms.custom: ""
4+
ms.date: "11/04/2016"
5+
ms.technology: ["cpp-masm"]
6+
ms.topic: "reference"
7+
f1_keywords: ["SEGMENT"]
8+
dev_langs: ["C++"]
9+
helpviewer_keywords: ["SEGMENT directive"]
10+
ms.assetid: e6f68367-6714-4f06-a79c-edfa88014430
11+
author: "corob-msft"
12+
ms.author: "corob"
13+
ms.workload: ["cplusplus"]
1414
---
1515
# SEGMENT
1616
Defines a program segment called *name* having segment attributes
@@ -40,7 +40,7 @@ name ENDS
4040
If this parameter is not specified, **PARA** is used by default.
4141

4242
*combine*
43-
**PUBLIC**, **STACK**, **COMMON**, **MEMORY**, **AT***address*, **PRIVATE**
43+
**PUBLIC**, **STACK**, **COMMON**, **MEMORY**, **AT**<em>address</em>, **PRIVATE**
4444

4545
*use*
4646
**USE16**, **USE32**, **FLAT**

‎docs/atl-mfc-shared/string-data-management.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Visual C++ provides several ways to manage string data:
5757
A `CString` object can store up to INT_MAX (2,147,483,647) characters. The TCHAR data type is used to get or set individual characters inside a `CString` object. Unlike character arrays, the `CString` class has a built-in memory allocation capability. This allows `CString` objects to automatically grow as needed (that is, you do not have to worry about growing a `CString` object to fit longer strings).
5858

5959
## <a name="_core_cstrings_and_const_char_pointers"></a> CStrings and const char Pointers
60-
A `CString` object also can act like a literal C-style string (an `PCXSTR`, which is the same as **const char\*** if not under Unicode). The [CSimpleStringT::operator PCXSTR](../atl-mfc-shared/reference/csimplestringt-class.md#operator_pcxstr) conversion operator allows `CString` objects to be freely substituted for character pointers in function calls. The **CString( LPCWSTR** `pszSrc` **)** constructor allows character pointers to be substituted for `CString` objects.
60+
A `CString` object also can act like a literal C-style string (an `PCXSTR`, which is the same as **const char**<strong>\*</strong> if not under Unicode). The [CSimpleStringT::operator PCXSTR](../atl-mfc-shared/reference/csimplestringt-class.md#operator_pcxstr) conversion operator allows `CString` objects to be freely substituted for character pointers in function calls. The **CString( LPCWSTR** `pszSrc` **)** constructor allows character pointers to be substituted for `CString` objects.
6161

6262
No attempt is made to fold `CString` objects. If you make two `CString` objects containing `Chicago`, for example, the characters in `Chicago` are stored in two places. (This may not be true of future versions of MFC, so you should not depend on it.)
6363

‎docs/atl-mfc-shared/unicode-and-multibyte-character-set-mbcs-support.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ To complete Unicode programming of your application, you must also:
5050

5151
- Use TCHAR where you would use **char**.
5252

53-
- Use LPTSTR where you would use **char\***.
53+
- Use LPTSTR where you would use **char**<strong>\*</strong>.
5454

55-
- Use LPCTSTR where you would use **const char\***. `CString` provides the operator LPCTSTR to convert between `CString` and LPCTSTR.
55+
- Use LPCTSTR where you would use **const char**<strong>\*</strong>. `CString` provides the operator LPCTSTR to convert between `CString` and LPCTSTR.
5656

5757
`CString` also supplies Unicode-aware constructors, assignment operators, and comparison operators.
5858

@@ -84,7 +84,7 @@ Under DBCS, a given string can contain all single-byte ANSI characters, all doub
8484
8585
Generic-text function mappings for all of the run-time string-handling routines are discussed in [C Run-Time Library Reference](../c-runtime-library/c-run-time-library-reference.md). For a list, see [Internationalization](../c-runtime-library/internationalization.md).
8686

87-
Similarly, `CString` methods are implemented by using generic data type mappings. To enable both MBCS and Unicode, MFC uses TCHAR for **char** or `wchar_t`, LPTSTR for **char\*** or `wchar_t*`, and LPCTSTR for **const char\*** or `const wchar_t*`. These ensure the correct mappings for either MBCS or Unicode.
87+
Similarly, `CString` methods are implemented by using generic data type mappings. To enable both MBCS and Unicode, MFC uses TCHAR for **char** or `wchar_t`, LPTSTR for **char**<strong>\*</strong> or `wchar_t*`, and LPCTSTR for **const char**<strong>\*</strong> or `const wchar_t*`. These ensure the correct mappings for either MBCS or Unicode.
8888

8989
## See Also
9090

‎docs/atl/reference/aggregation-and-class-factory-macros.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,11 @@ class CComClassFactory2 : public IClassFactory2,
138138
*license*
139139
A class that implements the following static functions:
140140

141-
- **static BOOL VerifyLicenseKey( BSTR** `bstr` **);**
141+
- `static BOOL VerifyLicenseKey( BSTR bstr );`
142142

143-
- **static BOOL GetLicenseKey( DWORD** `dwReserved` **, BSTR\*** `pBstr` **);**
143+
- `static BOOL GetLicenseKey( DWORD dwReserved, BSTR * pBstr );`
144144

145-
- **static BOOL IsLicenseValid( );**
145+
- `static BOOL IsLicenseValid( );`
146146

147147
### Remarks
148148
`CComClassFactory2` implements the [IClassFactory2](/windows/desktop/api/ocidl/nn-ocidl-iclassfactory2) interface, which is an extension of [IClassFactory](/windows/desktop/api/unknwnbase/nn-unknwnbase-iclassfactory). `IClassFactory2` controls object creation through a license. A class factory executing on a licensed machine can provide a run-time license key. This license key allows an application to instantiate objects when a full machine license does not exist.

‎docs/atl/reference/catlfilemapping-class.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ class CAtlFileMapping : public CAtlFileMappingBase
3535

3636
|Name|Description|
3737
|----------|-----------------|
38-
|[CAtlFileMapping::operator T*](#operator_t_star)|Allows implicit conversion of `CAtlFileMapping` objects to `T`**\***.|
38+
|[CAtlFileMapping::operator T*](#operator_t_star)|Allows implicit conversion of `CAtlFileMapping` objects to `T*`.|
3939

4040
## Remarks
41-
This class adds a single cast operator to allow implicit conversion of `CAtlFileMapping` objects to `T`**\***. Other members are supplied by the base class, [CAtlFileMappingBase](../../atl/reference/catlfilemappingbase-class.md).
41+
This class adds a single cast operator to allow implicit conversion of `CAtlFileMapping` objects to `T*`. Other members are supplied by the base class, [CAtlFileMappingBase](../../atl/reference/catlfilemappingbase-class.md).
4242

4343
## Inheritance Hierarchy
4444
[CAtlFileMappingBase](../../atl/reference/catlfilemappingbase-class.md)
@@ -49,17 +49,17 @@ class CAtlFileMapping : public CAtlFileMappingBase
4949
**Header:** atlfile.h
5050

5151
## <a name="operator_t_star"></a> CAtlFileMapping::operator T*
52-
Allows implicit conversion of `CAtlFileMapping` objects to `T`**\***.
52+
Allows implicit conversion of `CAtlFileMapping` objects to `T*`.
5353

5454
```
5555
operator T*() const throw();
5656
```
5757

5858
### Return Value
59-
Returns a `T`**\*** pointer to the start of the memory-mapped file.
59+
Returns a `T*` pointer to the start of the memory-mapped file.
6060

6161
### Remarks
62-
Calls [CAtlFileMappingBase::GetData](../../atl/reference/catlfilemappingbase-class.md#getdata) and reinterprets the returned pointer as a `T`**\*** where *T* is the type used as the template parameter of this class.
62+
Calls [CAtlFileMappingBase::GetData](../../atl/reference/catlfilemappingbase-class.md#getdata) and reinterprets the returned pointer as a `T*` where *T* is the type used as the template parameter of this class.
6363

6464
## See Also
6565
[CAtlFileMappingBase Class](../../atl/reference/catlfilemappingbase-class.md)

‎docs/atl/reference/ccomaggobject-class.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ static HRESULT WINAPI CreateInstance(
117117

118118
### Parameters
119119
*pp*
120-
[out] A pointer to a **CComAggObject\<***contained* **>** pointer. If `CreateInstance` is unsuccessful, *pp* is set to NULL.
120+
[out] A pointer to a **CComAggObject\<**<em>contained</em>**>** pointer. If `CreateInstance` is unsuccessful, *pp* is set to NULL.
121121

122122
### Return Value
123123
A standard HRESULT value.

‎docs/atl/reference/ccomclassfactory2-class.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ class CComClassFactory2 : public IClassFactory2,
2828
*license*
2929
A class that implements the following static functions:
3030

31-
- **static BOOL VerifyLicenseKey( BSTR** `bstr` **);**
31+
- `static BOOL VerifyLicenseKey( BSTR bstr );`
3232

33-
- **static BOOL GetLicenseKey( DWORD** `dwReserved` **, BSTR\*** `pBstr` **);**
33+
- `static BOOL GetLicenseKey( DWORD dwReserved, BSTR * pBstr );`
3434

35-
- **static BOOL IsLicenseValid( );**
35+
- `static BOOL IsLicenseValid( );`
3636

3737
## Members
3838

‎docs/atl/reference/ccomobject-class.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ CComObject(void* = NULL);
7575
```
7676

7777
### Parameters
78-
**void\***
79-
[in] This unnamed parameter is not used. It exists for symmetry with other **CCom***XXX*`Object`*XXX* constructors.
78+
<em>void\*</em>
79+
[in] This unnamed parameter is not used. It exists for symmetry with other `CComXXXObjectXXX` constructors.
8080

8181
### Remarks
8282
The destructor decrements it.

‎docs/atl/reference/ccomobjectnolock-class.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ CComObjectNoLock(void* = NULL);
7474
```
7575

7676
### Parameters
77-
**void\***
78-
[in] This unnamed parameter is not used. It exists for symmetry with other **CCom***XXX*`Object`*XXX* constructors.
77+
<em>void\*</em>
78+
[in] This unnamed parameter is not used. It exists for symmetry with other `CComXXXObjectXXX` constructors.
7979

8080
## <a name="dtor"></a> CComObjectNoLock::~CComObjectNoLock
8181
The destructor.

0 commit comments

Comments
 (0)