httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r1673932 - in /httpd/httpd/trunk/docs/manual: ./ howto/ misc/ mod/ rewrite/
Date Wed, 15 Apr 2015 19:10:39 GMT
Author: coar
Date: Wed Apr 15 19:10:38 2015
New Revision: 1673932

URL: http://svn.apache.org/r1673932
Log:
Break <highlight language="commit">foo</highlight> into separate lines.

Modified:
    httpd/httpd/trunk/docs/manual/content-negotiation.xml
    httpd/httpd/trunk/docs/manual/howto/access.xml
    httpd/httpd/trunk/docs/manual/howto/auth.xml
    httpd/httpd/trunk/docs/manual/howto/public_html.xml
    httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml
    httpd/httpd/trunk/docs/manual/misc/security_tips.xml
    httpd/httpd/trunk/docs/manual/mod/core.xml
    httpd/httpd/trunk/docs/manual/mod/mod_asis.xml
    httpd/httpd/trunk/docs/manual/mod/mod_authnz_ldap.xml
    httpd/httpd/trunk/docs/manual/mod/mod_cern_meta.xml
    httpd/httpd/trunk/docs/manual/mod/mod_filter.xml
    httpd/httpd/trunk/docs/manual/mod/mod_imagemap.xml
    httpd/httpd/trunk/docs/manual/mod/mod_journald.xml
    httpd/httpd/trunk/docs/manual/mod/mod_mime.xml
    httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml
    httpd/httpd/trunk/docs/manual/mod/mod_proxy_ftp.xml
    httpd/httpd/trunk/docs/manual/mod/mod_so.xml
    httpd/httpd/trunk/docs/manual/mod/mod_syslog.xml
    httpd/httpd/trunk/docs/manual/mod/mod_xml2enc.xml
    httpd/httpd/trunk/docs/manual/rewrite/flags.xml
    httpd/httpd/trunk/docs/manual/rewrite/remapping.xml
    httpd/httpd/trunk/docs/manual/rewrite/rewritemap.xml

Modified: httpd/httpd/trunk/docs/manual/content-negotiation.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/content-negotiation.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/content-negotiation.xml (original)
+++ httpd/httpd/trunk/docs/manual/content-negotiation.xml Wed Apr 15 19:10:38 2015
@@ -120,7 +120,9 @@
     defines a file suffix as <code>type-map</code>; this is best done
     with</p>
 
-<highlight language="config">AddHandler type-map .var</highlight>
+    <highlight language="config">
+AddHandler type-map .var
+    </highlight>
 
     <p>in the server configuration file.</p>
 
@@ -223,7 +225,9 @@
     module="mod_dir">DirectoryIndex</directive> directive, if the
     server is trying to index a directory. If the configuration files
     specify</p>
-<highlight language="config">DirectoryIndex index</highlight>
+    <highlight language="config">
+DirectoryIndex index
+    </highlight>
     <p>then the server will arbitrate between <code>index.html</code>
     and <code>index.html3</code> if both are present. If neither
     are present, and <code>index.cgi</code> is there, the server

Modified: httpd/httpd/trunk/docs/manual/howto/access.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/access.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/access.xml (original)
+++ httpd/httpd/trunk/docs/manual/howto/access.xml Wed Apr 15 19:10:38 2015
@@ -85,7 +85,7 @@ Require ip ip.address
     syntax.</p>
 
     <p>You can insert <code>not</code> to negate a particular requirement.
-    Note, that since a <code>not</code> is a negation of a value, it cannot 
+    Note, that since a <code>not</code> is a negation of a value, it cannot
     be used by itself to allow or deny a request, as <em>not true</em>
     does not constitute <em>false</em>. Thus, to deny a visit using a negation,
     the block must have one element that evaluates as true or false.
@@ -101,11 +101,13 @@ Require ip ip.address
 </highlight>
 
     <p>Visitors coming from that address (<code>10.252.46.165</code>)
-    will not be able to see the content covered by this directive. If, 
-    instead, you have a machine name, rather than an IP address, you 
+    will not be able to see the content covered by this directive. If,
+    instead, you have a machine name, rather than an IP address, you
     can use that.</p>
 
-    <highlight language="config">Require not host <var>host.example.com</var></highlight>
+    <highlight language="config">
+Require not host <var>host.example.com</var>
+    </highlight>
 
     <p>And, if you'd like to block access from an entire domain,
     you can specify just part of an address or domain name:</p>
@@ -203,4 +205,3 @@ RewriteRule ^/fridge - [F]
 </section>
 
 </manualpage>
-

Modified: httpd/httpd/trunk/docs/manual/howto/auth.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/auth.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/auth.xml (original)
+++ httpd/httpd/trunk/docs/manual/howto/auth.xml Wed Apr 15 19:10:38 2015
@@ -127,7 +127,9 @@ module from each group.</p>
     an <directive module="core">AllowOverride</directive> directive like the
     following:</p>
 
-    <highlight language="config">AllowOverride AuthConfig</highlight>
+    <highlight language="config">
+AllowOverride AuthConfig
+    </highlight>
 
     <p>Or, if you are just going to put the directives directly in
     your main server configuration file, you will of course need to
@@ -322,7 +324,9 @@ Require group GroupName
     specific. Rather than creating a group file, you can just use
     the following directive:</p>
 
-    <highlight language="config">Require valid-user</highlight>
+    <highlight language="config">
+Require valid-user
+    </highlight>
 
     <p>Using that rather than the <code>Require user rbowen</code>
     line will allow anyone in that is listed in the password file,
@@ -503,12 +507,16 @@ Require group GroupName
         that will be called during the authorization stage of the request
         processing. For example:</p>
 
-        <highlight language="config">Require ip <var>address</var></highlight>
+        <highlight language="config">
+Require ip <var>address</var>
+        </highlight>
 
         <p>where <var>address</var> is an IP address (or a partial IP
         address) or:</p>
 
-        <highlight language="config">Require host <var>domain_name</var></highlight>
+        <highlight language="config">
+Require host <var>domain_name</var>
+        </highlight>
 
         <p>where <var>domain_name</var> is a fully qualified domain name
         (or a partial domain name); you may provide multiple addresses or
@@ -597,4 +605,3 @@ Require group GroupName
 </section>
 
 </manualpage>
-

Modified: httpd/httpd/trunk/docs/manual/howto/public_html.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/public_html.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/public_html.xml (original)
+++ httpd/httpd/trunk/docs/manual/howto/public_html.xml Wed Apr 15 19:10:38 2015
@@ -72,7 +72,9 @@
     assumed to be a directory path relative to the home directory of the
     specified user. Given this configuration:</p>
 
-    <highlight language="config">UserDir public_html</highlight>
+    <highlight language="config">
+UserDir public_html
+    </highlight>
 
     <p>the URL <code>http://example.com/~rbowen/file.html</code> will be
     translated to the file path
@@ -82,7 +84,9 @@
     constructed using that path, plus the username specified. Given this
     configuration:</p>
 
-    <highlight language="config">UserDir /var/html</highlight>
+    <highlight language="config">
+UserDir /var/html
+    </highlight>
 
     <p>the URL <code>http://example.com/~rbowen/file.html</code> will be
     translated to the file path <code>/var/html/rbowen/file.html</code></p>
