You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@apache.org on 2012/04/26 16:57:40 UTC

svn commit: r1330892 [3/3] - in /httpd/httpd/trunk/docs/manual: ./ misc/ mod/ platform/ rewrite/ ssl/ vhosts/

Modified: httpd/httpd/trunk/docs/manual/vhosts/mass.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/mass.html.en?rev=1330892&r1=1330891&r2=1330892&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/mass.html.en (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/mass.html.en Thu Apr 26 14:57:35 2012
@@ -55,7 +55,7 @@ mod_rewrite</a></li>
     <code>&lt;VirtualHost&gt;</code> sections that are
     substantially the same, for example:</p>
 
-<div class="example"><pre>
+<pre class="prettyprint lang-config">
 &lt;VirtualHost 111.22.33.44&gt;
     ServerName                 customer-1.example.com
     DocumentRoot        /www/hosts/customer-1.example.com/docs
@@ -73,7 +73,8 @@ mod_rewrite</a></li>
     DocumentRoot        /www/hosts/customer-N.example.com/docs
     ScriptAlias  /cgi-bin/  /www/hosts/customer-N.example.com/cgi-bin
 &lt;/VirtualHost&gt;
-</pre></div>
+</pre>
+
 
     <p>We wish to replace these multiple
     <code>&lt;VirtualHost&gt;</code> blocks with a mechanism
@@ -157,19 +158,20 @@ mod_vhost_alias</a></h2>
     virtual host arrangement outlined in the <a href="#motivation">Motivation</a> section above
     using <code class="module"><a href="../mod/mod_vhost_alias.html">mod_vhost_alias</a></code>.</p>
 
-<div class="example"><p><code>
-# get the server name from the Host: header<br />
-UseCanonicalName Off<br />
-<br />
-# this log format can be split per-virtual-host based on the first field<br />
-# using the split-logfile utility.<br />
-LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon<br />
-CustomLog logs/access_log vcommon<br />
-<br />
-# include the server name in the filenames used to satisfy requests<br />
-VirtualDocumentRoot /www/hosts/%0/docs<br />
+<pre class="prettyprint lang-config">
+# get the server name from the Host: header
+UseCanonicalName Off
+
+# this log format can be split per-virtual-host based on the first field
+# using the split-logfile utility.
+LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon
+CustomLog logs/access_log vcommon
+
+# include the server name in the filenames used to satisfy requests
+VirtualDocumentRoot /www/hosts/%0/docs
 VirtualScriptAlias  /www/hosts/%0/cgi-bin
-</code></p></div>
+</pre>
+
 
     <p>This configuration can be changed into an IP-based virtual
     hosting solution by just turning <code>UseCanonicalName
@@ -194,18 +196,19 @@ examples.</p>
     <code>/home/user/www</code>. It uses a single <code>cgi-bin</code>
     directory instead of one per virtual host.</p>
 
-<div class="example"><p><code>
-UseCanonicalName Off<br />
-<br />
-LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon<br />
-CustomLog logs/access_log vcommon<br />
-<br />
-# include part of the server name in the filenames<br />
-VirtualDocumentRoot /home/%2/www<br />
-<br />
-# single cgi-bin directory<br />
-ScriptAlias  /cgi-bin/  /www/std-cgi/<br />
-</code></p></div>
+<pre class="prettyprint lang-config">
+UseCanonicalName Off
+
+LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon
+CustomLog logs/access_log vcommon
+
+# include part of the server name in the filenames
+VirtualDocumentRoot /home/%2/www
+
+# single cgi-bin directory
+ScriptAlias  /cgi-bin/  /www/std-cgi/
+</pre>
+
 
     <p>There are examples of more complicated
     <code>VirtualDocumentRoot</code> settings in the
@@ -225,47 +228,40 @@ ScriptAlias  /cgi-bin/  /www/std-cgi/<br
     <code>&lt;VirtualHost&gt;</code> configuration sections, as shown
     below.</p>
 
-<div class="example"><p><code>
-UseCanonicalName Off<br />
-<br />
-LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon<br />
-<br />
-&lt;Directory /www/commercial&gt;<br />
-<span class="indent">
-    Options FollowSymLinks<br />
-    AllowOverride All<br />
-</span>
-&lt;/Directory&gt;<br />
-<br />
-&lt;Directory /www/homepages&gt;<br />
-<span class="indent">
-    Options FollowSymLinks<br />
-    AllowOverride None<br />
-</span>
-&lt;/Directory&gt;<br />
-<br />
-&lt;VirtualHost 111.22.33.44&gt;<br />
-<span class="indent">
-    ServerName www.commercial.example.com<br />
-    <br />
-    CustomLog logs/access_log.commercial vcommon<br />
-    <br />
-    VirtualDocumentRoot /www/commercial/%0/docs<br />
-    VirtualScriptAlias  /www/commercial/%0/cgi-bin<br />
-</span>
-&lt;/VirtualHost&gt;<br />
-<br />
-&lt;VirtualHost 111.22.33.45&gt;<br />
-<span class="indent">
-    ServerName www.homepages.example.com<br />
-    <br />
-    CustomLog logs/access_log.homepages vcommon<br />
-    <br />
-    VirtualDocumentRoot /www/homepages/%0/docs<br />
-    ScriptAlias         /cgi-bin/ /www/std-cgi/<br />
-</span>
+<pre class="prettyprint lang-config">
+UseCanonicalName Off
+
+LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon
+
+&lt;Directory /www/commercial&gt;
+    Options FollowSymLinks
+    AllowOverride All
+&lt;/Directory&gt;
+
+&lt;Directory /www/homepages&gt;
+    Options FollowSymLinks
+    AllowOverride None
+&lt;/Directory&gt;
+
+&lt;VirtualHost 111.22.33.44&gt;
+    ServerName www.commercial.example.com
+    
+    CustomLog logs/access_log.commercial vcommon
+    
+    VirtualDocumentRoot /www/commercial/%0/docs
+    VirtualScriptAlias  /www/commercial/%0/cgi-bin
 &lt;/VirtualHost&gt;
-</code></p></div>
+
+&lt;VirtualHost 111.22.33.45&gt;
+    ServerName www.homepages.example.com
+    
+    CustomLog logs/access_log.homepages vcommon
+    
+    VirtualDocumentRoot /www/homepages/%0/docs
+    ScriptAlias         /cgi-bin/ /www/std-cgi/
+&lt;/VirtualHost&gt;
+</pre>
+
 
 <div class="note">
     <h3>Note</h3>
@@ -290,18 +286,19 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" 
     negating the need for a DNS lookup. Logging will also have to be adjusted
     to fit this system.</p>
 
-<div class="example"><p><code>
-# get the server name from the reverse DNS of the IP address<br />
-UseCanonicalName DNS<br />
-<br />
-# include the IP address in the logs so they may be split<br />
-LogFormat "%A %h %l %u %t \"%r\" %s %b" vcommon<br />
-CustomLog logs/access_log vcommon<br />
-<br />
-# include the IP address in the filenames<br />
-VirtualDocumentRootIP /www/hosts/%0/docs<br />
-VirtualScriptAliasIP  /www/hosts/%0/cgi-bin<br />
-</code></p></div>
+<pre class="prettyprint lang-config">
+# get the server name from the reverse DNS of the IP address
+UseCanonicalName DNS
+
+# include the IP address in the logs so they may be split
+LogFormat "%A %h %l %u %t \"%r\" %s %b" vcommon
+CustomLog logs/access_log vcommon
+
+# include the IP address in the filenames
+VirtualDocumentRootIP /www/hosts/%0/docs
+VirtualScriptAliasIP  /www/hosts/%0/cgi-bin
+</pre>
+
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">

Modified: httpd/httpd/trunk/docs/manual/vhosts/mass.html.tr.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/mass.html.tr.utf8?rev=1330892&r1=1330891&r2=1330892&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/mass.html.tr.utf8 [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/mass.html.tr.utf8 [utf-8] Thu Apr 26 14:57:35 2012
@@ -26,6 +26,7 @@
 <a href="../ko/vhosts/mass.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../tr/vhosts/mass.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.</div>
 
 
     <p>Bu belgede sanal konakların sonu belirsiz bir şekilde artışı karşısında

Modified: httpd/httpd/trunk/docs/manual/vhosts/mass.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/mass.xml.fr?rev=1330892&r1=1330891&r2=1330892&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/mass.xml.fr (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/mass.xml.fr Thu Apr 26 14:57:35 2012
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1138405:1174747 (outdated) -->
+<!-- English Revision: 1138405:1330878 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 
 <!--

Modified: httpd/httpd/trunk/docs/manual/vhosts/mass.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/mass.xml.ko?rev=1330892&r1=1330891&r2=1330892&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/mass.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/mass.xml.ko [euc-kr] Thu Apr 26 14:57:35 2012
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408:1174747 (outdated) -->
+<!-- English Revision: 151408:1330878 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/vhosts/mass.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/mass.xml.meta?rev=1330892&r1=1330891&r2=1330892&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/mass.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/mass.xml.meta Thu Apr 26 14:57:35 2012
@@ -10,6 +10,6 @@
     <variant>en</variant>
     <variant outdated="yes">fr</variant>
     <variant outdated="yes">ko</variant>
-    <variant>tr</variant>
+    <variant outdated="yes">tr</variant>
   </variants>
 </metafile>

Modified: httpd/httpd/trunk/docs/manual/vhosts/mass.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/mass.xml.tr?rev=1330892&r1=1330891&r2=1330892&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/mass.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/mass.xml.tr [utf-8] Thu Apr 26 14:57:35 2012
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1174747 -->
+<!-- English Revision: 1174747:1330878 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>

Modified: httpd/httpd/trunk/docs/manual/vhosts/name-based.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/name-based.html.en?rev=1330892&r1=1330891&r2=1330892&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/name-based.html.en (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/name-based.html.en Thu Apr 26 14:57:35 2012
@@ -116,22 +116,20 @@
     <code>other.example.com</code>, which points at the same IP address.
     Then you simply add the following to <code>httpd.conf</code>:</p>
 
-    <div class="example"><p><code>
-        &lt;VirtualHost *:80&gt;<br />
-        <span class="indent">
-            # This first-listed virtual host is also the default for *:80
-            ServerName www.example.com<br />
-            ServerAlias example.com <br />
-            DocumentRoot /www/domain<br />
-        </span>
-        &lt;/VirtualHost&gt;<br />
-        <br />
-        &lt;VirtualHost *:80&gt;<br />
-        <span class="indent">ServerName other.example.com<br />
-            DocumentRoot /www/otherdomain<br />
-        </span>
-        &lt;/VirtualHost&gt;<br />
-    </code></p></div>
+    <pre class="prettyprint lang-config">
+&lt;VirtualHost *:80&gt;
+    # This first-listed virtual host is also the default for *:80
+    ServerName www.example.com
+    ServerAlias example.com 
+    DocumentRoot /www/domain
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost *:80&gt;
+ServerName other.example.com
+    DocumentRoot /www/otherdomain
+&lt;/VirtualHost&gt;
+    </pre>
+
 
     <p>You can alternatively specify an explicit IP address in place of the
     <code>*</code> in <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> directives. For example, you might want to do this
@@ -145,9 +143,10 @@
     the listed names are other names which people can use to see that same
     web site:</p>
 
-    <div class="example"><p><code>
+    <pre class="prettyprint lang-config">
         ServerAlias example.com *.example.com
-    </code></p></div>
+    </pre>
+
 
     <p>then requests for all hosts in the <code>example.com</code> domain will
     be served by the <code>www.example.com</code> virtual host. The wildcard

Modified: httpd/httpd/trunk/docs/manual/vhosts/name-based.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/name-based.html.fr?rev=1330892&r1=1330891&r2=1330892&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/name-based.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/name-based.html.fr Thu Apr 26 14:57:35 2012
@@ -28,6 +28,8 @@
 <a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../tr/vhosts/name-based.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.</div>
 
     <p>Ce document décrit quand et comment utiliser des serveurs 
     virtuels par nom.</p>

Modified: httpd/httpd/trunk/docs/manual/vhosts/name-based.html.tr.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/name-based.html.tr.utf8?rev=1330892&r1=1330891&r2=1330892&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/name-based.html.tr.utf8 [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/name-based.html.tr.utf8 [utf-8] Thu Apr 26 14:57:35 2012
@@ -28,6 +28,7 @@
 <a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../tr/vhosts/name-based.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.</div>
 
     <p>Bu belgede isme dayalı sanal konakların ne zaman, nasıl kullanılacakları
       açıklanmıştır.</p>

Modified: httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.de?rev=1330892&r1=1330891&r2=1330892&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.de Thu Apr 26 14:57:35 2012
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 420990:1301398 (outdated) -->
+<!-- English Revision: 420990:1330878 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.fr?rev=1330892&r1=1330891&r2=1330892&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.fr (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.fr Thu Apr 26 14:57:35 2012
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='ISO-8859-1' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1301398 -->
+<!-- English Revision: 1301398:1330878 (outdated) -->
 <!-- French translation by alain B, review by Vincent Deffontaines 
 	updated by Lucien GENTIS -->
 

Modified: httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.ja?rev=1330892&r1=1330891&r2=1330892&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.ja [utf-8] Thu Apr 26 14:57:35 2012
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 420990:1301398 (outdated) -->
+<!-- English Revision: 420990:1330878 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.ko?rev=1330892&r1=1330891&r2=1330892&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.ko [euc-kr] Thu Apr 26 14:57:35 2012
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 420990:1301398 (outdated) -->
+<!-- English Revision: 420990:1330878 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.meta?rev=1330892&r1=1330891&r2=1330892&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.meta Thu Apr 26 14:57:35 2012
@@ -9,9 +9,9 @@
   <variants>
     <variant outdated="yes">de</variant>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
-    <variant>tr</variant>
+    <variant outdated="yes">tr</variant>
   </variants>
 </metafile>

Modified: httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.tr?rev=1330892&r1=1330891&r2=1330892&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.tr [utf-8] Thu Apr 26 14:57:35 2012
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1301398 -->
+<!-- English Revision: 1301398:1330878 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>