]> granicus.if.org Git - apache/commitdiff
projects / apache / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a0ec8c8)
Clarifying some of the phrasing, and removing some of the chattiness
authorRich Bowen <rbowen@apache.org>
Fri, 27 Nov 2009 17:35:47 +0000 (17:35 +0000)
committerRich Bowen <rbowen@apache.org>
Fri, 27 Nov 2009 17:35:47 +0000 (17:35 +0000)
from the example itself. Will eventually remove duplication between this
doc and the rewrite/vhosts.xml doc.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@884917 13f79535-47bb-0310-9956-ffa450edef68

docs/manual/vhosts/mass.html.en patch | blob | history
docs/manual/vhosts/mass.xml patch | blob | history

diff --git a/docs/manual/vhosts/mass.html.en b/docs/manual/vhosts/mass.html.en
index df168b182df722e751e552c65d4deab33238b042..51333c7073d93f482d4dd53e7d0b9eb594e34efc 100644 (file)
--- a/docs/manual/vhosts/mass.html.en
+++ b/docs/manual/vhosts/mass.html.en
@@ -53,34 +53,29 @@
     <code>&lt;VirtualHost&gt;</code> sections that are
     substantially the same, for example:</p>
 
-<div class="example"><p><code>
-NameVirtualHost 111.22.33.44<br />
-&lt;VirtualHost 111.22.33.44&gt;<br />
-<span class="indent">
-    ServerName                 www.customer-1.com<br />
-    DocumentRoot        /www/hosts/www.customer-1.com/docs<br />
-    ScriptAlias  /cgi-bin/  /www/hosts/www.customer-1.com/cgi-bin<br />
-</span>
-&lt;/VirtualHost&gt;<br />
-&lt;VirtualHost 111.22.33.44&gt;<br />
-<span class="indent">
-    ServerName                 www.customer-2.com<br />
-    DocumentRoot        /www/hosts/www.customer-2.com/docs<br />
-    ScriptAlias  /cgi-bin/  /www/hosts/www.customer-2.com/cgi-bin<br />
-</span>
-&lt;/VirtualHost&gt;<br />
-# blah blah blah<br />
-&lt;VirtualHost 111.22.33.44&gt;<br />
-<span class="indent">
-    ServerName                 www.customer-N.com<br />
-    DocumentRoot        /www/hosts/www.customer-N.com/docs<br />
-    ScriptAlias  /cgi-bin/  /www/hosts/www.customer-N.com/cgi-bin<br />
-</span>
+<div class="example"><pre>
+NameVirtualHost 111.22.33.44
+&lt;VirtualHost 111.22.33.44&gt;
+    ServerName                 www.customer-1.com
+    DocumentRoot        /www/hosts/www.customer-1.com/docs
+    ScriptAlias  /cgi-bin/  /www/hosts/www.customer-1.com/cgi-bin
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost 111.22.33.44&gt;
+    ServerName                 www.customer-2.com
+    DocumentRoot        /www/hosts/www.customer-2.com/docs
+    ScriptAlias  /cgi-bin/  /www/hosts/www.customer-2.com/cgi-bin
 &lt;/VirtualHost&gt;
-</code></p></div>
 
-    <p>The basic idea is to replace all of the static
-    <code>&lt;VirtualHost&gt;</code> configurations with a mechanism
+&lt;VirtualHost 111.22.33.44&gt;
+    ServerName                 www.customer-N.com
+    DocumentRoot        /www/hosts/www.customer-N.com/docs
+    ScriptAlias  /cgi-bin/  /www/hosts/www.customer-N.com/cgi-bin
+&lt;/VirtualHost&gt;
+</pre></div>
+
+    <p>We wish to replace these multiple
+    <code>&lt;VirtualHost&gt;</code> blocks with a mechanism
     that works them out dynamically. This has a number of
     advantages:</p>
 
@@ -301,12 +296,12 @@ VirtualScriptAliasIP  /www/hosts/%0/cgi-bin<br />
     <code>mod_rewrite</code> part work properly; the second half
     configures <code>mod_rewrite</code> to do the actual work.</p>
 
-    <p>There are a couple of especially tricky bits: by default,
-    <code>mod_rewrite</code> runs before other URI translation
-    modules (<code>mod_alias</code> etc.) - so if you wish to use these modules,    <code>mod_rewrite</code> must be configured to accommodate
-    them. Also, some magic is required to do a
-    per-dynamic-virtual-host equivalent of
-    <code>ScriptAlias</code>.</p>
+    <p>Because <code>mod_rewrite</code> runs before other URI translation
+    modules (e.g., <code>mod_alias</code>), <code>mod_rewrite</code> must
+    be told to explicitly ignore any URLs that would have been handled
+    by those modules. And, because these rules would otherwise bypass
+    any <code>ScriptAlias</code> directives, we must have
+    <code>mod_rewrite</code> explicitly enact those mappings.</p>
 
 <div class="example"><p><code>
 # get the server name from the Host: header<br />
@@ -324,8 +319,6 @@ CustomLog logs/access_log vcommon<br />
 </span>
 &lt;/Directory&gt;<br />
 <br />
-# now for the hard bit<br />
-<br />
 RewriteEngine On<br />
 <br />
 # a ServerName derived from a Host: header may be any case at all<br />