@@ -91,7 +95,9 @@
     in which the asterisk is replaced with the username. Given this
     configuration:</p>
 
-    <highlight language="config">UserDir /var/www/*/docs</highlight>
+    <highlight language="config">
+UserDir /var/www/*/docs
+    </highlight>
 
     <p>the URL <code>http://example.com/~rbowen/file.html</code> will be
     translated to the file path
@@ -99,7 +105,9 @@
 
     <p>Multiple directories or directory paths can also be set.</p>
 
-    <highlight language="config">UserDir public_html /var/html</highlight>
+    <highlight language="config">
+UserDir public_html /var/html
+    </highlight>
 
     <p>For the URL <code>http://example.com/~rbowen/file.html</code>,
     Apache will search for <code>~rbowen</code>. If it isn't found,
@@ -114,7 +122,9 @@
     <p>The <directive module="mod_userdir">UserDir</directive> directive can be
       used to redirect user directory requests to external URLs.</p>
 
-    <highlight language="config">UserDir http://example.org/users/*/</highlight>
+    <highlight language="config">
+UserDir http://example.org/users/*/
+    </highlight>
 
     <p>The above example will redirect a request for
     <code>http://example.com/~bob/abc.html</code> to
@@ -128,7 +138,9 @@
     <p>Using the syntax shown in the UserDir documentation, you can restrict
     what users are permitted to use this functionality:</p>
 
-    <highlight language="config">UserDir disabled root jro fish</highlight>
+    <highlight language="config">
+UserDir disabled root jro fish
+    </highlight>
 
     <p>The configuration above will enable the feature for all users
     except for those listed in the <code>disabled</code> statement.

Modified: httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml (original)
+++ httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml Wed Apr 15 19:10:38 2015
@@ -248,11 +248,15 @@ DocumentRoot "/www/htdocs"
       penalties. There's one case where you can speed up the server.
       Instead of using a wildcard such as:</p>
 
-      <highlight language="config">DirectoryIndex index</highlight>
+      <highlight language="config">
+DirectoryIndex index
+      </highlight>
 
       <p>Use a complete list of options:</p>
 
-      <highlight language="config">DirectoryIndex index.cgi index.pl index.shtml index.html</highlight>
+      <highlight language="config">
+DirectoryIndex index.cgi index.pl index.shtml index.html
+      </highlight>
 
       <p>where you list the most common choice first.</p>
 
@@ -431,10 +435,10 @@ DocumentRoot "/www/htdocs"
         one connection at a time.  Worker generally is a good
         choice for high-traffic servers because it has a smaller
         memory footprint than the prefork MPM.</li>
-        
-        <li>The <module>event</module> MPM is threaded like the 
-        Worker MPM, but is designed to allow more requests to be 
-        served simultaneously by passing off some processing work 
+
+        <li>The <module>event</module> MPM is threaded like the
+        Worker MPM, but is designed to allow more requests to be
+        served simultaneously by passing off some processing work
         to supporting threads, freeing up the main threads to work
         on new requests.</li>
 
@@ -644,7 +648,7 @@ DocumentRoot "/www/htdocs"
           <strong>accept_mutex_on ();</strong>
           for (;;) {
             fd_set accept_fds;
-            
+
             FD_ZERO (&amp;accept_fds);
             for (i = first_socket; i &lt;= last_socket; ++i) {
               FD_SET (i, &amp;accept_fds);
@@ -776,7 +780,7 @@ DocumentRoot "/www/htdocs"
         void lingering_close (int s)
         {
           char junk_buffer[2048];
-          
+
           /* shutdown the sending side */
           shutdown (s, 1);
 
@@ -793,7 +797,7 @@ DocumentRoot "/www/htdocs"
               /* just toss away whatever is here */
             }
           }
-          
+
           close (s);
         }
       </highlight>
@@ -1013,4 +1017,3 @@ DocumentRoot "/www/htdocs"
   </section>
 
 </manualpage>
-

Modified: httpd/httpd/trunk/docs/manual/misc/security_tips.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/misc/security_tips.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/misc/security_tips.xml (original)
+++ httpd/httpd/trunk/docs/manual/misc/security_tips.xml Wed Apr 15 19:10:38 2015
@@ -117,7 +117,7 @@
 
       <li>The use of a threaded <a href="../mpm.html">mpm</a> may
       allow you to handle more simultaneous connections, thereby
-      mitigating DoS attacks.  Further, the 
+      mitigating DoS attacks.  Further, the
       <module>event</module> mpm
       uses asynchronous processing to avoid devoting a thread to each
       connection. Due to the nature of the OpenSSL library the
@@ -392,7 +392,9 @@
     recommend that you include the following line in your server
     configuration files:</p>
 
-    <highlight language="config">UserDir disabled root</highlight>
+    <highlight language="config">
+UserDir disabled root
+    </highlight>
 
   </section>
 
@@ -451,10 +453,10 @@
     directive specific.  Always test your changes when creating dependencies
     on how directives are merged.</p>
 
-    <p> For modules that don't implement any merging logic, such as 
+    <p> For modules that don't implement any merging logic, such as
     <directive>mod_access_compat</directive>, the behavior in later sections
     depends on whether the later section has any directives
-    from the module.  The configuration is inherited until a change is made, 
+    from the module.  The configuration is inherited until a change is made,
     at which point the configuration is <em>replaced</em> and not merged.</p>
   </section>
 

Modified: httpd/httpd/trunk/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml Wed Apr 15 19:10:38 2015
@@ -195,7 +195,9 @@ AcceptFilter https data
     configuration files are <a href="#allowoverride">enabled for that
     directory</a>. For example:</p>
 
-    <highlight language="config">AccessFileName .acl</highlight>
+    <highlight language="config">
+AccessFileName .acl
+    </highlight>
 
     <p>before returning the document
     <code>/usr/local/web/index.html</code>, the server will read
@@ -240,7 +242,9 @@ content-type is <code>text/plain</code>
     charset values</a> for use in Internet media types (MIME types).
     For example:</p>
 
-    <highlight language="config">AddDefaultCharset utf-8</highlight>
+    <highlight language="config">
+AddDefaultCharset utf-8
+    </highlight>
 
     <p><directive>AddDefaultCharset</directive> should only be used when all
     of the text resources to which it applies are known to be in that
@@ -464,7 +468,9 @@ NoDecode option available in 2.3.12 and
 
     <p>Example:</p>
 
-    <highlight language="config">AllowOverride AuthConfig Indexes</highlight>
+    <highlight language="config">
+AllowOverride AuthConfig Indexes
+    </highlight>
 
     <p>In the example above all directives that are neither in the group
     <code>AuthConfig</code> nor <code>Indexes</code> cause an internal
@@ -697,7 +703,9 @@ which no other media type configuration
     of configuration files, it may be specified with the value
     <code>none</code>, meaning no default media type. For example:</p>
 
-    <highlight language="config">DefaultType None</highlight>
+    <highlight language="config">
+DefaultType None
+    </highlight>
 
     <p><code>DefaultType None</code> is only available in
     httpd-2.2.7 and later.</p>
@@ -1115,7 +1123,9 @@ for a complete reference and more exampl
     <p>For server configurations that are vulnerable to these problems,
     you should disable memory-mapping of delivered files by specifying:</p>
 
