Merge pull request #1575 from MicrosoftDocs/FromPublicMasterBranch

Colin Robertson · web-flow · commit d4ee06a122df · 2018-11-14T15:10:00.000-08:00
Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master)
diff --git a/docs/c-runtime-library/reference/getdrives.md b/docs/c-runtime-library/reference/getdrives.md
@@ -37,7 +37,7 @@ For more compatibility information, see [Compatibility](../../c-runtime-library/
 
 ```C
 // crt_getdrives.c
-// This program retrives and lists out
+// This program retrieves and lists out
 // all the logical drives that are
 // currently mounted on the machine.
 
diff --git a/docs/cpp-conformance-improvements-2017.md b/docs/cpp-conformance-improvements-2017.md
@@ -1837,15 +1837,14 @@ struct A
   private:
     template <template <typename...> typename Type, typename... Args>
     static constexpr A<Args...> from_template(A<Type<Args...>>);
-
 };
 
 A<>::from_template_t<A<int>> a;
 ```
 
-In Visual Studio 2017 version 15.9, in **/permissive-** mode, the compiler raises C3861: *'from_template': identifier not found*.d
+In Visual Studio 2017 version 15.9, in **/permissive-** mode, the compiler raises C3861: *'from_template': identifier not found*.
 
-To fix the error, declare `a` before `A`.
+To fix the error, declare `from_template` before `from_template_t`.
 
 ### Modules changes
 
diff --git a/docs/cpp/this-pointer.md b/docs/cpp/this-pointer.md
@@ -11,7 +11,7 @@ The **this** pointer is a pointer accessible only within the nonstatic member fu
 
 ## Syntax
 
-```
+```cpp
 this
 this->member-identifier
 ```
@@ -116,7 +116,7 @@ int main()
     // Display 'my buffer'
     myBuf.Display();
 
-    // assignment opperator
+    // assignment operator
     myBuf = yourBuf;
 
     // Display 'your buffer'
diff --git a/docs/linux/prop-pages/linker-linux.md b/docs/linux/prop-pages/linker-linux.md
@@ -29,7 +29,7 @@ Copy Output | Specifies whether to copy the build output file from the remote sy
 Property | Description | Choices
 --- | ---| ---
 Ignore Specific Default Libraries | Specifies one or more names of default libraries to ignore. (--exclude-libs lib,lib)
-Ignore Default Libraries | Ignore default libraries and only search libraries explicitely specified.
+Ignore Default Libraries | Ignore default libraries and only search libraries explicitly specified.
 Force Undefined Symbol References | Force symbol to be entered in the output file as an undefined symbol. (-u symbol --undefined=symbol)
 Library Dependencies | This option allows specifying additional libraries to be  added to the linker command line. The additional library will be added to the end of the linker command line  prefixed with 'lib' and end with the '.a' extension.  (-lFILE)
 Additional Dependencies | Specifies additional items to add to the link command line.
diff --git a/docs/mfc/reference/coleclientitem-class.md b/docs/mfc/reference/coleclientitem-class.md
@@ -60,7 +60,7 @@ class COleClientItem : public CDocItem
 |[COleClientItem::GetDocument](#getdocument)|Returns the `COleDocument` object that contains the present item.|
 |[COleClientItem::GetDrawAspect](#getdrawaspect)|Gets the item's current view for rendering.|
 |[COleClientItem::GetExtent](#getextent)|Returns the bounds of the OLE item's rectangle.|
-|[COleClientItem::GetIconFromRegistry](#geticonfromregistry)|Retrives a handle to an icon associated with the server of a particular CLSID.|
+|[COleClientItem::GetIconFromRegistry](#geticonfromregistry)|Retrieves a handle to an icon associated with the server of a particular CLSID.|
 |[COleClientItem::GetIconicMetafile](#geticonicmetafile)|Gets the metafile used for drawing the item's icon.|
 |[COleClientItem::GetInPlaceWindow](#getinplacewindow)|Returns a pointer to the item's in-place editing window.|
 |[COleClientItem::GetItemState](#getitemstate)|Gets the item's current state.|
diff --git a/docs/parallel/concrt/codesnippet/CPP/best-practices-in-the-asynchronous-agents-library_1.cpp b/docs/parallel/concrt/codesnippet/CPP/best-practices-in-the-asynchronous-agents-library_1.cpp
@@ -12,7 +12,7 @@ class basic_agent : public concurrency::agent
    {
    }
    
-   // Retrives the message buffer that holds output messages.
+   // Retrieves the message buffer that holds output messages.
    concurrency::unbounded_buffer<int>& output()
    {
       return _output;
diff --git a/docs/standard-library/hash-map-class.md b/docs/standard-library/hash-map-class.md
@@ -2002,7 +2002,7 @@ int main( )
       cout << " " << pIter -> second;
    cout << "." << endl;
 
-   // opperator[] will also insert by moving a key
+   // operator[] will also insert by moving a key
    hash_map <string, int> hm2;
    string str("a");
    hm2[move(str)] = 1;
@@ -2673,7 +2673,7 @@ int main( )
    hash_map <int, int> :: iterator pIter;
 
    // value_type can be used to pass the correct type
-   // explicitely to avoid implicit type conversion
+   // explicitly to avoid implicit type conversion
    hm1.insert ( hash_map <int, int> :: value_type ( 1, 10 ) );
 
    // Compare other ways to insert objects into a hash_map
diff --git a/docs/standard-library/hash-multimap-class.md b/docs/standard-library/hash-multimap-class.md
@@ -2466,7 +2466,7 @@ int main( )
    hash_multimap <int, int> :: iterator pIter;
 
    // value_type can be used to pass the correct type
-   // explicitely to avoid implicit type conversion
+   // explicitly to avoid implicit type conversion
    hm1.insert ( hash_multimap <int, int> :: value_type ( 1, 10 ) );
 
    // Compare another way to insert objects into a hash_multimap
diff --git a/docs/standard-library/hash-multiset-class.md b/docs/standard-library/hash-multiset-class.md
@@ -1786,15 +1786,15 @@ int main( )
         << *hms1_rIter << "." << endl;
 
    // begin can be used to start an iteration
-   // throught a hash_multiset in a forward order
+   // through a hash_multiset in a forward order
    cout << "The hash_multiset is: ";
    for ( hms1_Iter = hms1.begin( ) ; hms1_Iter != hms1.end( );
          hms1_Iter++ )
       cout << *hms1_Iter << " ";
    cout << endl;
 
    // rbegin can be used to start an iteration
-   // throught a hash_multiset in a reverse order
+   // through a hash_multiset in a reverse order
    cout << "The reversed hash_multiset is: ";
    for ( hms1_rIter = hms1.rbegin( ) ; hms1_rIter != hms1.rend( );
          hms1_rIter++ )
@@ -1929,7 +1929,7 @@ int main( )
    cout << "." << endl;
 
    // rend can be used to terminate an iteration
-   // throught a hash_multiset in a reverse order
+   // through a hash_multiset in a reverse order
    cout << "The reversed hash_multiset is: ";
    for ( hms1_rIter = hms1.rbegin( ) ; hms1_rIter != hms1.rend( );
          hms1_rIter++ )
diff --git a/docs/standard-library/hash-set-class.md b/docs/standard-library/hash-set-class.md
@@ -1787,15 +1787,15 @@ int main( )
         << *hs1_rIter << "." << endl;
 
    // begin can be used to start an iteration
-   // throught a hash_set in a forward order
+   // through a hash_set in a forward order
    cout << "The hash_set is: ";
    for ( hs1_Iter = hs1.begin( ) ; hs1_Iter != hs1.end( );
          hs1_Iter++ )
       cout << *hs1_Iter << " ";
    cout << endl;
 
    // rbegin can be used to start an iteration
-   // throught a hash_set in a reverse order
+   // through a hash_set in a reverse order
    cout << "The reversed hash_set is: ";
    for ( hs1_rIter = hs1.rbegin( ) ; hs1_rIter != hs1.rend( );
          hs1_rIter++ )
@@ -1922,7 +1922,7 @@ int main( )
         << *hs1_rIter << "." << endl;
 
    // end can be used to terminate an iteration
-   // throught a hash_set in a forward order
+   // through a hash_set in a forward order
    cout << "The hash_set is: ";
    for ( hs1_Iter = hs1.begin( ) ; hs1_Iter != hs1.end( );
          hs1_Iter++ )
diff --git a/docs/standard-library/map-class.md b/docs/standard-library/map-class.md
@@ -1754,7 +1754,7 @@ int main()
     m1.insert(Int_Pair(4, 40));
 
     // Create an empty map m2 with the key comparison
-    // function of geater than, then insert 2 elements
+    // function of greater than, then insert 2 elements
     map <int, int, less<int> > m2;
     m2.insert(Int_Pair(1, 10));
     m2.insert(Int_Pair(2, 20));
diff --git a/docs/standard-library/multimap-class.md b/docs/standard-library/multimap-class.md
@@ -1615,7 +1615,7 @@ int main()
     m1.insert(Int_Pair(4, 40));
 
     // Create an empty multimap m2 with the key comparison
-    // function of geater than, then insert 2 elements
+    // function of greater than, then insert 2 elements
     multimap <int, int, less<int> > m2;
     m2.insert(Int_Pair(1, 10));
     m2.insert(Int_Pair(2, 20));
@@ -1818,14 +1818,14 @@ int main( )
         << m1_rIter -> first << "." << endl;
 
    // begin can be used to start an iteration
-   // throught a multimap in a forward order
+   // through a multimap in a forward order
    cout << "The multimap is: ";
    for ( m1_Iter = m1.begin( ) ; m1_Iter != m1.end( ); m1_Iter++)
       cout << m1_Iter -> first << " ";
       cout << "." << endl;
 
    // rbegin can be used to start an iteration
-   // throught a multimap in a reverse order
+   // through a multimap in a reverse order
    cout << "The reversed multimap is: ";
    for ( m1_rIter = m1.rbegin( ) ; m1_rIter != m1.rend( ); m1_rIter++)
       cout << m1_rIter -> first << " ";
@@ -1958,14 +1958,14 @@ int main( )
         << m1_rIter -> first << "." << endl;
 
    // begin can be used to start an iteration
-   // throught a multimap in a forward order
+   // through a multimap in a forward order
    cout << "The multimap is: ";
    for ( m1_Iter = m1.begin( ) ; m1_Iter != m1.end( ); m1_Iter++)
       cout << m1_Iter -> first << " ";
       cout << "." << endl;
 
    // rbegin can be used to start an iteration
-   // throught a multimap in a reverse order
+   // through a multimap in a reverse order
    cout << "The reversed multimap is: ";
    for ( m1_rIter = m1.rbegin( ) ; m1_rIter != m1.rend( ); m1_rIter++)
       cout << m1_rIter -> first << " ";
@@ -2199,7 +2199,7 @@ int main( )
            << m1_RcIter -> second << "." << endl;
 
    // The element at a specific location in the multimap can be
-   // found using a derefenced iterator addressing the location
+   // found using a dereferenced iterator addressing the location
    m1_AcIter = m1.begin( );
    m1_RcIter = m1.upper_bound( m1_AcIter -> first );
    cout << "The first element of m1 with a key greater than\n"
@@ -2309,7 +2309,7 @@ int main( )
    multimap <int, int> :: iterator pIter;
 
    // value_type can be used to pass the correct type
-   // explicitely to avoid implicit type conversion
+   // explicitly to avoid implicit type conversion
    m1.insert ( multimap <int, int> :: value_type ( 1, 10 ) );
 
    // Compare another way to insert objects into a hash_multimap
diff --git a/docs/standard-library/multiset-class.md b/docs/standard-library/multiset-class.md
@@ -1373,7 +1373,7 @@ int main( )
            << *ms1_RcIter << "." << endl;
 
    // The element at a specific location in the multiset can be
-   // found using a derefenced iterator addressing the location
+   // found using a dereferenced iterator addressing the location
    ms1_AcIter = ms1.end( );
    ms1_AcIter--;
    ms1_RcIter = ms1.lower_bound( *ms1_AcIter );
@@ -1527,7 +1527,7 @@ int main()
     ms1.insert(40);
 
     // Create an empty multiset ms2 with the key comparison
-    // function of geater than, then insert 2 elements
+    // function of greater than, then insert 2 elements
     multiset <int, less<int> > ms2;
     ms2.insert(10);
     ms2.insert(20);
@@ -1718,15 +1718,15 @@ int main( )
    cout << "The first element in the reversed multiset is "
         << *ms1_rIter << "." << endl;
 
-   // begin can be used to start an interation
-   // throught a multiset in a forward order
+   // begin can be used to start an iteration
+   // through a multiset in a forward order
    cout << "The multiset is:";
    for ( ms1_Iter = ms1.begin( ) ; ms1_Iter != ms1.end( ); ms1_Iter++ )
       cout << " " << *ms1_Iter;
    cout << endl;
 
-   // rbegin can be used to start an interation
-   // throught a multiset in a reverse order
+   // rbegin can be used to start an iteration
+   // through a multiset in a reverse order
    cout << "The reversed multiset is:";
    for ( ms1_rIter = ms1.rbegin( ) ; ms1_rIter != ms1.rend( ); ms1_rIter++ )
       cout << " " << *ms1_rIter;
@@ -1834,15 +1834,15 @@ int main() {
    cout << "The last element in the reversed multiset is "
         << *ms1_rIter << "." << endl;
 
-   // end can be used to terminate an interation
-   // throught a multiset in a forward order
+   // end can be used to terminate an iteration
+   // through a multiset in a forward order
    cout << "The multiset is: ";
    for ( ms1_Iter = ms1.begin( ) ; ms1_Iter != ms1.end( ); ms1_Iter++ )
       cout << *ms1_Iter << " ";
    cout << "." << endl;
 
    // rend can be used to terminate an interation
-   // throught a multiset in a reverse order
+   // through a multiset in a reverse order
    cout << "The reversed multiset is: ";
    for ( ms1_rIter = ms1.rbegin( ) ; ms1_rIter != ms1.rend( ); ms1_rIter++ )
       cout << *ms1_rIter << " ";
diff --git a/docs/standard-library/set-class.md b/docs/standard-library/set-class.md
@@ -1693,14 +1693,14 @@ int main( )
         << *s1_rIter << "." << endl;
 
    // begin can be used to start an iteration
-   // throught a set in a forward order
+   // through a set in a forward order
    cout << "The set is:";
    for ( s1_Iter = s1.begin( ) ; s1_Iter != s1.end( ); s1_Iter++ )
       cout << " " << *s1_Iter;
    cout << endl;
 
    // rbegin can be used to start an iteration
-   // throught a set in a reverse order
+   // through a set in a reverse order
    cout << "The reversed set is:";
    for ( s1_rIter = s1.rbegin( ) ; s1_rIter != s1.rend( ); s1_rIter++ )
       cout << " " << *s1_rIter;
@@ -1806,14 +1806,14 @@ int main() {
         << *s1_rIter << "." << endl;
 
    // end can be used to terminate an iteration
-   // throught a set in a forward order
+   // through a set in a forward order
    cout << "The set is: ";
    for ( s1_Iter = s1.begin( ) ; s1_Iter != s1.end( ); s1_Iter++ )
       cout << *s1_Iter << " ";
    cout << "." << endl;
 
    // rend can be used to terminate an iteration
-   // throught a set in a reverse order
+   // through a set in a reverse order
    cout << "The reversed set is: ";
    for ( s1_rIter = s1.rbegin( ) ; s1_rIter != s1.rend( ); s1_rIter++ )
       cout << *s1_rIter << " ";

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class basic_agent : public concurrency::agent`
`12`	`12`	`{`
`13`	`13`	`}`
`14`	`14`
`15`		`- // Retrives the message buffer that holds output messages.`
	`15`	`+ // Retrieves the message buffer that holds output messages.`
`16`	`16`	`concurrency::unbounded_buffer<int>& output()`
`17`	`17`	`{`
`18`	`18`	`return _output;`