Fix the remaining keywords with single underscore aliases

Author: Colin Robertson

docs/cpp/extension-restrict.md

@@ -1,10 +1,10 @@
 ---
 title: "__restrict | Microsoft Docs"
 ms.custom: ""
-ms.date: "11/04/2016"
+ms.date: "10/10/2018"
 ms.technology: ["cpp-language"]
 ms.topic: "language-reference"
-f1_keywords: ["__restrict_cpp"]
+f1_keywords: ["__restrict_cpp", "__restrict", "_restrict"]
 dev_langs: ["C++"]
 helpviewer_keywords: ["__restrict keyword [C++]"]
 ms.assetid: 2d151b4d-f930-49df-bd16-d8757ec7fa83
@@ -24,6 +24,8 @@ Like the **__declspec ( [restrict](../cpp/restrict.md) )** modifier, the **__res
 
 Generally, if you affect the behavior of an entire function, it is better to use `__declspec ( restrict )` than the keyword.
 
+For compatibility with previous versions, **_restrict** is a synonym for **__restrict** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
+
 In Visual Studio 2015 and later, **__restrict** can be used on C++ references.
 
 > [!NOTE]

docs/cpp/keywords-cpp.md

@@ -28,10 +28,9 @@ Keywords are predefined reserved identifiers that have special meanings. They ca
 |[__noop](../intrinsics/noop.md)|**__pin** <sup>2</sup>|**__property** <sup>2</sup>|[__ptr32](ptr32-ptr64.md) <sup>4</sup>|
 |[__ptr64](ptr32-ptr64.md)<sup>4</sup>|[__raise](raise.md)|[__restrict](extension-restrict.md) <sup>4</sup>|**__sealed** <sup>2</sup>|
 |[__single_inheritance](inheritance-keywords.md)<sup>4</sup>|[__sptr](sptr-uptr.md)<sup>4</sup>|[__stdcall](stdcall.md) <sup>4</sup>|[__super](super.md)|
-|[__thiscall](thiscall.md)|[__try/\__except](try-except-statement.md) <sup>4</sup>|[__try/\__finally](try-finally-statement.md) <sup>4</sup>|[__try_cast](../dotnet/cast-notation-and-introduction-of-safe-cast-angles.md) <sup>2</sup>|
-|[__unaligned](unaligned.md) <sup>4</sup>|[__unhook](unhook.md) <sup>3</sup>|[__uptr](sptr-uptr.md) <sup>4</sup>|[__uuidof](uuidof-operator.md) <sup>4</sup>|
-|[__value](../dotnet/value-type-semantics.md) <sup>2</sup>|[__vectorcall](vectorcall.md) <sup>4</sup>|[__virtual_inheritance](inheritance-keywords.md) <sup>4</sup>|[__w64](w64.md) <sup>4</sup>|
-|[__wchar_t](fundamental-types-cpp.md)|||[abstract](../windows/abstract-cpp-component-extensions.md)|
+|[__thiscall](thiscall.md)|[__try_cast](../dotnet/cast-notation-and-introduction-of-safe-cast-angles.md) <sup>2</sup>|[__unaligned](unaligned.md) <sup>4</sup>|[__unhook](unhook.md) <sup>3</sup>|
+|[__uptr](sptr-uptr.md) <sup>4</sup>|[__uuidof](uuidof-operator.md) <sup>4</sup>|[__value](../dotnet/value-type-semantics.md) <sup>2</sup>|[__vectorcall](vectorcall.md) <sup>4</sup>|
+|[__virtual_inheritance](inheritance-keywords.md) <sup>4</sup>|[__w64](w64.md) <sup>4</sup>|[__wchar_t](fundamental-types-cpp.md)|[abstract](../windows/abstract-cpp-component-extensions.md)|
 |[alignas](align-cpp.md)|[array](../windows/arrays-cpp-component-extensions.md)|[auto](auto-keyword.md)|[bool](bool-cpp.md)|
 |[break](break-statement-cpp.md)|[case](switch-statement-cpp.md)|[catch](try-throw-and-catch-statements-cpp.md)|[char](fundamental-types-cpp.md)|
 |[char16_t](char-wchar-t-char16-t-char32-t.md)|[char32_t](char-wchar-t-char16-t-char32-t.md)|[class](class-cpp.md)|[const](const-cpp.md)|

