]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
add upgrade option to the styles. rebuild mod_access
authorAndré Malo <nd@apache.org>
Sat, 1 Feb 2014 19:11:43 +0000 (19:11 +0000)
committerAndré Malo <nd@apache.org>
Sat, 1 Feb 2014 19:11:43 +0000 (19:11 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1563454 13f79535-47bb-0310-9956-ffa450edef68

docs/manual/mod/mod_access.html.en
docs/manual/mod/mod_access.html.ja.utf8
docs/manual/mod/mod_access.xml
docs/manual/mod/mod_access.xml.ja
docs/manual/style/modulesynopsis.dtd
docs/manual/style/xsl/common.xsl

index b1c600234488f9fe98a84c5461b945e97ac72a64..539c885e8f19eb60a2c1e9b0735ba3e2016884dc 100644 (file)
@@ -9,7 +9,7 @@
 <link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
 <link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
 <link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /><link href="http://httpd.apache.org/docs/current/mod/mod_access_compat.html" rel="canonical" /></head>
+<link href="../images/favicon.ico" rel="shortcut icon" /><link href="http://httpd.apache.org/docs/2.2/mod/mod_access_compat.html" rel="canonical" /></head>
 <body>
 <div id="page-header">
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
@@ -20,6 +20,8 @@
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="../">Version 2.0</a> &gt; <a href="./">Modules</a></div><div style="width: 90%;" class="outofdate"><h4>Please note</h4>
     This document refers to the 2.0 version of Apache httpd, which is no longer maintained.<br />
     Upgrade, and refer to the current version of httpd instead, documented at:<br /><ul><li><a href="http://httpd.apache.org/docs/current/">Current release version of Apache HTTP Server documentation</a></li></ul>
+    You may follow <a href="http://httpd.apache.org/docs/current/mod/mod_access_compat.html">this link</a> to 
+    go to the current version of this document.
 </div>
 <div id="page-content">
 <div id="preamble"><h1>Apache Module mod_access</h1>
@@ -372,4 +374,4 @@ evaluated.</td></tr>
 </div><div id="footer">
 <p class="apache">Copyright 2013 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
-</body></html>
+</body></html>
\ No newline at end of file
index 430ba223b1bf23456c8cbd5a40a98e1c397534ab..a69d099d1aad03798f59814b94ff0e775bf59074 100644 (file)
@@ -9,7 +9,7 @@
 <link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
 <link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
 <link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /><link href="http://httpd.apache.org/docs/current/mod/mod_access_compat.html" rel="canonical" /></head>
+<link href="../images/favicon.ico" rel="shortcut icon" /><link href="http://httpd.apache.org/docs/2.2/mod/mod_access_compat.html" rel="canonical" /></head>
 <body>
 <div id="page-header">
 <p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
@@ -20,6 +20,8 @@
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サーバ</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">バージョン 2.0</a> &gt; <a href="./">モジュール</a></div><div style="width: 90%;" class="outofdate"><h4>Please note</h4>
     This document refers to the 2.0 version of Apache httpd, which is no longer maintained.<br />
     Upgrade, and refer to the current version of httpd instead, documented at:<br /><ul><li><a href="http://httpd.apache.org/docs/current/">Current release version of Apache HTTP Server documentation</a></li></ul>
+    You may follow <a href="http://httpd.apache.org/docs/current/mod/mod_access_compat.html">this link</a> to 
+    go to the current version of this document.
 </div>
 <div id="page-content">
 <div id="preamble"><h1>Apache モジュール mod_access</h1>
 </div><div id="footer">
 <p class="apache">Copyright 2013 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
-</body></html>
+</body></html>
\ No newline at end of file
index e802caac5e51c8fda9b6224dd932041b93543863..fc03fb898ad1f021df18852b921efffdbbaf19f1 100644 (file)
@@ -20,7 +20,7 @@
  limitations under the License.
 -->
 
-<modulesynopsis metafile="mod_access.xml.meta">
+<modulesynopsis metafile="mod_access.xml.meta" upgrade="mod_access_compat">
 
 <name>mod_access</name> 
 <description>Provides access control based on client hostname, IP
index 2c9dd4a60a3c199d333c2162edbc150fb00abd6b..97dc8bd163530bc12ab55c79230e8dc9976b4f92 100644 (file)
@@ -20,7 +20,7 @@
  limitations under the License.
 -->
 
-<modulesynopsis metafile="mod_access.xml.meta">
+<modulesynopsis metafile="mod_access.xml.meta" upgrade="mod_access_compat">
 
 <name>mod_access</name> 
 <description>クライアントのホスト名、IP アドレス、その他のクライアント
index 14f947a591de489cbba76c6e9c59b579b7783434..006b690aabe97538d923e0cab57cf7aa8feeae32 100644 (file)
@@ -24,7 +24,8 @@
 identifier? , compatibility? , summary? , seealso* , section*,
 directivesynopsis*)>
 
