From: Eric Covener <covener@apache.org>
Date: Mon, 6 Feb 2017 17:41:49 +0000 (+0000)
Subject: add a note to the vhost examples about context
X-Git-Tag: 2.5.0-alpha~690
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18a1d21220c0a6fe48efbda6e2ec40586afeddd0;p=thirdparty%2Fapache%2Fhttpd.git

add a note to the vhost examples about context

seems like a steady stream of comments/questions in this area.



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

diff --git a/docs/manual/vhosts/examples.html.en b/docs/manual/vhosts/examples.html.en
index 03601876ca4..574874b9655 100644
--- a/docs/manual/vhosts/examples.html.en
+++ b/docs/manual/vhosts/examples.html.en
@@ -36,6 +36,17 @@
     web sites running on a single server, via <a href="name-based.html">name-based</a> or <a href="ip-based.html">IP-based</a> virtual hosts.
     </p>
 
+    <div class="note"><h3>Context note</h3><p>Virtual hosts must be specified in 
+    global scope.  Third-party distributions of the server may use an
+    alternate initial configuration file or multiple configuration files
+    that all accept directives with global scope.  These distributions may
+    also suggest a convention for specifying virtual hosts in their own individual
+    files included into the global configuration via the
+    <code class="directive"><a href="../mod/core.html#include">Include</a></code> directive. Further details
+    may be provided in a third-party README, such as 
+    /usr/share/doc/apache2/README.Debian.gz on Debian and Ubuntu based 
+    distributions.</p>
+    </div>
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#purename">Running several name-based web
     sites on a single IP address.</a></li>
diff --git a/docs/manual/vhosts/examples.xml b/docs/manual/vhosts/examples.xml
index 4aae8d2fad7..44f9d248986 100644
--- a/docs/manual/vhosts/examples.xml
+++ b/docs/manual/vhosts/examples.xml
@@ -33,6 +33,17 @@
     href="ip-based.html">IP-based</a> virtual hosts.
     </p>
 
+    <note><title>Context note</title><p>Virtual hosts must be specified in 
+    global scope.  Third-party distributions of the server may use an
+    alternate initial configuration file or multiple configuration files
+    that all accept directives with global scope.  These distributions may
+    also suggest a convention for specifying virtual hosts in their own individual
+    files included into the global configuration via the
+    <directive module="core">Include</directive> directive. Further details
+    may be provided in a third-party README, such as 
+    /usr/share/doc/apache2/README.Debian.gz on Debian and Ubuntu based 
+    distributions.</p>
+    </note>
 </summary>
 
   <section id="purename"><title>Running several name-based web