Merge branch 'develop' into feature/documentation

doc/variant2/reference.adoc

@@ -247,6 +247,9 @@ public:
 } // namespace boost
 ```
 
+In the descriptions that follow, let `i` be in the range `[0, sizeof...(T))`,
+and `Ti` be the `i`-th type in `T...`.
+
 #### Constructors
 
 ```
@@ -707,6 +710,8 @@ template<size_t I, class... T>
 +
 Effects: :: If `v.index()` is `I`, returns a reference to the object stored in
   the variant. Otherwise, throws `bad_variant_access`.
+Remarks: :: These functions do not participate in overload resolution
+  unless `I` < `sizeof...(T)`.
 
 ```
 template<class U, class... T>
@@ -747,9 +752,10 @@ template<size_t I, class... T>
 [none]
 * {blank}
 +
-Requires: :: `I < sizeof...(U)`. Otherwise, the program is ill-formed.
 Effects:  :: A pointer to the value stored in the variant, if
   `v != nullptr && v\->index() == I`. Otherwise, `nullptr`.
+Remarks: :: These functions do not participate in overload resolution
+  unless `I` < `sizeof...(T)`.
 
 ```
 template<class U, class... T>
@@ -778,7 +784,7 @@ template<class... T>
 [none]
 * {blank}
 +
-Returns: :: `v.index() == w.index && get<I>(v) == get<I>(w)`, where `I`
+Returns: :: `v.index() == w.index() && get<I>(v) == get<I>(w)`, where `I`
   is `v.index()`.
 
 ```
@@ -797,7 +803,7 @@ template<class... T>
 [none]
 * {blank}
 +
-Returns: :: `v.index() < w.index || (v.index() == w.index && get<I>(v) < get<I>(w))`,
+Returns: :: `v.index() < w.index() || (v.index() == w.index() && get<I>(v) < get<I>(w))`,
   where `I` is `v.index()`.
 
 ```
@@ -816,7 +822,7 @@ template<class... T>
 [none]
 * {blank}
 +
-Returns: :: `v.index() < w.index || (v.index() == w.index && get<I>(v) \<= get<I>(w))`,
+Returns: :: `v.index() < w.index() || (v.index() == w.index() && get<I>(v) \<= get<I>(w))`,
   where `I` is `v.index()`.
 
 ```