-    <highlight language="config">EnableMMAP Off</highlight>
+    <highlight language="config">
+EnableMMAP Off
+    </highlight>
 
     <p>For NFS mounted files, this feature may be disabled explicitly for
     the offending files by specifying:</p>
@@ -1171,7 +1181,9 @@ version 2.3.9.</compatibility>
     <p>For server configurations that are not vulnerable to these problems,
     you may enable this feature by specifying:</p>
 
-    <highlight language="config">EnableSendfile On</highlight>
+    <highlight language="config">
+EnableSendfile On
+    </highlight>
 
     <p>For network mounted files, this feature may be disabled explicitly
     for the offending files by specifying:</p>
@@ -1351,13 +1363,17 @@ ErrorDocument 404 /cgi-bin/bad_urls.pl
     the <var>file-path</var> is not absolute then it is assumed to be
     relative to the <directive module="core">ServerRoot</directive>.</p>
 
-    <highlight language="config">ErrorLog "/var/log/httpd/error_log"</highlight>
+    <highlight language="config">
+ErrorLog "/var/log/httpd/error_log"
+    </highlight>
 
     <p>If the <var>file-path</var>
     begins with a pipe character "<code>|</code>" then it is assumed to be a
     command to spawn to handle the error log.</p>
 
-    <highlight language="config">ErrorLog "|/usr/local/bin/httpd_errors"</highlight>
+    <highlight language="config">
+ErrorLog "|/usr/local/bin/httpd_errors"
+    </highlight>
 
     <p>See the notes on <a href="../logs.html#piped">piped logs</a> for
     more information.</p>
@@ -1371,7 +1387,9 @@ ErrorDocument 404 /cgi-bin/bad_urls.pl
     in individual virtual hosts, the final facility specified affects the
     entire server.</p>
 
-    <highlight language="config">ErrorLog syslog:user</highlight>
+    <highlight language="config">
+ErrorLog syslog:user
+    </highlight>
 
     <p>Additional modules can provide their own ErrorLog providers. The syntax
     is similar to <code>syslog</code> example above.</p>
@@ -1672,7 +1690,9 @@ earlier.</compatibility>
      <dd>The number of bytes in the file will be included</dd>
      <dt><strong>All</strong></dt>
      <dd>All available fields will be used. This is equivalent to:
-         <highlight language="config">FileETag INode MTime Size</highlight></dd>
+         <highlight language="config">
+FileETag INode MTime Size
+         </highlight></dd>
      <dt><strong>None</strong></dt>
      <dd>If a document is file-based, no <code>ETag</code> field will be
        included in the response</dd>
@@ -1843,7 +1863,9 @@ media type in the HTTP Content-Type head
     GIF files, but did not want to label them all with <code>.gif</code>,
     you might want to use:</p>
 
-    <highlight language="config">ForceType image/gif</highlight>
+    <highlight language="config">
+ForceType image/gif
+    </highlight>
 
     <p>Note that this directive overrides other indirect media type
     associations defined in mime.types or via the
@@ -1953,7 +1975,9 @@ satisfied by a request at runtime</descr
     directives if and only if the expression evaluates to true.
     For example:</p>
 
-    <highlight language="config">&lt;If "-z req('Host')"&gt;</highlight>
+    <highlight language="config">
+&lt;If "-z req('Host')"&gt;
+    </highlight>
 
     <p>would match HTTP/1.0 requests without a <var>Host:</var> header.
     Expressions may contain various shell-like operators for string
@@ -1962,7 +1986,9 @@ satisfied by a request at runtime</descr
     and others (<code>-n</code>, <code>-z</code>, <code>-f</code>, ...).
     It is also possible to use regular expressions, </p>
 
-    <highlight language="config">&lt;If "%{QUERY_STRING} =~ /(delete|commit)=.*?elem/"&gt;</highlight>
+    <highlight language="config">
+&lt;If "%{QUERY_STRING} =~ /(delete|commit)=.*?elem/"&gt;
+    </highlight>
 
     <p>shell-like pattern matches and many other operations. These operations
     can be done on request headers (<code>req</code>), environment variables
