backport changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@103576 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/style/man/man.en.xsl b/docs/manual/style/man/man.en.xsl
index 2ae593bf05b11404dab96bd406ee7ae153b505ca..e3aa61bb9d6e667caf945870912f40341b3fcaa4 100644 (file)
--- a/docs/manual/style/man/man.en.xsl
+++ b/docs/manual/style/man/man.en.xsl
@@ -26,7 +26,7 @@
 />
 
 <!-- Read the localized messages from the specified language file -->
-<xsl:variable name="messages" select="document('../lang/en.xml')/messages" />
+<xsl:variable name="message" select="document('../lang/en.xml')/language/messages/message" />
 
 <!-- Now get the real guts of the stylesheet -->
 <xsl:include href="manpage.xsl" />

diff --git a/docs/manual/style/man/manpage.xsl b/docs/manual/style/man/manpage.xsl
index 545e8cea9b6ce69b09e99f4ca610cc0a2d3a34a1..9f9924ffe58bd99d4beafdfb505f646a8a2b77df 100644 (file)
--- a/docs/manual/style/man/manpage.xsl
+++ b/docs/manual/style/man/manpage.xsl
@@ -17,7 +17,7 @@
 -->
 
 <!--
- * This software is based on initial work of Joe Orton <jorton@redhat.com>
+ * This software is based on initial work of Joe Orton <jorton redhat.com>
  * (contributed to the ASF) which is based on the db2man stylesheets developed
  * by Martijn van Beers. db2man is now part of docbook-xsl, which is
  * licensed under the following terms:
@@ -239,8 +239,8 @@
 &lf;
 <xsl:text>.SH "</xsl:text>
     <xsl:call-template name="filter.escape">
-        <xsl:with-param name="text" select="normalize-space(translate($messages
-                          /message[@name='summary'], $lowercase, $uppercase))"/>
+        <xsl:with-param name="text" select="normalize-space(translate($message
+                          [@id='summary'], $lowercase, $uppercase))"/>
     </xsl:call-template>
 <xsl:text>"</xsl:text>&lf;
 <xsl:apply-templates />