You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2020/06/13 06:33:47 UTC
svn commit: r1878788 - in /httpd/httpd/trunk/docs/manual/style: lang/en.xml
manual.en.xsl xsl/util/designations.xml
Author: jailletc36
Date: Sat Jun 13 06:33:47 2020
New Revision: 1878788
URL: http://svn.apache.org/viewvc?rev=1878788&view=rev
Log:
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]
Modified:
httpd/httpd/trunk/docs/manual/style/lang/en.xml
httpd/httpd/trunk/docs/manual/style/manual.en.xsl
httpd/httpd/trunk/docs/manual/style/xsl/util/designations.xml
Modified: httpd/httpd/trunk/docs/manual/style/lang/en.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/lang/en.xml?rev=1878788&r1=1878787&r2=1878788&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/en.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/en.xml Sat Jun 13 06:33:47 2020
@@ -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 -->
Modified: httpd/httpd/trunk/docs/manual/style/manual.en.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/manual.en.xsl?rev=1878788&r1=1878787&r2=1878788&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/manual.en.xsl (original)
+++ httpd/httpd/trunk/docs/manual/style/manual.en.xsl Sat Jun 13 06:33:47 2020
@@ -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()"/>
Modified: httpd/httpd/trunk/docs/manual/style/xsl/util/designations.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/xsl/util/designations.xml?rev=1878788&r1=1878787&r2=1878788&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/xsl/util/designations.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/xsl/util/designations.xml Sat Jun 13 06:33:47 2020
@@ -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>