174c174
<    The Application Configuration Access Protocol ACAP [12] specification
---
>    The Application Configuration Access Protocol ACAP [11] specification
177,178c177,178
<    introduction of stringprep [7] and the Unicode Collation Algorithm
<    [8], it is now time to create that registry and populate it with some
---
>    introduction of stringprep [6] and the Unicode Collation Algorithm
>    [7], it is now time to create that registry and populate it with some
192c192
<    Language Tags [5] and "hostname" from URI: Generic Syntax [6].
---
>    Language Tags [5] and "reg-name" from URI: Generic Syntax [4].
209c209
<    use that collation.  This is similar to the way a charset [14]
---
>    use that collation.  This is similar to the way a charset [13]
211c211
<    specification, such as MIME [10], or the way SASL [11] separates the
---
>    specification, such as MIME [9], or the way SASL [10] separates the
213c213
<    such as ACAP [12].
---
>    such as ACAP [11].
262c262
<    it may be a Sieve [15] interpreter running a Sieve script written by
---
>    it may be a Sieve [14] interpreter running a Sieve script written by
455,457c455,458
<    its input string is a valid input to collation's other operations,
<    and invalid if not.  (In other words, a string is valid if it is
<    equal to itself, according to the collation's equality operation.)
---
>    its input string is a valid input to the collation's other
>    operations, and invalid if not.  (In other words, a string is valid
>    if it is equal to itself according to the collation's equality
>    operation.)
499d499
<    to.  For example, in a collation which treats all whitespace
507a508
>    to.  For example, in a collation which treats all whitespace
510,511c511,513
<    "1" SP SP), not four times (SP SP 1 SP, SP 1 SP, SP 1 SP SP and SP SP
<    1 SP SP), since the four matches are, in a sense, the same match.
---
>    "1" SP SP), not four times (SP SP "1" SP, SP "1" SP, SP "1" SP SP and
>    SP SP "1" SP SP), since the four matches are, in a sense, the same
>    match.
519c521
<    Collation Algorithm [8] discusses this in more detail.
---
>    Collation Algorithm [7] discusses this in more detail.
557,558d558
< 
< 
656,657c656,657
<    and "I" as equivalent in Italy, and differently in Turkey (Turkey
<    also has a dotted upper-case" I" and a dotless lower-case "i").
---
>    and "I" as equivalent in Italy, and different in Turkey (Turkish also
>    has a dotted upper-case" I" and a dotless lower-case "i").
716c716
<    Both ACAP [12] and Sieve [15] are standards track specifications that
---
>    Both ACAP [11] and Sieve [14] are standards track specifications that
739,741c739,741
<    IMAP [16] also collates, although that is explicit only when the
<    COMPARATOR [18] extension is used.  The built-in IMAP substring
<    operation and the ordering provided by the SORT [17] extension may
---
>    IMAP [15] also collates, although that is explicit only when the
>    COMPARATOR [17] extension is used.  The built-in IMAP substring
>    operation and the ordering provided by the SORT [16] extension may
878c878
<    The <submitter> element provides an RFC 2822 [13] email address for
---
>    The <submitter> element provides an RFC 2822 [12] email address for
904,905c904,905
<    results change for certain input strings.  The <version> element is
<    optional.
---
>    results change for one or more input strings.  The <version> element
>    is optional.
909,912c909,913
<    The <variable> element specifies an optional variable using which the
<    collation's behaviour can be tailored.  The <variable> element is
<    optional.  When it is used, it must contain <name> and <default>
<    elements, and it may contain one or more <value> elements.
---
>    The <variable> element specifies an optional variable to control the
>    collation's behaviour, for example whether it is case sensitive.  The
>    <variable> element is optional.  When <variable> is used, it must
>    contain <name> and <default> elements, and it may contain one or more
>    <value> elements.
928c929
<    present, only those values are legal.  If none is, then the
---
>    present, only those values are legal.  If none are, then the
947d947
<    collation registrations published in IESG-approved RFCs, or for
955a956
>    collation registrations published in IESG-approved RFCs, or for
1006d1006
< 
1052c1052
<    defined in [12], and are implemented in most [15] engines.  Some of
---
>    defined in [11], and are implemented in most [14] engines.  Some of
1056,1057c1056,1057
<    Some of the, perhaps surprising, aspects of these collations, which
<    are necessary to maintain compatibility with widely deployed code.
---
>    Some of the aspects of these collations are necessary to maintain
>    compatibility with widely deployed code.
1271,1272c1271,1272
<    security considerations for UTF-8 [3], stringprep [7], and Unicode
<    TR-36 [9] also apply, and are normative to this specification.
---
>    security considerations for UTF-8 [3], stringprep [6], and Unicode
>    TR-36 [8] also apply, and are normative to this specification.
1312,1316c1312
<    [6]   Berners-Lee, T., Fielding, R., and L. Masinter, "Uniform
<          Resource Identifiers (URI): Generic Syntax", RFC 2396,
<          August 1998.
< 
<    [7]   Hoffman, P. and M. Blanchet, "Preparation of Internationalized
---
>    [6]   Hoffman, P. and M. Blanchet, "Preparation of Internationalized
1319c1315
<    [8]   Davis, M. and K. Whistler, "Unicode Collation Algorithm version
---
>    [7]   Davis, M. and K. Whistler, "Unicode Collation Algorithm version
1323c1319
<    [9]   Davis, M. and M. Suignard, "Unicode Security Considerations",
---
>    [8]   Davis, M. and M. Suignard, "Unicode Security Considerations",
1328c1324
<    [10]  Freed, N. and N. Borenstein, "Multipurpose Internet Mail
---
>    [9]   Freed, N. and N. Borenstein, "Multipurpose Internet Mail
1332,1333c1328,1329
<    [11]  Myers, J., "Simple Authentication and Security Layer (SASL)",
<          RFC 2222, October 1997.
---
>    [10]  Melnikov, A., "Simple Authentication and Security Layer
>          (SASL)", RFC 4422, June 2006.
1335c1331
<    [12]  Newman, C. and J. Myers, "ACAP -- Application Configuration
---
>    [11]  Newman, C. and J. Myers, "ACAP -- Application Configuration
1338c1334
<    [13]  Resnick, P., "Internet Message Format", RFC 2822, April 2001.
---
>    [12]  Resnick, P., "Internet Message Format", RFC 2822, April 2001.
1339a1336,1337
>    [13]  Freed, N. and J. Postel, "IANA Charset Registration
>          Procedures", BCP 19, RFC 2978, October 2000.
1340a1339
>    [14]  Showalter, T., "Sieve: A Mail Filtering Language", RFC 3028,
1342a1342
> 
1348,1351d1347
<    [14]  Freed, N. and J. Postel, "IANA Charset Registration
<          Procedures", BCP 19, RFC 2978, October 2000.
< 
<    [15]  Showalter, T., "Sieve: A Mail Filtering Language", RFC 3028,
1354c1350
<    [16]  Crispin, M., "Internet Message Access Protocol - Version
---
>    [15]  Crispin, M., "Internet Message Access Protocol - Version
1357c1353
<    [17]  Crispin, M. and K. Murchison, "Internet Message Access Protocol
---
>    [16]  Crispin, M. and K. Murchison, "Internet Message Access Protocol
1360c1356
<    [18]  Newman, C. and A. Gulbrandsen, "Internet Message Access
---
>    [17]  Newman, C. and A. Gulbrandsen, "Internet Message Access
1396a1393,1396
> 
> 
> 
>