From: Igor Galić <igalic@apache.org>
Date: Wed, 11 Aug 2010 14:54:08 +0000 (+0000)
Subject: Kicking out the 1.3 reference from the mass vhost document. Nobody cares.
X-Git-Tag: 2.2.17~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3b4d7ef567573bdef12afd2938670bd6cd041ad;p=thirdparty%2Fapache%2Fhttpd.git

Kicking out the 1.3 reference from the mass vhost document. Nobody cares.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@984428 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/programs/httpd.html.en b/docs/manual/programs/httpd.html.en
index 5a496803bf8..97f1e0adfa1 100644
--- a/docs/manual/programs/httpd.html.en
+++ b/docs/manual/programs/httpd.html.en
@@ -142,6 +142,10 @@ places where the directive is valid.</dd>
 <dd>Show the settings as parsed from the config file (currently only
 shows the virtualhost settings).</dd>
 
+<dt><code>-T</code></dt>
+
+<dd>Skip document root check at startup/restart.</dd>
+
 <dt><code>-t</code></dt>
 
 <dd>Run syntax tests for configuration files only.  The program
diff --git a/docs/manual/programs/httpd.xml.ko b/docs/manual/programs/httpd.xml.ko
index 882ea24d583..b44639ef1cc 100644
--- a/docs/manual/programs/httpd.xml.ko
+++ b/docs/manual/programs/httpd.xml.ko
@@ -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: 105989:561800 (outdated) -->
+<!-- English Revision: 105989:984171 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/programs/httpd.xml.meta b/docs/manual/programs/httpd.xml.meta
index d5360d527ad..b8e0281df39 100644
--- a/docs/manual/programs/httpd.xml.meta
+++ b/docs/manual/programs/httpd.xml.meta
@@ -9,6 +9,6 @@
   <variants>
     <variant>en</variant>
     <variant outdated="yes">ko</variant>
-    <variant>tr</variant>
+    <variant outdated="yes">tr</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/programs/httpd.xml.tr b/docs/manual/programs/httpd.xml.tr
index f8ed3636f86..aa8df98c9d5 100644
--- a/docs/manual/programs/httpd.xml.tr
+++ b/docs/manual/programs/httpd.xml.tr
@@ -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: 561800 -->
+<!-- English Revision: 561800:984171 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/vhosts/mass.html.en b/docs/manual/vhosts/mass.html.en
index 8f1aa2fa1e3..035cc5de40e 100644
--- a/docs/manual/vhosts/mass.html.en
+++ b/docs/manual/vhosts/mass.html.en
@@ -36,7 +36,6 @@
 <li><img alt="" src="../images/down.gif" /> <a href="#combinations">Using more than
     one virtual hosting system on the same server</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#ipbased">More efficient IP-based virtual hosting</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#oldversion">Using older versions of Apache</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#simple.rewrite">Simple dynamic
     virtual hosts using <code>mod_rewrite</code></a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#homepages.rewrite">A
@@ -291,30 +290,6 @@ VirtualDocumentRootIP /www/hosts/%0/docs<br />
 VirtualScriptAliasIP  /www/hosts/%0/cgi-bin<br />
 </code></p></div>
 
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="oldversion" id="oldversion">Using older versions of Apache</a></h2>
-
-    <p>The examples above rely on <code>mod_vhost_alias</code>
-    which appeared after version 1.3.6. If you are using a version
-    of Apache without <code>mod_vhost_alias</code> then you can
-    implement this technique with <code>mod_rewrite</code> as
-    illustrated below, but only for Host:-header-based virtual
-    hosts.</p>
-
-    <p>In addition there are some things to beware of with logging.
-    Apache 1.3.6 is the first version to include the
-    <code>%V</code> log format directive; in versions 1.3.0 - 1.3.3
-    the <code>%v</code> option did what <code>%V</code> does;
-    version 1.3.4 has no equivalent. In all these versions of
-    Apache the <code>UseCanonicalName</code> directive can appear
-    in <code>.htaccess</code> files which means that customers can
-    cause the wrong thing to be logged. Therefore the best thing to
-    do is use the <code>%{Host}i</code> directive which logs the
-    <code>Host:</code> header directly; note that this may include
-    <code>:port</code> on the end which is not the case for
-    <code>%V</code>.</p>
-
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="simple.rewrite" id="simple.rewrite">Simple dynamic
diff --git a/docs/manual/vhosts/mass.xml b/docs/manual/vhosts/mass.xml
index 4214c33aa36..321085e8f34 100644
--- a/docs/manual/vhosts/mass.xml
+++ b/docs/manual/vhosts/mass.xml
@@ -290,30 +290,6 @@ VirtualScriptAliasIP  /www/hosts/%0/cgi-bin<br />
 
 </section>
 
-<section id="oldversion"><title>Using older versions of Apache</title>
-
-    <p>The examples above rely on <code>mod_vhost_alias</code>
-    which appeared after version 1.3.6. If you are using a version
-    of Apache without <code>mod_vhost_alias</code> then you can
-    implement this technique with <code>mod_rewrite</code> as
-    illustrated below, but only for Host:-header-based virtual
-    hosts.</p>
-
-    <p>In addition there are some things to beware of with logging.
-    Apache 1.3.6 is the first version to include the
-    <code>%V</code> log format directive; in versions 1.3.0 - 1.3.3
-    the <code>%v</code> option did what <code>%V</code> does;
-    version 1.3.4 has no equivalent. In all these versions of
-    Apache the <code>UseCanonicalName</code> directive can appear
-    in <code>.htaccess</code> files which means that customers can
-    cause the wrong thing to be logged. Therefore the best thing to
-    do is use the <code>%{Host}i</code> directive which logs the
-    <code>Host:</code> header directly; note that this may include
-    <code>:port</code> on the end which is not the case for
-    <code>%V</code>.</p>
-
-</section>
-
 <section id="simple.rewrite"><title>Simple dynamic
     virtual hosts using <code>mod_rewrite</code></title>