summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2024-12-03 22:09:49 +0000
committerBruce Momjian2024-12-03 22:09:49 +0000
commit8b318a168a5830770722c501d7db0607649b3c33 (patch)
tree13267138b374355ce4683ec8c2d921d160503350
parent7167e05fc7d191bfd59f16d0852705d8f4a3fa08 (diff)
Now that we have non-Latin1 SGML detection, restore Latin1 chars
This reverts the change in commit 641a5b7a144 that converted them to HTML entities. Reported-by: Peter Eisentraut Discussion: https://postgr.es/m/[email protected] Backpatch-through: master
-rw-r--r--doc/src/sgml/charset.sgml10
-rw-r--r--doc/src/sgml/stylesheet-man.xsl12
2 files changed, 11 insertions, 11 deletions
diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index 00e1986849a..6c633678790 100644
--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
@@ -1225,7 +1225,7 @@ CREATE COLLATION ignore_accents (provider = icu, locale = 'und-u-ks-level1-kc-tr
<programlisting>
-- ignore differences in accents and case
CREATE COLLATION ignore_accent_case (provider = icu, deterministic = false, locale = 'und-u-ks-level1');
-SELECT '&Aring;' = 'A' COLLATE ignore_accent_case; -- true
+SELECT 'Å' = 'A' COLLATE ignore_accent_case; -- true
SELECT 'z' = 'Z' COLLATE ignore_accent_case; -- true
-- upper case letters sort before lower case.
@@ -1282,7 +1282,7 @@ SELECT 'w;x*y-z' = 'wxyz' COLLATE num_ignore_punct; -- true
<entry><literal>'ab' = U&amp;'a\2063b'</literal></entry>
<entry><literal>'x-y' = 'x_y'</literal></entry>
<entry><literal>'g' = 'G'</literal></entry>
- <entry><literal>'n' = '&ntilde;'</literal></entry>
+ <entry><literal>'n' = 'ñ'</literal></entry>
<entry><literal>'y' = 'z'</literal></entry>
</row>
</thead>
@@ -1346,7 +1346,7 @@ SELECT 'w;x*y-z' = 'wxyz' COLLATE num_ignore_punct; -- true
<para>
At every level, even with full normalization off, basic normalization is
- performed. For example, <literal>'&aacute;'</literal> may be composed of the
+ performed. For example, <literal>'á'</literal> may be composed of the
code points <literal>U&amp;'\0061\0301'</literal> or the single code
point <literal>U&amp;'\00E1'</literal>, and those sequences will be
considered equal even at the <literal>identic</literal> level. To treat
@@ -1430,8 +1430,8 @@ SELECT 'x-y' = 'x_y' COLLATE level4; -- false
<entry><literal>false</literal></entry>
<entry>
Backwards comparison for the level 2 differences. For example,
- locale <literal>und-u-kb</literal> sorts <literal>'&agrave;e'</literal>
- before <literal>'a&eacute;'</literal>.
+ locale <literal>und-u-kb</literal> sorts <literal>'àe'</literal>
+ before <literal>'aé'</literal>.
</entry>
</row>
diff --git a/doc/src/sgml/stylesheet-man.xsl b/doc/src/sgml/stylesheet-man.xsl
index 2e2564da683..fcb485c2931 100644
--- a/doc/src/sgml/stylesheet-man.xsl
+++ b/doc/src/sgml/stylesheet-man.xsl
@@ -213,12 +213,12 @@
<!-- Slight rephrasing to indicate that missing sections are found
in the documentation. -->
<l:context name="xref-number-and-title">
- <l:template name="chapter" text="Chapter %n, &quot;%t&quot;, in the documentation"/>
- <l:template name="sect1" text="Section %n, &quot;%t&quot;, in the documentation"/>
- <l:template name="sect2" text="Section %n, &quot;%t&quot;, in the documentation"/>
- <l:template name="sect3" text="Section %n, &quot;%t&quot;, in the documentation"/>
- <l:template name="sect4" text="Section %n, &quot;%t&quot;, in the documentation"/>
- <l:template name="sect5" text="Section %n, &quot;%t&quot;, in the documentation"/>
+ <l:template name="chapter" text="Chapter %n, %t, in the documentation"/>
+ <l:template name="sect1" text="Section %n, “%t”, in the documentation"/>
+ <l:template name="sect2" text="Section %n, “%t”, in the documentation"/>
+ <l:template name="sect3" text="Section %n, “%t”, in the documentation"/>
+ <l:template name="sect4" text="Section %n, “%t”, in the documentation"/>
+ <l:template name="sect5" text="Section %n, “%t”, in the documentation"/>
</l:context>
</l:l10n>
</l:i18n>