From: Rich Bowen <rbowen@apache.org>
Date: Fri, 30 Mar 2012 11:49:43 +0000 (+0000)
Subject: Rebuild
X-Git-Tag: 2.2.23~217
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1dc6167dabb328143bb581bc9956610c57d595f4;p=thirdparty%2Fapache%2Fhttpd.git

Rebuild


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

diff --git a/docs/manual/mod/mod_expires.html.en b/docs/manual/mod/mod_expires.html.en
index 96f6b011054..8a911f96b6b 100644
--- a/docs/manual/mod/mod_expires.html.en
+++ b/docs/manual/mod/mod_expires.html.en
@@ -74,13 +74,13 @@ criteria</td></tr>
     can also be defined in a more readable syntax of the form:</p>
 
     <div class="example"><p><code>
-      ExpiresDefault "&lt;base&gt; [plus] {&lt;num&gt;
-      &lt;type&gt;}*"<br />
-      ExpiresByType type/encoding "&lt;base&gt; [plus]
-      {&lt;num&gt; &lt;type&gt;}*"
+      ExpiresDefault "<var>base</var> [plus <var>num</var> <var>type</var>]
+        [<var>num</var> <var>type</var>] ..."<br />
+      ExpiresByType type/encoding "<var>base</var> [plus <var>num</var> <var>type</var>]
+        [<var>num</var> <var>type</var>] ..."
     </code></p></div>
 
-    <p>where &lt;base&gt; is one of:</p>
+    <p>where <var>base</var> is one of:</p>
 
     <ul>
       <li><code>access</code></li>
@@ -91,9 +91,9 @@ criteria</td></tr>
       <li><code>modification</code></li>
     </ul>
 
-    <p>The <code>plus</code> keyword is optional. &lt;num&gt;
+    <p>The <code>plus</code> keyword is optional. <var>num</var>
     should be an integer value [acceptable to <code>atoi()</code>],
-    and &lt;type&gt; is one of:</p>
+    and <var>type</var> is one of:</p>
 
     <ul>
       <li><code>years</code></li>
@@ -116,7 +116,7 @@ criteria</td></tr>
     </code></p></div>
 
     <p>The expiry time can be fine-tuned by adding several
-    '&lt;num&gt; &lt;type&gt;' clauses:</p>
+    '<var>num</var> <var>type</var>' clauses:</p>
 
     <div class="example"><p><code>
       ExpiresByType text/html "access plus 1 month 15
diff --git a/docs/manual/mod/mod_expires.xml.ja b/docs/manual/mod/mod_expires.xml.ja
index 5c1d6d1e117..eaaa9d612e7 100644
--- a/docs/manual/mod/mod_expires.xml.ja
+++ b/docs/manual/mod/mod_expires.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 421100:1098875 (outdated) -->
+<!-- English Revision: 421100:1307375 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_expires.xml.ko b/docs/manual/mod/mod_expires.xml.ko
index f716314db84..7330cfdc8b4 100644
--- a/docs/manual/mod/mod_expires.xml.ko
+++ b/docs/manual/mod/mod_expires.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 421100:1098875 (outdated) -->
+<!-- English Revision: 421100:1307375 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more