fixed up lexical conventions node

Author: mikeblome

.openpublishing.redirection.json

@@ -1,6 +1,6 @@
 ---
 title: "auto (C++)"
-ms.date: "11/04/2016"
+ms.date: "12/10/2019"
 f1_keywords: ["auto_CPP", "auto"]
 helpviewer_keywords: ["auto keyword [C++]"]
 ms.assetid: e9d495d7-601c-4547-b897-998389a311f4
@@ -9,6 +9,9 @@ ms.assetid: e9d495d7-601c-4547-b897-998389a311f4
 
 Deduces the type of a declared variable from its initialization expression.
 
+> [!NOTE]
+> The C++ standard defines an original and a revised meaning for this keyword. Before Visual Studio 2010, the **auto** keyword declares a variable in the *automatic* storage class; that is, a variable that has a local lifetime. Starting with Visual Studio 2010, the **auto** keyword declares a variable whose type is deduced from the initialization expression in its declaration. The [/Zc:auto[-]](../build/reference/zc-auto-deduce-variable-type.md) compiler option controls the meaning of the **auto** keyword.
+
 ## Syntax
 
 ```

docs/cpp/auto-cpp.md

@@ -1,20 +1,32 @@
 ---
-title: "Character Sets"
-ms.date: "05/06/2019"
-helpviewer_keywords: ["Character sets", "basic source character set (C++)", "universal character names", "basic execution character set (C++)"]
+title: "Tokens and character Sets"
+ms.date: "12/10/2019"
+helpviewer_keywords: ["Tokens (C++), "Character sets", "basic source character set (C++)", "universal character names", "basic execution character set (C++)"]
 ms.assetid: 379a2af6-6422-425f-8352-ef0bca6c0d74
 ---
-# Character Sets
+# Tokens and character Sets
 
-The text of a C++ program is stored in source files that use a particular character encoding. The C++ standard specifies a basic source character set for source files and a basic execution character set for compiled files. The Microsoft C++ compiler (MSVC) allows an additional set of locale-specific characters to be used in source files and compiled files.
+The text of a C++ program consists of tokens and *white space*. A token is the smallest element of a C++ program that is meaningful to the compiler. The C++ parser recognizes these kinds of tokens:
 
-## Character sets
+- [Keywords](../cpp/keywords-cpp.md)
+- [Identifiers](../cpp/identifiers-cpp.md)
+- [Numeric, Boolean and Pointer Literals](../cpp/numeric-boolean-and-pointer-literals-cpp.md)
+- [String and Character Literals](../cpp/string-and-character-literals-cpp.md)
+- [User-Defined Literals](../cpp/user-defined-literals-cpp.md)
+- [Operators](../cpp/cpp-built-in-operators-precedence-and-associativity.md)
+- [Punctuators](../cpp/punctuators-cpp.md)
 
-The C++ standard specifies a *basic  source character set* that may be used in source files. To represent characters outside of this set, additional characters can be specified by using a *universal character name*. When compiled, the *basic execution character set* and *basic execution wide-character set* represent the characters and strings that can appear in a program. The MSVC implementation allows additional characters in source code and compiled code.
+Tokens are usually separated by *white space*, which can be one or more:
 
-### Basic source character set
+- Blanks
+- Horizontal or vertical tabs
+- New lines
+- Form feeds
+- Comments
 
-The *basic  source character set* consists of  96 characters that may be used in source files. This set includes the space character, horizontal tab, vertical tab, form feed and new-line control characters, and this set of graphical characters:
+## Basic source character set
+
+The C++ standard specifies a *basic source character set* that may be used in source files. To represent characters outside of this set, additional characters can be specified by using a *universal character name*. The MSVC implementation allows additional characters. The *basic source character set* consists of  96 characters that may be used in source files. This set includes the space character, horizontal tab, vertical tab, form feed and new-line control characters, and this set of graphical characters:
 
 `a b c d e f g h i j k l m n o p q r s t u v w x y z`
 
@@ -49,6 +61,6 @@ The format of extended characters on the Windows clipboard is specific to applic
 
 **END Microsoft Specific**
 
-### Basic execution character set
+### Execution character sets
 
-The *basic execution character set* and the *basic execution wide-character set* consist of all the characters in the basic source character set, and the control characters that represent alert, backspace, carriage return, and the null character. The *execution character set* and *execution wide-character set* are supersets of the basic sets. They include the implementation-defined source characters outside the basic source character set. The execution character set has a locale-specific representation.
+The *execution character sets* represent the characters and strings that can appear in a compiled program. These character sets consist of all the characters permitted in a source file, and also the control characters that represent alert, backspace, carriage return, and the null character. The execution character set has a locale-specific representation.

docs/cpp/auto-keyword.md

@@ -1,7 +1,7 @@
 ---
 title: "C++ Language Reference"
 ms.custom: "index-page"
-ms.date: "05/06/2019"
+ms.date: "12/10/2019"
 helpviewer_keywords: ["C++, language reference"]
 ms.assetid: 4be9cacb-c862-4391-894a-3a118c9c93ce
 ---
@@ -40,12 +40,12 @@ A programming technique that implicitly defines a function object class and cons
 [Statements](../cpp/statements-cpp.md)<br/>
 Expression, null, compound, selection, iteration, jump, and declaration statements.
 
-[Declarations and Definitions](declarations-and-definitions-cpp.md)<br/>
-Storage-class specifiers, function definitions, initializations, enumerations, **class**, **struct**, and **union** declarations, and **typedef** declarations. Also, **inline** functions, **const** keyword, namespaces.
-
-[Classes, Structures, and Unions](../cpp/classes-and-structs-cpp.md)<br/>
+[Classes and structs](../cpp/classes-and-structs-cpp.md)<br/>
 Introduction to classes, structures, and unions. Also, member functions, special member functions, data members, bit fields, **this** pointer, nested classes.
 
+[Unions](unions.md)<br/>
+User-defined types in which all members share the same memory location.
+
 [Derived Classes](../cpp/inheritance-cpp.md)<br/>
 Single and multiple inheritance, **virtual** functions, multiple base classes, **abstract** classes, scope rules. Also, the **__super** and **__interface** keywords.
 

docs/cpp/character-sets.md

@@ -6,21 +6,25 @@ ms.assetid: aa812fd0-6d47-4f3f-aee0-db002ee4d8b9
 ---
 # Tokens (C++)
 
-A token is the smallest element of a C++ program that is meaningful to the compiler. The C++ parser recognizes these kinds of tokens: identifiers, keywords, literals, operators, punctuators, and other separators. A stream of these tokens makes up a translation unit.
+A token is the smallest element of a C++ program that is meaningful to the compiler. The C++ parser recognizes these kinds of tokens:
+
+- [Keywords](../cpp/keywords-cpp.md)
+- [Identifiers](../cpp/identifiers-cpp.md)
+- [Numeric, Boolean and Pointer Literals](../cpp/numeric-boolean-and-pointer-literals-cpp.md)
+- [String and Character Literals](../cpp/string-and-character-literals-cpp.md)
+- [User-Defined Literals](../cpp/user-defined-literals-cpp.md)
+- [Operators](../cpp/cpp-built-in-operators-precedence-and-associativity.md)
+- [Punctuators](../cpp/punctuators-cpp.md)
 
 Tokens are usually separated by *white space*. White space can be one or more:
 
 - Blanks
-
 - Horizontal or vertical tabs
-
 - New lines
-
 - Form feeds
-
 - Comments
 
-The parser recognizes keywords, identifiers, literals, operators, and punctuators. For information on specific token types, see [Keywords](../cpp/keywords-cpp.md), [Identifiers](../cpp/identifiers-cpp.md), [Numeric, Boolean and Pointer Literals](../cpp/numeric-boolean-and-pointer-literals-cpp.md), [String and Character Literals](../cpp/string-and-character-literals-cpp.md), [User-Defined Literals](../cpp/user-defined-literals-cpp.md), [C++ Built-in Operators, Precedence and Associativity](../cpp/cpp-built-in-operators-precedence-and-associativity.md), and [Punctuators](../cpp/punctuators-cpp.md). White space is ignored, except as required to separate tokens.
+ White space is ignored, except as required to separate tokens.
 
 Preprocessing tokens are used in the preprocessing phases to generate the token stream passed to the compiler. The preprocessing token categories are header names, identifiers, preprocessing numbers, character literals, string literals, preprocessing operators and punctuators, and single non-white-space characters that do not match one of the other categories. Character and string literals can be user-defined literals. Preprocessing tokens can be separated by white space or comments.
 

docs/cpp/cpp-language-reference.md

@@ -1,9 +1,9 @@
 ---
-title: "User-Defined Literals  (C++)"
+title: "User-defined literals  (C++)"
 ms.date: "11/04/2016"
 ms.assetid: ff4a5bec-f795-4705-a2c0-53788fd57609
 ---
-# User-Defined Literals  (C++)
+# User-defined literals  (C++)
 
 There are five major categories of literals:  integer,  character,  floating-point,  string, boolean and pointer.  Starting in C++ 11 you can define your own literals based on these categories to provide syntactic shortcuts for common idioms and increase type safety. For example, let's say you have a Distance class. You could define a literal for kilometers and another one for miles, and encourage the user to be explicit about the units of measure by simply writing: auto d = 42.0_km or auto d = 42.0_mi. There is no performance advantage or disadvantage to user-defined literals; they are primarily for convenience or for compile-time type deduction. The Standard Library has user-defined literals for std:string, for std::complex, and for units in time and duration operations in the \<chrono> header:
 

docs/cpp/tokens-cpp.md

@@ -3665,12 +3665,7 @@
                 - name: Identifiers
                   href: cpp/identifiers-cpp.md
                 - name: Keywords
-                  expanded: false
-                  items: 
-                    - name: Keywords
-                      href: cpp/keywords-cpp.md
-                    - name: auto keyword
-                      href: cpp/auto-keyword.md
+                  href: cpp/keywords-cpp.md
                 - name: Punctuators
                   href: cpp/punctuators-cpp.md
                 - name: Numeric, boolean, and pointer literals