Imported Upstream version 2.4.9upstream/2.4.9

1 files changed, 14 insertions, 30 deletions

diff --git a/docs/manual/mod/mod_vhost_alias.html.en b/docs/manual/mod/mod_vhost_alias.html.en
index 4a251323..9a414430 100644
--- a/docs/manual/mod/mod_vhost_alias.html.en
+++ b/docs/manual/mod/mod_vhost_alias.html.en
@@ -9,7 +9,7 @@
 <link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
 <link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
 <link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link rel="stylesheet" type="text/css" href="../style/css/prettify.css" />
-<script src="../style/scripts/prettify.js" type="text/javascript">
+<script src="../style/scripts/prettify.min.js" type="text/javascript">
 </script>
 
 <link href="../images/favicon.ico" rel="shortcut icon" /></head>
@@ -49,10 +49,8 @@ hosting</td></tr>
       /cgi-bin/script.pl</code> to <code>
       /usr/local/apache2/cgi-bin/script.pl</code> in all cases:</p>
 
-      <pre class="prettyprint lang-config">
-ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/
-VirtualScriptAlias /never/found/%0/cgi-bin/
-      </pre>
+      <pre class="prettyprint lang-config">ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/
+VirtualScriptAlias /never/found/%0/cgi-bin/</pre>
 
     </div>
 </div>
@@ -145,10 +143,8 @@ VirtualScriptAlias /never/found/%0/cgi-bin/
     <p>For simple name-based virtual hosts you might use the
     following directives in your server configuration file:</p>
 
-    <pre class="prettyprint lang-config">
-UseCanonicalName    Off
-VirtualDocumentRoot /usr/local/apache/vhosts/%0
-    </pre>
+    <pre class="prettyprint lang-config">UseCanonicalName    Off
+VirtualDocumentRoot /usr/local/apache/vhosts/%0</pre>
 
 
     <p>A request for
@@ -162,10 +158,8 @@ VirtualDocumentRoot /usr/local/apache/vhosts/%0
     <code>vhosts</code> directory. To do this you might use the
     following in your configuration file:</p>
 
-    <pre class="prettyprint lang-config">
-UseCanonicalName    Off
-VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2
-    </pre>
+    <pre class="prettyprint lang-config">UseCanonicalName    Off
+VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2</pre>
 
 
     <p>A request for
@@ -176,9 +170,7 @@ VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2
     <p>A more even spread of files can be achieved by hashing from the
     end of the name, for example: </p>
 
-<pre class="prettyprint lang-config">
-    VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.-1/%2.-2/%2.-3/%2
-</pre>
+<pre class="prettyprint lang-config">VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.-1/%2.-2/%2.-3/%2</pre>
 
 
     <p>The example request would come from
@@ -186,9 +178,7 @@ VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2
 
     <p>Alternatively you might use: </p>
 
-<pre class="prettyprint lang-config">
-    VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2.4+
-</pre>
+<pre class="prettyprint lang-config">VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2.4+</pre>
 
 
     <p>The example request would come from
@@ -205,9 +195,7 @@ tld, for example <code>example.com</code> regardless of the number of subdomains
 to the hostname. As such, one can make a configuration that will direct all first, second 
 or third level subdomains to the same directory:
 </p>
-<pre class="prettyprint lang-config">
-    VirtualDocumentRoot "/usr/local/apache/vhosts/%-2.0.%-1.0"
-</pre>
+<pre class="prettyprint lang-config">VirtualDocumentRoot "/usr/local/apache/vhosts/%-2.0.%-1.0"</pre>
 
 <p>
 In the example above, both <code>www.example.com</code> as well as <code>www.sub.example.com</code>
@@ -217,11 +205,9 @@ or <code>example.com</code> will all point to <code>/usr/local/apache/vhosts/exa
     <p>For IP-based virtual hosting you might use the following in
     your configuration file:</p>
 
-    <pre class="prettyprint lang-config">
-UseCanonicalName DNS
+    <pre class="prettyprint lang-config">UseCanonicalName DNS
 VirtualDocumentRootIP /usr/local/apache/vhosts/%1/%2/%3/%4/docs
-VirtualScriptAliasIP  /usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin
-    </pre>
+VirtualScriptAliasIP  /usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin</pre>
 
 
     <p>A request for
@@ -239,9 +225,7 @@ VirtualScriptAliasIP  /usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin
     a <code>%</code> directive, you can work around the problem in
     the following way:</p>
 
-<pre class="prettyprint lang-config">
-    VirtualDocumentRoot /usr/local/apache/vhosts/%2.0.%3.0
-</pre>
+<pre class="prettyprint lang-config">VirtualDocumentRoot /usr/local/apache/vhosts/%2.0.%3.0</pre>
 
 
     <p>A request for
@@ -366,7 +350,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/mod_vhost_alias.
     }
 })(window, document);
 //--><!]]></script></div><div id="footer">
-<p class="apache">Copyright 2013 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2014 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
 if (typeof(prettyPrint) !== 'undefined') {
     prettyPrint();