Merge pull request #860 from MicrosoftDocs/master636885396366517465

Colin Robertson · web-flow · commit dfff4626c192 · 2019-03-18T14:51:43.000-07:00
Fix git push error for protected CLA branch
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
diff --git a/docs/standard-library/TOC.md b/docs/standard-library/TOC.md
@@ -405,7 +405,6 @@
 #### [<system_error> functions](system-error-functions.md)
 #### [<system_error> operators](system-error-operators.md)
 #### [<system_error> enums](system-error-enums.md)
-#### [<system_error> typedefs](system-error-typedefs.md)
 #### [error_category Class](error-category-class.md)
 #### [error_code Class](error-code-class.md)
 #### [error_condition Class](error-condition-class.md)
diff --git a/docs/standard-library/function-objects-in-the-stl.md b/docs/standard-library/function-objects-in-the-stl.md
@@ -1,6 +1,6 @@
 ---
 title: "Function Objects in the C++ Standard Library"
-ms.date: "11/04/2016"
+ms.date: "03/15/2019"
 helpviewer_keywords: ["functors", "C++ Standard Library, functors", "C++ Standard Library, function objects", "function objects"]
 ms.assetid: 85f8a735-2c7b-4f10-9c4d-95c666ec4192
 ---
@@ -23,9 +23,17 @@ public:
         return a < b;
     }
 };
+
+int main()
+{
+    Functor f;
+    int a = 5;
+    int b = 7;
+    int ans = f(a, b);
+}
 ```
 
-The last line of the `main` function shows how you call the function object. This call looks like a call to a function, but it is actually calling operator() of the Functor type. This similarity between calling a function object and a function is how the term function object came about.
+The last line of the `main` function shows how you call the function object. This call looks like a call to a function, but it's actually calling operator() of the Functor type. This similarity between calling a function object and a function is how the term function object came about.
 
 ## Function Objects and Containers
 
@@ -38,7 +46,7 @@ template <class Key,
 class set
 ```
 
-The second template argument is the function object `less`. This function object returns **true** if the first parameter passed to it is less than the second parameter passed. Since some containers sort their elements, the container needs a way of comparing two elements, and this is accomplished using the function object. You can define your own sorting criteria for containers by creating a function object and specifying it in the template list for the container.
+The second template argument is the function object `less`. This function object returns **true** if the first parameter is less than the second parameter. Since some containers sort their elements, the container needs a way of comparing two elements. The comparison is done by using the function object. You can define your own sorting criteria for containers by creating a function object and specifying it in the template list for the container.
 
 ## Function Objects and Algorithms
 
diff --git a/docs/standard-library/system-error-functions.md b/docs/standard-library/system-error-functions.md
@@ -1,6 +1,6 @@
 ---
 title: "&lt;system_error&gt; functions"
-ms.date: "11/04/2016"
+ms.date: "03/15/2019"
 f1_keywords: ["system_error/std::generic_category", "system_error/std::make_error_code", "system_error/std::make_error_condition", "system_error/std::system_category"]
 ms.assetid: 57d6f15f-f0b7-4e2f-80fe-31d3c320ee33
 helpviewer_keywords: ["std::generic_category", "std::make_error_code", "std::make_error_condition", "std::system_category"]
