Merge pull request #1001 from msebolt/consolidation-final

rjagiewich · web-flow · commit 79055e81c6b5 · 2018-06-27T11:23:24.000-07:00
consolidation final edits
diff --git a/docs/dotnet/TOC.md b/docs/dotnet/TOC.md
@@ -172,14 +172,14 @@
 ### [How to: Convert from a .NET Collection to a STL/CLR Container](how-to-convert-from-a-dotnet-collection-to-a-stl-clr-container.md)
 ### [How to: Convert from a STL/CLR Container to a .NET Collection](how-to-convert-from-a-stl-clr-container-to-a-dotnet-collection.md)
 ### [How to: Expose an STL/CLR Container from an Assembly](how-to-expose-an-stl-clr-container-from-an-assembly.md)
-### [adapter (STL/CLR)](adapter-stl-clr.md)
-### [algorithm (STL/CLR)](algorithm-stl-clr.md)
-### [deque (STL/CLR)](deque-stl-clr.md)
 ### [for each, in](for-each-in.md)
 #### [Iterating Over C++ Standard Library Collection By Using for each](iterating-over-stl-collection-by-using-for-each.md)
 #### [How to: Iterate Over Arrays with for each](how-to-iterate-over-arrays-with-for-each.md)
 #### [How to: Iterate Over a Generic Collection with for each](how-to-iterate-over-a-generic-collection-with-for-each.md)
 #### [How to: Iterate Over a User-Defined Collection with for each](how-to-iterate-over-a-user-defined-collection-with-for-each.md)
+### [adapter (STL/CLR)](adapter-stl-clr.md)
+### [algorithm (STL/CLR)](algorithm-stl-clr.md)
+### [deque (STL/CLR)](deque-stl-clr.md)
 ### [functional (STL/CLR)](functional-stl-clr.md)
 ### [hash_map (STL/CLR)](hash-map-stl-clr.md)
 ### [hash_multimap (STL/CLR)](hash-multimap-stl-clr.md)