@@ -2164,12 +2190,16 @@ Include conf/vhosts/*.conf
     path. This example will fail if there is no subdirectory in conf/vhosts
     that contains at least one *.conf file:</p>
 
-    <highlight language="config">Include conf/vhosts/*/*.conf</highlight>
+    <highlight language="config">
+Include conf/vhosts/*/*.conf
+    </highlight>
 
     <p>Alternatively, the following command will just be ignored in case of
     missing files or directories:</p>
 
-    <highlight language="config">IncludeOptional conf/vhosts/*/*.conf</highlight>
+    <highlight language="config">
+IncludeOptional conf/vhosts/*/*.conf
+    </highlight>
 
 </usage>
 
@@ -2406,7 +2436,9 @@ subrequests</description>
     determines, how deep subrequests may be nested. If you specify only one
     <var>number</var>, it will be assigned to both limits.</p>
 
-    <highlight language="config">LimitInternalRecursion 5</highlight>
+    <highlight language="config">
+LimitInternalRecursion 5
+    </highlight>
 </usage>
 </directivesynopsis>
 
@@ -2449,7 +2481,9 @@ from the client</description>
     location, and wish to limit the size of the uploaded file to 100K,
     you might use the following directive:</p>
 
-    <highlight language="config">LimitRequestBody 102400</highlight>
+    <highlight language="config">
+LimitRequestBody 102400
+    </highlight>
 
     <note><p>For a full description of how this directive is interpreted by
     proxy requests, see the <module>mod_proxy</module> documentation.</p>
@@ -2492,7 +2526,9 @@ will be accepted from the client</descri
 
     <p>For example:</p>
 
-    <highlight language="config">LimitRequestFields 50</highlight>
+    <highlight language="config">
+LimitRequestFields 50
+    </highlight>
 
      <note type="warning"><title>Warning</title>
      <p> When name-based virtual hosting is used, the value for this
@@ -2531,7 +2567,9 @@ client</description>
 
     <p>For example:</p>
 
-    <highlight language="config">LimitRequestFieldSize 4094</highlight>
+    <highlight language="config">
+LimitRequestFieldSize 4094
+    </highlight>
 
     <note>Under normal conditions, the value should not be changed from
     the default.</note>
@@ -2572,7 +2610,9 @@ from the client</description>
 
     <p>For example:</p>
 
-    <highlight language="config">LimitRequestLine 4094</highlight>
+    <highlight language="config">
+LimitRequestLine 4094
+    </highlight>
 
     <note>Under normal conditions, the value should not be changed from
     the default.</note>
@@ -2601,7 +2641,9 @@ from the client</description>
 
     <p>Example:</p>
 
-    <highlight language="config">LimitXMLRequestBody 0</highlight>
+    <highlight language="config">
+LimitXMLRequestBody 0
+    </highlight>
 
 </usage>
 </directivesynopsis>
@@ -2970,7 +3012,9 @@ matching URLs</description>
 
     <p>For example:</p>
 
-    <highlight language="config">LogLevel notice</highlight>
+    <highlight language="config">
+LogLevel notice
+    </highlight>
 
     <note><title>Note</title>
       <p>When logging to a regular file messages of the level
@@ -3085,7 +3129,9 @@ connection</description>
 
     <p>For example:</p>
 
-    <highlight language="config">MaxKeepAliveRequests 500</highlight>
+    <highlight language="config">
+MaxKeepAliveRequests 500
+    </highlight>
 </usage>
 </directivesynopsis>
 
@@ -3626,7 +3672,9 @@ directory</description>
 
     <p>For example, if you are running <code>https</code> on a non-standard port, specify the protocol explicitly:</p>
 
-    <highlight language="config">Protocol https</highlight>
+    <highlight language="config">
+Protocol https
+    </highlight>
 
     <p>You can also specify the protocol using the <directive module="mpm_common">Listen</directive> directive.</p>
 </usage>
@@ -3859,7 +3907,9 @@ messages sent to the client</description
 
     <p>It may be worth setting up a dedicated address for this, e.g.</p>
 
-    <highlight language="config">ServerAdmin www-admin@foo.example.com</highlight>
+    <highlight language="config">
+ServerAdmin www-admin@foo.example.com
+    </highlight>
     <p>as users do not always mention that they are talking about the
     server!</p>
 </usage>
@@ -3896,7 +3946,7 @@ to name-virtual hosts</description>
     (nor for ServerName vs. ServerAlias).  </p>
 
     <p>The complete list of names in the <directive>VirtualHost</directive>
-    directive are treated just like a (non wildcard) 
+    directive are treated just like a (non wildcard)
     <directive>ServerAlias</directive>.</p>
 
 </usage>
@@ -3929,7 +3979,9 @@ itself</description>
     and you wish the web server to be so identified, the following
     directive should be used:</p>
 
-    <highlight language="config">ServerName www.example.com</highlight>
+    <highlight language="config">
+ServerName www.example.com
+    </highlight>
 
     <p>The <directive>ServerName</directive> directive
     may appear anywhere within the definition of a server. However,
@@ -3939,7 +3991,7 @@ itself</description>
     <p>If no <directive>ServerName</directive> is specified, then the
     server attempts to deduce the client visible hostname by performing a
     reverse lookup on an IP address of the systems hostname.</p>
-    
+
     <p>If no port is specified in the
     <directive>ServerName</directive>, then the server will use the
     port from the incoming request. For optimal reliability and
@@ -4023,7 +4075,9 @@ is accessed by an incompatible browser</
     module="mod_so">LoadModule</directive>, for example) are taken as
     relative to this directory.</p>
 
-    <highlight language="config">ServerRoot "/home/httpd"</highlight>
+    <highlight language="config">
+ServerRoot "/home/httpd"
+    </highlight>
 
     <p>The default location of <directive>ServerRoot</directive> may be
     modified by using the <code>--prefix</code> argument to
@@ -4162,7 +4216,9 @@ handler</description>
     of extension, you might put the following into an
     <code>.htaccess</code> file in that directory:</p>
 
-    <highlight language="config">SetHandler imap-file</highlight>
+    <highlight language="config">
+SetHandler imap-file
+    </highlight>
 
     <p>Another example: if you wanted to have the server display a
     status report whenever a URL of
@@ -4278,7 +4334,7 @@ certain events before failing a request<
       for an acknowledgement of a packet if the send buffer is
       full.</li>
 
-      <li>In <module>mod_cgi</module> and <module>mod_cgid</module>, 
+      <li>In <module>mod_cgi</module> and <module>mod_cgid</module>,
       the length of time to wait for output from a CGI script.</li>
 
       <li>In <module>mod_ext_filter</module>, the length of time to
@@ -4625,8 +4681,8 @@ for external processing, e.g. to a CGI s
 
 <usage>
     <p>This directive controls whether HTTP trailers are copied into the
-    internal representation of HTTP headers. This mergeing occurs when the 
-    request body has been completely consumed, long after most header 
+    internal representation of HTTP headers. This mergeing occurs when the
+    request body has been completely consumed, long after most header
     processing would have a chance to examine or modify request headers.</p>
     <p>This option is provided for compatibility with releases prior to 2.4.10,
     where trailers were always merged.</p>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_asis.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_asis.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_asis.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_asis.xml Wed Apr 15 19:10:38 2015
@@ -51,7 +51,9 @@ HTTP headers</description>
     <p>In the server configuration file, associate files with the
     <code>send-as-is</code> handler <em>e.g.</em></p>
 
-    <highlight language="config">AddHandler send-as-is asis</highlight>
+    <highlight language="config">
+AddHandler send-as-is asis
+    </highlight>
 
     <p>The contents of any file with a <code>.asis</code> extension
     will then be sent by Apache httpd to the client with almost no

Modified: httpd/httpd/trunk/docs/manual/mod/mod_authnz_ldap.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_authnz_ldap.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authnz_ldap.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authnz_ldap.xml Wed Apr 15 19:10:38 2015
@@ -566,7 +566,8 @@ Require valid-user
         The next example is the same as above; but with the fields
         that have useful defaults omitted. Also, note the use of a
         redundant LDAP server.
-<highlight language="config">AuthLDAPURL "ldap://ldap1.example.com ldap2.example.com/ou=People, o=Example"
+<highlight language="config">
+AuthLDAPURL "ldap://ldap1.example.com ldap2.example.com/ou=People, o=Example"
 Require valid-user
 </highlight>
       </li>
@@ -926,8 +927,12 @@ to perform a DN lookup</description>
         <directive module="mod_authnz_ldap">AuthLDAPBindDN</directive>.
     </p>
 
-    <highlight language="config"> AuthLDAPInitialBindPattern (.+) $1@example.com </highlight>
-    <highlight language="config"> AuthLDAPInitialBindPattern (.+) cn=$1,dc=example,dc=com</highlight>
+    <highlight language="config">
+AuthLDAPInitialBindPattern (.+) $1@example.com
+    </highlight>
+    <highlight language="config">
+AuthLDAPInitialBindPattern (.+) cn=$1,dc=example,dc=com
+    </highlight>
 
     <note><title>Not available with authorization-only</title>
         This directive can only be used if this module authenticates the user, and
@@ -1157,8 +1162,8 @@ evaluated before the user search is disc
    <note><title>Nested groups performance</title>
    <p> When <directive>AuthLDAPSubGroupAttribute</directive> overlaps with
    <directive>AuthLDAPGroupAttribute</directive> (as it does by default and
-   as required by common LDAP schemas), uncached searching for subgroups in 
-   large groups can be very slow. If you use large, non-nested groups, keep 
+   as required by common LDAP schemas), uncached searching for subgroups in
+   large groups can be very slow. If you use large, non-nested groups, keep
    <directive>AuthLDAPMaxSubGroupDepth</directive> set to zero.</p>
    </note>
 
@@ -1186,7 +1191,7 @@ query to set the REMOTE_USER environment
     directive is useful should you want people to log into a website
     using an email address, but a backend application expects the
     username as a userid.</p>
-    <p> This directive only has effect when this module is used for 
+    <p> This directive only has effect when this module is used for
     authentication.</p>
 </usage>
 </directivesynopsis>
@@ -1307,7 +1312,9 @@ objects that are groups during sub-group
     to use. The syntax of the URL is</p>
 <example>ldap://host:port/basedn?attribute?scope?filter</example>
     <p>If you want to specify more than one LDAP URL that Apache should try in turn, the syntax is:</p>
-<highlight language="config">AuthLDAPUrl "ldap://ldap1.example.com ldap2.example.com/dc=..."</highlight>
+<highlight language="config">
+AuthLDAPUrl "ldap://ldap1.example.com ldap2.example.com/dc=..."
+</highlight>
 <p><em><strong>Caveat: </strong>If you specify multiple servers, you need to enclose the entire URL string in quotes;
 otherwise you will get an error: "AuthLDAPURL takes one argument, URL to define LDAP connection.." </em>
 You can of course use search parameters on each of these.</p>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_cern_meta.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_cern_meta.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cern_meta.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cern_meta.xml Wed Apr 15 19:10:38 2015
@@ -81,12 +81,16 @@ files</description>
     accessed. Set to "<code>.</code>" to look in the same directory
     as the file:</p>
 
-    <highlight language="config">MetaDir .</highlight>
+    <highlight language="config">
+MetaDir .
+    </highlight>
 
     <p>Or, to set it to a subdirectory of the directory containing the
     files:</p>
 
-    <highlight language="config">MetaDir .meta</highlight>
+    <highlight language="config">
+MetaDir .meta
+    </highlight>
 </usage>
 </directivesynopsis>
 

Modified: httpd/httpd/trunk/docs/manual/mod/mod_filter.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_filter.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_filter.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_filter.xml Wed Apr 15 19:10:38 2015
@@ -404,10 +404,10 @@ for a complete reference and examples.</
     With two arguments it applies to a <var>filter-name</var> whenever the
     filter runs <em>any</em> provider.</p>
 
-    <p>Flags specified with this directive are merged with the flags 
-    that underlying providers may have registerd with 
+    <p>Flags specified with this directive are merged with the flags
+    that underlying providers may have registerd with
     <module>mod_filter</module>. For example, a filter may internally specify
-    the equivalent of <code>change=yes</code>, but a particular 
+    the equivalent of <code>change=yes</code>, but a particular
     configuration of the module can override with <code>change=no</code>.
     </p>
 
@@ -415,7 +415,7 @@ for a complete reference and examples.</
 
     <dl>
     <dt><code>change=yes|no</code></dt>
-    <dd>Specifies whether the filter changes the content, including possibly 
+    <dd>Specifies whether the filter changes the content, including possibly
     the content length.  The "no" argument is supported in 2.4.7 and later.</dd>
 
     <dt><code>change=1:1</code></dt>
@@ -474,4 +474,3 @@ for a complete reference and examples.</
 </directivesynopsis>
 
 </modulesynopsis>
-

Modified: httpd/httpd/trunk/docs/manual/mod/mod_imagemap.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_imagemap.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_imagemap.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_imagemap.xml Wed Apr 15 19:10:38 2015
@@ -40,11 +40,15 @@
     <p>The following directive will activate files ending with
     <code>.map</code> as imagemap files:</p>
 
-    <highlight language="config">AddHandler imap-file map</highlight>
+    <highlight language="config">
+AddHandler imap-file map
+    </highlight>
 
     <p>Note that the following is still supported:</p>
 
-    <highlight language="config">AddType application/x-httpd-imap map</highlight>
+    <highlight language="config">
+AddType application/x-httpd-imap map
+    </highlight>
 
     <p>However, we are trying to phase out "magic MIME types" so we
     are deprecating this method.</p>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_journald.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_journald.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_journald.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_journald.xml Wed Apr 15 19:10:38 2015
@@ -75,7 +75,9 @@
     if the system supports it.
     </p>
     
-    <highlight language="config">ErrorLog journald</highlight>
+    <highlight language="config">
+ErrorLog journald
+    </highlight>
 
 </section>
 

Modified: httpd/httpd/trunk/docs/manual/mod/mod_mime.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_mime.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_mime.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_mime.xml Wed Apr 15 19:10:38 2015
@@ -192,7 +192,9 @@ module="mod_mime_magic">MimeMagicFile</d
     resource, in order to tell the client browser about the
     encoding method.</p>
 
-    <highlight language="config">Content-encoding: pkzip</highlight>
+    <highlight language="config">
+Content-encoding: pkzip
+    </highlight>
 </section>
 
 <section id="charset-lang"><title>Character sets and languages</title>
@@ -364,7 +366,7 @@ handler</description>
     might use:</p>
 
     <highlight language="config">
-      AddHandler cgi-script .cgi
+AddHandler cgi-script .cgi
     </highlight>
 
     <p>Once that has been put into your httpd.conf file, any file containing
@@ -497,7 +499,7 @@ responses from the server</description>
     compress the output using <module>mod_deflate</module>.</p>
 
     <highlight language="config">
-      AddOutputFilter INCLUDES;DEFLATE shtml
+AddOutputFilter INCLUDES;DEFLATE shtml
     </highlight>
 
     <p>If more than one filter is specified, they must be separated
@@ -568,16 +570,16 @@ type</description>
 
     <example><title>Example</title>
     <highlight language="config">
-      AddType image/gif .gif
-      </highlight>
+AddType image/gif .gif
+    </highlight>
     </example>
 
     <p>Or, to specify multiple file extensions in one directive:</p>
 
     <example><title>Example</title>
     <highlight language="config">
-      AddType image/jpeg jpeg jpg jpe
-      </highlight>
+AddType image/jpeg jpeg jpg jpe
+    </highlight>
     </example>
 
     <p>The <var>extension</var> argument is case-insensitive and can
@@ -593,8 +595,8 @@ type</description>
 
     <example><title>Example</title>
     <highlight language="config">
-      AddType application/rss+xml;qs=0.8 .xml
-      </highlight>
+AddType application/rss+xml;qs=0.8 .xml
+    </highlight>
     </example>
 
     <p>This is useful in situations, <em>e.g.</em> when a client
@@ -658,7 +660,7 @@ a matching file with MultiViews</descrip
     files:</p>
 
     <highlight language="config">
-      MultiviewsMatch Handlers Filters
+MultiviewsMatch Handlers Filters
     </highlight>
 
     <p><directive>MultiviewsMatch</directive> is not allowed in a
@@ -700,8 +702,8 @@ assigned a language-tag by some other me
 
     <example><title>Example</title>
     <highlight language="config">
-      DefaultLanguage en
-      </highlight>
+DefaultLanguage en
+    </highlight>
     </example>
 </usage>
 <seealso><module>mod_negotiation</module></seealso>
@@ -726,8 +728,8 @@ components as part of the filename</desc
 
     <example><title>Example</title>
     <highlight language="config">
-      ModMimeUsePathInfo On
-      </highlight>
+ModMimeUsePathInfo On
+    </highlight>
     </example>
 
     <p>If you have a request for <code>/index.php/foo.shtml</code>
@@ -765,8 +767,8 @@ extensions</description>
 
     <example><title>Example</title>
     <highlight language="config">
-      RemoveCharset .html .shtml
-      </highlight>
+RemoveCharset .html .shtml
+    </highlight>
     </example>
 </usage>
 </directivesynopsis>
@@ -833,14 +835,14 @@ extensions</description>
 
     <example><title>/foo/.htaccess:</title>
     <highlight language="config">
-      AddHandler server-parsed .html
-      </highlight>
+AddHandler server-parsed .html
+    </highlight>
     </example>
 
     <example><title>/foo/bar/.htaccess:</title>
     <highlight language="config">
-      RemoveHandler .html
-      </highlight>
+RemoveHandler .html
+    </highlight>
     </example>
 
     <p>This has the effect of returning <code>.html</code> files in
@@ -923,8 +925,8 @@ extensions</description>
 
     <example><title>Example</title>
     <highlight language="config">
-      RemoveOutputFilter shtml
-      </highlight>
+RemoveOutputFilter shtml
+    </highlight>
     </example>
 </usage>
 <seealso><directive module="mod_mime">AddOutputFilter</directive></seealso>
@@ -950,8 +952,8 @@ extensions</description>
 
     <example><title>/foo/.htaccess:</title>
     <highlight language="config">
-      RemoveType .cgi
-      </highlight>
+RemoveType .cgi
+    </highlight>
     </example>
 
     <p>This will remove any special handling of <code>.cgi</code>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml Wed Apr 15 19:10:38 2015
@@ -451,7 +451,7 @@ ProxyPass "/examples" "http://backend.ex
     other request headers.</p>
 
     <p>Note:  If you need to specify custom request headers to be
-    added to the forwarded request, use the 
+    added to the forwarded request, use the
     <directive module="mod_headers">RequestHeader</directive>
     directive.</p>
 
@@ -484,7 +484,7 @@ ProxyPass "/examples" "http://backend.ex
     directory of <code>example.com</code> through the <code>INCLUDES</code>
     filter when they are sent through the proxy server:</p>
 
-   <highlight language="config">    
+   <highlight language="config">
 &lt;Proxy http://example.com/foo/*&gt;
   SetOutputFilter INCLUDES
 &lt;/Proxy&gt;
@@ -503,14 +503,14 @@ ProxyPass "/examples" "http://backend.ex
    </highlight>
 
     <note><title>Differences from the Location configuration section</title>
-      <p>A backend URL matches the configuration section if it begins with the 
+      <p>A backend URL matches the configuration section if it begins with the
       the <var>wildcard-url</var> string, even if the last path segment in the
-      directive only matches a prefix of the backend URL.  For example, 
-      &lt;Proxy http://example.com/foo&gt; matches all of 
-      http://example.com/foo, http://example.com/foo/bar, and 
+      directive only matches a prefix of the backend URL.  For example,
+      &lt;Proxy http://example.com/foo&gt; matches all of
+      http://example.com/foo, http://example.com/foo/bar, and
       http://example.com/foobar.  The matching of the final URL differs
       from the behavior of the <directive type="section" module="core"
-      >Location</directive> section, which for purposes of this note 
+      >Location</directive> section, which for purposes of this note
       treats the final path component as if it ended in a slash.</p>
       <p>For more control over the matching, see <directive type="section"
       >ProxyMatch</directive>.</p>
@@ -860,7 +860,7 @@ expressions</description>
     a local virtual path; <var>url</var> is a partial URL for the
     remote server and cannot include a query string.</p>
 
-    <note><strong>Note: </strong>This directive cannot be used within a 
+    <note><strong>Note: </strong>This directive cannot be used within a
     <code>&lt;Directory&gt;</code> context.</note>
 
     <note type="warning">The <directive
@@ -1205,7 +1205,7 @@ ProxyPass "/example" "http://backend.exa
     <tr><td>stickysessionsep</td>
         <td>"."</td>
         <td>Sets the separation symbol in the session cookie. Some backend application servers
-        do not use the '.' as the symbol. For example the Oracle Weblogic server uses 
+        do not use the '.' as the symbol. For example the Oracle Weblogic server uses
         '!'. The correct symbol can be set using this option. The setting of 'Off'
         signifies that no symbol is used.
     </td></tr>
@@ -1359,9 +1359,9 @@ ProxyPassReverse  "/mirror/foo/" "https:
        matches, the server will substitute any parenthesized matches into the given
        string and use it as a new <var>url</var>.</p>
 
-    <note><strong>Note: </strong>This directive cannot be used within a 
+    <note><strong>Note: </strong>This directive cannot be used within a
     <code>&lt;Directory&gt;</code> context.</note>
-    
+
     <p>Suppose the local server has address <code>http://example.com/</code>;
     then</p>
 
@@ -1533,7 +1533,7 @@ reverse proxy. This directive rewrites t
 <var>internal-path</var>, the cookie path will be replaced with
 <var>public-path</var>.
 </p><p>
-In the example given with 
+In the example given with
 <directive module="mod_proxy">ProxyPassReverse</directive>, the directive:
 </p>
     <highlight language="config">

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy_ftp.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_ftp.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_ftp.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_ftp.xml Wed Apr 15 19:10:38 2015
@@ -59,7 +59,9 @@
       </example>
     <p>Alternatively you may prefer to default everything to binary:</p>
       <example>
-        <highlight language="config">ForceType application/octet-stream</highlight>
+        <highlight language="config">
+ForceType application/octet-stream
+        </highlight>
       </example>
     </section> <!-- /mimetypes -->
 

Modified: httpd/httpd/trunk/docs/manual/mod/mod_so.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_so.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_so.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_so.xml Wed Apr 15 19:10:38 2015
@@ -145,7 +145,9 @@ Windows</compatibility>
 
     <p>For example:</p>
 
-    <highlight language="config">LoadFile libexec/libxmlparse.so</highlight>
+    <highlight language="config">
+LoadFile "libexec/libxmlparse.so"
+    </highlight>
 
 </usage>
 </directivesynopsis>
@@ -170,7 +172,7 @@ of active modules</description>
     in the module documentation. Example:</p>
 
     <highlight language="config">
-      LoadModule status_module modules/mod_status.so
+LoadModule status_module "modules/mod_status.so"
     </highlight>
 
     <p>loads the named module from the modules subdirectory of the
@@ -179,4 +181,3 @@ of active modules</description>
 
 </directivesynopsis>
 </modulesynopsis>
-

Modified: httpd/httpd/trunk/docs/manual/mod/mod_syslog.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_syslog.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_syslog.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_syslog.xml Wed Apr 15 19:10:38 2015
@@ -46,7 +46,9 @@
     in individual virtual hosts, the final facility specified affects the
     entire server.</p>
     
-    <highlight language="config">ErrorLog syslog:user</highlight>
+    <highlight language="config">
+ErrorLog syslog:user
+    </highlight>
 
 </section>
 

Modified: httpd/httpd/trunk/docs/manual/mod/mod_xml2enc.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_xml2enc.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_xml2enc.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_xml2enc.xml Wed Apr 15 19:10:38 2015
@@ -132,7 +132,9 @@ module for earlier versions.</compatibil
     information, you can set this default to help mod_xml2enc process
     the data correctly.  For example, to work with the default value
     of Latin1 (<var>iso-8859-1</var> specified in HTTP/1.0, use</p>
-    <highlight language="config">xml2EncDefault iso-8859-1</highlight>
+    <highlight language="config">
+xml2EncDefault iso-8859-1
+    </highlight>
 </usage>
 </directivesynopsis>
 

Modified: httpd/httpd/trunk/docs/manual/rewrite/flags.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/flags.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/flags.xml (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/flags.xml Wed Apr 15 19:10:38 2015
@@ -46,10 +46,12 @@ providing detailed explanations and exam
 its behavior modified by one or more flags. Flags are included in
 square brackets at the end of the rule, and multiple flags are separated
 by commas.</p>
-<highlight language="config">RewriteRule pattern target [Flag1,Flag2,Flag3]</highlight>
+<highlight language="config">
+RewriteRule pattern target [Flag1,Flag2,Flag3]
+</highlight>
 
 <p>Each flag (with a few exceptions) has a short form, such as
-<code>CO</code>, as well as a longer form, such as <code>cookie</code>. 
+<code>CO</code>, as well as a longer form, such as <code>cookie</code>.
 While it is most common to use
 the short form, it is recommended that you familiarize yourself with the
 long form, so that you remember what each flag is supposed to do.
@@ -68,9 +70,9 @@ of how you might use them.</p>
 <p>The [B] flag instructs <directive
 module="mod_rewrite">RewriteRule</directive> to escape non-alphanumeric
 characters before applying the transformation.</p>
-<p>In 2.4.10 and later, you can limit the escaping to specific characters 
-in backreferences by listing them: <code>[B=#?;]</code>. Note: The space 
-character can be used in the list of characters to escape, but it cannot be 
+<p>In 2.4.10 and later, you can limit the escaping to specific characters
+in backreferences by listing them: <code>[B=#?;]</code>. Note: The space
+character can be used in the list of characters to escape, but it cannot be
 the last character in the list.</p>
 
 <p><code>mod_rewrite</code> has to unescape URLs before mapping them,
@@ -78,7 +80,9 @@ so backreferences are unescaped at the t
 Using the B flag, non-alphanumeric characters in backreferences
 will be escaped. For example, consider the rule:</p>
 
-<highlight language="config">RewriteRule ^search/(.*)$ /search.php?term=$1</highlight>
+<highlight language="config">
+RewriteRule ^search/(.*)$ /search.php?term=$1
+</highlight>
 
 <p>Given a search term of 'x &amp; y/z', a browser will encode it as
 'x%20%26%20y%2Fz', making the request 'search/x%20%26%20y%2Fz'. Without the B
@@ -106,7 +110,7 @@ strings in the encoded form.</p>
 <section id="flag_bnp"><title>BNP|backrefnoplus (don't escape space to +)</title>
 <p>The [BNP] flag instructs <directive
 module="mod_rewrite">RewriteRule</directive> to escape the space character
-in a backreference to %20 rather than '+'. Useful when the backreference 
+in a backreference to %20 rather than '+'. Useful when the backreference
 will be used in the path component rather than the query string.</p>
 </section>
 
@@ -272,7 +276,7 @@ module="mod_setenvif">SetEnvIf</directiv
 an example, not as a recommendation.</p>
 </section>
 
-<section id="flag_end"><title>END</title> 
+<section id="flag_end"><title>END</title>
 <p>Using the [END] flag terminates not only the current round of rewrite
 processing (like [L]) but also prevents any subsequent rewrite
 processing from occurring in per-directory (htaccess) context.</p>
@@ -290,7 +294,9 @@ allows more flexibility in assigning a F
 <p>The following rule will forbid <code>.exe</code> files from being
 downloaded from your server.</p>
 
-<highlight language="config">RewriteRule \.exe - [F]</highlight>
+<highlight language="config">
+RewriteRule \.exe - [F]
+</highlight>
 
 <p>This example uses the "-" syntax for the rewrite target, which means
 that the requested URI is not modified. There's no reason to rewrite to
@@ -309,7 +315,9 @@ longer available.</p>
 <p>As with the [F] flag, you will typically use the "-" syntax for the
 rewrite target when using the [G] flag:</p>
 
-<highlight language="config">RewriteRule oldproduct - [G,NC]</highlight>
+<highlight language="config">
+RewriteRule oldproduct - [G,NC]
+</highlight>
 
 <p>When using [G], an [L] is implied - that is, the response is returned
 immediately, and no further rules are evaluated.</p>
@@ -321,7 +329,9 @@ immediately, and no further rules are ev
 handler. For example, one might use this to force all files without a
 file extension to be parsed by the php handler:</p>
 
-<highlight language="config">RewriteRule !\. - [H=application/x-httpd-php]</highlight>
+<highlight language="config">
+RewriteRule !\. - [H=application/x-httpd-php]
+</highlight>
 
 <p>
 The regular expression above - <code>!\.</code> - will match any request
@@ -405,14 +415,16 @@ certain string or letter repeatedly in a
 will replace A with B everywhere in a request, and will continue doing
 so until there are no more As to be replaced.
 </p>
-<highlight language="config">RewriteRule (.*)A(.*) $1B$2 [N]</highlight>
+<highlight language="config">
+RewriteRule (.*)A(.*) $1B$2 [N]
+</highlight>
 <p>You can think of this as a <code>while</code> loop: While this
 pattern still matches (i.e., while the URI still contains an
 <code>A</code>), perform this substitution (i.e., replace the
 <code>A</code> with a <code>B</code>).</p>
 
 <p>In 2.5.0 and later, this module returns an error after 10,000 iterations to
-protect against unintended looping.  An alternative maximum number of 
+protect against unintended looping.  An alternative maximum number of
 iterations can be specified by adding to the N flag.  </p>
 <highlight language="config">
 # Be willing to replace 1 character in each pass of the loop
@@ -434,7 +446,9 @@ to your dedicated image server. The matc
 <code>.jpg</code> and <code>.JPG</code> files are both acceptable, for
 example.</p>
 
-<highlight language="config">RewriteRule (.*\.(jpg|gif|png))$ http://images.example.com$1 [P,NC]</highlight>
+<highlight language="config">
+RewriteRule (.*\.(jpg|gif|png))$ http://images.example.com$1 [P,NC]
+</highlight>
 </section>
 
 <section id="flag_ne"><title>NE|noescape</title>
@@ -443,7 +457,9 @@ example.</p>
 equivalent. Using the [NE] flag prevents that from happening.
 </p>
 
-<highlight language="config">RewriteRule ^/anchor/(.+) /bigpage.html#$1 [NE,R]</highlight>
+<highlight language="config">
+RewriteRule ^/anchor/(.+) /bigpage.html#$1 [NE,R]
+</highlight>
 
 <p>
 The above example will redirect <code>/anchor/xyz</code> to
@@ -484,7 +500,9 @@ requests.
 example, if you wanted all image requests to be handled by a back-end
 image server, you might do something like the following:</p>
 
-<highlight language="config">RewriteRule /(.*)\.(jpg|gif|png)$ http://images.example.com/$1.$2 [P]</highlight>
+<highlight language="config">
+RewriteRule /(.*)\.(jpg|gif|png)$ http://images.example.com/$1.$2 [P]
+</highlight>
 
 <p>Use of the [P] flag implies [L] - that is, the request is immediately
 pushed through the proxy, and any following rules will not be
@@ -578,7 +596,9 @@ Using the [QSA] flag causes the query st
 
 <p>Consider the following rule:</p>
 
-<highlight language="config">RewriteRule /pages/(.+) /page.php?page=$1 [QSA]</highlight>
+<highlight language="config">
+RewriteRule /pages/(.+) /page.php?page=$1 [QSA]
+</highlight>
 
 <p>With the [QSA] flag, a request for <code>/pages/123?one=two</code> will be
 mapped to <code>/page.php?page=123&amp;one=two</code>. Without the [QSA]
@@ -625,7 +645,7 @@ will be used to generate the URL sent wi
 <em>Any</em> valid HTTP response  status code may be specified,
 using the syntax [R=305], with a 302 status code being used by
 default if none is specified. The status code specified need not
-necessarily be a redirect (3xx) status code. However, 
+necessarily be a redirect (3xx) status code. However,
 if a status code is outside the redirect range (300-399) then the
 substitution string is dropped entirely, and rewriting is stopped as if
 the <code>L</code> were used.</p>
@@ -645,14 +665,14 @@ URI in request' warnings.
 </section>
 
 <section id="flag_s"><title>S|skip</title>
-<p>The [S] flag is used to skip rules that you don't want to run. The 
-syntax of the skip flag is [S=<em>N</em>], where <em>N</em> signifies 
+<p>The [S] flag is used to skip rules that you don't want to run. The
+syntax of the skip flag is [S=<em>N</em>], where <em>N</em> signifies
 the number of rules to skip (provided the <directive module="mod_rewrite">
 RewriteRule</directive> and any preceding <directive module="mod_rewrite">
-RewriteCond</directive> directives match). This can be thought of as a 
-<code>goto</code> statement in your rewrite ruleset. In the following 
+RewriteCond</directive> directives match). This can be thought of as a
+<code>goto</code> statement in your rewrite ruleset. In the following
 example, we only want to run the <directive module="mod_rewrite">
-RewriteRule</directive> if the requested URI doesn't correspond with an 
+RewriteRule</directive> if the requested URI doesn't correspond with an
 actual file.</p>
 
 <highlight language="config">
@@ -738,4 +758,3 @@ The <code>L</code> flag can be useful in
 </section>
 
 </manualpage>
-

Modified: httpd/httpd/trunk/docs/manual/rewrite/remapping.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/remapping.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/remapping.xml (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/remapping.xml Wed Apr 15 19:10:38 2015
@@ -477,7 +477,9 @@ com       http://www.example.com/<br />
        we replace <code>/puppies</code> and <code>/canines</code>
        by the canonical <code>/dogs</code>.</p>
 
-<highlight language="config">RewriteRule   ^/(puppies|canines)/(.*)    /dogs/$2  [R]</highlight>
+<highlight language="config">
+RewriteRule   ^/(puppies|canines)/(.*)    /dogs/$2  [R]
+</highlight>
         </dd>
 
      <dt>Discussion:</dt>
@@ -605,7 +607,7 @@ of the URL.</dd>
 <p> Many of the solutions in this section will all use the same condition,
 which leaves the matched value in the %2 backreference.  %1 is the beginining
 of the query string (up to the key of intererest), and %3 is the remainder. This
-condition is a bit complex for flexibility and to avoid double '&amp;&amp;' in the 
+condition is a bit complex for flexibility and to avoid double '&amp;&amp;' in the
 substitutions.</p>
 <ul>
   <li>This solution removes the matching key and value:
@@ -632,7 +634,7 @@ RewriteRule (.*) $1/products/%2/? [PT]
 <highlight language="config">
 # Capture the value of mykey in the query string
 RewriteCond %{QUERY_STRING} (.*(?:^|&amp;))mykey=([^&amp;]*)&amp;?(.*)&amp;?$
-RewriteCond %2 !=not-so-secret-value 
+RewriteCond %2 !=not-so-secret-value
 RewriteRule (.*) - [F]
 </highlight>
   </li>
@@ -640,7 +642,7 @@ RewriteRule (.*) - [F]
   <li>This solution shows the reverse of the previous ones, copying
       path components (perhaps PATH_INFO) from the URL into the query string.
 <highlight language="config">
-# The desired URL might be /products/kitchen-sink, and the script expects 
+# The desired URL might be /products/kitchen-sink, and the script expects
 # /path?products=kitchen-sink.
 RewriteRule ^/?path/([^/]+)/([^/]+) /path?$1=$2 [PT]
 </highlight>

Modified: httpd/httpd/trunk/docs/manual/rewrite/rewritemap.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/rewritemap.xml?rev=1673932&r1=1673931&r2=1673932&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/rewritemap.xml (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/rewritemap.xml Wed Apr 15 19:10:38 2015
@@ -60,7 +60,9 @@ configuration.</note>
    <p>The syntax of the <code>RewriteMap</code> directive is as
    follows:</p>
 
-<highlight language="config">RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em></highlight>
+<highlight language="config">
+RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
+</highlight>
 
     <p>The <a id="mapfunc" name="mapfunc"><em>MapName</em></a> is an
     arbitray name that you assign to the map, and which you will use in
@@ -84,15 +86,21 @@ configuration.</note>
 
     <p>For example, you can define a
       <directive>RewriteMap</directive> as:</p>
-    <highlight language="config">RewriteMap examplemap txt:/path/to/file/map.txt</highlight>
+    <highlight language="config">
+RewriteMap examplemap txt:/path/to/file/map.txt
+    </highlight>
     <p>You would then be able to use this map in a
       <directive>RewriteRule</directive> as follows:</p>
-<highlight language="config">RewriteRule ^/ex/(.*) ${examplemap:$1}</highlight>
+      <highlight language="config">
+RewriteRule ^/ex/(.*) ${examplemap:$1}
+      </highlight>
 
 <p>A default value can be specified in the event that nothing is found
 in the map:</p>
 
-<highlight language="config">RewriteRule ^/ex/(.*) ${examplemap:$1|/not_found.html}</highlight>
+<highlight language="config">
+RewriteRule ^/ex/(.*) ${examplemap:$1|/not_found.html}
+</highlight>
 
 <note><title>Per-directory and .htaccess context</title>
 <p>
@@ -139,7 +147,6 @@ may be used, and give examples of each.<
 
    <p> <strong>Redirect a URI to an all-lowercase version of itself</strong></p>
     <highlight language="config">
-
 RewriteMap lc int:tolower
 RewriteRule (.*?[A-Z]+.*) ${lc:$1} [R]
     </highlight>
@@ -211,7 +218,9 @@ telephone  328
     scope. If you're planning to use this in a <code>.htaccess</code>
     file, you'll need to remove the leading slash from the rewrite
     pattern in order for it to match anything:
-    <highlight language="config">RewriteRule ^product/(.*) /prods.php?id=${product2id:$1|NOTFOUND} [PT]</highlight>
+    <highlight language="config">
+RewriteRule ^product/(.*) /prods.php?id=${product2id:$1|NOTFOUND} [PT]
+    </highlight>
     </note>
 
     <note><title>Cached lookups</title>
@@ -362,10 +371,9 @@ by many requests.
 
     <p>A simple example is shown here which will replace all dashes with
     underscores in a request URI.</p>
-    
+
 <p><strong>Rewrite configuration</strong></p>
     <highlight language="config">
-
 RewriteMap d2u prg:/www/bin/dash2under.pl apache:apache<br />
 RewriteRule - ${d2u:%{REQUEST_URI}}
     </highlight>



Mime
View raw message