@@ -342,8 +335,6 @@ RewriteRule  ^/(.*)$  /www/hosts/${lowercase:%{SERVER_NAME}}/docs/$1<br />
 ## and now deal with CGIs - we have to force a handler<br />
 RewriteCond  %{REQUEST_URI}  ^/cgi-bin/<br />
 RewriteRule  ^/(.*)$  /www/hosts/${lowercase:%{SERVER_NAME}}/cgi-bin/$1  [H=cgi-script]<br />
-<br />
-# that's it!
 </code></p></div>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
diff --git a/docs/manual/vhosts/mass.xml b/docs/manual/vhosts/mass.xml
index c9b7f4a000e933fe71ad862a9c528bf3e34b357e..c9a370ac10b994c9306a21c03869a15ec1368c5c 100644 (file)
--- a/docs/manual/vhosts/mass.xml
+++ b/docs/manual/vhosts/mass.xml
@@ -40,33 +40,30 @@
     substantially the same, for example:</p>
 
 <example>
-NameVirtualHost 111.22.33.44<br />
-&lt;VirtualHost 111.22.33.44&gt;<br />
-<indent>
-    ServerName                 www.customer-1.com<br />
-    DocumentRoot        /www/hosts/www.customer-1.com/docs<br />
-    ScriptAlias  /cgi-bin/  /www/hosts/www.customer-1.com/cgi-bin<br />
-</indent>
-&lt;/VirtualHost&gt;<br />
-&lt;VirtualHost 111.22.33.44&gt;<br />
-<indent>
-    ServerName                 www.customer-2.com<br />
-    DocumentRoot        /www/hosts/www.customer-2.com/docs<br />
-    ScriptAlias  /cgi-bin/  /www/hosts/www.customer-2.com/cgi-bin<br />
-</indent>
-&lt;/VirtualHost&gt;<br />
-# blah blah blah<br />
-&lt;VirtualHost 111.22.33.44&gt;<br />
-<indent>
-    ServerName                 www.customer-N.com<br />
-    DocumentRoot        /www/hosts/www.customer-N.com/docs<br />
-    ScriptAlias  /cgi-bin/  /www/hosts/www.customer-N.com/cgi-bin<br />
-</indent>
+<pre>
+NameVirtualHost 111.22.33.44
+&lt;VirtualHost 111.22.33.44&gt;
+    ServerName                 www.customer-1.com
+    DocumentRoot        /www/hosts/www.customer-1.com/docs
+    ScriptAlias  /cgi-bin/  /www/hosts/www.customer-1.com/cgi-bin
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost 111.22.33.44&gt;
+    ServerName                 www.customer-2.com
+    DocumentRoot        /www/hosts/www.customer-2.com/docs
+    ScriptAlias  /cgi-bin/  /www/hosts/www.customer-2.com/cgi-bin
 &lt;/VirtualHost&gt;
+
+&lt;VirtualHost 111.22.33.44&gt;
+    ServerName                 www.customer-N.com
+    DocumentRoot        /www/hosts/www.customer-N.com/docs
+    ScriptAlias  /cgi-bin/  /www/hosts/www.customer-N.com/cgi-bin
+&lt;/VirtualHost&gt;
+</pre>
 </example>
 
-    <p>The basic idea is to replace all of the static
-    <code>&lt;VirtualHost&gt;</code> configurations with a mechanism
+    <p>We wish to replace these multiple
+    <code>&lt;VirtualHost&gt;</code> blocks with a mechanism
     that works them out dynamically. This has a number of
     advantages:</p>
 
@@ -289,12 +286,12 @@ VirtualScriptAliasIP  /www/hosts/%0/cgi-bin<br />
     <code>mod_rewrite</code> part work properly; the second half
     configures <code>mod_rewrite</code> to do the actual work.</p>
 
-    <p>There are a couple of especially tricky bits: by default,
-    <code>mod_rewrite</code> runs before other URI translation
-    modules (<code>mod_alias</code> etc.) - so if you wish to use these modules,    <code>mod_rewrite</code> must be configured to accommodate
-    them. Also, some magic is required to do a
-    per-dynamic-virtual-host equivalent of
-    <code>ScriptAlias</code>.</p>
+    <p>Because <code>mod_rewrite</code> runs before other URI translation
+    modules (e.g., <code>mod_alias</code>), <code>mod_rewrite</code> must
+    be told to explicitly ignore any URLs that would have been handled
+    by those modules. And, because these rules would otherwise bypass
+    any <code>ScriptAlias</code> directives, we must have
+    <code>mod_rewrite</code> explicitly enact those mappings.</p>
 
 <example>
 # get the server name from the Host: header<br />
@@ -312,8 +309,6 @@ CustomLog logs/access_log vcommon<br />
 </indent>
 &lt;/Directory&gt;<br />
 <br />
-# now for the hard bit<br />
-<br />
 RewriteEngine On<br />
 <br />
 # a ServerName derived from a Host: header may be any case at all<br />
@@ -330,8 +325,6 @@ RewriteRule  ^/(.*)$  /www/hosts/${lowercase:%{SERVER_NAME}}/docs/$1<br />
 ## and now deal with CGIs - we have to force a handler<br />
 RewriteCond  %{REQUEST_URI}  ^/cgi-bin/<br />
 RewriteRule  ^/(.*)$  /www/hosts/${lowercase:%{SERVER_NAME}}/cgi-bin/$1  [H=cgi-script]<br />
-<br />
-# that's it!
 </example>
 
 </section>
Unnamed repository; edit this file 'description' to name the repository.