[uaxid] Clarify that requirements come "from UAX cplusplus#31", and use "this document".

Author: tkoeppe

source/uax31.tex

@@ -7,13 +7,13 @@
 This Annex describes the choices made in application of
 \UAX{31} (``Unicode Identifier and Pattern Syntax'')
 to \Cpp{} in terms of the requirements from \UAX{31} and
-how they do or do not apply to \Cpp{}.
+how they do or do not apply to this document.
 In terms of \UAX{31},
-\Cpp{} conforms by meeting the requirements
+this document conforms by meeting the requirements
 R1 ``Default Identifiers'' and
-R4 ``Equivalent Normalized Identifiers''.
-The other requirements, also listed below,
-are either alternatives not taken or do not apply to \Cpp{}.
+R4 ``Equivalent Normalized Identifiers'' from \UAX{31}.
+The other requirements from \UAX{31}, also listed below,
+are either alternatives not taken or do not apply to this document.
 
 \rSec1[uaxid.def]{R1 Default identifiers}
 
@@ -91,7 +91,7 @@
 during the processes of lexing and parsing.
 
 \pnum
-\Cpp{} does not claim conformance with this requirement.
+This document does not claim conformance with this requirement from \UAX{31}.
 
 \rSec1[uaxid.eqn]{R4 Equivalent normalized identifiers}
 
@@ -100,16 +100,16 @@
 how identifiers are compared and considered equivalent.
 
 \pnum
-\Cpp{} requires that identifiers be in Normalization Form C and
+This document requires that identifiers be in Normalization Form C and
 therefore identifiers that compare the same under NFC are equivalent.
 This is described in \ref{lex.name}.
 
 \rSec1[uaxid.eqci]{R5 Equivalent case-insensitive identifiers}
 
 \pnum
-\Cpp{} considers case to be significant in identifier comparison, and
+This document considers case to be significant in identifier comparison, and
 does not do any case folding.
-This requirement does not apply to \Cpp{}.
+This requirement from \UAX{31} does not apply to this document.
 
 \rSec1[uaxid.filter]{R6 Filtered normalized identifiers}
 
@@ -118,15 +118,15 @@
 \UAX{31} requires a precise specification of those exclusions.
 
 \pnum
-\Cpp{} does not make any such exclusions.
+This document does not make any such exclusions.
 
 \rSec1[uaxid.filterci]{R7 Filtered case-insensitive identifiers}
 
 \pnum
 \Cpp{} identifiers are case sensitive, and
-therefore this requirement does not apply.
+therefore this requirement from \UAX{31} does not apply.
 
 \rSec1[uaxid.hashtag]{R8 Hashtag identifiers}
 
 \pnum
-There are no hashtags in \Cpp{}, so this requirement does not apply.
+There are no hashtags in \Cpp{}, so this requirement from \UAX{31} does not apply.