docs/cpp/sptr-uptr.md

@@ -1,10 +1,10 @@
 ---
 title: "__sptr, __uptr | Microsoft Docs"
 ms.custom: ""
-ms.date: "11/04/2016"
+ms.date: "10/10/2018"
 ms.technology: ["cpp-language"]
 ms.topic: "language-reference"
-f1_keywords: ["__uptr_cpp", "__sptr_cpp"]
+f1_keywords: ["__uptr_cpp", "__sptr_cpp", "__uptr", "__sptr", "_uptr", "_sptr"]
 dev_langs: ["C++"]
 helpviewer_keywords: ["__sptr modifier", "__uptr modifier"]
 ms.assetid: c7f5f3b2-9106-4a0b-a6de-d1588ab153ed
@@ -32,6 +32,8 @@ void MyFunction(char * __uptr __ptr32 myValue);
 
 Use the **__sptr** and **__uptr** modifiers with pointer declarations. Use the modifiers in the position of a [pointer type qualifier](../c-language/pointer-declarations.md), which means the modifier must follow the asterisk. You cannot use the modifiers with [pointers to members](../cpp/pointers-to-members.md). The modifiers do not affect non-pointer declarations.
 
+For compatibility with previous versions, **_sptr** and **_uptr** are synonyms for **__sptr** and **__uptr** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
+
 ## Example
 
 The following example declares 32-bit pointers that use the **__sptr** and **__uptr** modifiers, assigns each 32-bit pointer to a 64-bit pointer variable, and then displays the hexadecimal value of each 64-bit pointer. The example is compiled with the native 64-bit compiler and is executed on a 64-bit platform.

docs/cpp/stdcall.md

@@ -1,10 +1,10 @@
 ---
 title: "__stdcall | Microsoft Docs"
 ms.custom: ""
-ms.date: "09/05/2018"
+ms.date: "10/10/2018"
 ms.technology: ["cpp-language"]
 ms.topic: "language-reference"
-f1_keywords: ["__stdcall_cpp"]
+f1_keywords: ["__stdcall_cpp", "__stdcall", "_stdcall"]
 dev_langs: ["C++"]
 helpviewer_keywords: ["__stdcall keyword [C++]"]
 ms.assetid: e212594b-1827-4d07-9527-7d412b300df8
@@ -36,6 +36,8 @@ The following list shows the implementation of this calling convention.
 
 The [/Gz](../build/reference/gd-gr-gv-gz-calling-convention.md) compiler option specifies **__stdcall** for all functions not explicitly declared with a different calling convention.
 
+For compatibility with previous versions, **_stdcall** is a synonym for **__stdcall** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
+
 Functions declared using the **__stdcall** modifier return values the same way as functions declared using [__cdecl](../cpp/cdecl.md).
 
 On ARM and x64 processors, **__stdcall** is accepted and ignored by the compiler; on ARM and x64 architectures, by convention, arguments are passed in registers when possible, and subsequent arguments are passed on the stack.

docs/cpp/unaligned.md

@@ -1,10 +1,10 @@
 ---
 title: "__unaligned | Microsoft Docs"
 ms.custom: ""
-ms.date: "03/09/2018"
+ms.date: "10/10/2018"
 ms.technology: ["cpp-language"]
 ms.topic: "language-reference"
-f1_keywords: ["__unaligned_cpp"]
+f1_keywords: ["__unaligned_cpp", "__unaligned", "_unaligned"]
 dev_langs: ["C++"]
 helpviewer_keywords: ["__unaligned keyword [C++]"]
 ms.assetid: 0cd83aad-1840-47e3-ad33-59bfcbe6375b
@@ -22,6 +22,8 @@ This modifier describes the alignment of the data addressed by the pointer; the
 
 The necessity for the **__unaligned** keyword varies by platform and environment. Failure to mark data appropriately can result in issues ranging from performance penalties to hardware faults. The **__unaligned** modifier is not valid for the x86 platform.
 
