httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r1673563 [3/4] - in /httpd/httpd/branches/2.4.x/docs/manual: ./ developer/ howto/ misc/ mod/ platform/ rewrite/ ssl/ vhosts/
Date Tue, 14 Apr 2015 22:02:23 GMT
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.xml?rev=1673563&r1=1673562&r2=1673563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.xml Tue Apr 14 22:02:22 2015
@@ -174,7 +174,7 @@ provided. Information about this functio
 href="../ssl/ssl_compat.html">Compatibility</a> chapter.</p>
 <example><title>Example</title>
 <highlight language="config">
-CustomLog logs/ssl_request_log "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
+CustomLog "logs/ssl_request_log" "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
 </highlight>
 </example>
 </section>
@@ -322,7 +322,7 @@ query can be done in two ways which can
 </ul>
 <example><title>Example</title>
 <highlight language="config">
-SSLPassPhraseDialog exec:/usr/local/apache/sbin/pp-filter
+SSLPassPhraseDialog "exec:/usr/local/apache/sbin/pp-filter"
 </highlight>
 </example>
 </usage>
@@ -405,12 +405,12 @@ The following <em>source</em> variants a
 <example><title>Example</title>
 <highlight language="config">
 SSLRandomSeed startup builtin
-SSLRandomSeed startup file:/dev/random
-SSLRandomSeed startup file:/dev/urandom 1024
-SSLRandomSeed startup exec:/usr/local/bin/truerand 16
+SSLRandomSeed startup "file:/dev/random"
+SSLRandomSeed startup "file:/dev/urandom" 1024
+SSLRandomSeed startup "exec:/usr/local/bin/truerand" 16
 SSLRandomSeed connect builtin
-SSLRandomSeed connect file:/dev/random
-SSLRandomSeed connect file:/dev/urandom 1024
+SSLRandomSeed connect "file:/dev/random"
+SSLRandomSeed connect "file:/dev/urandom" 1024
 </highlight>
 </example>
 </usage>
@@ -483,8 +483,8 @@ The following five storage <em>type</em>
 
 <example><title>Examples</title>
 <highlight language="config">
-SSLSessionCache dbm:/usr/local/apache/logs/ssl_gcache_data
-SSLSessionCache shmcb:/usr/local/apache/logs/ssl_gcache_data(512000)
+SSLSessionCache "dbm:/usr/local/apache/logs/ssl_gcache_data"
+SSLSessionCache "shmcb:/usr/local/apache/logs/ssl_gcache_data(512000)"
 </highlight>
 </example>
 
@@ -866,7 +866,7 @@ such issues.
 
 <example><title>Example</title>
 <highlight language="config">
-SSLCertificateFile /usr/local/apache2/conf/ssl.crt/server.crt
+SSLCertificateFile "/usr/local/apache2/conf/ssl.crt/server.crt"
 </highlight>
 </example>
 </usage>
@@ -896,7 +896,7 @@ directive.</p>
 
 <example><title>Example</title>
 <highlight language="config">
-SSLCertificateKeyFile /usr/local/apache2/conf/ssl.key/server.key
+SSLCertificateKeyFile "/usr/local/apache2/conf/ssl.key/server.key"
 </highlight>
 </example>
 </usage>
@@ -944,7 +944,7 @@ certificates use the <em>same</em> certi
 confused in this situation.</p>
 <example><title>Example</title>
 <highlight language="config">
-SSLCertificateChainFile /usr/local/apache2/conf/ssl.crt/ca.crt
+SSLCertificateChainFile "/usr/local/apache2/conf/ssl.crt/ca.crt"
 </highlight>
 </example>
 </usage>
@@ -971,7 +971,7 @@ there: you also have to create symbolic
 contains the appropriate symbolic links.</p>
 <example><title>Example</title>
 <highlight language="config">
-SSLCACertificatePath /usr/local/apache2/conf/ssl.crt/
+SSLCACertificatePath "/usr/local/apache2/conf/ssl.crt/"
 </highlight>
 </example>
 </usage>
@@ -995,7 +995,7 @@ preference. This can be used alternative
 <directive module="mod_ssl">SSLCACertificatePath</directive>.</p>
 <example><title>Example</title>
 <highlight language="config">
-SSLCACertificateFile /usr/local/apache2/conf/ssl.crt/ca-bundle-client.crt
+SSLCACertificateFile "/usr/local/apache2/conf/ssl.crt/ca-bundle-client.crt"
 </highlight>
 </example>
 </usage>
@@ -1042,7 +1042,7 @@ PEM-encoded CA certificates.</p>
 
 <example><title>Example</title>
 <highlight language="config">
-SSLCADNRequestFile /usr/local/apache2/conf/ca-names.crt
+SSLCADNRequestFile "/usr/local/apache2/conf/ca-names.crt"
 </highlight>
 </example>
 </usage>
@@ -1071,7 +1071,7 @@ Certificate files there: you also have t
 this directory contains the appropriate symbolic links.</p>
 <example><title>Example</title>
 <highlight language="config">
-SSLCADNRequestPath /usr/local/apache2/conf/ca-names.crt/
+SSLCADNRequestPath "/usr/local/apache2/conf/ca-names.crt/"
 </highlight>
 </example>
 </usage>
@@ -1098,7 +1098,7 @@ Additionally you have to create symbolic
 contains the appropriate symbolic links.</p>
 <example><title>Example</title>
 <highlight language="config">
-SSLCARevocationPath /usr/local/apache2/conf/ssl.crl/
+SSLCARevocationPath "/usr/local/apache2/conf/ssl.crl/"
 </highlight>
 </example>
 </usage>
@@ -1123,7 +1123,7 @@ used alternatively and/or additionally t
 module="mod_ssl">SSLCARevocationPath</directive>.</p>
 <example><title>Example</title>
 <highlight language="config">
-SSLCARevocationFile /usr/local/apache2/conf/ssl.crl/ca-bundle-client.crl
+SSLCARevocationFile "/usr/local/apache2/conf/ssl.crl/ca-bundle-client.crl"
 </highlight>
 </example>
 </usage>
@@ -1668,7 +1668,7 @@ directory contains the appropriate symbo
 </note>
 <example><title>Example</title>
 <highlight language="config">
-SSLProxyMachineCertificatePath /usr/local/apache2/conf/proxy.crt/
+SSLProxyMachineCertificatePath "/usr/local/apache2/conf/proxy.crt/"
 </highlight>
 </example>
 </usage>
@@ -1697,7 +1697,7 @@ or additionally to <code>SSLProxyMachine
 </note>
 <example><title>Example</title>
 <highlight language="config">
-SSLProxyMachineCertificateFile /usr/local/apache2/conf/ssl.crt/proxy.pem
+SSLProxyMachineCertificateFile "/usr/local/apache2/conf/ssl.crt/proxy.pem"
 </highlight>
 </example>
 </usage>
@@ -1729,7 +1729,7 @@ SSLProxyCACertificateFile</directive>.</
 </note>
 <example><title>Example</title>
 <highlight language="config">
-SSLProxyMachineCertificateChainFile /usr/local/apache2/conf/ssl.crt/proxyCA.pem
+SSLProxyMachineCertificateChainFile "/usr/local/apache2/conf/ssl.crt/proxyCA.pem"
 </highlight>
 </example>
 </usage>
@@ -1979,7 +1979,7 @@ there: you also have to create symbolic
 contains the appropriate symbolic links.</p>
 <example><title>Example</title>
 <highlight language="config">
-SSLProxyCACertificatePath /usr/local/apache2/conf/ssl.crt/
+SSLProxyCACertificatePath "/usr/local/apache2/conf/ssl.crt/"
 </highlight>
 </example>
 </usage>
@@ -2003,7 +2003,7 @@ preference. This can be used alternative
 <directive module="mod_ssl">SSLProxyCACertificatePath</directive>.</p>
 <example><title>Example</title>
 <highlight language="config">
-SSLProxyCACertificateFile /usr/local/apache2/conf/ssl.crt/ca-bundle-remote-server.crt
+SSLProxyCACertificateFile "/usr/local/apache2/conf/ssl.crt/ca-bundle-remote-server.crt"
 </highlight>
 </example>
 </usage>
@@ -2030,7 +2030,7 @@ Additionally you have to create symbolic
 contains the appropriate symbolic links.</p>
 <example><title>Example</title>
 <highlight language="config">
-SSLProxyCARevocationPath /usr/local/apache2/conf/ssl.crl/
+SSLProxyCARevocationPath "/usr/local/apache2/conf/ssl.crl/"
 </highlight>
 </example>
 </usage>
@@ -2055,7 +2055,7 @@ used alternatively and/or additionally t
 module="mod_ssl">SSLProxyCARevocationPath</directive>.</p>
 <example><title>Example</title>
 <highlight language="config">
-SSLProxyCARevocationFile /usr/local/apache2/conf/ssl.crl/ca-bundle-remote-server.crl
+SSLProxyCARevocationFile "/usr/local/apache2/conf/ssl.crl/ca-bundle-remote-server.crl"
 </highlight>
 </example>
 </usage>
@@ -2201,7 +2201,7 @@ directives.</p>
 <highlight language="config">
 SSLVerifyClient on
 SSLOCSPEnable on
-SSLOCSPDefaultResponder http://responder.example.com:8888/responder
+SSLOCSPDefaultResponder "http://responder.example.com:8888/responder"
 SSLOCSPOverrideResponder on
 </highlight>
 </example>
@@ -2641,7 +2641,7 @@ may sometimes differ.</p>
 <highlight language="config">
 SSLOpenSSLConfCmd Options -SessionTicket,ServerPreference
 SSLOpenSSLConfCmd ECDHParameters brainpoolP256r1
-SSLOpenSSLConfCmd ServerInfoFile /usr/local/apache2/conf/server-info.pem
+SSLOpenSSLConfCmd ServerInfoFile "/usr/local/apache2/conf/server-info.pem"
 SSLOpenSSLConfCmd Protocol "-ALL, TLSv1.2"
 SSLOpenSSLConfCmd SignatureAlgorithms RSA+SHA384:ECDSA+SHA256
 </highlight>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_status.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_status.xml?rev=1673563&r1=1673562&r2=1673563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_status.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_status.xml Tue Apr 14 22:02:22 2015
@@ -78,7 +78,7 @@ performance</description>
     domain add this code to your <code>httpd.conf</code>
     configuration file</p>
 <highlight language="config">
-&lt;Location /server-status&gt;
+&lt;Location "/server-status"&gt;
     SetHandler server-status
     Require host example.com
 &lt;/Location&gt;

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_substitute.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_substitute.xml?rev=1673563&r1=1673562&r2=1673563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_substitute.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_substitute.xml Tue Apr 14 22:02:22 2015
@@ -72,9 +72,9 @@
 
     <example><title>Example</title>
     <highlight language="config">
-&lt;Location /&gt;
+&lt;Location "/"&gt;
     AddOutputFilterByType SUBSTITUTE text/html
-    Substitute s/foo/bar/ni
+    Substitute "s/foo/bar/ni"
 &lt;/Location&gt;
         </highlight>
     </example>
@@ -84,7 +84,7 @@
 
     <example><title>Example of using an alternate delimiter</title>
     <highlight language="config">
-&lt;Location /&gt;
+&lt;Location "/"&gt;
     AddOutputFilterByType SUBSTITUTE text/html
     Substitute "s|&lt;BR */?&gt;|&lt;br /&gt;|i"
 &lt;/Location&gt;
@@ -95,7 +95,7 @@
     when regular expressions are used, as illustrated in the following example: </p>
     <example><title>Example of using backreferences and captures</title>
     <highlight language="config">
-&lt;Location /&gt;
+&lt;Location "/"&gt;
     AddOutputFilterByType SUBSTITUTE text/html
     # "foo=k,bar=k" -> "foo/bar=k" 
     Substitute "s|foo=(\w+),bar=\1|foo/bar=$1"
@@ -114,8 +114,8 @@
 
     <example><title>Rewriting URLs embedded in proxied content</title>
     <highlight language="config">
-ProxyPass /blog/ http://internal.blog.example.com
-ProxyPassReverse /blog/ http://internal.blog.example.com/
+ProxyPass "/blog/" "http://internal.blog.example.com"
+ProxyPassReverse "/blog/" "http://internal.blog.example.com/"
 
 Substitute "s|http://internal.blog.example.com/|http://www.example.com/blog/|i"
     </highlight>
@@ -152,10 +152,10 @@ Substitute "s|http://internal.blog.examp
 
     <example><title>Example</title>
     <highlight language="config">
-&lt;Location /&gt;
+&lt;Location "/"&gt;
     AddOutputFilterByType SUBSTITUTE text/html
     SubstituteMaxLineLength 10m
-    Substitute s/foo/bar/ni
+    Substitute "s/foo/bar/ni"
 &lt;/Location&gt;
         </highlight>
     </example>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_vhost_alias.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_vhost_alias.xml?rev=1673563&r1=1673562&r2=1673563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_vhost_alias.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_vhost_alias.xml Tue Apr 14 22:02:22 2015
@@ -45,8 +45,8 @@ hosting</description>
       /usr/local/apache2/cgi-bin/script.pl</code> in all cases:</p>
 
       <highlight language="config">
-ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/
-VirtualScriptAlias /never/found/%0/cgi-bin/
+ScriptAlias "/cgi-bin/" "/usr/local/apache2/cgi-bin/"
+VirtualScriptAlias "/never/found/%0/cgi-bin/"
       </highlight>
     </note>
 </summary>
@@ -128,7 +128,7 @@ VirtualScriptAlias /never/found/%0/cgi-b
 
     <highlight language="config">
 UseCanonicalName    Off
-VirtualDocumentRoot /usr/local/apache/vhosts/%0
+VirtualDocumentRoot "/usr/local/apache/vhosts/%0"
     </highlight>
 
     <p>A request for
@@ -144,7 +144,7 @@ VirtualDocumentRoot /usr/local/apache/vh
 
     <highlight language="config">
 UseCanonicalName    Off
-VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2
+VirtualDocumentRoot "/usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2"
     </highlight>
 
     <p>A request for
@@ -156,7 +156,7 @@ VirtualDocumentRoot /usr/local/apache/vh
     end of the name, for example: </p>
 
 <highlight language="config">
-    VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.-1/%2.-2/%2.-3/%2
+    VirtualDocumentRoot "/usr/local/apache/vhosts/%3+/%2.-1/%2.-2/%2.-3/%2"
 </highlight>
 
     <p>The example request would come from
@@ -165,7 +165,7 @@ VirtualDocumentRoot /usr/local/apache/vh
     <p>Alternatively you might use: </p>
 
 <highlight language="config">
-    VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2.4+
+    VirtualDocumentRoot "/usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2.4+"
 </highlight>
 
     <p>The example request would come from
@@ -195,8 +195,8 @@ or <code>example.com</code> will all poi
 
     <highlight language="config">
 UseCanonicalName DNS
-VirtualDocumentRootIP /usr/local/apache/vhosts/%1/%2/%3/%4/docs
-VirtualScriptAliasIP  /usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin
+VirtualDocumentRootIP "/usr/local/apache/vhosts/%1/%2/%3/%4/docs"
+VirtualScriptAliasIP  "/usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin"
     </highlight>
 
     <p>A request for
@@ -215,7 +215,7 @@ VirtualScriptAliasIP  /usr/local/apache/
     the following way:</p>
 
 <highlight language="config">
-    VirtualDocumentRoot /usr/local/apache/vhosts/%2.0.%3.0
+    VirtualDocumentRoot "/usr/local/apache/vhosts/%2.0.%3.0"
 </highlight>
 
     <p>A request for

Modified: httpd/httpd/branches/2.4.x/docs/manual/platform/windows.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/platform/windows.xml?rev=1673563&r1=1673562&r2=1673563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/platform/windows.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/platform/windows.xml Tue Apr 14 22:02:22 2015
@@ -138,8 +138,8 @@
       <highlight language="config">
 RewriteEngine On
 RewriteMap lowercase int:tolower
-RewriteCond %{REQUEST_URI} [A-Z]
-RewriteRule (.*) ${lowercase:$1} [R,L]
+RewriteCond "%{REQUEST_URI}" "[A-Z]"
+RewriteRule "(.*)" "${lowercase:$1}" [R,L]
       </highlight></li>
 
       <li><p>When running, Apache needs write access only to the logs
@@ -585,10 +585,10 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
 
   <dl>
     <dt>Mapped drive letters</dt>
-    <dd>e.g., <code>Alias /images/ Z:/</code></dd>
+    <dd>e.g., <code>Alias "/images/" "Z:/"</code></dd>
 
     <dt>UNC paths</dt>
-    <dd>e.g., <code>Alias /images/ //imagehost/www/images/</code></dd>
+    <dd>e.g., <code>Alias "/images/" "//imagehost/www/images/"</code></dd>
   </dl>
 
   <p>Mapped drive letters allow the administrator to maintain the
@@ -603,21 +603,21 @@ RewriteRule (.*) ${lowercase:$1} [R,L]
 
   <example><title>Example DocumentRoot with UNC path</title>
   <highlight language="config">
-  DocumentRoot //dochost/www/html/
+  DocumentRoot "//dochost/www/html/"
   </highlight>
   </example>
 
   <example><title>Example DocumentRoot with IP address in UNC path</title>
   <highlight language="config">
-  DocumentRoot //192.168.1.50/docs/
+  DocumentRoot "//192.168.1.50/docs/"
   </highlight>
   </example>
 
   <example><title>Example Alias and corresponding Directory with UNC path</title>
   <highlight language="config">
-Alias /images/ //imagehost/www/images/
+Alias "/images/" "//imagehost/www/images/"
 
-&lt;Directory //imagehost/www/images/&gt;
+&lt;Directory "//imagehost/www/images/"&gt;
 #...
 &lt;Directory&gt;
   </highlight>

Modified: httpd/httpd/branches/2.4.x/docs/manual/rewrite/access.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/rewrite/access.xml?rev=1673563&r1=1673562&r2=1673563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/rewrite/access.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/rewrite/access.xml Tue Apr 14 22:02:22 2015
@@ -84,27 +84,27 @@ configuration.</note>
 <!-- TODO: Add discussion here of why we have !^$ in there. -->
 
 <highlight language="config">
-RewriteCond %{HTTP_REFERER} !^$
-RewriteCond %{HTTP_REFERER} !www.example.com [NC]
-RewriteRule \.(gif|jpg|png)$    -   [F,NC]
+RewriteCond "%{HTTP_REFERER}" "!^$"
+RewriteCond "%{HTTP_REFERER}" "!www.example.com" [NC]
+RewriteRule "\.(gif|jpg|png)$"    "-"   [F,NC]
 </highlight>
 
     <p>In this second example, instead of failing the request, we display
     an alternate image instead.</p>
 
 <highlight language="config">
-RewriteCond %{HTTP_REFERER} !^$
-RewriteCond %{HTTP_REFERER} !www.example.com [NC]
-RewriteRule \.(gif|jpg|png)$    /images/go-away.png   [R,NC]
+RewriteCond "%{HTTP_REFERER}" "!^$"
+RewriteCond "%{HTTP_REFERER}" "!www.example.com" [NC]
+RewriteRule "\.(gif|jpg|png)$"    "/images/go-away.png"   [R,NC]
 </highlight>
 
     <p>In the third example, we redirect the request to an image on some
     other site.</p>
 
 <highlight language="config">
-RewriteCond %{HTTP_REFERER} !^$
-RewriteCond %{HTTP_REFERER} !www.example.com [NC]
-RewriteRule \.(gif|jpg|png)$ http://other.example.com/image.gif   [R,NC]
+RewriteCond "%{HTTP_REFERER}" "!^$"
+RewriteCond "%{HTTP_REFERER}" "!www.example.com" [NC]
+RewriteRule "\.(gif|jpg|png)$" "http://other.example.com/image.gif"   [R,NC]
 </highlight>
 
     <p>Of these techniques, the last two tend to be the most effective
@@ -121,8 +121,8 @@ RewriteRule \.(gif|jpg|png)$ http://othe
         accomplished without the use of mod_rewrite:</p>
 
         <highlight language="config">
-SetEnvIf Referer example\.com localreferer
-&lt;FilesMatch \.(jpg|png|gif)$&gt;
+SetEnvIf Referer "example\.com" localreferer
+&lt;FilesMatch "\.(jpg|png|gif)$"&gt;
     Require env localreferer
 &lt;/FilesMatch&gt;
         </highlight>
@@ -169,9 +169,9 @@ SetEnvIf Referer example\.com localrefer
         particular source.</p>
 
 <highlight language="config">
-RewriteCond %{HTTP_USER_AGENT}   ^NameOfBadRobot
-RewriteCond %{REMOTE_ADDR}       =123\.45\.67\.[8-9]
-RewriteRule ^/secret/files/   -   [F]
+RewriteCond "%{HTTP_USER_AGENT}"   "^NameOfBadRobot"
+RewriteCond "%{REMOTE_ADDR}"       "=123\.45\.67\.[8-9]"
+RewriteRule "^/secret/files/"   "-"   [F]
 </highlight>
         </dd>
 
@@ -183,8 +183,8 @@ RewriteRule ^/secret/files/   -   [F]
         same end using alternate means, as illustrated here:
       </p>
       <highlight language="config">
-SetEnvIfNoCase User-Agent ^NameOfBadRobot goaway
-&lt;Location /secret/files&gt;
+SetEnvIfNoCase User-Agent "^NameOfBadRobot" goaway
+&lt;Location "/secret/files"&gt;
     &lt;RequireAll&gt;
         Require all granted
         Require not env goaway
@@ -222,10 +222,10 @@ SetEnvIfNoCase User-Agent ^NameOfBadRobo
     <dd>
 <highlight language="config">
 RewriteEngine on
-RewriteMap    hosts-deny  txt:/path/to/hosts.deny
-RewriteCond   ${hosts-deny:%{REMOTE_ADDR}|NOT-FOUND} !=NOT-FOUND [OR]
-RewriteCond   ${hosts-deny:%{REMOTE_HOST}|NOT-FOUND} !=NOT-FOUND
-RewriteRule   ^  -  [F]
+RewriteMap    hosts-deny  "txt:/path/to/hosts.deny"
+RewriteCond   "${hosts-deny:%{REMOTE_ADDR}|NOT-FOUND}" "!=NOT-FOUND" [OR]
+RewriteCond   "${hosts-deny:%{REMOTE_HOST}|NOT-FOUND}" "!=NOT-FOUND"
+RewriteRule   "^"  "-"  [F]
 </highlight>
 
 <example>
@@ -275,15 +275,15 @@ bsdti1.sdm.de  -<br />
   with a redirection target.</p>
 
 <highlight language="config">
-RewriteMap  deflector txt:/path/to/deflector.map
+RewriteMap  deflector "txt:/path/to/deflector.map"
 
-RewriteCond %{HTTP_REFERER} !=""
-RewriteCond ${deflector:%{HTTP_REFERER}} =-
-RewriteRule ^ %{HTTP_REFERER} [R,L]
-
-RewriteCond %{HTTP_REFERER} !=""
-RewriteCond ${deflector:%{HTTP_REFERER}|NOT-FOUND} !=NOT-FOUND
-RewriteRule ^ ${deflector:%{HTTP_REFERER}} [R,L]
+RewriteCond "%{HTTP_REFERER}" !=""
+RewriteCond "${deflector:%{HTTP_REFERER}}" "=-"
+RewriteRule "^" "%{HTTP_REFERER}" [R,L]
+
+RewriteCond "%{HTTP_REFERER}" !=""
+RewriteCond "${deflector:%{HTTP_REFERER}|NOT-FOUND}" "!=NOT-FOUND"
+RewriteRule "^" "${deflector:%{HTTP_REFERER}}" [R,L]
 </highlight>
 
       <p>The map file lists redirection targets for each referer, or, if

Modified: httpd/httpd/branches/2.4.x/docs/manual/rewrite/advanced.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/rewrite/advanced.xml?rev=1673563&r1=1673562&r2=1673563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/rewrite/advanced.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/rewrite/advanced.xml Tue Apr 14 22:02:22 2015
@@ -94,8 +94,8 @@ http://physical_host_of_user1/u/user/any
 
 <highlight language="config">
 RewriteEngine on
-RewriteMap      users-to-hosts   txt:/path/to/map.users-to-hosts
-RewriteRule   ^/u/([^/]+)/?(.*)   http://${users-to-hosts:$1|server0}/u/$1/$2
+RewriteMap      users-to-hosts   "txt:/path/to/map.users-to-hosts"
+RewriteRule   "^/u/([^/]+)/?(.*)"   "http://${users-to-hosts:$1|server0}/u/$1/$2"
 </highlight>
     </dd>
   </dl>
@@ -127,8 +127,8 @@ RewriteRule   ^/u/([^/]+)/?(.*)   http:/
 
 <highlight language="config">
 # This example is valid in per-directory context only
-RewriteCond %{REQUEST_URI}   !-U
-RewriteRule ^(.+)\.html$          /regenerate_page.cgi   [PT,L]
+RewriteCond "%{REQUEST_URI}"   "!-U"
+RewriteRule "^(.+)\.html$"          "/regenerate_page.cgi"   [PT,L]
 </highlight>
 
     <p>The <code>-U</code> operator determines whether the test string
@@ -169,8 +169,8 @@ RewriteRule ^(.+)\.html$          /regen
 
 <highlight language="config">
 RewriteEngine on
-RewriteMap lb rnd:/path/to/serverlist.txt
-RewriteRule ^/(.*) http://${lb:servers}/$1 [P,L]
+RewriteMap lb "rnd:/path/to/serverlist.txt"
+RewriteRule "^/(.*)" "http://${lb:servers}/$1" [P,L]
 </highlight>
 
 <p><code>serverlist.txt</code> will contain a list of the servers:</p>
@@ -221,7 +221,7 @@ featureful than anything you can cobble
 
 <highlight language="config">
 RewriteEngine on
-RewriteRule   ^/~(<strong>([a-z])</strong>[a-z0-9]+)(.*)  /home/<strong>$2</strong>/$1/public_html$3
+RewriteRule   "^/~(<strong>([a-z])</strong>[a-z0-9]+)(.*)"  "/home/<strong>$2</strong>/$1/public_html$3"
 </highlight>
     </dd>
   </dl>
@@ -280,10 +280,10 @@ RewriteRule   ^/~(<strong>([a-z])</stron
 
 <highlight language="config">
 RewriteEngine on
-RewriteCond   %{TIME_HOUR}%{TIME_MIN} &gt;0700
-RewriteCond   %{TIME_HOUR}%{TIME_MIN} &lt;1900
-RewriteRule   ^foo\.html$             foo.day.html [L]
-RewriteRule   ^foo\.html$             foo.night.html
+RewriteCond   "%{TIME_HOUR}%{TIME_MIN}" "&gt;0700"
+RewriteCond   "%{TIME_HOUR}%{TIME_MIN}" "&lt;1900"
+RewriteRule   "^foo\.html$"             "foo.day.html" [L]
+RewriteRule   "^foo\.html$"             "foo.night.html"
 </highlight>
 
       <p>This provides the content of <code>foo.day.html</code>
@@ -325,14 +325,14 @@ RewriteRule   ^foo\.html$             fo
 
 <highlight language="config">
 RewriteEngine on
-RewriteRule   ^/horse/(.*)   /pony/$1 [E=<strong>rewritten:1</strong>]
+RewriteRule   "^/horse/(.*)"   "/pony/$1" [E=<strong>rewritten:1</strong>]
 </highlight>
 
     <p>Later in your ruleset you might check for this environment
     variable using a RewriteCond:</p>
 
 <highlight language="config">
-RewriteCond %{ENV:rewritten} =1
+RewriteCond "%{ENV:rewritten}" "=1"
 </highlight>
 
     <p>Note that environment variables do not survive an external

Modified: httpd/httpd/branches/2.4.x/docs/manual/rewrite/avoid.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/rewrite/avoid.xml?rev=1673563&r1=1673562&r2=1673563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/rewrite/avoid.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/rewrite/avoid.xml Tue Apr 14 22:02:22 2015
@@ -98,7 +98,7 @@ following:</p>
 <highlight language="config">
 &lt;VirtualHost *:80&gt;
     ServerName www.example.com
-    Redirect / https://www.example.com/
+    Redirect "/" "https://www.example.com/"
 &lt;/VirtualHost &gt;
 
 &lt;VirtualHost *:443&gt;
@@ -130,7 +130,7 @@ is possible to perform this mapping with
 and performance.</p>
 
 <example><title>Using Alias</title>
-<highlight language="config">Alias /cats /var/www/virtualhosts/felines/htdocs</highlight>
+<highlight language="config">Alias "/cats" "/var/www/virtualhosts/felines/htdocs"</highlight>
 </example>
 
 <p>
@@ -173,7 +173,7 @@ href="flags.html#flag_p">[P]</a> flag to
 <module>mod_proxy</module>.</p>
 
 <highlight language="config">
-RewriteRule ^/?images(.*) http://imageserver.local/images$1 [P]
+RewriteRule "^/?images(.*)" "http://imageserver.local/images$1" [P]
 </highlight>
 
 <p>However, in many cases, when there is no actual pattern matching
@@ -182,7 +182,7 @@ module="mod_proxy">ProxyPass</directive>
 The example here could be rendered as:</p>
 
 <highlight language="config">
-ProxyPass /images/ http://imageserver.local/images/
+ProxyPass "/images/" "http://imageserver.local/images/"
 </highlight>
 
 <p>Note that whether you use <directive
@@ -192,7 +192,7 @@ module="mod_proxy">ProxyPass</directive>
 catch redirects issued from the back-end server:</p>
 
 <highlight language="config">
-ProxyPassReverse /images/ http://imageserver.local/images/
+ProxyPassReverse "/images/" "http://imageserver.local/images/"
 </highlight>
 
 <p>You may need to use <code>RewriteRule</code> instead when there are
@@ -218,7 +218,7 @@ module="core" type="section">If</directi
 
 <highlight language="config">
 &lt;If "req('Host') != 'www.example.com'"&gt;
-    Redirect / http://www.example.com/
+    Redirect "/" "http://www.example.com/"
 &lt;/If&gt;
 </highlight>
 

Modified: httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml?rev=1673563&r1=1673562&r2=1673563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml Tue Apr 14 22:02:22 2015
@@ -46,7 +46,9 @@ 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>. 
@@ -75,7 +77,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
@@ -163,7 +167,7 @@ browsers that support this feature.</dd>
 
 <highlight language="config">
 RewriteEngine On
-RewriteRule ^/index\.html - [CO=frontdoor:yes:.example.com:1440:/]
+RewriteRule "^/index\.html" "-" [CO=frontdoor:yes:.example.com:1440:/]
 </highlight>
 
 <p>In the example give, the rule doesn't rewrite the request.
@@ -250,8 +254,8 @@ environment variable is used to exclude
 log.</p>
 
 <highlight language="config">
-RewriteRule \.(png|gif|jpg)$ - [E=image:1]
-CustomLog logs/access_log combined env=!image
+RewriteRule "\.(png|gif|jpg)$" "-" [E=image:1]
+CustomLog "logs/access_log" combined env=!image
 </highlight>
 
 <p>Note that this same effect can be obtained using <directive
@@ -277,7 +281,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
@@ -296,7 +302,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>
@@ -308,7 +316,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
@@ -321,7 +331,7 @@ For example, the following snippet used
 if they are requested with the <code>.phps</code> extension:</p>
 
 <highlight language="config">
-RewriteRule ^(/source/.+\.php)s$ $1 [H=application/x-httpd-php-source]
+RewriteRule "^(/source/.+\.php)s$" "$1" [H=application/x-httpd-php-source]
 </highlight>
 
 <p>The regular expression above - <code>^(/source/.+\.php)s$</code> - will
@@ -374,9 +384,9 @@ is already for <code>index.php</code>, t
 module="mod_rewrite">RewriteRule</directive> will be skipped.</p>
 
 <highlight language="config">
-RewriteBase /
-RewriteCond %{REQUEST_URI} !=/index.php
-RewriteRule ^(.*) /index.php?req=$1 [L,PT]
+RewriteBase "/"
+RewriteCond "%{REQUEST_URI}" "!=/index.php"
+RewriteRule "^(.*)" "/index.php?req=$1" [L,PT]
 </highlight>
 </section>
 
@@ -392,7 +402,9 @@ 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
@@ -403,9 +415,9 @@ protect against unintended looping.  An
 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
-RewriteRule (.+)[&gt;&lt;;]$ $1 [N=64000]
+RewriteRule "(.+)[&gt;&lt;;]$" "$1" [N=64000]
 # ... or, give up if after 10 loops
-RewriteRule (.+)[&gt;&lt;;]$ $1 [N=10]
+RewriteRule "(.+)[&gt;&lt;;]$" "$1" [N=10]
 </highlight>
 
 </section>
@@ -421,7 +433,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>
@@ -430,7 +444,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
@@ -471,7 +487,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
@@ -534,8 +552,8 @@ use the [PT] flag to ensure that the
 </p>
 
 <highlight language="config">
-Alias /icons /usr/local/apache/icons
-RewriteRule /pics/(.+)\.jpg$ /icons/$1.gif [PT]
+Alias "/icons" "/usr/local/apache/icons"
+RewriteRule "/pics/(.+)\.jpg$" "/icons/$1.gif" [PT]
 </highlight>
 
 <p>
@@ -565,7 +583,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]
@@ -642,13 +662,13 @@ requested URI doesn't correspond with an
 
 <highlight language="config">
 # Is the request for a non-existent file?
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond "%{REQUEST_FILENAME}" "!-f"
+RewriteCond "%{REQUEST_FILENAME}" "!-d"
 # If so, skip these two RewriteRules
-RewriteRule .? - [S=2]
+RewriteRule ".?" "-" [S=2]
 
-RewriteRule (.*\.gif) images.php?$1
-RewriteRule (.*\.html) docs.php?$1
+RewriteRule "(.*\.gif)" "images.php?$1"
+RewriteRule "(.*\.html)" "docs.php?$1"
 </highlight>
 
 <p>This technique is useful because a <directive
@@ -662,18 +682,18 @@ the then-clause becomes <code>skip=N</co
 number of rules in the else-clause:</p>
 <highlight language="config">
 # Does the file exist?
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond "%{REQUEST_FILENAME}" "!-f"
+RewriteCond "%{REQUEST_FILENAME}" "!-d"
 # Create an if-then-else construct by skipping 3 lines if we meant to go to the &quot;else&quot; stanza.
-RewriteRule .? - [S=3]
+RewriteRule ".?" "-" [S=3]
 
 # IF the file exists, then:
-    RewriteRule (.*\.gif) images.php?$1
-    RewriteRule (.*\.html) docs.php?$1
+    RewriteRule "(.*\.gif)" "images.php?$1"
+    RewriteRule "(.*\.html)" "docs.php?$1"
     # Skip past the &quot;else&quot; stanza.
-    RewriteRule .? - [S=1]
+    RewriteRule ".?" "-" [S=1]
 # ELSE...
-    RewriteRule (.*) 404.php?file=$1
+    RewriteRule "(.*)" "404.php?file=$1"
 # END
 </highlight>
 
@@ -694,7 +714,7 @@ source code as plain text, if requested
 
 <highlight language="config">
 # Serve .pl files as plain text
-RewriteRule \.pl$ - [T=text/plain]
+RewriteRule "\.pl$" "-" [T=text/plain]
 </highlight>
 
 <p>Or, perhaps, if you have a camera that produces jpeg images without
@@ -703,7 +723,7 @@ correct MIME type by virtue of their fil
 
 <highlight language="config">
 # Files with 'IMG' in the name are jpg images.
-RewriteRule IMG - [T=image/jpg]
+RewriteRule "IMG" "-" [T=image/jpg]
 </highlight>
 
 <p>Please note that this is a trivial example, and could be better done

Modified: httpd/httpd/branches/2.4.x/docs/manual/rewrite/intro.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/rewrite/intro.xml?rev=1673563&r1=1673562&r2=1673563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/rewrite/intro.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/rewrite/intro.xml Tue Apr 14 22:02:22 2015
@@ -206,7 +206,7 @@ value.
 <dt>A full filesystem path to a resource</dt>
 <dd>
 <highlight language="config">
-RewriteRule ^/games /usr/local/games/web
+RewriteRule "^/games" "/usr/local/games/web"
 </highlight>
 <p>This maps a request to an arbitrary location on your filesystem, much
 like the <directive module="mod_alias">Alias</directive> directive.</p>
@@ -215,7 +215,7 @@ like the <directive module="mod_alias">A
 <dt>A web-path to a resource</dt>
 <dd>
 <highlight language="config">
-RewriteRule ^/foo$ /bar
+RewriteRule "^/foo$" "/bar"
 </highlight>
 <p>If <directive module="core">DocumentRoot</directive> is set
 to <code>/usr/local/apache2/htdocs</code>, then this directive would
@@ -226,7 +226,7 @@ path <code>/usr/local/apache2/htdocs/bar
 <dt>An absolute URL</dt>
 <dd>
 <highlight language="config">
-RewriteRule ^/product/view$ http://site2.example.com/seeproduct.html [R]
+RewriteRule "^/product/view$" "http://site2.example.com/seeproduct.html" [R]
 </highlight>
 <p>This tells the client to make a new request for the specified URL.</p>
 </dd>
@@ -236,7 +236,7 @@ RewriteRule ^/product/view$ http://site2
 contain <em>back-references</em> to parts of the incoming URL-path
 matched by the <var>Pattern</var>. Consider the following:</p>
 <highlight language="config">
-RewriteRule ^/product/(.*)/view$ /var/web/productdb/$1
+RewriteRule "^/product/(.*)/view$" "/var/web/productdb/$1"
 </highlight>
 <p>The variable <code>$1</code> will be replaced with whatever text
 was matched by the expression inside the parenthesis in
@@ -260,7 +260,7 @@ matching behavior of a rule can be made
 application of the <code>[NC]</code> flag:
 </p>
 <highlight language="config">
-RewriteRule ^puppy.html smalldog.html [NC]
+RewriteRule "^puppy.html" "smalldog.html" [NC]
 </highlight>
 
 <p>For more details on the available flags, their meanings, and
@@ -288,8 +288,8 @@ argument is a list of flags that modify
 <p>For example, to send all requests from a particular IP range to a
 different server, you could use:</p>
 <highlight language="config">
-RewriteCond %{REMOTE_ADDR} ^10\.2\.
-RewriteRule (.*) http://intranet.example.com$1
+RewriteCond "%{REMOTE_ADDR}" "^10\.2\."
+RewriteRule "(.*)" "http://intranet.example.com$1"
 </highlight>
 
 <p>When more than
@@ -300,9 +300,9 @@ applied. For example, to deny requests t
 their query string, unless they also contain a cookie containing
 the word "go", you could use:</p>
 <highlight language="config">
-RewriteCond %{QUERY_STRING} hack
-RewriteCond %{HTTP_COOKIE} !go
-RewriteRule . - [F]
+RewriteCond "%{QUERY_STRING}" "hack"
+RewriteCond "%{HTTP_COOKIE}" "!go"
+RewriteRule "." "-" [F]
 </highlight>
 <p>Notice that the exclamation mark specifies a negative match, so the rule is only applied if the cookie does not contain "go".</p>
 
@@ -314,8 +314,8 @@ variables <code>%1</code>, <code>%2</cod
 will direct the request to a different directory depending on the
 hostname used to access the site:</p>
 <highlight language="config">
-RewriteCond %{HTTP_HOST} (.*)
-RewriteRule ^/(.*) /sites/%1/$1
+RewriteCond "%{HTTP_HOST}" "(.*)"
+RewriteRule "^/(.*)" "/sites/%1/$1"
 </highlight>
 <p>If the request was for <code>http://example.com/foo/bar</code>,
 then <code>%1</code> would contain <code>example.com</code>

Modified: httpd/httpd/branches/2.4.x/docs/manual/rewrite/proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/rewrite/proxy.xml?rev=1673563&r1=1673562&r2=1673563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/rewrite/proxy.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/rewrite/proxy.xml Tue Apr 14 22:02:22 2015
@@ -67,9 +67,9 @@ A number of recipes are provided that de
 
 <highlight language="config">
 RewriteEngine  on
-RewriteBase    /products/
-RewriteRule    ^widget/(.*)$  http://product.example.com/widget/$1  [P]
-ProxyPassReverse /products/widget/ http://product.example.com/widget/
+RewriteBase    "/products/"
+RewriteRule    "^widget/(.*)$"  "http://product.example.com/widget/$1"  [P]
+ProxyPassReverse "/products/widget/" "http://product.example.com/widget/"
 </highlight>
 
    <p>In the second example, we proxy the request only if we can't find
@@ -78,10 +78,10 @@ ProxyPassReverse /products/widget/ http:
    has been migrated yet.</p>
 
 <highlight language="config">
-RewriteCond %{REQUEST_FILENAME}       !-f
-RewriteCond %{REQUEST_FILENAME}       !-d
-RewriteRule ^/(.*) http://old.example.com/$1 [P]
-ProxyPassReverse / http://old.example.com/
+RewriteCond "%{REQUEST_FILENAME}"       !-f
+RewriteCond "%{REQUEST_FILENAME}"       !-d
+RewriteRule "^/(.*)" "http://old.example.com/$1" [P]
+ProxyPassReverse "/" "http://old.example.com/"
 </highlight>
     </dd>
 

Modified: httpd/httpd/branches/2.4.x/docs/manual/rewrite/remapping.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/rewrite/remapping.xml?rev=1673563&r1=1673562&r2=1673563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/rewrite/remapping.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/rewrite/remapping.xml Tue Apr 14 22:02:22 2015
@@ -73,7 +73,7 @@ configuration.</note>
 
 <highlight language="config">
 RewriteEngine  on
-RewriteRule    ^<strong>/foo</strong>\.html$  <strong>/bar</strong>.html [PT]
+RewriteRule    "^<strong>/foo</strong>\.html$"  "<strong>/bar</strong>.html" [PT]
 </highlight>
     </dd>
   </dl>
@@ -104,7 +104,7 @@ RewriteRule    ^<strong>/foo</strong>\.h
 
 <highlight language="config">
 RewriteEngine  on
-RewriteRule    ^<strong>/foo</strong>\.html$  <strong>bar</strong>.html  [<strong>R</strong>]
+RewriteRule    "^<strong>/foo</strong>\.html$"  "<strong>bar</strong>.html"  [<strong>R</strong>]
 </highlight>
 </dd>
 
@@ -116,7 +116,9 @@ RewriteRule    ^<strong>/foo</strong>\.h
     use the Redirect directive. mod_rewrite was used in that earlier
     example in order to hide the redirect from the client:</p>
 
-    <highlight language="config">Redirect /foo.html /bar.html</highlight>
+    <highlight language="config">
+Redirect "/foo.html" "/bar.html"
+    </highlight>
 
     </dd>
   </dl>
@@ -143,17 +145,20 @@ RewriteRule    ^<strong>/foo</strong>\.h
       to the new server, but you might also consider using the Redirect
       or RedirectMatch directive.</p>
 
-<highlight language="config">#With mod_rewrite
+<highlight language="config">
+#With mod_rewrite
 RewriteEngine on
-RewriteRule   ^/docs/(.+)  http://new.example.com/docs/$1  [R,L]
+RewriteRule   "^/docs/(.+)"  "http://new.example.com/docs/$1"  [R,L]
 </highlight>
 
-<highlight language="config">#With RedirectMatch
-RedirectMatch ^/docs/(.*) http://new.example.com/docs/$1
+<highlight language="config">
+#With RedirectMatch
+RedirectMatch "^/docs/(.*)" "http://new.example.com/docs/$1"
 </highlight>
 
-<highlight language="config">#With Redirect
-Redirect /docs/ http://new.example.com/docs/
+<highlight language="config">
+#With Redirect
+Redirect "/docs/" "http://new.example.com/docs/"
 </highlight>
     </dd>
   </dl>
@@ -186,8 +191,8 @@ Redirect /docs/ http://new.example.com/d
 
 <highlight language="config">
 RewriteEngine  on
-RewriteBase    /~quux/
-RewriteRule    ^foo\.html$  foo.cgi &nbsp; [H=<strong>cgi-script</strong>]
+RewriteBase    "/~quux/"
+RewriteRule    "^foo\.html$"  "foo.cgi" &nbsp; [H=<strong>cgi-script</strong>]
 </highlight>
     </dd>
   </dl>
@@ -219,13 +224,13 @@ RewriteRule    ^foo\.html$  foo.cgi &nbs
 #   backward compatibility ruleset for
 #   rewriting document.html to document.php
 #   when and only when document.php exists
-&lt;Directory /var/www/htdocs&gt;
+&lt;Directory "/var/www/htdocs"&gt;
     RewriteEngine on
-    RewriteBase /var/www/htdocs
+    RewriteBase "/var/www/htdocs"
 
-    RewriteCond $1.php -f
-    RewriteCond $1.html !-f
-    RewriteRule ^(.*).html$ $1.php
+    RewriteCond "$1.php" -f
+    RewriteCond "$1.html" !-f
+    RewriteRule "^(.*).html$" "$1.php"
 &lt;/Directory&gt;
 </highlight>
     </dd>
@@ -280,7 +285,7 @@ hostname(s).</p>
   ServerName undesired.example.com
   ServerAlias example.com notthis.example.com
 
-  Redirect / http://www.example.com/
+  Redirect "/" "http://www.example.com/"
 &lt;/VirtualHost&gt;
 
 &lt;VirtualHost *:80&gt;
@@ -294,7 +299,7 @@ directive:</p>
 
 <highlight language="config">
 &lt;If "%{HTTP_HOST} != 'www.example.com'"&gt;
-	Redirect / http://www.example.com/
+	Redirect "/" "http://www.example.com/"
 &lt;/If&gt;
 </highlight>
 
@@ -303,7 +308,7 @@ might do the following:</p>
 
 <highlight language="config">
 &lt;If "%{SERVER_PROTOCOL} != 'HTTPS'"&gt;
-	Redirect /admin/ https://www.example.com/admin/
+	Redirect "/admin/" "https://www.example.com/admin/"
 &lt;/If&gt;
 </highlight>
 
@@ -313,17 +318,17 @@ you might use one of the recipes below.<
 
 <p>For sites running on a port other than 80:</p>
 <highlight language="config">
-RewriteCond %{HTTP_HOST}   !^www\.example\.com [NC]
-RewriteCond %{HTTP_HOST}   !^$
-RewriteCond %{SERVER_PORT} !^80$
-RewriteRule ^/?(.*)         http://www.example.com:%{SERVER_PORT}/$1 [L,R,NE]
+RewriteCond "%{HTTP_HOST}"   "!^www\.example\.com" [NC]
+RewriteCond "%{HTTP_HOST}"   "!^$"
+RewriteCond "%{SERVER_PORT}" "!^80$"
+RewriteRule "^/?(.*)         "http://www.example.com:%{SERVER_PORT}/$1" [L,R,NE]
 </highlight>
 
 <p>And for a site running on port 80</p>
 <highlight language="config">
-RewriteCond %{HTTP_HOST}   !^www\.example\.com [NC]
-RewriteCond %{HTTP_HOST}   !^$
-RewriteRule ^/?(.*)         http://www.example.com/$1 [L,R,NE]
+RewriteCond "%{HTTP_HOST}"   "!^www\.example\.com" [NC]
+RewriteCond "%{HTTP_HOST}"   "!^$"
+RewriteRule "^/?(.*)"        "http://www.example.com/$1" [L,R,NE]
 </highlight>
 
         <p>
@@ -334,9 +339,9 @@ RewriteRule ^/?(.*)         http://www.e
         recipe:</p>
 
 <highlight language="config">
-RewriteCond %{HTTP_HOST} !^www\. [NC]
-RewriteCond %{HTTP_HOST} !^$
-RewriteRule ^/?(.*) http://www.%{HTTP_HOST}/$1 [L,R,NE]
+RewriteCond "%{HTTP_HOST}" "!^www\." [NC]
+RewriteCond "%{HTTP_HOST}" "!^$"
+RewriteRule "^/?(.*)"      "http://www.%{HTTP_HOST}/$1" [L,R,NE]
 </highlight>
 
     <p>These rulesets will work either in your main server configuration
@@ -373,17 +378,17 @@ RewriteEngine on
 
 #   first try to find it in dir1/...
 #   ...and if found stop and be happy:
-RewriteCond         %{DOCUMENT_ROOT}/<strong>dir1</strong>/%{REQUEST_URI}  -f
-RewriteRule  ^(.+)  %{DOCUMENT_ROOT}/<strong>dir1</strong>/$1  [L]
+RewriteCond         "%{DOCUMENT_ROOT}/<strong>dir1</strong>/%{REQUEST_URI}"  -f
+RewriteRule "^(.+)" "%{DOCUMENT_ROOT}/<strong>dir1</strong>/$1"  [L]
 
 #   second try to find it in dir2/...
 #   ...and if found stop and be happy:
-RewriteCond         %{DOCUMENT_ROOT}/<strong>dir2</strong>/%{REQUEST_URI}  -f
-RewriteRule  ^(.+)  %{DOCUMENT_ROOT}/<strong>dir2</strong>/$1  [L]
+RewriteCond         "%{DOCUMENT_ROOT}/<strong>dir2</strong>/%{REQUEST_URI}"  -f
+RewriteRule "^(.+)" "%{DOCUMENT_ROOT}/<strong>dir2</strong>/$1"  [L]
 
 #   else go on for other Alias or ScriptAlias directives,
 #   etc.
-RewriteRule   ^  -  [PT]
+RewriteRule   "^"  "-"  [PT]
 </highlight>
     </dd>
   </dl>
@@ -415,9 +420,9 @@ RewriteRule   ^  -  [PT]
 <highlight language="config">
 HostnameLookups on
 RewriteEngine on
-RewriteMap    multiplex         txt:/path/to/map.mirrors
-RewriteCond  %{REMOTE_HOST}     ([a-z]+)$ [NC]
-RewriteRule   ^/(.*)$  ${multiplex:<strong>%1</strong>|http://www.example.com/}$1  [R,L]
+RewriteMap    multiplex         "txt:/path/to/map.mirrors"
+RewriteCond   "%{REMOTE_HOST}"  "([a-z]+)$" [NC]
+RewriteRule   "^/(.*)$"  "${multiplex:<strong>%1</strong>|http://www.example.com/}$1"  [R,L]
 </highlight>
 
 <example>
@@ -473,14 +478,14 @@ com       http://www.example.com/<br />
       This is done with the following ruleset:</p>
 
 <highlight language="config">
-RewriteCond %{HTTP_USER_AGENT}  ^<strong>Mozilla/3</strong>.*
-RewriteRule ^foo\.html$         foo.<strong>NS</strong>.html          [<strong>L</strong>]
+RewriteCond "%{HTTP_USER_AGENT}"  "^<strong>Mozilla/3</strong>.*"
+RewriteRule "^foo\.html$"         "foo.<strong>NS</strong>.html"          [<strong>L</strong>]
 
-RewriteCond %{HTTP_USER_AGENT}  ^Lynx/ [OR]
-RewriteCond %{HTTP_USER_AGENT}  ^Mozilla/[12]
-RewriteRule ^foo\.html$         foo.<strong>20</strong>.html          [<strong>L</strong>]
+RewriteCond "%{HTTP_USER_AGENT}"  "^Lynx/" [OR]
+RewriteCond "%{HTTP_USER_AGENT}"  "^Mozilla/[12]"
+RewriteRule "^foo\.html$"         "foo.<strong>20</strong>.html"          [<strong>L</strong>]
 
-RewriteRule ^foo\.html$         foo.<strong>32</strong>.html          [<strong>L</strong>]
+RewriteRule "^foo\.html$"         "foo.<strong>32</strong>.html"          [<strong>L</strong>]
 </highlight>
     </dd>
   </dl>
@@ -512,7 +517,9 @@ RewriteRule ^foo\.html$         foo.<str
        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>
@@ -520,7 +527,9 @@ RewriteRule ^foo\.html$         foo.<str
      This should really be accomplished with Redirect or RedirectMatch
      directives:
 
-     <highlight language="config"> RedirectMatch ^/(puppies|canines)/(.*) /dogs/$2 </highlight>
+     <highlight language="config">
+RedirectMatch "^/(puppies|canines)/(.*)" "/dogs/$2"
+</highlight>
      </dd>
       </dl>
 
@@ -551,13 +560,15 @@ using the following ruleset:</p>
 
 <highlight language="config">
 RewriteEngine on
-RewriteRule   ^/$  /about/  [<strong>R</strong>]
+RewriteRule   "^/$"  "/about/"  [<strong>R</strong>]
 </highlight>
 
 <p>Note that this can also be handled using the <directive
 module="mod_alias">RedirectMatch</directive> directive:</p>
 
-<highlight language="config">RedirectMatch ^/$ http://example.com/about/</highlight>
+<highlight language="config">
+RedirectMatch "^/$" "http://example.com/about/"
+</highlight>
 
 <p>Note also that the example rewrites only the root URL. That is, it
 rewrites a request for <code>http://example.com/</code>, but not a
@@ -587,8 +598,8 @@ that should go to an existing resource s
 module="mod_dir">FallbackResource</directive> directive for this:</p>
 
 <highlight language="config">
-&lt;Directory /var/www/my_blog&gt;
-  FallbackResource index.php
+&lt;Directory "/var/www/my_blog"&gt;
+  FallbackResource "index.php"
 &lt;/Directory&gt;
 </highlight>
 
@@ -597,19 +608,21 @@ complicated than this, you can use a var
 set to accomplish the same thing:</p>
 
 <highlight language="config">
-&lt;Directory /var/www/my_blog&gt;
-  RewriteBase /my_blog
+&lt;Directory "/var/www/my_blog"&gt;
+  RewriteBase "/my_blog"
 
-  RewriteCond /var/www/my_blog/%{REQUEST_FILENAME} !-f
-  RewriteCond /var/www/my_blog/%{REQUEST_FILENAME} !-d
-  RewriteRule ^ index.php [PT]
+  RewriteCond "/var/www/my_blog/%{REQUEST_FILENAME}" !-f
+  RewriteCond "/var/www/my_blog/%{REQUEST_FILENAME}" !-d
+  RewriteRule "^" "index.php" [PT]
 &lt;/Directory&gt;
 </highlight>
 
 <p>If, on the other hand, you wish to pass the requested URI as a query
 string argument to index.php, you can replace that RewriteRule with:</p>
 
-<highlight language="config">RewriteRule (.*) index.php?$1 [PT,QSA]</highlight>
+<highlight language="config">
+RewriteRule "(.*)" "index.php?$1" [PT,QSA]
+</highlight>
 
 <p>Note that these rulesets can be used in a <code>.htaccess</code>
 file, as well as in a &lt;Directory&gt; block.</p>
@@ -641,8 +654,8 @@ substitutions.</p>
 
 <highlight language="config">
 # Remove mykey=???
-RewriteCond %{QUERY_STRING} (.*(?:^|&amp;))mykey=([^&amp;]*)&amp;?(.*)&amp;?$
-RewriteRule (.*) $1?%1%3
+RewriteCond "%{QUERY_STRING}" "(.*(?:^|&amp;))mykey=([^&amp;]*)&amp;?(.*)&amp;?$"
+RewriteRule "(.*)" "$1?%1%3"
 </highlight>
   </li>
 
@@ -651,8 +664,8 @@ RewriteRule (.*) $1?%1%3
 
 <highlight language="config">
 # Copy from query string to PATH_INFO
-RewriteCond %{QUERY_STRING} (.*(?:^|&amp;))mykey=([^&amp;]*)&amp;?(.*)&amp;?$
-RewriteRule (.*) $1/products/%2/? [PT]
+RewriteCond "%{QUERY_STRING}" "(.*(?:^|&amp;))mykey=([^&amp;]*)&amp;?(.*)&amp;?$"
+RewriteRule "(.*)" "$1/products/%2/?" [PT]
 </highlight>
   </li>
 
@@ -660,9 +673,9 @@ 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 
-RewriteRule (.*) - [F]
+RewriteCond "%{QUERY_STRING}" "(.*(?:^|&amp;))mykey=([^&amp;]*)&amp;?(.*)&amp;?$"
+RewriteCond "%2" !=not-so-secret-value 
+RewriteRule "(.*)" - [F]
 </highlight>
   </li>
 
@@ -671,7 +684,7 @@ RewriteRule (.*) - [F]
 <highlight language="config">
 # The desired URL might be /products/kitchen-sink, and the script expects 
 # /path?products=kitchen-sink.
-RewriteRule ^/?path/([^/]+)/([^/]+) /path?$1=$2 [PT]
+RewriteRule "^/?path/([^/]+)/([^/]+)" "/path?$1=$2" [PT]
 </highlight>
   </li>
 </ul>

Modified: httpd/httpd/branches/2.4.x/docs/manual/rewrite/rewritemap.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/rewrite/rewritemap.xml?rev=1673563&r1=1673562&r2=1673563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/rewrite/rewritemap.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/rewrite/rewritemap.xml Tue Apr 14 22:02:22 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 might 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>
@@ -135,8 +143,8 @@ may be used, and give examples of each.<
     recipe:</p>
 <p><strong>Product to ID configuration</strong></p>
     <highlight language="config">
-RewriteMap product2id txt:/etc/apache2/productmap.txt
-RewriteRule ^/product/(.*) /prods.php?id=${product2id:$1|NOTFOUND} [PT]
+RewriteMap product2id "txt:/etc/apache2/productmap.txt"
+RewriteRule "^/product/(.*)" "/prods.php?id=${product2id:$1|NOTFOUND}" [PT]
     </highlight>
 
     <p>We assume here that the <code>prods.php</code> script knows what
@@ -167,7 +175,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>
@@ -205,10 +215,10 @@ dynamic  www5|www6
     </example>
 <p><strong>Configuration directives</strong></p>
     <highlight language="config">
-RewriteMap servers rnd:/path/to/file/map.txt
+RewriteMap servers "rnd:/path/to/file/map.txt"
 
-RewriteRule ^/(.*\.(png|gif|jpg)) http://${servers:static}/$1 [NC,P,L]
-RewriteRule ^/(.*) http://${servers:dynamic}/$1 [P,L]
+RewriteRule "^/(.*\.(png|gif|jpg))" "http://${servers:static}/$1" [NC,P,L]
+RewriteRule "^/(.*)" "http://${servers:dynamic}/$1" [P,L]
     </highlight>
 
     <p>So, when an image is requested and the first of these rules is
@@ -241,7 +251,7 @@ static   www1|www1|www2|www3|www4
     <p>You may optionally specify a particular dbm type:</p>
 
  <highlight language="config">
-RewriteMap examplemap dbm=sdbm:/etc/apache/mapfile.dbm
+RewriteMap examplemap "dbm=sdbm:/etc/apache/mapfile.dbm"
  </highlight>
 
     <p>The type can be sdbm, gdbm, ndbm or db.
@@ -262,7 +272,7 @@ $ httxt2dbm -i mapfile.txt -o mapfile.ma
 <code>RewriteMap</code> directive:</p>
 
 <highlight language="config">
-RewriteMap mapname dbm:/etc/apache/mapfile.map
+RewriteMap mapname "dbm:/etc/apache/mapfile.map"
 </highlight>
 
 <note>
@@ -316,7 +326,7 @@ by many requests.
     <highlight language="config">
 
 RewriteMap lc int:tolower
-RewriteRule (.*?[A-Z]+.*) ${lc:$1} [R]
+RewriteRule "(.*?[A-Z]+.*)" "${lc:$1}" [R]
     </highlight>
 
     <note>
@@ -361,8 +371,8 @@ RewriteRule (.*?[A-Z]+.*) ${lc:$1} [R]
 <p><strong>Rewrite configuration</strong></p>
     <highlight language="config">
 
-RewriteMap d2u prg:/www/bin/dash2under.pl<br />
-RewriteRule - ${d2u:%{REQUEST_URI}}
+RewriteMap d2u "prg:/www/bin/dash2under.pl"<br />
+RewriteRule "-" "${d2u:%{REQUEST_URI}}"
     </highlight>
 
     <p><strong>dash2under.pl</strong></p>

Modified: httpd/httpd/branches/2.4.x/docs/manual/rewrite/tech.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/rewrite/tech.xml?rev=1673563&r1=1673562&r2=1673563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/rewrite/tech.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/rewrite/tech.xml Tue Apr 14 22:02:22 2015
@@ -112,17 +112,17 @@ and URL matching.</p>
 
         <tr>
             <td>VirtualHost section</td>
-            <td>RewriteRule ^/images/(.+)\.jpg /images/$1.gif</td>
+            <td>RewriteRule "^/images/(.+)\.jpg" "/images/$1.gif"</td>
         </tr>
 
         <tr>
             <td>.htaccess file in document root</td>
-            <td>RewriteRule ^images/(.+)\.jpg images/$1.gif</td>
+            <td>RewriteRule "^images/(.+)\.jpg" "images/$1.gif"</td>
         </tr>
 
         <tr>
             <td>.htaccess file in images directory</td>
-            <td>RewriteRule ^(.+)\.jpg $1.gif</td>
+            <td>RewriteRule "^(.+)\.jpg" "$1.gif"</td>
         </tr>
 
     </table>

Modified: httpd/httpd/branches/2.4.x/docs/manual/rewrite/vhosts.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/rewrite/vhosts.xml?rev=1673563&r1=1673562&r2=1673563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/rewrite/vhosts.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/rewrite/vhosts.xml Tue Apr 14 22:02:22 2015
@@ -76,8 +76,8 @@ RewriteEngine on
 
 RewriteMap    lowercase int:tolower
 
-RewriteCond   ${lowercase:%{<strong>HTTP_HOST</strong>}}   ^www\.<strong>([^.]+)</strong>\.example\.com$
-RewriteRule   ^(.*) /home/<strong>%1</strong>/www$1
+RewriteCond   "${lowercase:%{<strong>HTTP_HOST</strong>}}"   "^www\.<strong>([^.]+)</strong>\.example\.com$"
+RewriteRule   "^(.*)" "/home/<strong>%1</strong>/www$1"
 </highlight></dd>
 
 <dt>Discussion</dt>
@@ -135,9 +135,9 @@ UseCanonicalName Off
 
 # splittable logs
 LogFormat "%{Host}i %h %l %u %t \"%r\" %s %b" vcommon
-CustomLog logs/access_log vcommon
+CustomLog "logs/access_log" vcommon
 
-&lt;Directory /www/hosts&gt;
+&lt;Directory "/www/hosts"&gt;
     # ExecCGI is needed here because we can't force
     # CGI execution in the way that ScriptAlias does
     Options FollowSymLinks ExecCGI
@@ -149,16 +149,16 @@ RewriteEngine On
 RewriteMap  lowercase  int:tolower
 
 ## deal with normal documents first:
-# allow Alias /icons/ to work - repeat for other aliases
-RewriteCond  %{REQUEST_URI}  !^/icons/
+# allow Alias "/icons/" to work - repeat for other aliases
+RewriteCond  "%{REQUEST_URI}"  "!^/icons/"
 # allow CGIs to work
-RewriteCond  %{REQUEST_URI}  !^/cgi-bin/
+RewriteCond  "%{REQUEST_URI}"  "!^/cgi-bin/"
 # do the magic
-RewriteRule  ^/(.*)$  /www/hosts/${lowercase:%{SERVER_NAME}}/docs/$1
+RewriteRule  "^/(.*)$"  "/www/hosts/${lowercase:%{SERVER_NAME}}/docs/$1"
 
 ## and now deal with CGIs - we have to force a handler
-RewriteCond  %{REQUEST_URI}  ^/cgi-bin/
-RewriteRule  ^/(.*)$  /www/hosts/${lowercase:%{SERVER_NAME}}/cgi-bin/$1  [H=cgi-script]
+RewriteCond  "%{REQUEST_URI}"  "^/cgi-bin/"
+RewriteRule  "^/(.*)$"  "/www/hosts/${lowercase:%{SERVER_NAME}}/cgi-bin/$1"  [H=cgi-script]
 </highlight>
 
 </section>
@@ -188,20 +188,20 @@ RewriteEngine on
 RewriteMap   lowercase  int:tolower
 
 # define the map file
-RewriteMap   vhost      txt:/www/conf/vhost.map
+RewriteMap   vhost      "txt:/www/conf/vhost.map"
 
 # deal with aliases as above
-RewriteCond  %{REQUEST_URI}               !^/icons/
-RewriteCond  %{REQUEST_URI}               !^/cgi-bin/
-RewriteCond  ${lowercase:%{SERVER_NAME}}  ^(.+)$
+RewriteCond  "%{REQUEST_URI}"               "!^/icons/"
+RewriteCond  "%{REQUEST_URI}"               "!^/cgi-bin/"
+RewriteCond  "${lowercase:%{SERVER_NAME}}"  "^(.+)$"
 # this does the file-based remap
-RewriteCond  ${vhost:%1}                  ^(/.*)$
-RewriteRule  ^/(.*)$                      %1/docs/$1
+RewriteCond  "${vhost:%1}"                  "^(/.*)$"
+RewriteRule  "^/(.*)$"                      "%1/docs/$1"
 
-RewriteCond  %{REQUEST_URI}               ^/cgi-bin/
-RewriteCond  ${lowercase:%{SERVER_NAME}}  ^(.+)$
-RewriteCond  ${vhost:%1}                  ^(/.*)$
-RewriteRule  ^/(.*)$                      %1/cgi-bin/$1 [H=cgi-script]
+RewriteCond  "%{REQUEST_URI}"               "^/cgi-bin/"
+RewriteCond  "${lowercase:%{SERVER_NAME}}"  "^(.+)$"
+RewriteCond  "${vhost:%1}"                  "^(/.*)$"
+RewriteRule  "^/(.*)$"                      "%1/cgi-bin/$1" [H=cgi-script]
 </highlight>
 
 </section>

Modified: httpd/httpd/branches/2.4.x/docs/manual/sections.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/sections.xml?rev=1673563&r1=1673562&r2=1673563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/sections.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/sections.xml Tue Apr 14 22:02:22 2015
@@ -77,7 +77,7 @@ to another site only if the server is st
 
 <highlight language="config">
 &lt;IfDefine ClosedForNow&gt;
-    Redirect / http://otherserver.example.com/
+    Redirect "/" "http://otherserver.example.com/"
 &lt;/IfDefine&gt;
 </highlight>
 
@@ -99,7 +99,7 @@ applied only if <module>mod_mime_magic</
 
 <highlight language="config">
 &lt;IfModule mod_mime_magic.c&gt;
-    MimeMagicFile conf/magic
+    MimeMagicFile "conf/magic"
 &lt;/IfModule&gt;
 </highlight>
 
@@ -161,7 +161,7 @@ following configuration, directory index
 <code>/var/web/dir1</code> directory and all subdirectories.</p>
 
 <highlight language="config">
-&lt;Directory /var/web/dir1&gt;
+&lt;Directory "/var/web/dir1"&gt;
     Options +Indexes
 &lt;/Directory&gt;
 </highlight>
@@ -175,7 +175,7 @@ deny access to any file named <code>priv
 of where it is found.</p>
 
 <highlight language="config">
-&lt;Files private.html&gt;
+&lt;Files "private.html"&gt;
     Require all denied
 &lt;/Files&gt;
 </highlight>
@@ -191,8 +191,8 @@ of <code>private.html</code> found under
 directory.</p>
 
 <highlight language="config">
-&lt;Directory /var/web/dir1&gt;
-    &lt;Files private.html&gt;
+&lt;Directory "/var/web/dir1"&gt;
+    &lt;Files "private.html"&gt;
         Require all denied
     &lt;/Files&gt;
 &lt;/Directory&gt;
@@ -213,7 +213,7 @@ In particular, it will apply to requests
 as any other requests starting with the <code>/private</code> string.</p>
 
 <highlight language="config">
-&lt;LocationMatch ^/private&gt;
+&lt;LocationMatch "^/private"&gt;
     Require all denied
 &lt;/LocationMatch&gt;
 </highlight>
@@ -226,7 +226,7 @@ No file called <code>server-status</code
 filesystem.</p>
 
 <highlight language="config">
-&lt;Location /server-status&gt;
+&lt;Location "/server-status"&gt;
     SetHandler server-status
 &lt;/Location&gt;
 </highlight>
@@ -237,22 +237,22 @@ filesystem.</p>
 certain sections or directives are evaluated. For
 <directive type="section" module="core">Location</directive> this would be:</p>
 <highlight language="config">
-&lt;Location /foo&gt;
+&lt;Location "/foo"&gt;
 &lt;/Location&gt;
-&lt;Location /foo/bar&gt;
+&lt;Location "/foo/bar"&gt;
 &lt;/Location>
 </highlight>
 <p><directive type="section" module="mod_alias">Alias</directive>es on the other hand,
 are mapped vice-versa:</p>
 <highlight language="config">
-Alias /foo/bar /srv/www/uncommon/bar
-Alias /foo /srv/www/common/foo
+Alias "/foo/bar" "/srv/www/uncommon/bar"
+Alias "/foo" "/srv/www/common/foo"
 </highlight>
 <p>The same is true for the <directive module="mod_proxy">ProxyPass</directive>
 directives:</p>
 <highlight language="config">
-ProxyPass /special-area http://special.example.com smax=5 max=10
-ProxyPass / balancer://mycluster/ stickysession=JSESSIONID|jsessionid nofailover=On
+ProxyPass "/special-area" "http://special.example.com" smax=5 max=10
+ProxyPass "/" "balancer://mycluster/" stickysession=JSESSIONID|jsessionid nofailover=On
 </highlight>
 </section>
 
@@ -283,7 +283,7 @@ how directives are applied.</p>
 all user directories could look as follows:</p>
 
 <highlight language="config">
-&lt;Directory /home/*/public_html&gt;
+&lt;Directory "/home/*/public_html"&gt;
     Options Indexes
 &lt;/Directory&gt;
 </highlight>
@@ -291,7 +291,7 @@ all user directories could look as follo
 <p>Using regex sections, we can deny access to many types of image files
 at once:</p>
 <highlight language="config">
-&lt;FilesMatch \.(?i:gif|jpe?g|png)$&gt;
+&lt;FilesMatch "\.(?i:gif|jpe?g|png)$"&gt;
     Require all denied
 &lt;/FilesMatch&gt;
 </highlight>
@@ -303,8 +303,8 @@ and URLs to be referenced from within <a
 and modules like <module>mod_rewrite</module>.</p>
 
 <highlight language="config">
-&lt;DirectoryMatch ^/var/www/combined/(?&lt;SITENAME&gt;[^/]+)&gt;
-    require ldap-group cn=%{env:MATCH_SITENAME},ou=combined,o=Example
+&lt;DirectoryMatch "^/var/www/combined/(?&lt;SITENAME&gt;[^/]+)"&gt;
+    require ldap-group "cn=%{env:MATCH_SITENAME},ou=combined,o=Example"
 &lt;/DirectoryMatch&gt;
 </highlight>
 
@@ -343,7 +343,7 @@ location, allowing your restrictions to
 For example, consider the following configuration:</p>
 
 <highlight language="config">
-&lt;Location /dir/&gt;
+&lt;Location "/dir/"&gt;
     Require all denied
 &lt;/Location&gt;
 </highlight>
@@ -369,7 +369,7 @@ many other ways to map multiple webspace
 filesystem location.  Therefore you should always use the filesystem
 containers when you can.  There is, however, one exception to this
 rule.  Putting configuration restrictions in a <code>&lt;Location
-/&gt;</code> section is perfectly safe because this section will apply
+"/"&gt;</code> section is perfectly safe because this section will apply
 to all requests regardless of the specific URL.</p>
 </section>
 
@@ -410,7 +410,7 @@ will prevent the proxy server from being
 <code>www.example.com</code> website.</p>
 
 <highlight language="config">
-&lt;Proxy http://www.example.com/*&gt;
+&lt;Proxy "http://www.example.com/*"&gt;
     Require all granted
 &lt;/Proxy&gt;
 </highlight>
@@ -467,7 +467,7 @@ are interpreted, it is important to unde
       <directive type="section" module="core">Directory</directive>)</li>
 
       <li><directive type="section" module="core">DirectoryMatch</directive>
-      (and <code>&lt;Directory ~&gt;</code>)</li>
+      (and <code>&lt;Directory "~"&gt;</code>)</li>
 
       <li><directive type="section"
       module="core">Files</directive> and <directive
@@ -488,9 +488,9 @@ are interpreted, it is important to unde
     the order that they appear in the configuration files.  <directive
     type="section" module="core">Directory</directive> (group 1 above)
     is processed in the order shortest directory component to longest.
-    So for example, <code>&lt;Directory /var/web/dir&gt;</code> will
+    So for example, <code>&lt;Directory "/var/web/dir"&gt;</code> will
     be processed before <code>&lt;Directory
-    /var/web/dir/subdir&gt;</code>.  If multiple <directive
+    "/var/web/dir/subdir"&gt;</code>.  If multiple <directive
     type="section" module="core">Directory</directive> sections apply
     to the same directory they are processed in the configuration file
     order. Configurations included via the <directive
@@ -535,16 +535,16 @@ this example will be applied in the orde
 E.</p>
 
 <highlight language="config">
-&lt;Location /&gt;
+&lt;Location "/"&gt;
     E
 &lt;/Location&gt;
 
-&lt;Files f.html&gt;
+&lt;Files "f.html"&gt;
     D
 &lt;/Files&gt;
 
 &lt;VirtualHost *&gt;
-&lt;Directory /a/b&gt;
+&lt;Directory "/a/b"&gt;
     B
 &lt;/Directory&gt;
 &lt;/VirtualHost&gt;
@@ -553,7 +553,7 @@ E.</p>
     C
 &lt;/DirectoryMatch&gt;
 
-&lt;Directory /a/b&gt;
+&lt;Directory "/a/b"&gt;
     A
 &lt;/Directory&gt;
 
@@ -567,12 +567,12 @@ evaluated last and will allow unrestrict
 other words, order of merging is important, so be careful!</p>
 
 <highlight language="config">
-&lt;Location /&gt;
+&lt;Location "/"&gt;
     Require all granted
 &lt;/Location&gt;
 
 # Woops!  This &lt;Directory&gt; section will have no effect
-&lt;Directory /&gt;
+&lt;Directory "/"&gt;
     &lt;RequireAll&gt;
         Require all granted
         Require not host badguy.example.com

Modified: httpd/httpd/branches/2.4.x/docs/manual/ssl/ssl_faq.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/ssl/ssl_faq.xml?rev=1673563&r1=1673562&r2=1673563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/ssl/ssl_faq.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/ssl/ssl_faq.xml Tue Apr 14 22:02:22 2015
@@ -174,8 +174,8 @@ relative hyperlinks?</a></li>
     manipulate relative hyperlinks, to achieve the same effect.</p>
     <highlight language="config">
 RewriteEngine on
-RewriteRule   ^/(.*)_SSL$   https://%{SERVER_NAME}/$1 [R,L]
-RewriteRule   ^/(.*)_NOSSL$ http://%{SERVER_NAME}/$1  [R,L]
+RewriteRule   "^/(.*)_SSL$"   "https://%{SERVER_NAME}/$1" [R,L]
+RewriteRule   "^/(.*)_NOSSL$" "http://%{SERVER_NAME}/$1"  [R,L]
     </highlight>
 
     <p>This rewrite ruleset lets you use hyperlinks of the form
@@ -254,8 +254,8 @@ Certificate for testing purposes?</title
         These can be used as follows in your <code>httpd.conf</code>
         file:
         <highlight language="config">
-SSLCertificateFile    /path/to/this/server.crt
-SSLCertificateKeyFile /path/to/this/server.key
+SSLCertificateFile    "/path/to/this/server.crt"
+SSLCertificateKeyFile "/path/to/this/server.key"
         </highlight>
     </li>
     <li>It is important that you are aware that this
@@ -334,8 +334,8 @@ SSLCertificateKeyFile /path/to/this/serv
     <code>server.crt</code>. These can be used as follows in your
     <code>httpd.conf</code> file:
        <highlight language="config">
-SSLCertificateFile    /path/to/this/server.crt
-SSLCertificateKeyFile /path/to/this/server.key
+SSLCertificateFile    "/path/to/this/server.crt"
+SSLCertificateKeyFile "/path/to/this/server.key"
        </highlight>
        The <code>server.csr</code> file is no longer needed.
     </li>

Modified: httpd/httpd/branches/2.4.x/docs/manual/ssl/ssl_howto.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/ssl/ssl_howto.xml?rev=1673563&r1=1673562&r2=1673563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/ssl/ssl_howto.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/ssl/ssl_howto.xml Tue Apr 14 22:02:22 2015
@@ -46,8 +46,8 @@ Listen 443
 &lt;VirtualHost *:443&gt;
     ServerName www.example.com
     SSLEngine on
-    SSLCertificateFile /path/to/www.example.com.cert
-    SSLCertificateKeyFile /path/to/www.example.com.key
+    SSLCertificateFile "/path/to/www.example.com.cert"
+    SSLCertificateKeyFile "/path/to/www.example.com.key"
 &lt;/VirtualHost&gt;
 </highlight>
 
@@ -94,7 +94,7 @@ URL?</title>
 # be liberal in general
 SSLCipherSuite ALL:!aNULL:RC4+RSA:+HIGH:+MEDIUM:+LOW:+EXP:+eNULL
 
-&lt;Location /strong/area&gt;
+&lt;Location "/strong/area"&gt;
 # but https://hostname/strong/area/ and below
 # requires strong ciphers
 SSLCipherSuite HIGH:!aNULL:!MD5
@@ -281,7 +281,7 @@ Intranet website, for clients coming fro
 # signed by our CA certificate in ca.crt
 SSLVerifyClient require
 SSLVerifyDepth 1
-SSLCACertificateFile conf/ssl.crt/ca.crt
+SSLCACertificateFile "conf/ssl.crt/ca.crt"
     </highlight>
 </section>
 
@@ -295,9 +295,9 @@ SSLCACertificateFile conf/ssl.crt/ca.crt
 
     <highlight language="config">
 SSLVerifyClient none
-SSLCACertificateFile conf/ssl.crt/ca.crt
+SSLCACertificateFile "conf/ssl.crt/ca.crt"
 
-&lt;Location /secure/area&gt;
+&lt;Location "/secure/area"&gt;
 SSLVerifyClient require
 SSLVerifyDepth 1
 &lt;/Location&gt;
@@ -322,10 +322,10 @@ SSLVerifyDepth 1
 
     <highlight language="config">
 SSLVerifyClient      none
-SSLCACertificateFile conf/ssl.crt/ca.crt
-SSLCACertificatePath conf/ssl.crt
+SSLCACertificateFile "conf/ssl.crt/ca.crt"
+SSLCACertificatePath "conf/ssl.crt"
 
-&lt;Directory /usr/local/apache2/htdocs/secure/area&gt;
+&lt;Directory "/usr/local/apache2/htdocs/secure/area"&gt;
     SSLVerifyClient      require
     SSLVerifyDepth       5
     SSLOptions           +FakeBasicAuth
@@ -333,7 +333,7 @@ SSLCACertificatePath conf/ssl.crt
     AuthName             "Snake Oil Authentication"
     AuthType             Basic
     AuthBasicProvider    file
-    AuthUserFile         /usr/local/apache2/conf/httpd.passwd
+    AuthUserFile         "/usr/local/apache2/conf/httpd.passwd"
     Require              valid-user
 &lt;/Directory&gt;
     </highlight>
@@ -355,10 +355,10 @@ SSLCACertificatePath conf/ssl.crt
 
     <highlight language="config">
 SSLVerifyClient      none
-SSLCACertificateFile conf/ssl.crt/ca.crt
-SSLCACertificatePath conf/ssl.crt
+SSLCACertificateFile "conf/ssl.crt/ca.crt"
+SSLCACertificatePath "conf/ssl.crt"
 
-&lt;Directory /usr/local/apache2/htdocs/secure/area&gt;
+&lt;Directory "/usr/local/apache2/htdocs/secure/area"&gt;
   SSLVerifyClient      require
   SSLVerifyDepth       5
   SSLOptions           +FakeBasicAuth
@@ -382,14 +382,14 @@ plain HTTP access for clients on the Int
    that it applies to both HTTPS and HTTP.</p>
 
     <highlight language="config">
-SSLCACertificateFile conf/ssl.crt/company-ca.crt
+SSLCACertificateFile "conf/ssl.crt/company-ca.crt"
 
-&lt;Directory /usr/local/apache2/htdocs&gt;
+&lt;Directory "/usr/local/apache2/htdocs"&gt;
     #   Outside the subarea only Intranet access is granted
     Require              ip 192.168.1.0/24
 &lt;/Directory&gt;
 
-&lt;Directory /usr/local/apache2/htdocs/subarea&gt;
+&lt;Directory "/usr/local/apache2/htdocs/subarea"&gt;
     #   Inside the subarea any Intranet access is allowed
     #   but from the Internet only HTTPS + Strong-Cipher + Password
     #   or the alternative HTTPS + Strong-Cipher + Client-Certificate
@@ -403,9 +403,9 @@ SSLCACertificateFile conf/ssl.crt/compan
     
     #   Force clients from the Internet to use HTTPS
     RewriteEngine        on
-    RewriteCond          %{REMOTE_ADDR} !^192\.168\.1\.[0-9]+$
-    RewriteCond          %{HTTPS} !=on
-    RewriteRule          . - [F]
+    RewriteCond          "%{REMOTE_ADDR}" "!^192\.168\.1\.[0-9]+$"
+    RewriteCond          "%{HTTPS}" "!=on"
+    RewriteRule          "." "-" [F]
     
     #   Allow Network Access and/or Basic Auth
     Satisfy              any
@@ -417,7 +417,7 @@ SSLCACertificateFile conf/ssl.crt/compan
     AuthType             basic
     AuthName             "Protected Intranet Area"
     AuthBasicProvider    file
-    AuthUserFile         conf/protected.passwd
+    AuthUserFile         "conf/protected.passwd"
     Require              valid-user
 &lt;/Directory&gt;
     </highlight>

Modified: httpd/httpd/branches/2.4.x/docs/manual/urlmapping.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/urlmapping.xml?rev=1673563&r1=1673562&r2=1673563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/urlmapping.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/urlmapping.xml Tue Apr 14 22:02:22 2015
@@ -139,7 +139,9 @@
     module="mod_alias">Alias</directive> directive will map any part
     of the filesystem into the web space. For example, with</p>
 
-<highlight language="config">Alias /docs /var/web</highlight>
+<highlight language="config">
+Alias "/docs" "/var/web"
+</highlight>
 
     <p>the URL <code>http://www.example.com/docs/dir/file.html</code>
     will be served from <code>/var/web/dir/file.html</code>. The
@@ -156,7 +158,7 @@
     example,</p>
 
     <highlight language="config">
-    ScriptAliasMatch ^/~([a-zA-Z0-9]+)/cgi-bin/(.+)   /home/$1/cgi-bin/$2
+    ScriptAliasMatch "^/~([a-zA-Z0-9]+)/cgi-bin/(.+)"   "/home/$1/cgi-bin/$2"
     </highlight>
 
     <p>will map a request to
@@ -204,7 +206,7 @@
     <code>AliasMatch</code> directive:</p>
 
     <highlight language="config">
-    AliasMatch ^/upages/([a-zA-Z0-9]+)(/(.*))?$   /home/$1/public_html/$3
+    AliasMatch "^/upages/([a-zA-Z0-9]+)(/(.*))?$"   "/home/$1/public_html/$3"
     </highlight>
 </section>
 
@@ -224,7 +226,7 @@
     to request the content at the new location as follows:</p>
 
     <highlight language="config">
-    Redirect permanent /foo/   http://www.example.com/bar/
+    Redirect permanent "/foo/"   "http://www.example.com/bar/"
     </highlight>
 
     <p>This will redirect any URL-Path starting in
@@ -240,14 +242,14 @@
     requests alone, use the following configuration:</p>
 
     <highlight language="config">
