Skip to content

Fix git push error for protected CLA branch #1744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Nov 26, 2019
Merged

Fix git push error for protected CLA branch #1744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
720adee
Fix links, formatting
Nov 25, 2019
825eb21
Merge pull request #2518 from MicrosoftDocs/FromPublicMasterBranch
Nov 25, 2019
7f3c6bc
Add acrolinx updates
Nov 25, 2019
75167eb
Add preprocessor grammar fix
Nov 25, 2019
0bc784a
Remove acrolinx hacks that break formatting
Nov 25, 2019
20dfdc5
One more acrolinx fix
Nov 25, 2019
ed7a226
Undo preprocessor grammar
Nov 25, 2019
7f66e7b
Undo C4238
Nov 25, 2019
2a96e75
undo c4232
Nov 26, 2019
595855a
Undo C4100
Nov 26, 2019
c6ef624
Merge pull request #2519 from corob-msft/cr-code-msdn-1
PRMerger13 Nov 26, 2019
3ee06ec
Merge pull request #2521 from MicrosoftDocs/master
Taojunshen Nov 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/assembler/masm/comm.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ Communal variables are allocated by the linker, and can't be initialized. This m

Each *definition* has the following form:

⟦*langtype*⟧ ⟦⦃**NEAR** | **FAR**⦄⟧ _label_**:**_type_⟦**:**_count_⟧
⟦*language-type*⟧ ⟦**NEAR** | **FAR**⟧ _label_**:**_type_⟦**:**_count_⟧

The optional *langtype* sets the naming conventions for the name that follows. It overrides any language specified by the **.MODEL** directive. The optional **NEAR** or **FAR** override the current memory model. The *label* is the name of the variable. The *type* can be any type specifier ([BYTE](../../assembler/masm/byte-masm.md), [WORD](../../assembler/masm/word.md), and so on) or an integer specifying the number of bytes. The optional *count* specifies the number of elements in the declared data object; the default is one.
The optional *language-type* sets the naming conventions for the name that follows. It overrides any language specified by the **.MODEL** directive. The optional **NEAR** or **FAR** override the current memory model. The *label* is the name of the variable. The *type* can be any type specifier ([BYTE](../../assembler/masm/byte-masm.md), [WORD](../../assembler/masm/word.md), and so on) or an integer specifying the number of bytes. The optional *count* specifies the number of elements in the declared data object. The default *count* is one.

## Example

Expand All @@ -33,4 +33,4 @@ COMM FAR ByteArray:BYTE:512

## See also

[Directives Reference](../../assembler/masm/directives-reference.md)
[Directives reference](directives-reference.md)
2 changes: 1 addition & 1 deletion docs/cppcx/wrl/windows-runtime-cpp-template-library-wrl.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Uses the `HttpRequest` class that's defined in [Walkthrough: Connecting Using Ta
[Creating a Windows Runtime DLL component with C++ sample](https://code.msdn.microsoft.com/windowsapps/Creating-a-Windows-Runtime-6c399797)<br/>
Shows how to use the Windows Runtime C++ Template Library to create an in-process DLL component and consume it from C++/CX, JavaScript, and C#.

[DirectX marble maze game sample](https://code.msdn.microsoft.com/windowsapps/DirectX-Marble-Maze-Game-e4806345)<br/>
[DirectX marble maze game sample](https://docs.microsoft.com/samples/microsoft/windows-appsample-marble-maze/directx-marble-maze-game-sample/)<br/>
Demonstrates how to use the Windows Runtime C++ Template Library to manage the lifetime of COM components such as DirectX and Media Foundation in the context of a complete 3-D game.

[Sending toast notifications from desktop apps sample](https://code.msdn.microsoft.com/windowsdesktop/Sending-toast-notifications-71e230a2)<br/>
Expand Down