[container.requirements] Rephrase in terms of const types not values

Author: jwakely

source/containers.tex

@@ -85,9 +85,9 @@
 \item
 \tcode{u} denotes an identifier,
 \item
-\tcode{r} denotes a non-const value of type \tcode{X}, and
+\tcode{r} denotes value of type (non-const) \tcode{X}, and
 \item
-\tcode{rv} denotes a non-const rvalue of type \tcode{X}.
+\tcode{rv} denotes an rvalue of type (non-const) \tcode{X}.
 \end{itemize}
 
 \rSec3[container.reqmts]{Containers}
@@ -866,7 +866,7 @@
 and an \tcode{allocator_type} identical to \tcode{allocator_traits<A>::rebind_alloc<T>}
 and given an lvalue \tcode{m} of type \tcode{A},
 a pointer \tcode{p} of type \tcode{T*},
-an expression \tcode{v} of type (possibly \keyword{const}) \tcode{T},
+an expression \tcode{v} of type \tcode{T} or \tcode{const T},
 and an rvalue \tcode{rv} of type \tcode{T},
 the following terms are defined. If \tcode{X}
 is not allocator-aware or is a specialization of \tcode{basic_string},
@@ -2603,7 +2603,7 @@
 \tcode{a2} denotes a value of a type with nodes compatible with type
 \tcode{X} (\tref{container.node.compat}),
 \item
-\tcode{b} denotes a possibly \keyword{const} value of type \tcode{X},
+\tcode{b} denotes a value of type \tcode{X} or \tcode{const X},
 \item
 \tcode{u} denotes the name of a variable being declared,
 \item
@@ -2613,7 +2613,7 @@
 \tcode{a_eq} denotes a value of type \tcode{X}
 when \tcode{X} supports multiple keys,
 \item
-\tcode{a_tran} denotes a possibly \keyword{const} value of type \tcode{X}
+\tcode{a_tran} denotes a value of type \tcode{X} or \tcode{const X}
 when the \grammarterm{qualified-id}
 \tcode{X::key_compare::is_transpa\-rent} is valid
 and denotes a type\iref{temp.deduct},
@@ -2642,7 +2642,7 @@
 \item
 \tcode{k} denotes a value of type \tcode{X::key_type}, and
 \item
-\tcode{c} denotes a possibly \keyword{const} value of type \tcode{X::key_compare};
+\tcode{c} denotes a value of type \tcode{X::key_compare} or \tcode{const X::key_compare};
 \item
 \tcode{kl} is a value such that \tcode{a} is partitioned\iref{alg.sorting}
 with respect to \tcode{c(x, kl)},
@@ -4102,15 +4102,15 @@
 \tcode{a2} denotes a value of a type with nodes compatible
   with type \tcode{X} (\tref{container.node.compat}),
 \item
-\tcode{b} denotes a possibly const value of type \tcode{X},
+\tcode{b} denotes a value of type \tcode{X} or \tcode{const X},
 \item
 \tcode{a_uniq} denotes a value of type \tcode{X}
   when \tcode{X} supports unique keys,
 \item
 \tcode{a_eq} denotes a value of type \tcode{X}
   when \tcode{X} supports equivalent keys,
 \item
-\tcode{a_tran} denotes a possibly const value of type \tcode{X}
+\tcode{a_tran} denotes a value of type \tcode{X} or \tcode{const X}
   when the \grammarterm{qualified-id}s
   \tcode{X::key_equal::is_transparent} and
   \tcode{X::hasher::is_transparent}
@@ -4139,9 +4139,9 @@
 \item
 \tcode{k} denotes a value of type \tcode{key_type},
 \item
-\tcode{hf} denotes a possibly const value of type \tcode{hasher},
+\tcode{hf} denotes a value of type \tcode{hasher} or \tcode{const hasher},
 \item
-\tcode{eq} denotes a possibly const value of type \tcode{key_equal},
+\tcode{eq} denotes a value of type \tcode{key_equal} or \tcode{const key_equal},
 \item
 \tcode{ke} is a value such that
   \begin{itemize}
@@ -4165,7 +4165,7 @@
 \item
 \tcode{z} denotes a value of type \tcode{float}, and
 \item
-\tcode{nh} denotes a non-const rvalue of type \tcode{X::node_type}.
+\tcode{nh} denotes an rvalue of type (non-const) \tcode{X::node_type}.
 \end{itemize}
 
 \pnum