httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject svn commit: r1659855 - in /httpd/httpd/trunk/docs/manual/style: lang/da.xml lang/de.xml lang/en.xml lang/es.xml lang/fr.xml lang/ja.xml lang/ko.xml lang/pt-br.xml lang/ru.xml lang/tr.xml lang/zh-cn.xml latex/synopsis.xsl xsl/synopsis.xsl
Date Sat, 14 Feb 2015 20:07:47 GMT
Author: nd
Date: Sat Feb 14 20:07:46 2015
New Revision: 1659855

URL: http://svn.apache.org/r1659855
Log:
allow placing the 'directive' word before the directive name in the module synopsis.

Modified:
    httpd/httpd/trunk/docs/manual/style/lang/da.xml
    httpd/httpd/trunk/docs/manual/style/lang/de.xml
    httpd/httpd/trunk/docs/manual/style/lang/en.xml
    httpd/httpd/trunk/docs/manual/style/lang/es.xml
    httpd/httpd/trunk/docs/manual/style/lang/fr.xml
    httpd/httpd/trunk/docs/manual/style/lang/ja.xml
    httpd/httpd/trunk/docs/manual/style/lang/ko.xml
    httpd/httpd/trunk/docs/manual/style/lang/pt-br.xml
    httpd/httpd/trunk/docs/manual/style/lang/ru.xml
    httpd/httpd/trunk/docs/manual/style/lang/tr.xml
    httpd/httpd/trunk/docs/manual/style/lang/zh-cn.xml
    httpd/httpd/trunk/docs/manual/style/latex/synopsis.xsl
    httpd/httpd/trunk/docs/manual/style/xsl/synopsis.xsl

Modified: httpd/httpd/trunk/docs/manual/style/lang/da.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/lang/da.xml?rev=1659855&r1=1659854&r2=1659855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/da.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/da.xml Sat Feb 14 20:07:46 2015
@@ -101,6 +101,9 @@
              if present, the space between <directive name> and 'Directive'
              in directivesynopsis headings will be replaced by the given string.
              (see de.xml for an example) -->
+        <!-- the optional attribute before-name takes a string.
+             if "yes", the 'Directive' word is place before the name instead of
+             being placed behind. See fr.xml for an example. -->
         <message id="directive">Direktiv</message>
         <message id="nodirectives">Dette modul har ingen direktiver.</message>
 

Modified: httpd/httpd/trunk/docs/manual/style/lang/de.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/lang/de.xml?rev=1659855&r1=1659854&r2=1659855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/de.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/de.xml Sat Feb 14 20:07:46 2015
@@ -96,6 +96,9 @@
              if present, the space between <directive name> and 'Directive'
              in directivesynopsis headings will be replaced by the given string.
              (see de.xml for an example) -->
+        <!-- the optional attribute before-name takes a string.
+             if "yes", the 'Directive' word is place before the name instead of
+             being placed behind. See fr.xml for an example. -->
         <message id="directive" replace-space-with="-">Direktive</message>
         <message id="nodirectives">Dieses Modul enth&#228;lt keine
             Direktiven.</message>

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=1659855&r1=1659854&r2=1659855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/en.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/en.xml Sat Feb 14 20:07:46 2015
@@ -100,6 +100,9 @@
              if present, the space between <directive name> and 'Directive'
              in directivesynopsis headings will be replaced by the given string.
              (see de.xml for an example) -->
+        <!-- the optional attribute before-name takes a string.
+             if "yes", the 'Directive' word is place before the name instead of
+             being placed behind. See fr.xml for an example. -->
         <message id="directive">Directive</message>
         <message id="nodirectives">This module provides no
             directives.</message>

Modified: httpd/httpd/trunk/docs/manual/style/lang/es.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/lang/es.xml?rev=1659855&r1=1659854&r2=1659855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/es.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/es.xml Sat Feb 14 20:07:46 2015
@@ -98,6 +98,9 @@
              if present, the space between <directive name> and 'Directive'
              in directivesynopsis headings will be replaced by the given string.
              (see de.xml for an example) -->
+        <!-- the optional attribute before-name takes a string.
+             if "yes", the 'Directive' word is place before the name instead of
+             being placed behind. See fr.xml for an example. -->
         <message id="directive">Directiva</message>
         <message id="nodirectives">Este m&#243;dulo no suministra ninguna
             directiva.</message>