-    RedirectMatch permanent ^/$    http://www.example.com/startpage.html
+    RedirectMatch permanent "^/$"    "http://www.example.com/startpage.html"
     </highlight>
 
     <p>Alternatively, to temporarily redirect all pages on one site
     to a particular page on another site, use the following:</p>
 
     <highlight language="config">
-    RedirectMatch temp .*  http://othersite.example.com/startpage.html
+    RedirectMatch temp ".*"  "http://othersite.example.com/startpage.html"
     </highlight>
 </section>
 
@@ -267,10 +269,10 @@ and returns them to the client as if the
 server.</p>
 
 <highlight language="config">
-ProxyPass /foo/ http://internal.example.com/bar/<br />
-ProxyPassReverse /foo/ http://internal.example.com/bar/<br />
+ProxyPass "/foo/" "http://internal.example.com/bar/"<br />
+ProxyPassReverse "/foo/" "http://internal.example.com/bar/"<br />
 ProxyPassReverseCookieDomain internal.example.com public.example.com<br />
-ProxyPassReverseCookiePath /foo/ /bar/
+ProxyPassReverseCookiePath "/foo/" "/bar/"
 </highlight>
 
 <p>The <directive module="mod_proxy">ProxyPass</directive> configures
@@ -291,7 +293,7 @@ content) in a page as it is being served
 <module>mod_substitute</module>.</p>
 
 <highlight language="config">
-Substitute s/internal\.example\.com/www.example.com/i
+Substitute "s/internal\.example\.com/www.example.com/i"
 </highlight>
 
 <p>For more sophisticated rewriting of links in HTML and XHTML, the 

Modified: httpd/httpd/branches/2.4.x/docs/manual/vhosts/examples.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/vhosts/examples.xml?rev=1673563&r1=1673562&r2=1673563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/vhosts/examples.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/vhosts/examples.xml Tue Apr 14 22:02:22 2015
@@ -57,14 +57,14 @@
 # Ensure that Apache listens on port 80
 Listen 80
 &lt;VirtualHost *:80&gt;
-    DocumentRoot /www/example1
+    DocumentRoot "/www/example1"
     ServerName www.example.com
   
     # Other directives here
 &lt;/VirtualHost&gt;
 
 &lt;VirtualHost *:80&gt;
-    DocumentRoot /www/example2
+    DocumentRoot "/www/example2"
     ServerName www.example.org
 
     # Other directives here
@@ -121,17 +121,17 @@ Listen 80
 
 # This is the "main" server running on 172.20.30.40
 ServerName server.example.com
-DocumentRoot /www/mainserver
+DocumentRoot "/www/mainserver"
 
 &lt;VirtualHost 172.20.30.50&gt;
-    DocumentRoot /www/example1
+    DocumentRoot "/www/example1"
     ServerName www.example.com
     
     # Other directives here ...
 &lt;/VirtualHost&gt;
 
 &lt;VirtualHost 172.20.30.50&gt;
-    DocumentRoot /www/example2
+    DocumentRoot "/www/example2"
     ServerName www.example.org
     
     # Other directives here ...
@@ -163,7 +163,7 @@ DocumentRoot /www/mainserver
 
     <highlight language="config">
 &lt;VirtualHost 192.168.1.1 172.20.30.40&gt;
-    DocumentRoot /www/server1
+    DocumentRoot "/www/server1"
     ServerName server.example.com
     ServerAlias server
 &lt;/VirtualHost&gt;
@@ -199,22 +199,22 @@ Listen 8080
 
 &lt;VirtualHost 172.20.30.40:80&gt;
     ServerName www.example.com
-    DocumentRoot /www/domain-80
+    DocumentRoot "/www/domain-80"
 &lt;/VirtualHost&gt;
 
 &lt;VirtualHost 172.20.30.40:8080&gt;
     ServerName www.example.com
-    DocumentRoot /www/domain-8080
+    DocumentRoot "/www/domain-8080"
 &lt;/VirtualHost&gt;
 
 &lt;VirtualHost 172.20.30.40:80&gt;
     ServerName www.example.org
-    DocumentRoot /www/otherdomain-80
+    DocumentRoot "/www/otherdomain-80"
 &lt;/VirtualHost&gt;
 
 &lt;VirtualHost 172.20.30.40:8080&gt;
     ServerName www.example.org
-    DocumentRoot /www/otherdomain-8080
+    DocumentRoot "/www/otherdomain-8080"
 &lt;/VirtualHost&gt;
     </highlight>
 
@@ -231,12 +231,12 @@ Listen 8080
 Listen 80
 
 &lt;VirtualHost 172.20.30.40&gt;
-    DocumentRoot /www/example1
+    DocumentRoot "/www/example1"
     ServerName www.example.com
 &lt;/VirtualHost&gt;
 
 &lt;VirtualHost 172.20.30.50&gt;
-    DocumentRoot /www/example2
+    DocumentRoot "/www/example2"
     ServerName www.example.org
 &lt;/VirtualHost&gt;
     </highlight>
@@ -264,22 +264,22 @@ Listen 172.20.30.50:80
 Listen 172.20.30.50:8080
 
 &lt;VirtualHost 172.20.30.40:80&gt;
-    DocumentRoot /www/example1-80
+    DocumentRoot "/www/example1-80"
     ServerName www.example.com
 &lt;/VirtualHost&gt;
 
 &lt;VirtualHost 172.20.30.40:8080&gt;
-    DocumentRoot /www/example1-8080
+    DocumentRoot "/www/example1-8080"
     ServerName www.example.com
 &lt;/VirtualHost&gt;
 
 &lt;VirtualHost 172.20.30.50:80&gt;
-    DocumentRoot /www/example2-80
+    DocumentRoot "/www/example2-80"
     ServerName www.example.org
 &lt;/VirtualHost&gt;
 
 &lt;VirtualHost 172.20.30.50:8080&gt;
-    DocumentRoot /www/example2-8080
+    DocumentRoot "/www/example2-8080"
     ServerName www.example.org
 &lt;/VirtualHost&gt;
     </highlight>
@@ -295,28 +295,28 @@ Listen 172.20.30.50:8080
     <highlight language="config">
 Listen 80
 &lt;VirtualHost 172.20.30.40&gt;
-    DocumentRoot /www/example1
+    DocumentRoot "/www/example1"
     ServerName www.example.com
 &lt;/VirtualHost&gt;
 
 &lt;VirtualHost 172.20.30.40&gt;
-    DocumentRoot /www/example2
+    DocumentRoot "/www/example2"
     ServerName www.example.org
 &lt;/VirtualHost&gt;
 
 &lt;VirtualHost 172.20.30.40&gt;
-    DocumentRoot /www/example3
+    DocumentRoot "/www/example3"
     ServerName www.example.net
 &lt;/VirtualHost&gt;
 
 # IP-based
 &lt;VirtualHost 172.20.30.50&gt;
-    DocumentRoot /www/example4
+    DocumentRoot "/www/example4"
     ServerName www.example.edu
 &lt;/VirtualHost&gt;
 
 &lt;VirtualHost 172.20.30.60&gt;
-    DocumentRoot /www/example5
+    DocumentRoot "/www/example5"
     ServerName www.example.gov
 &lt;/VirtualHost&gt;
     </highlight>
@@ -338,8 +338,8 @@ Listen 80
     <highlight language="config">
 &lt;VirtualHost *:*&gt;
     ProxyPreserveHost On
-    ProxyPass / http://192.168.111.2/
-    ProxyPassReverse / http://192.168.111.2/
+    ProxyPass "/" "http://192.168.111.2/"
+    ProxyPassReverse "/" "http://192.168.111.2/"
     ServerName hostname.example.com
 &lt;/VirtualHost&gt;
     </highlight>
@@ -358,7 +358,7 @@ Listen 80
 
     <highlight language="config">
 &lt;VirtualHost _default_:*&gt;
-    DocumentRoot /www/default
+    DocumentRoot "/www/default"
 &lt;/VirtualHost&gt;
     </highlight>
 
@@ -384,12 +384,12 @@ Listen 80
 
     <highlight language="config">
 &lt;VirtualHost _default_:80&gt;
-    DocumentRoot /www/default80
+    DocumentRoot "/www/default80"
     # ...
 &lt;/VirtualHost&gt;
 
 &lt;VirtualHost _default_:*&gt;
-    DocumentRoot /www/default
+    DocumentRoot "/www/default"
     # ...
 &lt;/VirtualHost&gt;
     </highlight>
@@ -408,7 +408,7 @@ Listen 80
 
     <highlight language="config">
 &lt;VirtualHost _default_:80&gt;
-DocumentRoot /www/default
+DocumentRoot "/www/default"
 ...
 &lt;/VirtualHost&gt;
     </highlight>
@@ -442,16 +442,16 @@ DocumentRoot /www/default
     <highlight language="config">
 Listen 80
 ServerName www.example.com
-DocumentRoot /www/example1
+DocumentRoot "/www/example1"
 
 &lt;VirtualHost 172.20.30.40 172.20.30.50&gt;
-    DocumentRoot /www/example2
+    DocumentRoot "/www/example2"
     ServerName www.example.org
     # ...
 &lt;/VirtualHost&gt;
 
 &lt;VirtualHost 172.20.30.40&gt;
-    DocumentRoot /www/example3
+    DocumentRoot "/www/example3"
     ServerName www.example.net
     ServerAlias *.example.net
     # ...
@@ -479,27 +479,27 @@ DocumentRoot /www/example1
     <highlight language="config">
 &lt;VirtualHost 172.20.30.40&gt;
     # primary vhost
-    DocumentRoot /www/subdomain
+    DocumentRoot "/www/subdomain"
     RewriteEngine On
-    RewriteRule . /www/subdomain/index.html
+    RewriteRule "." "/www/subdomain/index.html"
     # ...
 &lt;/VirtualHost&gt;
 
 &lt;VirtualHost 172.20.30.40&gt;
-DocumentRoot /www/subdomain/sub1
+DocumentRoot "/www/subdomain/sub1"
     ServerName www.sub1.domain.tld
-    ServerPath /sub1/
+    ServerPath "/sub1/"
     RewriteEngine On
-    RewriteRule ^(/sub1/.*) /www/subdomain$1
+    RewriteRule "^(/sub1/.*)" "/www/subdomain$1"
     # ...
 &lt;/VirtualHost&gt;
 
 &lt;VirtualHost 172.20.30.40&gt;
-    DocumentRoot /www/subdomain/sub2
+    DocumentRoot "/www/subdomain/sub2"
     ServerName www.sub2.domain.tld
-    ServerPath /sub2/
+    ServerPath "/sub2/"
     RewriteEngine On
-    RewriteRule ^(/sub2/.*) /www/subdomain$1
+    RewriteRule "^(/sub2/.*)" "/www/subdomain$1"
     # ...
 &lt;/VirtualHost&gt;
     </highlight>

Modified: httpd/httpd/branches/2.4.x/docs/manual/vhosts/ip-based.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/vhosts/ip-based.xml?rev=1673563&r1=1673562&r2=1673563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/vhosts/ip-based.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/vhosts/ip-based.xml Tue Apr 14 22:02:22 2015
@@ -136,18 +136,18 @@ Virtual Hosts</a> to help you decide.  <
     <highlight language="config">
 &lt;VirtualHost 172.20.30.40:80&gt;
     ServerAdmin webmaster@www1.example.com
-    DocumentRoot /www/vhosts/www1
+    DocumentRoot "/www/vhosts/www1"
     ServerName www1.example.com
-    ErrorLog /www/logs/www1/error_log
-    CustomLog /www/logs/www1/access_log combined
+    ErrorLog "/www/logs/www1/error_log"
+    CustomLog "/www/logs/www1/access_log" combined
 &lt;/VirtualHost&gt;
 
 &lt;VirtualHost 172.20.30.50:80&gt;
     ServerAdmin webmaster@www2.example.org
-    DocumentRoot /www/vhosts/www2
+    DocumentRoot "/www/vhosts/www2"
     ServerName www2.example.org
-    ErrorLog /www/logs/www2/error_log
-    CustomLog /www/logs/www2/access_log combined
+    ErrorLog "/www/logs/www2/error_log"
+    CustomLog "/www/logs/www2/access_log" combined
 &lt;/VirtualHost&gt;
     </highlight>
 



Mime
View raw message