Merge branch 'live' into master

Author: ghogen

docs/build/reference/permissive-standards-conformance.md

@@ -291,7 +291,7 @@ auto x = cond ? "A" : s;
 auto y = cond ? "A" : static_cast<const char*>(s); 
 ```  
   
-Another case where you may see errors is in conditional optators with one argument of type `void`. This case may be common in ASSERT-like macros.  
+Another case where you may see errors is in conditional operators with one argument of type `void`. This case may be common in ASSERT-like macros.  
   
 ```cpp  
 // Example 3: void arguments 
@@ -356,4 +356,4 @@ int main()
 
 ## See Also  
  [Compiler Options](../../build/reference/compiler-options.md)   
- [Setting Compiler Options](../../build/reference/setting-compiler-options.md)
+ [Setting Compiler Options](../../build/reference/setting-compiler-options.md)

docs/cpp/ellipses-and-variadic-templates.md

@@ -114,7 +114,7 @@ template <typename First, typename... Rest> returntype functionname(const First&
 template<typename... Arguments>  
 void tfunc(const Arguments&... args)  
 {  
-    const unsigned numargs = sizeof...(Arguments);  
+    constexpr auto numargs{ sizeof...(Arguments) };  
 
     X xobj[numargs]; // array of some previously defined type X  
 

docs/ide/writing-and-refactoring-code-cpp.md

@@ -31,7 +31,7 @@ translation.priority.ht:
   - "zh-tw"
 ---
 # Writing and refactoring code (C++)
-The Visual C++ code editor and IDE provide many coding aids. Some are unique to C++, and some are essentially the same for all Visual Studio languages. For mroe information about the shared features, see [Writing Code in the Code and Text Editor](/visualstudio/ide/writing-code-in-the-code-and-text-editor). Options for enabling and configuring C++-specific features are located in the [Text Editor C++ Advanced](/visualstudio/ide/reference/options-text-editor-c-cpp-advanced) dialog (**Tools | Options | Text Editor | C/C++ | Advanced** or type "C++ Advanced" in **Quick Launch**). After choosing which option you want to set, you can get more help by pressing **F1** when the dialog is in focus. For general code formatting options, type `Editor C++` into **QuickLaunch**.  
+The Visual C++ code editor and IDE provide many coding aids. Some are unique to C++, and some are essentially the same for all Visual Studio languages. For more information about the shared features, see [Writing Code in the Code and Text Editor](/visualstudio/ide/writing-code-in-the-code-and-text-editor). Options for enabling and configuring C++-specific features are located in the [Text Editor C++ Advanced](/visualstudio/ide/reference/options-text-editor-c-cpp-advanced) dialog (**Tools | Options | Text Editor | C/C++ | Advanced** or type "C++ Advanced" in **Quick Launch**). After choosing which option you want to set, you can get more help by pressing **F1** when the dialog is in focus. For general code formatting options, type `Editor C++` into **QuickLaunch**.  
 
 Experimental features, which may or may not be included in a future version of Visual Studio, are found in the [Text Editor C++ Experimental](/visualstudio/ide/reference/options-text-editor-c-cpp-experimental) dialog. In Visual Studio 2017 you can enable **Predictive Intellisense** in this dialog.
 
@@ -122,4 +122,4 @@ Experimental features, which may or may not be included in a future version of V
 ### Quick Launch  
  To easily navigate to any window or tool in Visual Studio, simply type its name in the Quick Launch window in the upper right corner of the UI. The auto-completion list will filter as you type.  
 
- ![Visual Studio Quick Launch](../ide/media/vs2015_cpp_quick_launch.png "vs2015_cpp_quick_launch")
+ ![Visual Studio Quick Launch](../ide/media/vs2015_cpp_quick_launch.png "vs2015_cpp_quick_launch")

docs/standard-library/regular-expressions-cpp.md

@@ -159,13 +159,13 @@ Zero or more flags may be combined with the grammar to specify the regular expre
 
  For all grammars except `basic` and `grep`, a repetition count can also take one of the following forms:  
 
--   "". Equivalent to "{0,1}".  
+-   "?". Equivalent to "{0,1}".  
 
 -   "+". Equivalent to "{1,unbounded}".  
 
  Examples:  
 
--   "a" matches the target sequence "" and the target sequence "a", but not the target sequence "aa".  
+-   "a?" matches the target sequence "" and the target sequence "a", but not the target sequence "aa".  
 
 -   "a+" matches the target sequence "a", the target sequence "aa", and so on, but not the target sequence "".  
 
@@ -211,7 +211,7 @@ Zero or more flags may be combined with the grammar to specify the regular expre
 |repetition using "{}"||+|+||+|+|  
 |repetition using "\\{\\}"|+|||+|||  
 |repetition using '*'|+|+|+|+|+|+|  
-|repetition using '' and '+'||+|+||+|+|  
+|repetition using '?' and '+'||+|+||+|+|  
 |unicode escape sequence|||+||||  
 |wildcard character|+|+|+|+|+|+|  
 |word boundary assert|||+||||  
@@ -323,18 +323,18 @@ Zero or more flags may be combined with the grammar to specify the regular expre
 ### Identity Escape  
  An identity escape is a backslash followed by a single character. It matches that character. It is required when the character has a special meaning; by using the identity escape, the special meaning is removed. For example:  
 
--   "a*" matches the target sequence "aaa", but does not match the target sequence "a\*".  
+-   "a\*" matches the target sequence "aaa", but does not match the target sequence "a\*".  
 
--   "a\\*" does not match the target sequence "aaa", but matches the target sequence "a\*".  
+-   "a\\\*" does not match the target sequence "aaa", but matches the target sequence "a\*".  
 
  The set of characters that are allowed in an identity escape depends on the regular expression grammar, as shown in the following table.  
 
 |Grammar|Allowed Identity Escape Characters|  
 |-------------|----------------------------------------|  
-|`basic`, `grep`|{ '(', ')', '{', '}', '.', '[', '\\', '*', '^', '$' }|  
-|`extended`, `egrep`|{ '(', ')', '{', '.', '[', '\\', '*', '^', '$', '+', '', '|' }|  
+|`basic`, `grep`|{ '(', ')', '{', '}', '.', '[', '\\', '\*', '^', '$' }|  
+|`extended`, `egrep`|{ '(', ')', '{', '.', '[', '\\', '\*', '^', '$', '+', '?', '|' }|  
 |`awk`|`extended` plus { '"', '/' }|  
-|`ECMAScript`|All characters except those that can be part of an identifier. Typically, this includes letters, digits, '$', '_', and unicode escape sequences. For more information, see the ECMAScript Language Specification.|  
+|`ECMAScript`|All characters except those that can be part of an identifier. Typically, this includes letters, digits, '$', '\_', and unicode escape sequences. For more information, see the ECMAScript Language Specification.|  
 
 ### Individual Character  
  An individual character in a bracket expression adds that character to the character set that is defined by the bracket expression. Anywhere in a bracket expression except at the beginning, a '^' represents itself.  
@@ -372,10 +372,10 @@ Zero or more flags may be combined with the grammar to specify the regular expre
  A negative word boundary assert matches if the current position in the target string is not immediately after a *word boundary*.  
 
 ### Non-capture Group  
- A non-capture group marks its contents as a single unit in the regular expression grammar, but does not label the target text. For example, "(a)(:b)*(c) matches the target text "abbc" and associates capture group 1 with the subsequence "a" and capture group 2 with the subsequence "c".  
+ A non-capture group marks its contents as a single unit in the regular expression grammar, but does not label the target text. For example, "(a)(:b)\*(c)" matches the target text "abbc" and associates capture group 1 with the subsequence "a" and capture group 2 with the subsequence "c".  
 
 ### Non-greedy Repetition  
- A non-greedy repetition consumes the shortest subsequence of the target sequence that matches the pattern. A greedy repetition consumes the longest. For example, "(a+)(a*b)" matches the target sequence "aaab". When a non-greedy repetition is used, it associates capture group 1 with the subsequence "a" at the beginning of the target sequence and capture group 2 with the subsequence "aab" at the end of the target sequence. When a greedy match is used, it associates capture group 1 with the subsequence "aaa" and capture group 2 with the subsequence "b".  
+ A non-greedy repetition consumes the shortest subsequence of the target sequence that matches the pattern. A greedy repetition consumes the longest. For example, "(a+)(a\*b)" matches the target sequence "aaab". When a non-greedy repetition is used, it associates capture group 1 with the subsequence "a" at the beginning of the target sequence and capture group 2 with the subsequence "aab" at the end of the target sequence. When a greedy match is used, it associates capture group 1 with the subsequence "aaa" and capture group 2 with the subsequence "b".  
 
 ### Octal Escape Sequence  
  An octal escape sequence is a backslash followed by one, two, or three octal digits (0-7). It matches a character in the target sequence that has the value that is specified by those digits. If all the digits are '0', the sequence is invalid. For example, "\101" matches the target sequence "A" when ASCII character encoding is used.  
@@ -385,23 +385,23 @@ Zero or more flags may be combined with the grammar to specify the regular expre
 
  In `ECMAScript`, the following characters have special meanings:  
 
--   ^  $  \  .  *  +    (  )  [  ]  {  }  |  
+-   ^  $  \  .  *  +  ?  (  )  [  ]  {  }  |  
 
  In `basic` and `grep`, the following characters have special meanings:  
 
 -   .   [   \  
 
  Also in `basic` and `grep`, the following characters have special meanings when they are used in a particular context:  
 
--   '*' has a special meaning in all cases except when it is the first character in a regular expression or the first character that follows an initial '^' in a regular expression, or when it is the first character of a capture group or the first character that follows an initial '^' in a capture group.  
+-   '\*' has a special meaning in all cases except when it is the first character in a regular expression or the first character that follows an initial '^' in a regular expression, or when it is the first character of a capture group or the first character that follows an initial '^' in a capture group.  
 
 -   '^' has a special meaning when it is the first character of a regular expression.  
 
 -   '$' has a special meaning when it is the last character of a regular expression.  
 
  In `extended`, `egrep`, and `awk`, the following characters have special meanings:  
 
--   .   [   \   (   *   +      {   |  
+-   .   [   \   (   *   +   ?   {   |  
 
  Also in `extended`, `egrep`, and `awk`, the following characters have special meanings when they are used in a particular context.  
 
@@ -418,9 +418,9 @@ Zero or more flags may be combined with the grammar to specify the regular expre
 
  Examples:  
 
--   "(=aa)(a*)" matches the target sequence "aaaa" and associates capture group 1 with the subsequence "aaaa".  
+-   "(=aa)(a\*)" matches the target sequence "aaaa" and associates capture group 1 with the subsequence "aaaa".  
 
--   "(aa)(a*)" matches the target sequence "aaaa" and associates capture group 1 with the subsequence "aa" at the beginning of the target sequence and capture group 2 with the subsequence "aa" at the end of the target sequence.  
+-   "(aa)(a\*)" matches the target sequence "aaaa" and associates capture group 1 with the subsequence "aa" at the beginning of the target sequence and capture group 2 with the subsequence "aa" at the end of the target sequence.  
 
 -   "(=aa)(a)|(a)" matches the target sequence "a" and associates capture group 1 with an empty sequence (because the positive assert failed) and capture group 2 with the subsequence "a". It also matches the target sequence "aa" and associates capture group 1 with the subsequence "aa" and capture group 2 with an empty sequence.  
 
@@ -466,7 +466,7 @@ Zero or more flags may be combined with the grammar to specify the regular expre
 |"$&"|"&"|The character sequence that matches the entire regular expression (`[match[0].first, match[0].second)`)|  
 |"$$"||"$"|  
 ||"\\&"|"&"|  
-|"$`" (dollar sign followed by back quote)||The character sequence that precedes the subsequence that matches the regular expression (`[match.prefix().first, match.prefix().second)`)|  
+|"$\`" (dollar sign followed by back quote)||The character sequence that precedes the subsequence that matches the regular expression (`[match.prefix().first, match.prefix().second)`)|  
 |"$'" (dollar sign followed by forward quote)||The character sequence that follows the subsequence that matches the regular expression (`[match.suffix().first, match.suffix().second)`)|  
 |"$n"|"\n"|The character sequence that matches the capture group at position `n`, where `n` is a number between 0 and 9 (`[match[n].first, match[n].second)`)|  
 ||"\\\n"|"\n"|