+For compatibility with previous versions, **_unaligned** is a synonym for **__unaligned** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
+
 For more information about alignment, see:
 
 - [align](../cpp/align-cpp.md)

docs/cpp/uuidof-operator.md

@@ -1,10 +1,10 @@
 ---
 title: "__uuidof Operator | Microsoft Docs"
 ms.custom: ""
-ms.date: "11/04/2016"
+ms.date: "10/10/2018"
 ms.technology: ["cpp-language"]
 ms.topic: "language-reference"
-f1_keywords: ["__LIBID_cpp", "__uuidof_cpp"]
+f1_keywords: ["__LIBID_cpp", "__uuidof_cpp", "__uuidof", "_uuidof"]
 dev_langs: ["C++"]
 helpviewer_keywords: ["__uuidof keyword [C++]", "__LIBID_ keyword [C++]"]
 ms.assetid: badfe709-809b-4b66-ad48-ee35039d25c6
@@ -39,6 +39,8 @@ Use this keyword to extract the GUID attached to:
 > [!NOTE]
 >  In a debug build, **__uuidof** always initializes an object dynamically (at runtime). In a release build, **__uuidof** can statically (at compile time) initialize an object.
 
+For compatibility with previous versions, **_uuidof** is a synonym for **__uuidof** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
+
 ## Example
 
 The following code (compiled with ole32.lib) will display the uuid of a library block created with the module attribute:

docs/cpp/vectorcall.md

@@ -1,10 +1,12 @@
 ---
 title: "__vectorcall | Microsoft Docs"
 ms.custom: ""
-ms.date: "11/04/2016"
+ms.date: "10/10/2018"
 ms.technology: ["cpp-language"]
 ms.topic: "language-reference"
+f1_keywords: ["__vectorcall_cpp", "__vectorcall", "_vectorcall"]
 dev_langs: ["C++"]
+helpviewer_keywords: ["__vectorcall keyword", "__vectorcall"]
 ms.assetid: 1c95ed59-86c6-4857-b4ed-10519193f851
 author: "mikeblome"
 ms.author: "mblome"
@@ -71,6 +73,8 @@ The **__vectorcall** calling convention modifier must be specified when a pointe
 typedef __m256 (__vectorcall * vcfnptr)(double, double, double, double);
 ```
 
+For compatibility with previous versions, **_vectorcall** is a synonym for **__vectorcall** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
+
 ## __vectorcall convention on x64
 
 The **__vectorcall** calling convention on x64 extends the standard x64 calling convention to take advantage of additional registers. Both integer type arguments and vector type arguments are mapped to registers based on position in the argument list. HVA arguments are allocated to unused vector registers.

docs/cpp/w64.md

@@ -1,10 +1,10 @@
 ---
 title: "__w64 | Microsoft Docs"
 ms.custom: ""
-ms.date: "11/04/2016"
+ms.date: "10/10/2018"
 ms.technology: ["cpp-language"]
 ms.topic: "language-reference"
-f1_keywords: ["__w64_cpp"]
+f1_keywords: ["__w64_cpp", "__w64", "_w64"]
 dev_langs: ["C++"]
 helpviewer_keywords: ["__w64 keyword [C++]", "64-bit compiler [C++], __w64 keyword", "Win64 [C++], __w64 keyword"]
 ms.assetid: b9d0c820-e132-40bc-b532-56edca132a6c
@@ -39,6 +39,8 @@ Any typedef that has **__w64** on it must be 32 bits on x86 and 64 bits on x64.
 
 To detect portability issues by using versions of the Visual C++ compiler earlier than Visual Studio 2010, the **__w64** keyword should be specified on any typedefs that change size between 32 bit and 64 bit platforms. For any such type, **__w64** must appear only on the 32-bit definition of the typedef.
 
+For compatibility with previous versions, **_w64** is a synonym for **__w64** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
+
 The **__w64** keyword is ignored if the compilation does not use `/Wp64`.
 
 For more information about porting to 64-bit, see the following topics: