fix $message references

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

diff --git a/docs/manual/style/latex/common.xsl b/docs/manual/style/latex/common.xsl
index aaaa24b894f2fae63cb70da801fa841d5aa38a57..fc8a680a59f72d60862d517f72cf761769973cca 100644 (file)
--- a/docs/manual/style/latex/common.xsl
+++ b/docs/manual/style/latex/common.xsl
@@ -177,7 +177,7 @@ select="$metafile/basename"/>
 \fbox{\begin{tabular}{rr}
 \begin{minipage}[t]{.49\linewidth}
 \textbf{</xsl:text>
-<xsl:value-of select="$messages/message[@name='relatedmodules']" />
+<xsl:value-of select="$message[@id='relatedmodules']" />
 <xsl:text>} \\
 </xsl:text>
 <xsl:for-each select="modulelist/module">
@@ -189,7 +189,7 @@ select="$metafile/basename"/>
 \end{minipage} &amp; 
 \begin{minipage}[t]{.4\linewidth}
 \textbf{</xsl:text>
-<xsl:value-of select="$messages/message[@name='relateddirectives']" />
+<xsl:value-of select="$message[@id='relateddirectives']" />
 <xsl:text>} \\
 </xsl:text>
 <xsl:for-each select="directivelist/directive">
@@ -211,7 +211,7 @@ select="$metafile/basename"/>
 <xsl:template name="seealso">
      <xsl:if test="seealso">
        <xsl:text>\textbf{</xsl:text>
-        <xsl:value-of select="$messages/message [@name='seealso']" />
+        <xsl:value-of select="$message[@id='seealso']" />
         <xsl:text>}\begin{itemize}</xsl:text>
         <xsl:for-each select="seealso">
         <xsl:text>\item </xsl:text>

diff --git a/docs/manual/style/latex/latex.xsl b/docs/manual/style/latex/latex.xsl
index 62938add1e1c64b0e59e28a7d6299cbb6e1fa4bf..07a717be412c426f303892183305cf17c73db1c4 100644 (file)
--- a/docs/manual/style/latex/latex.xsl
+++ b/docs/manual/style/latex/latex.xsl
@@ -26,7 +26,8 @@
 />
 
 <!-- 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"/>
 
 <!-- Get the guts of the stylesheets -->
 <xsl:include href="manualpage.xsl" />
@@ -73,25 +74,25 @@
 
 \hypersetup{
     pdftitle={</xsl:text>
-<xsl:value-of select="$messages/message[@name='apache']" />
+<xsl:value-of select="$message[@id='apache']" />
 <xsl:text> </xsl:text>
-<xsl:value-of select="$messages/message[@name='http-server']" />
+<xsl:value-of select="$message[@id='http-server']" />
 <xsl:text> </xsl:text>
-<xsl:value-of select="$messages/message[@name='documentation']" />
+<xsl:value-of select="$message[@id='documentation']" />
 <xsl:text> </xsl:text>
-<xsl:value-of select="$messages/message[@name='version']" />
+<xsl:value-of select="$message[@id='version']" />
 <xsl:text>},
     pdfauthor={Apache Software Foundation}
   }
 
 \title{</xsl:text>
-<xsl:value-of select="$messages/message[@name='apache']" />
+<xsl:value-of select="$message[@id='apache']" />
 <xsl:text> </xsl:text>
-<xsl:value-of select="$messages/message[@name='http-server']" />
+<xsl:value-of select="$message[@id='http-server']" />
 <xsl:text> </xsl:text>
-<xsl:value-of select="$messages/message[@name='documentation']" />
+<xsl:value-of select="$message[@id='documentation']" />
 <xsl:text> </xsl:text>
-<xsl:value-of select="$messages/message[@name='version']" />
+<xsl:value-of select="$message[@id='version']" />
 <xsl:text>\\ \bigskip \bigskip
 \includegraphics{images/feather}\\ \bigskip}
 \author{Apache Software Foundation}

diff --git a/docs/manual/style/latex/moduleindex.xsl b/docs/manual/style/latex/moduleindex.xsl
index 548d992dd0952c1cc29c03b14fc8d1997e18f2f6..c2f482a91245d50862cf5b448b7ac923b075df36 100644 (file)
--- a/docs/manual/style/latex/moduleindex.xsl
+++ b/docs/manual/style/latex/moduleindex.xsl
@@ -35,7 +35,7 @@
   <xsl:call-template name="seealso"/>
 
    <xsl:text>\subsection*{</xsl:text>
-   <xsl:value-of select="$messages/message[@name='corefeatures']" />
+   <xsl:value-of select="$message[@id='corefeatures']" />
    <xsl:text>}
 
 \begin{description}
@@ -103,7 +103,7 @@
     <!-- /core section -->
 
     <xsl:text>\section*{</xsl:text>
-    <xsl:value-of select="$messages/message[@name='othermodules']" />
+    <xsl:value-of select="$message[@id='othermodules']" />
     <xsl:text>}
 \begin{description}
 </xsl:text>

diff --git a/docs/manual/style/latex/synopsis.xsl b/docs/manual/style/latex/synopsis.xsl
index cd55d6c011c7ba7c4611d2ebe428234fde17c83a..7036775f22da0e9d0c6d52be2d963a06963ec2a9 100644 (file)
--- a/docs/manual/style/latex/synopsis.xsl
+++ b/docs/manual/style/latex/synopsis.xsl
@@ -30,18 +30,18 @@
 <xsl:text>\section{</xsl:text>
 <xsl:choose>
   <xsl:when test="../status='Core'">
-    <xsl:value-of select="$messages/message [@name='apachecore']" />
+    <xsl:value-of select="$message[@id='apachecore']" />
   </xsl:when>
   <xsl:when test=".='mpm_common'">
-    <xsl:value-of select="$messages/message [@name='apachempmcommon']" />
+    <xsl:value-of select="$message[@id='apachempmcommon']" />
   </xsl:when>
   <xsl:when test="../status='MPM'">
-    <xsl:value-of select="$messages/message [@name='apachempm']" />
+    <xsl:value-of select="$message[@id='apachempm']" />
     <xsl:text> </xsl:text>
     <xsl:apply-templates select="name"/>
   </xsl:when>
   <xsl:otherwise>
-    <xsl:value-of select="$messages/message [@name='apachemodule']" />
+    <xsl:value-of select="$message[@id='apachemodule']" />
     <xsl:text> </xsl:text>
     <xsl:apply-templates select="name"/>
   </xsl:otherwise>
@@ -56,20 +56,20 @@
 \begin{tabular}{lp{.75\linewidth}}
 \hline
 </xsl:text>
-<xsl:value-of select="$messages/message [@name='description']" />
+<xsl:value-of select="$message[@id='description']" />
 <xsl:text>: &amp;</xsl:text> 
 <xsl:apply-templates select="description" />
 <xsl:text>\\
 </xsl:text>
 
-<xsl:value-of select="$messages/message [@name='status']" />
+<xsl:value-of select="$message[@id='status']" />
 <xsl:text>: &amp;</xsl:text>
 <xsl:value-of select="status" />
 <xsl:text>\\
 </xsl:text>
 
 <xsl:if test="identifier">
-<xsl:value-of select="$messages/message [@name='moduleidentifier']" />
+<xsl:value-of select="$message[@id='moduleidentifier']" />
 <xsl:text>: &amp;</xsl:text>
 <xsl:apply-templates select="identifier" />
 <xsl:text>\\
@@ -77,7 +77,7 @@
 </xsl:if>
 
 <xsl:if test="sourcefile">
-<xsl:value-of select="$messages/message [@name='sourcefile']" />
+<xsl:value-of select="$message[@id='sourcefile']" />
 <xsl:text>: &amp;</xsl:text>
 <xsl:apply-templates select="sourcefile" />
 <xsl:text>\\
@@ -85,7 +85,7 @@
 </xsl:if>
 
 <xsl:if test="compatibility">
-<xsl:value-of select="$messages/message [@name='compatibility']" />
+<xsl:value-of select="$message[@id='compatibility']" />
 <xsl:text>: &amp;</xsl:text>
 <xsl:apply-templates select="compatibility" />
 <xsl:text> \\
@@ -97,7 +97,7 @@
     <!-- optional)                                            -->
     <xsl:if test="summary">
       <xsl:text>\subsection*{</xsl:text>
-      <xsl:value-of select="$messages/message [@name='summary']" />
+      <xsl:value-of select="$message[@id='summary']" />
       <xsl:text>}
 </xsl:text>
       <xsl:apply-templates select="summary" />
@@ -105,7 +105,7 @@
 
      <xsl:text>
 \smallskip\textbf{</xsl:text>
-     <xsl:value-of select="$messages/message [@name='directives']" />
+     <xsl:value-of select="$message[@id='directives']" />
      <xsl:text>}
 </xsl:text>
 
@@ -136,7 +136,7 @@
 </xsl:text>
      </xsl:when>
      <xsl:otherwise>
-       <xsl:value-of select="$messages/message [@name='nodirectives']" />
+       <xsl:value-of select="$message[@id='nodirectives']" />
      <xsl:text>
 </xsl:text>
      </xsl:otherwise>
@@ -172,17 +172,15 @@
 <xsl:text>\subsection*{</xsl:text>
 <xsl:call-template name="simpledirname"/>
   <xsl:choose>
-  <xsl:when test="$messages/message
-      [@name='directive']/@replace-space-with">
-    <xsl:value-of select="$messages/message
-        [@name='directive']/@replace-space-with"/>
+  <xsl:when test="$message[@id='directive']/@replace-space-with">
+    <xsl:value-of select="$message[@id='directive']/@replace-space-with"/>
   </xsl:when>
   <xsl:otherwise>
     <xsl:text> </xsl:text>
   </xsl:otherwise>
   </xsl:choose>
 
-<xsl:value-of select="$messages/message[@name='directive']" />
+<xsl:value-of select="$message[@id='directive']" />
 <xsl:text>}\label{</xsl:text>
 <xsl:value-of select="concat('/mod/', //modulesynopsis/name, ':', translate(., $uppercase, $lowercase))"/>
 <xsl:text>}\hypertarget{</xsl:text>
@@ -199,47 +197,47 @@
 \begin{tabular}{lp{.8\linewidth}}
 \hline
 </xsl:text>
-<xsl:value-of select="$messages/message [@name='description']" />
+<xsl:value-of select="$message[@id='description']" />
 <xsl:text>: &amp; </xsl:text>
 <xsl:apply-templates select="description" />
 <xsl:text>\\
 </xsl:text>
 
-<xsl:value-of select="$messages/message[@name='syntax']" />
+<xsl:value-of select="$message[@id='syntax']" />
 <xsl:text>: &amp; {\ttfamily </xsl:text>
 <xsl:apply-templates select="syntax" />
 <xsl:text>}\\
 </xsl:text>
 
 <xsl:if test="default">
-<xsl:value-of select="$messages/message[@name='default']" />
+<xsl:value-of select="$message[@id='default']" />
 <xsl:text>: &amp; {\ttfamily </xsl:text>
 <xsl:apply-templates select="default" />
 <xsl:text>} \\
 </xsl:text>
 </xsl:if>
 
-<xsl:value-of select="$messages/message[@name='context']" />
+<xsl:value-of select="$message[@id='context']" />
 <xsl:text>: &amp;</xsl:text>
 <xsl:apply-templates select="contextlist" />
 <xsl:text> \\
 </xsl:text>
 
 <xsl:if test="override">
-<xsl:value-of select="$messages/message[@name='override']"/>
+<xsl:value-of select="$message[@id='override']"/>
 <xsl:text>: &amp;</xsl:text>
 <xsl:apply-templates select="override" />
 <xsl:text> \\
 </xsl:text>
 </xsl:if>
 
-<xsl:value-of select="$messages/message[@name='status']" />
+<xsl:value-of select="$message[@id='status']" />
 <xsl:text>: &amp;</xsl:text>
 <xsl:value-of select="../status" />
 <xsl:text> \\
 </xsl:text>
 
-<xsl:value-of select="$messages/message[@name='module']" />
+<xsl:value-of select="$message[@id='module']" />
 <xsl:text>: &amp;</xsl:text>
 <xsl:choose>
 <xsl:when test="modulelist">
@@ -253,7 +251,7 @@
 </xsl:text>
 
 <xsl:if test="compatibility">
-<xsl:value-of select="$messages/message[@name='compatibility']" />
+<xsl:value-of select="$message[@id='compatibility']" />
 <xsl:text>: &amp;</xsl:text>
 <xsl:apply-templates select="compatibility" />
 <xsl:text> \\
@@ -290,16 +288,16 @@
 <xsl:template match="context">
 <xsl:choose>
 <xsl:when test="normalize-space(.) = 'server config'">
-    <xsl:value-of select="$messages/message[@name='serverconfig']" />
+    <xsl:value-of select="$message[@id='serverconfig']" />
 </xsl:when>
 <xsl:when test="normalize-space(.) = 'virtual host'">
-    <xsl:value-of select="$messages/message[@name='virtualhost']" />
+    <xsl:value-of select="$message[@id='virtualhost']" />
 </xsl:when>
 <xsl:when test="normalize-space(.) = 'directory'">
-    <xsl:value-of select="$messages/message[@name='directory']" />
+    <xsl:value-of select="$message[@id='directory']" />
 </xsl:when>
 <xsl:when test="normalize-space(.) = '.htaccess'">
-    <xsl:value-of select="$messages/message[@name='htaccess']" />
+    <xsl:value-of select="$message[@id='htaccess']" />
 </xsl:when>
 <xsl:otherwise> <!-- error -->
     <xsl:message terminate="yes">