From: Rich Bowen <rbowen@apache.org>
Date: Fri, 30 Mar 2012 11:48:10 +0000 (+0000)
Subject: MOre standard options syntax, as per https://issues.apache.org/bugzilla/show_bug... 
X-Git-Tag: 2.2.23~218
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69cd07844f4948303209bd7a6dbed2409a878dde;p=thirdparty%2Fapache%2Fhttpd.git

MOre standard options syntax, as per https://issues.apache.org/bugzilla/show_bug.cgi?id=52102


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

diff --git a/docs/manual/mod/mod_expires.xml b/docs/manual/mod/mod_expires.xml
index cf2b5968716..be7e94fa344 100644
--- a/docs/manual/mod/mod_expires.xml
+++ b/docs/manual/mod/mod_expires.xml
@@ -63,13 +63,13 @@ criteria</description>
     can also be defined in a more readable syntax of the form:</p>
 
     <example>
-      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>] ..."
     </example>
 
-    <p>where &lt;base&gt; is one of:</p>
+    <p>where <var>base</var> is one of:</p>
 
     <ul>
       <li><code>access</code></li>
@@ -80,9 +80,9 @@ criteria</description>
       <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>
@@ -105,7 +105,7 @@ criteria</description>
     </example>
 
     <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>
 
     <example>
       ExpiresByType text/html "access plus 1 month 15