Modified: httpd/httpd/trunk/docs/manual/style/lang/fr.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/lang/fr.xml?rev=1659855&r1=1659854&r2=1659855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/fr.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/fr.xml Sat Feb 14 20:07:46 2015
@@ -100,7 +100,10 @@
              if present, the space between <directive name> and 'Directive'
              in directivesynopsis headings will be replaced by the given string.
              (see de.xml for an example) -->
-        <message id="directive">Directive</message>
+        <!-- the optional attribute before-name takes a string.
+             if "yes", the 'Directive' word is place before the name instead of
+             being placed behind. See fr.xml for an example. -->
+        <message id="directive" before-name="no">Directive</message>
         <message id="nodirectives">Ce module ne fournit aucune directive.</message>
 
         <!-- Used in summaries -->

Modified: httpd/httpd/trunk/docs/manual/style/lang/ja.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/lang/ja.xml?rev=1659855&r1=1659854&r2=1659855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/ja.xml [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/ja.xml [utf-8] Sat Feb 14 20:07:46 2015
@@ -95,6 +95,9 @@
              if present, the space between <directive name> and 'Directive'
              in directivesynopsis headings will be replaced by the given string.
              (see de.xml for an example) -->
+        <!-- the optional attribute before-name takes a string.
+             if "yes", the 'Directive' word is place before the name instead of
+             being placed behind. See fr.xml for an example. -->
         <message id="directive">ディレクティブ</message>
         <message id="nodirectives">このモジュールにディレクティブはありません。</message>
 

Modified: httpd/httpd/trunk/docs/manual/style/lang/ko.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/lang/ko.xml?rev=1659855&r1=1659854&r2=1659855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/ko.xml [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/ko.xml [euc-kr] Sat Feb 14 20:07:46 2015
@@ -101,6 +101,9 @@
              if present, the space between <directive name> and 'Directive'
              in directivesynopsis headings will be replaced by the given string.
              (see de.xml for an example) -->
+        <!-- the optional attribute before-name takes a string.
+             if "yes", the 'Directive' word is place before the name instead of
+             being placed behind. See fr.xml for an example. -->
         <message id="directive">지시어</message>
         <message id="nodirectives">이 모듈에는 지시어가 없습니다.</message>
 

Modified: httpd/httpd/trunk/docs/manual/style/lang/pt-br.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/lang/pt-br.xml?rev=1659855&r1=1659854&r2=1659855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/pt-br.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/pt-br.xml Sat Feb 14 20:07:46 2015
@@ -99,6 +99,9 @@
              if present, the space between <directive name> and 'Directive'
              in directivesynopsis headings will be replaced by the given string.
              (see de.xml for an example) -->
+        <!-- the optional attribute before-name takes a string.
+             if "yes", the 'Directive' word is place before the name instead of
+             being placed behind. See fr.xml for an example. -->
         <message id="directive">Diretrizes</message>
         <message id="nodirectives">Esse m&#243;dulo n&#227;o fornece nenhuma
diretriz.</message>
 

Modified: httpd/httpd/trunk/docs/manual/style/lang/ru.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/lang/ru.xml?rev=1659855&r1=1659854&r2=1659855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/ru.xml [koi8-r] (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/ru.xml [koi8-r] Sat Feb 14 20:07:46 2015
@@ -95,6 +95,13 @@
 
         <!-- Used for directive lists -->
         <message id="directives">Директивы</message>
+        <!-- the optional attribute replace-space-with takes a string.
+             if present, the space between <directive name> and 'Directive'
+             in directivesynopsis headings will be replaced by the given string.
+             (see de.xml for an example) -->
+        <!-- the optional attribute before-name takes a string.
+             if "yes", the 'Directive' word is place before the name instead of
+             being placed behind. See fr.xml for an example. -->
         <message id="directive">Директива</message>
         <message id="nodirectives">Этот модуль не предоставляет
никаких
             директив.</message>

Modified: httpd/httpd/trunk/docs/manual/style/lang/tr.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/lang/tr.xml?rev=1659855&r1=1659854&r2=1659855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/tr.xml [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/tr.xml [utf-8] Sat Feb 14 20:07:46 2015
@@ -102,6 +102,9 @@
              if present, the space between <directive name> and 'Directive'
              in directivesynopsis headings will be replaced by the given string.
              (see de.xml for an example) -->
+        <!-- the optional attribute before-name takes a string.
+             if "yes", the 'Directive' word is place before the name instead of
+             being placed behind. See fr.xml for an example. -->
         <message id="directive">Yönergesi</message>
         <message id="nodirectives">Bu modül yönerge içermez.</message>
 

Modified: httpd/httpd/trunk/docs/manual/style/lang/zh-cn.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/lang/zh-cn.xml?rev=1659855&r1=1659854&r2=1659855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/zh-cn.xml [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/zh-cn.xml [utf-8] Sat Feb 14 20:07:46 2015
@@ -97,6 +97,9 @@
              if present, the space between <directive name> and 'Directive'
              in directivesynopsis headings will be replaced by the given string.
              (see de.xml for an example) -->
+        <!-- the optional attribute before-name takes a string.
+             if "yes", the 'Directive' word is place before the name instead of
+             being placed behind. See fr.xml for an example. -->
         <message id="directive">指令</message>
         <message id="nodirectives">此模块没有提供指令。</message>
 

Modified: httpd/httpd/trunk/docs/manual/style/latex/synopsis.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/latex/synopsis.xsl?rev=1659855&r1=1659854&r2=1659855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/latex/synopsis.xsl (original)
+++ httpd/httpd/trunk/docs/manual/style/latex/synopsis.xsl Sat Feb 14 20:07:46 2015
@@ -173,7 +173,26 @@
 
 <xsl:template match="directivesynopsis/name">
 <xsl:text>\subsection*{</xsl:text>
-<xsl:call-template name="simpledirname"/>
+
+<xsl:choose>
+<xsl:when test="$message [@id='directive']/@before-name = 'yes'">
+  <xsl:value-of select="$message[@id='directive']" />
+
+  <xsl:choose>
+  <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:call-template name="simpledirname"/>
+</xsl:when>
+
+<xsl:otherwise>
+  <xsl:call-template name="simpledirname"/>
+
   <xsl:choose>
   <xsl:when test="$message[@id='directive']/@replace-space-with">
     <xsl:value-of select="$message[@id='directive']/@replace-space-with"/>
@@ -183,7 +202,10 @@
   </xsl:otherwise>
   </xsl:choose>
 
-<xsl:value-of select="$message[@id='directive']" />
+  <xsl:value-of select="$message[@id='directive']" />
+</xsl:otherwise>
+</xsl:choose>
+
 <xsl:text>}\label{</xsl:text>
 <xsl:value-of select="concat('/mod/', //modulesynopsis/name, ':', translate(., $uppercase,
$lowercase))"/>
 <xsl:text>}\hypertarget{</xsl:text>

Modified: httpd/httpd/trunk/docs/manual/style/xsl/synopsis.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/xsl/synopsis.xsl?rev=1659855&r1=1659854&r2=1659855&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/xsl/synopsis.xsl (original)
+++ httpd/httpd/trunk/docs/manual/style/xsl/synopsis.xsl Sat Feb 14 20:07:46 2015
@@ -313,26 +313,54 @@
         <!-- Directive heading gets both mixed case and lowercase      -->
         <!-- anchors, and includes lt/gt only for "section" directives -->
         <h2>
-            <a id="{name}" name="{name}">
-                <xsl:if test="@type='section'">&lt;</xsl:if>
-                <xsl:value-of select="name" />
-                <xsl:if test="@type='section'">&gt;</xsl:if>
-            </a>
-
             <xsl:choose>
             <xsl:when test="$message
-                            [@id='directive']/@replace-space-with">
-                <xsl:value-of select="$message
-                                      [@id='directive']/@replace-space-with"/>
+                            [@id='directive']/@before-name = 'yes'">
+                <a id="{$lowername}" name="{$lowername}">
+                    <xsl:value-of select="$message[@id='directive']" />
+                </a>
+
+                <xsl:choose>
+                <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>
+
+                <a id="{name}" name="{name}">
+                    <xsl:if test="@type='section'">&lt;</xsl:if>
+                    <xsl:value-of select="name" />
+                    <xsl:if test="@type='section'">&gt;</xsl:if>
+                </a>
             </xsl:when>
+
             <xsl:otherwise>
-                <xsl:text> </xsl:text>
+                <a id="{name}" name="{name}">
+                    <xsl:if test="@type='section'">&lt;</xsl:if>
+                    <xsl:value-of select="name" />
+                    <xsl:if test="@type='section'">&gt;</xsl:if>
+                </a>
+
+                <xsl:choose>
+                <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>
+
+                <a id="{$lowername}" name="{$lowername}">
+                    <xsl:value-of select="$message[@id='directive']" />
+                </a>
             </xsl:otherwise>
             </xsl:choose>
-
-            <a id="{$lowername}" name="{$lowername}">
-                <xsl:value-of select="$message[@id='directive']" />
-            </a>
         </h2>&lf;
 
         <!-- Directive header -->



Mime
View raw message