diff --git a/docs/dotnet/adapter-stl-clr.md b/docs/dotnet/adapter-stl-clr.md
@@ -32,7 +32,7 @@ The STL/CLR header `<cliext/adapter>` specifies two template classes (`collectio
   
  **Namespace:** cliext 
   
-## Members  
+## Declarations  
   
 |Class|Description|  
 |-----------|-----------------|  
@@ -43,6 +43,8 @@ The STL/CLR header `<cliext/adapter>` specifies two template classes (`collectio
 |--------------|-----------------|  
 |[make_collection (STL/CLR)](#make_collection)|Creates a range adapter using an iterator pair.|   
   
+## Members
+
 ## <a name="collection_adapter"></a> collection_adapter (STL/CLR)
 Wraps a .NET collection for use as an STL/CLR container. A `collection_adapter` is a template class that describes a simple STL/CLR container object. It wraps a Base Class Library (BCL) interface, and returns an iterator pair that you use to manipulate the controlled sequence.  
   
diff --git a/docs/dotnet/algorithm-stl-clr.md b/docs/dotnet/algorithm-stl-clr.md
@@ -44,7 +44,7 @@ Defines STL/CLR container template functions that perform algorithms.
   
  **Namespace:** cliext  
     
-## Functions  
+## Declarations  
   
 |Function|Description|  
 |--------------|-----------------|  
@@ -115,6 +115,7 @@ Defines STL/CLR container template functions that perform algorithms.
 |[unique_copy (STL/CLR)](#unique_copy)|Copies elements from a source range into a destination range except for the duplicate elements that are adjacent to each other.|  
 |[upper_bound (STL/CLR)](#upper_bound)|Finds the position of the first element in an ordered range that has a value that is greater than a specified value, where the ordering criterion may be specified by a binary predicate.|  
  
+## Members
 
 ## <a name="adjacent_find"></a> adjacent_find (STL/CLR)
 Searches for two adjacent elements that are either equal or satisfy a specified condition.  
diff --git a/docs/dotnet/deque-stl-clr.md b/docs/dotnet/deque-stl-clr.md
@@ -57,7 +57,7 @@ template<typename Value>
   
  **Namespace:** cliext  
 
-## Members  
+## Declarations  
   
 |Type Definition|Description|  
 |---------------------|-----------------|  
@@ -138,7 +138,7 @@ template<typename Value>
   
  Erasing or removing an element calls the destructor for its stored value. Destroying the container erases all elements. Thus, a container whose element type is a ref class ensures that no elements outlive the container. Note, however, that a container of handles does `not` destroy its elements.  
  
-## Member Definitions
+## Members
 
 ## <a name="assign"></a> deque::assign (STL/CLR)
 Replaces all elements.  
diff --git a/docs/dotnet/hash-multimap-stl-clr.md b/docs/dotnet/hash-multimap-stl-clr.md
@@ -57,7 +57,7 @@ template<typename Key,
     { ..... };  
 ```  
   
-#### Parameters  
+### Parameters  
  Key  
  The type of the key component of an element in the controlled sequence.  
   
diff --git a/docs/dotnet/hash-multiset-stl-clr.md b/docs/dotnet/hash-multiset-stl-clr.md
@@ -48,7 +48,7 @@ template<typename Key>
     { ..... };  
 ```  
   
-#### Parameters  
+### Parameters  
  Key  
  The type of the key component of an element in the controlled sequence.  
 
@@ -57,7 +57,7 @@ template<typename Key>
   
  **Namespace:** cliext  
   
-## Members  
+## Declarations  
   
 |Type Definition|Description|  
 |---------------------|-----------------|  
@@ -122,7 +122,7 @@ template<typename Key>
 |<xref:System.Collections.Generic.ICollection%601>|Maintain group of typed elements.|  
 |IHash\<Key, Value>|Maintain generic container.|  
   
-### Remarks  
+## Remarks  
  The object allocates and frees storage for the sequence it controls as individual nodes in a bidirectional linked list. To speed access, the object also maintains a varying-length array of pointers into the list (the hash table), effectively managing the whole list as a sequence of sublists, or buckets. It inserts elements into a bucket that it keeps ordered by altering the links between nodes, never by copying the contents of one node to another. That means you can insert and remove elements freely without disturbing remaining elements.  
   
  The object orders each bucket it controls by calling a stored delegate object of type [hash_set::key_compare (STL/CLR)](../dotnet/hash-set-key-compare-stl-clr.md). You can specify the stored delegate object when you construct the hash_set; if you specify no delegate object, the default is the comparison `operator<=(key_type, key_type)`.  
@@ -155,6 +155,8 @@ template<typename Key>
   
  Erasing or removing an element calls the destructor for its stored value. Destroying the container erases all elements. Thus, a container whose element type is a ref class ensures that no elements outlive the container. Note, however, that a container of handles does `not` destroy its elements.  
   
+## Members
+
 ## <a name="begin"></a> hash_multiset::begin (STL/CLR)
 Designates the beginning of the controlled sequence.  
   
diff --git a/docs/dotnet/hash-set-stl-clr.md b/docs/dotnet/hash-set-stl-clr.md
@@ -31,7 +31,7 @@ The template class describes an object that controls a varying-length sequence o
   
  In the description below, `GValue` is the same as `GKey`, which in turn is the same as `Key` unless the latter is a ref type, in which case it is `Key^`.  
   
-### Syntax  
+## Syntax  
   
 ```  
 template<typename Key>  
@@ -47,7 +47,7 @@ template<typename Key>
     { ..... };  
 ```  
   
-#### Parameters  
+### Parameters  
  Key  
  The type of the key component of an element in the controlled sequence.  
 
@@ -56,7 +56,7 @@ template<typename Key>
   
  **Namespace:** cliext  
 
-## Members  
+## Declarations  
   
 |Type Definition|Description|  
 |---------------------|-----------------|  
@@ -121,7 +121,7 @@ template<typename Key>
 |<xref:System.Collections.Generic.ICollection%601>|Maintain group of typed elements.|  
 |IHash\<Key, Value>|Maintain generic container.|  
   
-### Remarks  
+## Remarks  
  The object allocates and frees storage for the sequence it controls as individual nodes in a bidirectional linked list. To speed access, the object also maintains a varying-length array of pointers into the list (the hash table), effectively managing the whole list as a sequence of sublists, or buckets. It inserts elements into a bucket that it keeps ordered by altering the links between nodes, never by copying the contents of one node to another. That means you can insert and remove elements freely without disturbing remaining elements.  
   
  The object orders each bucket it controls by calling a stored delegate object of type [hash_set::key_compare (STL/CLR)](../dotnet/hash-set-key-compare-stl-clr.md). You can specify the stored delegate object when you construct the hash_set; if you specify no delegate object, the default is the comparison `operator<=(key_type, key_type)`.  
@@ -154,6 +154,8 @@ template<typename Key>
   
  Erasing or removing an element calls the destructor for its stored value. Destroying the container erases all elements. Thus, a container whose element type is a ref class ensures that no elements outlive the container. Note, however, that a container of handles does `not` destroy its elements.  
   
+## Members
+
 ## <a name="begin"></a> hash_set::begin (STL/CLR)
 Designates the beginning of the controlled sequence.  
   
diff --git a/docs/dotnet/list-stl-clr.md b/docs/dotnet/list-stl-clr.md
@@ -46,7 +46,7 @@ template<typename Value>
     { ..... };  
 ```  
   
-#### Parameters  
+### Parameters  
  Value  
  The type of an element in the controlled sequence.  
   
@@ -55,7 +55,7 @@ template<typename Value>
   
  **Namespace:** cliext 
 
-## Members  
+## Declarations  
   
 |Type Definition|Description|  
 |---------------------|-----------------|  
@@ -140,6 +140,8 @@ template<typename Value>
   
  Erasing or removing an element calls the destructor for its stored value. Destroying the container erases all elements. Thus, a container whose element type is a ref class ensures that no elements outlive the container. Note, however, that a container of handles does `not` destroy its elements.  
   
+## Members
+
 ## <a name="assign"></a> list::assign (STL/CLR)
 Replaces all elements.  
   
diff --git a/docs/dotnet/map-stl-clr.md b/docs/dotnet/map-stl-clr.md
@@ -65,7 +65,7 @@ template<typename Key,
     { ..... };  
 ```  
   
-#### Parameters  
+### Parameters  
  Key  
  The type of the key component of an element in the controlled sequence.  
   
diff --git a/docs/dotnet/multimap-stl-clr.md b/docs/dotnet/multimap-stl-clr.md
@@ -45,7 +45,7 @@ The template class describes an object that controls a varying-length sequence o
   
  `GMapped` is the same as `Mapped` unless the latter is a ref type, in which case it is `Mapped^`  
   
-### Syntax  
+## Syntax  
   
 ```  
 template<typename Key,  
@@ -62,7 +62,7 @@ template<typename Key,
     { ..... };  
 ```  
   
-#### Parameters  
+### Parameters  
  Key  
  The type of the key component of an element in the controlled sequence.  
   
@@ -140,7 +140,7 @@ template<typename Key,
 |<xref:System.Collections.Generic.ICollection%601>|Maintain group of typed elements.|  
 |ITree\<Key, Value>|Maintain generic container.|  
   
-### Remarks  
+## Remarks  
  The object allocates and frees storage for the sequence it controls as individual nodes. It inserts elements into a (nearly) balanced tree that it keeps ordered by altering the links between nodes, never by copying the contents of one node to another. That means you can insert and remove elements freely without disturbing remaining elements.  
   
  The object orders the sequence it controls by calling a stored delegate object of type [multimap::key_compare (STL/CLR)](../dotnet/multimap-key-compare-stl-clr.md). You can specify the stored delegate object when you construct the multimap; if you specify no delegate object, the default is the comparison `operator<(key_type, key_type)`. You access this stored object by calling the member function [multimap::key_comp (STL/CLR)](../dotnet/multimap-key-comp-stl-clr.md)`()`.  
diff --git a/docs/dotnet/multiset-stl-clr.md b/docs/dotnet/multiset-stl-clr.md
@@ -54,7 +54,7 @@ template<typename Key>
     { ..... };  
 ```  
   
-#### Parameters  
+### Parameters  
  Key  
  The type of the key component of an element in the controlled sequence.  
 
diff --git a/docs/dotnet/numeric-stl-clr.md b/docs/dotnet/numeric-stl-clr.md
@@ -35,7 +35,7 @@ Defines container template functions that perform algorithms provided for numeri
 |[inner_product (STL/CLR)](#inner_product)|Computes the sum of the element-wise product of two ranges and adds it to a specified initial value or computes the result of a generalized procedure where the sum and product binary operations are replaced by other specified binary operations.|  
 |[partial_sum (STL/CLR)](#partial_sum)|Computes a series of sums in an input range from the first element through the `i`th element and stores the result of each such sum in `i`th element of a destination range or computes the result of a generalized procedure where the sum operation is replaced by another specified binary operation.|  
  
-## Functions
+## Members
 
 ## <a name="accumulate"></a> accumulate (STL/CLR)
 Computes the sum of all the elements in a specified range including some initial value by computing successive partial sums or computes the result of successive partial results similarly obtained from using a specified binary operation other than the sum.  
diff --git a/docs/dotnet/priority-queue-stl-clr.md b/docs/dotnet/priority-queue-stl-clr.md
@@ -27,7 +27,7 @@ The template class describes an object that controls a varying-length ordered se
   
  In the description below, `GValue` is the same as `Value` unless the latter is a ref type, in which case it is `Value^`. Similarly, `GContainer` is the same as `Container` unless the latter is a ref type, in which case it is `Container^`.  
   
-### Syntax  
+## Syntax  
   
 ```  
 template<typename Value,  
@@ -38,7 +38,7 @@ template<typename Value,
     { ..... };  
 ```  
   
-#### Parameters  
+### Parameters  
  Value  
  The type of an element in the controlled sequence.  
   
@@ -92,7 +92,7 @@ template<typename Value,
 |<xref:System.ICloneable>|Duplicate an object.|  
 |IPriorityQueue\<Value, Container>|Maintain generic container adapter.|  
   
-### Remarks  
+## Remarks  
  The object allocates and frees storage for the sequence it controls through an underlying container, of type `Container`, that stores `Value` elements and grows on demand. It keeps the sequence ordered as a heap, with the highest-priority element (the top element) readily accessible and removable. The object restricts access to pushing new elements and popping just the highest-priority element, implementing a priority queue.  
   
  The object orders the sequence it controls by calling a stored delegate object of type [priority_queue::value_compare (STL/CLR)](../dotnet/priority-queue-value-compare-stl-clr.md). You can specify the stored delegate object when you construct the priority_queue; if you specify no delegate object, the default is the comparison `operator<(value_type, value_type)`. You access this stored object by calling the member function [priority_queue::value_comp (STL/CLR)](../dotnet/priority-queue-value-comp-stl-clr.md)`()`.  
diff --git a/docs/dotnet/queue-stl-clr.md b/docs/dotnet/queue-stl-clr.md
@@ -41,7 +41,7 @@ template<typename Value,
     { ..... };  
 ```  
   
-#### Parameters  
+### Parameters  
  Value  
  The type of an element in the controlled sequence.  
   
@@ -101,7 +101,7 @@ template<typename Value,
 |<xref:System.ICloneable>|Duplicate an object.|  
 |IQueue\<Value, Container>|Maintain generic container adapter.|  
   
-### Remarks  
+## Remarks  
  The object allocates and frees storage for the sequence it controls through an underlying container, of type `Container`, that stores `Value` elements and grows on demand. The object restricts access to just pushing the first element and popping the last element, implementing a first-in first-out queue (also known as a FIFO queue, or simply a queue).  
   
 ## Members
diff --git a/docs/dotnet/set-stl-clr.md b/docs/dotnet/set-stl-clr.md
@@ -37,7 +37,7 @@ The template class describes an object that controls a varying-length sequence o
   
  In the description below, `GValue` is the same as `GKey`, which in turn is the same as `Key` unless the latter is a ref type, in which case it is `Key^`.  
   
-### Syntax  
+## Syntax  
   
 ```  
 template<typename Key>  
@@ -53,10 +53,15 @@ template<typename Key>
     { ..... };  
 ```  
   
-#### Parameters  
+### Parameters  
  Key  
  The type of the key component of an element in the controlled sequence.  
   
+## Requirements  
+ **Header:** \<cliext/set>  
+  
+ **Namespace:** cliext  
+
 ## Declarations  
   
 |Type Definition|Description|  
@@ -122,7 +127,7 @@ template<typename Key>
 |<xref:System.Collections.Generic.ICollection%601>|Maintain group of typed elements.|  
 |ITree\<Key, Value>|Maintain generic container.|  
   
-### Remarks  
+## Remarks  
  The object allocates and frees storage for the sequence it controls as individual nodes. It inserts elements into a (nearly) balanced tree that it keeps ordered by altering the links between nodes, never by copying the contents of one node to another. That means you can insert and remove elements freely without disturbing remaining elements.  
   
  The object orders the sequence it controls by calling a stored delegate object of type [set::key_compare (STL/CLR)](../dotnet/set-key-compare-stl-clr.md). You can specify the stored delegate object when you construct the set; if you specify no delegate object, the default is the comparison `operator<(key_type, key_type)`. You access this stored object by calling the member function [set::key_comp (STL/CLR)](../dotnet/set-key-comp-stl-clr.md)`()`.  
@@ -148,11 +153,6 @@ template<typename Key>
  A set iterator stores a handle to its associated set node, which in turn stores a handle to its associated container. You can use iterators only with their associated container objects. A set iterator remains valid so long as its associated set node is associated with some set. Moreover, a valid iterator is dereferencable -- you can use it to access or alter the element value it designates -- so long as it is not equal to `end()`.  
   
  Erasing or removing an element calls the destructor for its stored value. Destroying the container erases all elements. Thus, a container whose element type is a ref class ensures that no elements outlive the container. Note, however, that a container of handles does `not` destroy its elements.  
-  
-## Requirements  
- **Header:** \<cliext/set>  
-  
- **Namespace:** cliext  
  
 ## Members
 
diff --git a/docs/dotnet/stack-stl-clr.md b/docs/dotnet/stack-stl-clr.md
@@ -41,7 +41,7 @@ template<typename Value,
     { ..... };  
 ```  
   
-#### Parameters  
+### Parameters  
  Value  
  The type of an element in the controlled sequence.  
   
diff --git a/docs/dotnet/vector-stl-clr.md b/docs/dotnet/vector-stl-clr.md
@@ -53,7 +53,7 @@ template<typename Value>
     { ..... };  
 ```  
   
-#### Parameters  
+### Parameters  
  Value  
  The type of an element in the controlled sequence.  
   
@@ -143,10 +143,7 @@ template<typename Value>
   
  Erasing or removing an element calls the destructor for its stored value. Destroying the container erases all elements. Thus, a container whose element type is a ref class ensures that no elements outlive the container. Note, however, that a container of handles does not destroy its elements.  
   
-## Requirements  
- **Header:** \<cliext/vector>  
-  
- **Namespace:** cliext  
+## Members
 
 ## <a name="assign"></a> vector::assign (STL/CLR)
 Replaces all elements.  
