Links to appropriate phase of translation

source/intro.tex

@@ -788,7 +788,7 @@
 consistent with the descriptions in the library Clauses.
 
 \pnum
-A \Cpp{}  translation unit\iref{lex.phases}
+A \Cpp{}  translation unit\iref{lex.phase.7,module.unit}
 obtains access to the names defined in the library by
 including the appropriate standard library header or importing
 the appropriate standard library named header unit\iref{using.headers}.
@@ -797,7 +797,7 @@
 The templates, classes, functions, and objects in the library have
 external linkage\iref{basic.link}. The implementation provides
 definitions for standard library entities, as necessary, while combining
-translation units to form a complete \Cpp{}  program\iref{lex.phases}.%
+translation units to form a complete \Cpp{}  program\iref{lex.phase.9}.%
 \indextext{conformance requirements!library|)}
 
 \pnum

source/lex.tex

@@ -26,7 +26,7 @@
 
 \pnum
 \indextext{program}%
-A \defn{program} consists of one or more translation units\iref{lex.phases,module.unit}
+A \defn{program} consists of one or more translation units\iref{lex.phase.7,module.unit}
 linked together.
 
 \pnum
@@ -2065,7 +2065,7 @@
 and \tcode{std::numeric_limits<unsigned int>::max()} is \tcode{0xFFFF},
 the integer literal \tcode{0x8000} is signed and positive within a \tcode{\#if}
 expression even though it is unsigned in translation phase
-7\iref{lex.phases}.
+7\iref{lex.phase.7}.
 \end{note}
 This includes interpreting \grammarterm{character-literal}s
 according to the rules in \ref{lex.ccon}.
@@ -2245,7 +2245,7 @@
 \begin{footnote}
 Note that adjacent \grammarterm{string-literal}s are not concatenated into
 a single \grammarterm{string-literal}
-(see the translation phases in~\ref{lex.phases});
+(see the translation phases in~\ref{lex.phase.6});
 thus, an expansion that results in two \grammarterm{string-literal}s is an
 invalid directive.
 \end{footnote}
@@ -2610,7 +2610,7 @@
 Since, by macro-replacement time,
 all \grammarterm{character-literal}s and \grammarterm{string-literal}s are preprocessing tokens,
 not sequences possibly containing identifier-like subsequences
-(see \ref{lex.phases}, translation phases),
+(see \ref{lex.phase.3}, translation phases),
 they are never scanned for macro names or parameters.
 \end{footnote}
 to be replaced by the replacement list of preprocessing tokens
@@ -3126,7 +3126,7 @@
 \defn{line number}
 of the current source line is one greater than
 the number of new-line characters read or introduced
-in translation phase 1\iref{lex.phases}
+in translation phase 1\iref{lex.phase.1}
 while processing the source file to the current token.
 
 \pnum

source/lib-intro.tex

@@ -1584,8 +1584,8 @@
 \pnum
 Subclause \ref{using} describes how a \Cpp{} program gains access to the facilities of the
 \Cpp{} standard library. \ref{using.headers} describes effects during translation
-phase 4, while~\ref{using.linkage} describes effects during phase
-8\iref{lex.phases}.
+phase 4\iref{lex.phase.4}, while~\ref{using.linkage} describes effects during phase
+8\iref{lex.phase.9}.
 
 \rSec3[using.headers]{Headers}
 

source/limits.tex

@@ -59,10 +59,10 @@
 \item%
 Arguments in one macro invocation\iref{cpp.replace} [256].
 \item%
-Characters in one logical source line\iref{lex.phases} [65\,536].
+Characters in one logical source line\iref{lex.phase.2} [65\,536].
 \item%
 Characters in a \grammarterm{string-literal}\iref{lex.string}
-(after concatenation\iref{lex.phases}) [65\,536].
+(after concatenation\iref{lex.phase.6}) [65\,536].
 \item%
 Size of an object\iref{intro.object} [262\,144].
 \item%

source/modules.tex

@@ -526,7 +526,7 @@
 \begin{note}
 Such indirect importation does not make macros available,
 because a translation unit is
-a sequence of tokens in translation phase 7\iref{lex.phases}.
+a sequence of tokens in translation phase 7\iref{lex.phase.7}.
 Macros can be made available by directly importing header units
 as described in \ref{cpp.import}.
 \end{note}