Don't define typedef-names in the library wording

source/iterators.tex

@@ -902,7 +902,7 @@
 
 \pnum
 \begin{note}
-Some legacy output iterators define a nested type named \tcode{value_type}
+Some legacy output iterators declare a nested type named \tcode{value_type}
 that is an alias for \keyword{void}.
 These types are not \libconcept{indirectly_readable}
 and have no associated value types.
@@ -929,15 +929,15 @@
 \begin{codeblock}
 iterator_traits<I>::iterator_category
 \end{codeblock}
-be defined as the iterator's iterator category.
+be declared as the iterator's iterator category.
 In addition, the types
 \indexlibrarymember{pointer}{iterator_traits}%
 \indexlibrarymember{reference}{iterator_traits}%
 \begin{codeblock}
 iterator_traits<I>::pointer
 iterator_traits<I>::reference
 \end{codeblock}
-shall be defined as the iterator's pointer and reference types;
+shall be declared as the iterator's pointer and reference types;
 that is, for an
 iterator object \tcode{a} of class type,
 the same type as
@@ -955,7 +955,7 @@
 iterator_traits<I>::difference_type
 iterator_traits<I>::reference
 \end{codeblock}
-may be defined as \keyword{void}.
+may be declared as \keyword{void}.
 
 \pnum
 The definitions in this subclause make use of the following
@@ -1115,7 +1115,7 @@
 the \oldconcept{InputIter\-ator} requirements\iref{input.iterators},
 an \tcode{iterator_traits} specialization might have
 \tcode{iterator_concept} denote \tcode{input_iterator_tag}
-but not define \tcode{iterator_category}.
+but not declare \tcode{iterator_category}.
 \end{example}
 
 \pnum
@@ -2781,7 +2781,7 @@
 For every iterator of type
 \tcode{I},
 \tcode{iterator_traits<I>::it\-er\-a\-tor_ca\-te\-go\-ry}
-shall be defined to be a category tag that describes the
+shall be declared to be a category tag that describes the
 iterator's behavior.
 Additionally,
 \tcode{iterator_traits<I>::it\-er\-a\-tor_con\-cept}
@@ -4396,7 +4396,7 @@
 \end{itemize}
 
 \pnum
-The member \grammarterm{typedef-name} \tcode{iterator_category} is defined
+The member \grammarterm{typedef-name} \tcode{iterator_category} is declared
 if and only if \tcode{Iterator} models \libconcept{forward_iterator}.
 In that case,
 \tcode{basic_const_iterator<Iterator>::iterator_category} denotes
@@ -4872,7 +4872,7 @@
 \end{itemize}
 
 \pnum
-The member \grammarterm{typedef-name} \tcode{iterator_category} is defined
+The member \grammarterm{typedef-name} \tcode{iterator_category} is declared
 if and only if the \grammarterm{qualified-id}
 \tcode{iterator_traits<It\-erator>::iterator_category}
 is valid and denotes a type.
@@ -5532,7 +5532,7 @@
 \pnum
 The nested \grammarterm{typedef-name} \tcode{iterator_category} of
 the specialization of \tcode{iterator_traits} for \tcode{common_iterator<I, S>}
-is defined if and only if \tcode{iter_difference_t<I>} is an integral type.
+is declared if and only if \tcode{iter_difference_t<I>} is an integral type.
 In that case,
 \tcode{iterator_category} denotes \tcode{forward_iterator_tag} if
 the \grammarterm{qualified-id} \tcode{iterator_traits<I>::iterator_category}

source/lib-intro.tex

@@ -528,13 +528,13 @@
 
 \pnum
 Several entities
-defined in \ref{\firstlibchapter} through \ref{\lastlibchapter} and \ref{depr}
-are only defined for the purpose of exposition.
+declared in \ref{\firstlibchapter} through \ref{\lastlibchapter} and \ref{depr}
+are provided for exposition only.
 The declaration of such an entity
 is followed by a comment ending in \expos.
 
 \pnum
-The following are defined for exposition only
+The following are provided for exposition only
 to aid in the specification of the library:
 \indexlibrary{decay-copy@\exposid{decay-copy}}%
 \begin{codeblock}
@@ -598,14 +598,14 @@
 the library.
 
 \pnum
-Certain types defined in \ref{input.output} are used to describe implementation-defined types.
+Certain types shown in \ref{input.output} are used to describe implementation-defined types.
 \indextext{types!implementation-defined}%
 They are based on other types, but with added constraints.
 
 \rSec4[enumerated.types]{Enumerated types}
 
 \pnum