-<!ATTLIST modulesynopsis metafile CDATA  #REQUIRED>
+<!ATTLIST modulesynopsis metafile CDATA  #REQUIRED
+                         upgrade  CDATA  #IMPLIED>
 
 <!ELEMENT directivesynopsis (name , description? , syntax? , default?
 , contextlist? , override? , modulelist?, status?, compatibility? ,
index f590dfb4f8bd0451f42fd9a5596619b3d398dfe4..6bcdee1748093e074593f48d6f0e30b5d2e1a328 100644 (file)
@@ -68,6 +68,7 @@
 <!-- make sure, we set relative anchors only, if we're actually -->
 <!-- transforming a modulefile (see <directive> template)       -->
 <xsl:variable name="in-modulesynopsis" select="boolean(/modulesynopsis)" />
+<xsl:variable name="upgrade" select="boolean(/modulesynopsis/@upgrade)" />
 
 <!-- when referencing to a directory, we may need to complete the path -->
 <!-- with the index file (for offline applications like *.chm files)   -->
     <!-- chm files do not need a favicon or a canonical link-->
     <xsl:if test="not($is-chm or $is-zip)">&lf;
         <link rel="shortcut icon" href="{$path}/images/favicon.ico" />
-        <link rel="canonical" href="http://httpd.apache.org/docs/2.2{concat($metafile/path, $metafile/basename, '.html')}"/>
+        <xsl:choose>
+        <xsl:when test="$upgrade">
+            <xsl:if test="not(/*/@upgrade = '')">
+                <link rel="canonical" href="http://httpd.apache.org/docs/2.2{concat($metafile/path, /*/@upgrade, '.html')}"/>
+            </xsl:if>
+        </xsl:when>
+        <xsl:otherwise>
+            <link rel="canonical" href="http://httpd.apache.org/docs/2.2{concat($metafile/path, $metafile/basename, '.html')}"/>
+        </xsl:otherwise>
+        </xsl:choose>
     </xsl:if>
 </head>
 </xsl:template>
 </div> <!-- /path -->
 <!-- Retirement notice -->
 <div class="outofdate" style="width: 90%;">
+    <xsl:variable name="future">
+        <xsl:choose>
+        <xsl:when test="$upgrade">
+            <xsl:if test="not(/*/@upgrade = '')">
+                <xsl:value-of
+                    select="concat($metafile/path, /*/@upgrade, '.html')" />
+            </xsl:if>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:value-of
+                select="concat($metafile/path, $metafile/basename, '.html')" />
+        </xsl:otherwise>
+        </xsl:choose>
+    </xsl:variable>
+
     <h4>Please note</h4>
     This document refers to the 2.0 version of Apache httpd, which is no longer maintained.<br/>
     Upgrade, and refer to the current version of httpd instead, documented at:<br/>
     <ul>
         <li><a href="http://httpd.apache.org/docs/current/">Current release version of Apache HTTP Server documentation</a></li>
     </ul>
-    You may follow <a href="http://httpd.apache.org/docs/current{concat($metafile/path, $metafile/basename, '.html')}">this link</a> to 
+    <xsl:if test="not($future = '')">
+    You may follow <a href="http://httpd.apache.org/docs/current{$future}">this link</a> to 
     go to the current version of this document.
-</div>
+</xsl:if></div>
 </xsl:template>
 <!-- /top -->