diff options
| author | Christophe Jaillet <jailletc36@apache.org> | 2020-06-13 08:33:47 +0200 |
|---|---|---|
| committer | Christophe Jaillet <jailletc36@apache.org> | 2020-06-13 08:33:47 +0200 |
| commit | e0613b9841f6f2cf63f9b87c5d0f84ed47c0f5a2 (patch) | |
| tree | a8dccd17b7fa3d66a9f99f0363d761b31806113e | |
| parent | Fix a typo (diff) | |
| download | apache2-e0613b9841f6f2cf63f9b87c5d0f84ed47c0f5a2.tar.xz apache2-e0613b9841f6f2cf63f9b87c5d0f84ed47c0f5a2.zip | |
Try to fix once and for all, our "en" html file generation issues with different Java version.
Switch "en" doc files to UTF-8.
We should also change "en.xml" with:
<target-ext>.html.en.utf8</target-ext>
and run:
./build.sh bootstrap
./build.sh
to be consistent with other languages.
Before making a lot of noise, first give some time to see how this works in RL.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1878788 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | docs/manual/style/lang/en.xml | 6 | ||||
| -rw-r--r-- | docs/manual/style/manual.en.xsl | 4 | ||||
| -rw-r--r-- | docs/manual/style/xsl/util/designations.xml | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/docs/manual/style/lang/en.xml b/docs/manual/style/lang/en.xml index 5c1599e063..ed4086b388 100644 --- a/docs/manual/style/lang/en.xml +++ b/docs/manual/style/lang/en.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE language SYSTEM "../lang.dtd"> <!-- $LastChangedRevision$ --> @@ -21,7 +21,7 @@ <language id="en"> <name>English</name> - <charset>ISO-8859-1</charset> + <charset>UTF-8</charset> <source-ext>.xml</source-ext> <target-ext>.html.en</target-ext> @@ -33,7 +33,7 @@ </chm> <man> - <charset>ISO-8859-1</charset> + <charset>UTF-8</charset> </man> <!-- Some strings might be used in other contexts, than stated in the --> diff --git a/docs/manual/style/manual.en.xsl b/docs/manual/style/manual.en.xsl index ea9fde85ac..00bb8e0958 100644 --- a/docs/manual/style/manual.en.xsl +++ b/docs/manual/style/manual.en.xsl @@ -18,7 +18,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> -<xsl:output method="xml" encoding="ISO-8859-1" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/> +<xsl:output method="xml" encoding="UTF-8" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/> <!-- Read the localized messages from the specified language file --> <xsl:variable name="message" select="document('lang/en.xml')/language/messages/message"/> @@ -26,7 +26,7 @@ <xsl:variable name="allmodules" select="document('xsl/util/allmodules.xml')/items/item[@lang=$doclang]"/> <!-- some meta information have to be passed to the transformation --> -<xsl:variable name="output-encoding">ISO-8859-1</xsl:variable> +<xsl:variable name="output-encoding">UTF-8</xsl:variable> <xsl:variable name="is-chm" select="false()"/> <xsl:variable name="is-zip" select="false()"/> <xsl:variable name="is-retired" select="false()"/> diff --git a/docs/manual/style/xsl/util/designations.xml b/docs/manual/style/xsl/util/designations.xml index ab772dcafb..97cc7f3b71 100644 --- a/docs/manual/style/xsl/util/designations.xml +++ b/docs/manual/style/xsl/util/designations.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?><items> <item charset="ISO-8859-1" lang="da">.html.da</item> <item charset="ISO-8859-1" lang="de">.html.de</item> -<item charset="ISO-8859-1" lang="en">.html.en</item> +<item charset="UTF-8" lang="en">.html.en</item> <item charset="UTF-8" lang="es">.html.es.utf8</item> <item charset="UTF-8" lang="fr">.html.fr.utf8</item> <item charset="UTF-8" lang="ja">.html.ja.utf8</item> |