-Several types defined in \ref{input.output} are
+Several types specified in \ref{input.output} and \ref{re} are
 \defnadjx{enumerated}{types}{type}.
 Each enumerated type may be implemented as an enumeration or as a synonym for
 an enumeration.
@@ -638,7 +638,7 @@
 \rSec4[bitmask.types]{Bitmask types}
 
 \pnum
-Several types defined in \ref{\firstlibchapter} through \ref{\lastlibchapter}
+Several types specified in \ref{\firstlibchapter} through \ref{\lastlibchapter}
 and \ref{depr} are
 \defnx{bitmask types}{type!bitmask}.
 Each bitmask type can be implemented as an
@@ -3384,7 +3384,7 @@
 \tcode{::T}
 and
 \tcode{std::T}
-are reserved to the implementation and, when defined,
+are reserved to the implementation and, when declared,
 \tcode{::T}
 shall be identical to
 \tcode{std::T}.

source/meta.tex

@@ -168,7 +168,7 @@
 modifies a property
 of a type. It shall be a class template that takes one
 template type argument and, optionally, additional arguments that help
-define the modification. It shall define a publicly accessible nested type
+define the modification. It shall declare a publicly accessible nested type
 named \tcode{type}, which shall be a synonym for the modified type.
 
 \pnum
@@ -2294,7 +2294,7 @@
  \tcode{template<class... T>} \tcode{struct common_type;}
  &
  Unless this trait is specialized,
- the member \tcode{type} is defined or omitted as specified below.
+ the member \tcode{type} is declared or omitted as specified below.
  If it is omitted, there shall be no member \tcode{type}.
  Each type in the template parameter pack \tcode{T} shall be
  complete, \cv{}~\keyword{void}, or an array of unknown bound. \\ \rowsep
@@ -2310,7 +2310,7 @@
 
 \tcode{template<class... T>} \tcode{struct \libglobal{common_reference};}
  &
- The member \grammarterm{typedef-name} \tcode{type} is defined or omitted
+ The member \grammarterm{typedef-name} \tcode{type} is declared or omitted
  as specified below. Each type in the parameter pack \tcode{T} shall
  be complete or \cv{} \keyword{void}. \\ \rowsep
 
@@ -2446,7 +2446,7 @@
 
 \pnum
 For the \tcode{common_type} trait applied to a template parameter pack \tcode{T} of types,
-the member \tcode{type} shall be either defined or not present as follows:
+the member \tcode{type} shall be either declared or not present as follows:
 
 \begin{itemize}
 \item If \tcode{sizeof...(T)} is zero, there shall be no member \tcode{type}.
@@ -2519,7 +2519,7 @@
 
 \pnum
 For the \tcode{common_reference} trait applied to a parameter pack
-\tcode{T} of types, the member \tcode{type} shall be either defined or not
+\tcode{T} of types, the member \tcode{type} shall be either declared or not
 present as follows:
 \begin{itemize}
 \item If \tcode{sizeof...(T)} is zero, there shall be no member \tcode{type}.
@@ -2589,7 +2589,7 @@
 
 \pnum
 \begin{example}
-Given these definitions:
+Given these declarations:
 \begin{codeblock}
 using PF1 = bool  (&)();
 using PF2 = short (*)(long);
@@ -7380,5 +7380,5 @@
 \tcode{ronna}, and \tcode{quetta},
 if both of the constants used in its
 specification are representable by \tcode{intmax_t}, the typedef is
-defined; if either of the constants is not representable by \tcode{intmax_t},
-the typedef is not defined.
+declared; if either of the constants is not representable by \tcode{intmax_t},
+the typedef is not declared.

source/ranges.tex

@@ -4936,7 +4936,7 @@
 \end{itemize}
 
 \pnum
-The member \grammarterm{typedef-name} \tcode{iterator_category} is defined
+The member \grammarterm{typedef-name} \tcode{iterator_category} is declared
 if and only if \tcode{V} models \libconcept{forward_range}.
 In that case,
 \tcode{\exposid{iterator}::iterator_category} is defined as follows:
@@ -5465,7 +5465,7 @@
 \end{itemize}
 
 \pnum
-The member \grammarterm{typedef-name} \tcode{iterator_category} is defined
+The member \grammarterm{typedef-name} \tcode{iterator_category} is declared
 if and only if \exposid{Base} models \libconcept{forward_range}.
 In that case,
 \tcode{\exposid{iterator}::iterator_category} is defined as follows:
@@ -6880,7 +6880,7 @@
 \end{itemize}
 
 \pnum
-The member \grammarterm{typedef-name} \tcode{iterator_category} is defined
+The member \grammarterm{typedef-name} \tcode{iterator_category} is declared
 if and only if \exposid{ref-is-glvalue} is \tcode{true},
 \exposid{Base} models \libconcept{forward_range}, and
 \tcode{range_reference_t<\exposid{Base}>} models \libconcept{forward_range}.