@@ -10,14 +10,14 @@ helpviewer_keywords: ["std::generic_category", "std::make_error_code", "std::mak
 ||||
 |-|-|-|
 |[generic_category](#generic_category)|[make_error_code](#make_error_code)|[make_error_condition](#make_error_condition)|
-|[system_category](#system_category)|
+|[system_category](#system_category)|||
 
-## <a name="generic_category"></a>  generic_category
+## <a name="generic_category"></a> generic_category
 
 Represents the category for generic errors.
 
 ```cpp
-extern const error_category& generic_category();
+const error_category& generic_category() noexcept;
 ```
 
 ### Remarks
@@ -29,14 +29,13 @@ The `generic_category` object is an implementation of [error_category](../standa
 Creates an error code object.
 
 ```cpp
-error_code make_error_code(generic_errno _Errno);
+error_code make_error_code(std::errc error) noexcept;
 ```
 
 ### Parameters
 
-|Parameter|Description|
-|---------------|-----------------|
-|*_Errno*|The enumeration value to store in the error code object.|
+*error*\
+The `std::errc` enumeration value to store in the error code object.
 
 ### Return Value
 
@@ -49,14 +48,13 @@ The error code object.
 Creates an error condition object.
 
 ```cpp
-error_condition make_error_condition(generic_errno _Errno);
+error_condition make_error_condition(std::errc error) noexcept;
 ```
 
 ### Parameters
 
-|Parameter|Description|
-|---------------|-----------------|
-|*_Errno*|The enumeration value to store in the error condition object.|
+*error*\
+The `std::errc` enumeration value to store in the error code object.
 
 ### Return Value
 
@@ -69,7 +67,7 @@ The error condition object.
 Represents the category for errors caused by low-level system overflows.
 
 ```cpp
-extern const error_category& system_category();
+const error_category& system_category() noexcept;
 ```
 
 ### Remarks
@@ -78,4 +76,4 @@ The `system_category` object is an implementation of [error_category](../standar
 
 ## See also
 
-[<system_error>](../standard-library/system-error.md)<br/>
+[\<system_error>](../standard-library/system-error.md)<br/>
diff --git a/docs/standard-library/system-error-typedefs.md b/docs/standard-library/system-error-typedefs.md
diff --git a/docs/standard-library/system-error.md b/docs/standard-library/system-error.md
@@ -1,6 +1,6 @@
 ---
 title: "&lt;system_error&gt;"
-ms.date: "11/04/2016"
+ms.date: "03/15/2019"
 f1_keywords: ["<system_error>", "system_error"]
 helpviewer_keywords: ["system_error header"]
 ms.assetid: 5e046c6e-48d9-4740-8c8a-05f3727c1215
@@ -22,12 +22,6 @@ Include the header \<system_error> to define the exception class `system_error`
 |[generic_category](../standard-library/system-error-functions.md#generic_category)|Represents the category for generic errors.|
 |[system_category](../standard-library/system-error-functions.md#system_category)|Represents the category for errors caused by low-level system overflows.|
 
-### Typedefs
-
-|Type name|Description|
-|-|-|
-|[generic_errno](../standard-library/system-error-typedefs.md#generic_errno)|A type that represents the enumeration that provides the symbolic names for all the error-code macros defined by Posix in `<errno.h>`.|
-
 ### Functions
 
 |Function|Description|
diff --git a/docs/vcpkg.md b/docs/vcpkg.md
@@ -3,7 +3,7 @@ title: vcpkg-- A C++ package manager for Windows, Linux and MacOS
 description: vcpkg is a command line package manager that greatly simplifies the acquisition and installation of open-source C++ libraries on Windows.
 author: mikeblome
 ms.author: mblome
-ms.date: "02/22/2019"
+ms.date: "03/18/2019"
 ms.technology: "cpp-ide"
 ms.assetid: f50d459a-e18f-4b4e-814b-913e444cedd6
 ---
@@ -13,7 +13,7 @@ vcpkg is a command-line package manager that greatly simplifies the acquisition
 
 ## Simple yet flexible
 
-With a single command, you can download sources and build a library. vcpkg is itself an open-source project, available on GitHub. You can customize your private clone(s) in any way you like. For example, you can specify different libraries, or different versions of libraries than what are found in the public catalog. You can have multiple clones of vcpkg on a single machine, each one producing custom sets of libraries and/or compilation switches, etc. Each clone is a self-contained, x-copyable environment with its own copy of vcpkg.exe that operates only on its own hierarchy. vcpkg is not added to any environment variables, and has no dependency on the Windows Registry or Visual Studio.
+With a single command, you can download sources and build a library. vcpkg is itself an open-source project, available on GitHub. You can customize your private clone(s) in any way you like. For example, you can specify different libraries, or different versions of libraries than what are found in the public catalog. You can have multiple clones of vcpkg on a single machine, each one producing custom sets of libraries and/or compilation switches, etc. Each clone is a self-contained environment with its own copy of vcpkg.exe that operates only on its own hierarchy. vcpkg is not added to any environment variables, and has no dependency on the Windows Registry or Visual Studio.
 
 ## Sources not binaries
 