@@ -7453,7 +7453,7 @@
 \end{itemize}
 
 \pnum
-The member \grammarterm{typedef-name} \tcode{iterator_category} is defined
+The member \grammarterm{typedef-name} \tcode{iterator_category} is declared
 if and only if \exposid{ref-is-glvalue} is \tcode{true}, and
 \exposid{Base} and \exposid{InnerBase} each model \libconcept{forward_range}.
 In that case,
@@ -9078,7 +9078,7 @@
 \end{itemize}
 
 \pnum
-The member \grammarterm{typedef-name} \tcode{iterator_category} is defined
+The member \grammarterm{typedef-name} \tcode{iterator_category} is declared
 if and only if
 \tcode{\exposconcept{all-forward}<Const, Views...>} is modeled.
 In that case,
@@ -10400,7 +10400,7 @@
 \end{itemize}
 
 \pnum
-The member \grammarterm{typedef-name} \tcode{iterator_category} is defined
+The member \grammarterm{typedef-name} \tcode{iterator_category} is declared
 if and only if \exposid{Base} models \libconcept{forward_range}.
 In that case, \tcode{iterator_category} is defined as follows:
 Let \tcode{C} denote the type
@@ -12217,7 +12217,7 @@
 \pnum
 The member \grammarterm{typedef-name}
 \tcode{\exposid{iterator}::iterator_category}
-is defined if and only if \exposid{Base} models \libconcept{forward_range}.
+is declared if and only if \exposid{Base} models \libconcept{forward_range}.
 In that case,
 \tcode{\exposid{iterator}::iterator_category} is defined as follows:
 \begin{itemize}
@@ -16212,7 +16212,7 @@
 \end{itemize}
 
 \pnum
-The member \grammarterm{typedef-name} \tcode{iterator_category} is defined
+The member \grammarterm{typedef-name} \tcode{iterator_category} is declared
 if and only if \exposid{Base} models \libconcept{forward_range}.
 In that case,
 \tcode{\exposid{iterator}::iterator_category} is defined as follows:

source/support.tex

@@ -2076,10 +2076,10 @@
 are also optional;
 however, if an implementation defines integer types
 with the corresponding width and no padding bits,
-it defines the corresponding \grammarterm{typedef-name}s.
+it declares the corresponding \grammarterm{typedef-name}s.
 Each of the macros listed in this subclause
 is defined if and only if
-the implementation defines the corresponding \grammarterm{typedef-name}.
+the implementation declares the corresponding \grammarterm{typedef-name}.
 \begin{note}
 The macros \tcode{INT\placeholdernc{N}_C} and \tcode{UINT\placeholdernc{N}_C}
 correspond to the \grammarterm{typedef-name}s
@@ -2090,7 +2090,7 @@
 \rSec2[stdfloat.syn]{Header \tcode{<stdfloat>} synopsis}
 
 \pnum
-The header \libheader{stdfloat} defines type aliases for
+The header \libheader{stdfloat} declares type aliases for
 the optional extended floating-point types that are specified in
 \ref{basic.extended.fp}.
 

source/text.tex

@@ -6642,7 +6642,7 @@
 \topline
 \lhdr{Type} & \rhdr{Meaning} \\ \rowsep
 none, \tcode{p} &
-If \tcode{uintptr_t} is defined,
+If \tcode{uintptr_t} is declared,
 \begin{codeblock}
 to_chars(first, last, reinterpret_cast<uintptr_t>(value), 16)
 \end{codeblock}

source/threads.tex

@@ -2807,10 +2807,10 @@
 \pnum
 The type aliases \tcode{atomic_int$N$_t}, \tcode{atomic_uint$N$_t},
 \tcode{atomic_intptr_t}, and \tcode{atomic_uintptr_t}
-are defined if and only if
+are declared if and only if
 \tcode{int$N$_t}, \tcode{uint$N$_t},
 \tcode{intptr_t}, and \tcode{uintptr_t}
-are defined, respectively.
+are declared, respectively.
 
 \pnum
 \indexlibraryglobal{atomic_signed_lock_free}%
@@ -7197,7 +7197,7 @@
 \pnum
 Each of the \grammarterm{using-declaration}s for
 \tcode{int$N$_t}, \tcode{uint$N$_t}, \tcode{intptr_t}, and \tcode{uintptr_t}
-listed above is defined if and only if the implementation defines
+listed above is declared if and only if the implementation declares
 the corresponding \grammarterm{typedef-name} in \ref{atomics.syn}.
 
 \pnum