httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rbo...@apache.org
Subject svn commit: r413683 - in /httpd/httpd/trunk/docs/manual: mod/core.html.en mod/core.xml urlmapping.html.en urlmapping.xml
Date Mon, 12 Jun 2006 15:28:53 GMT
Author: rbowen
Date: Mon Jun 12 08:28:52 2006
New Revision: 413683

URL: http://svn.apache.org/viewvc?rev=413683&view=rev
Log:
A little bit more detail, and an example, for how DocumentRoot is
handled. Examples good.

Modified:
    httpd/httpd/trunk/docs/manual/mod/core.html.en
    httpd/httpd/trunk/docs/manual/mod/core.xml
    httpd/httpd/trunk/docs/manual/urlmapping.html.en
    httpd/httpd/trunk/docs/manual/urlmapping.xml

Modified: httpd/httpd/trunk/docs/manual/mod/core.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.html.en?rev=413683&r1=413682&r2=413683&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.html.en Mon Jun 12 08:28:52 2006
@@ -801,8 +801,8 @@
 
 <h3>See also</h3>
 <ul>
-<li><a href="../urlmapping.html">Mapping URLs to Filesystem
-Location</a></li>
+<li><a href="../urlmapping.html#documentroot">Mapping URLs to Filesystem
+Locations</a></li>
 </ul>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>

Modified: httpd/httpd/trunk/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml?rev=413683&r1=413682&r2=413683&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml Mon Jun 12 08:28:52 2006
@@ -770,8 +770,8 @@
     <p>The <directive>DocumentRoot</directive> should be specified without
     a trailing slash.</p>
 </usage>
-<seealso><a href="../urlmapping.html">Mapping URLs to Filesystem
-Location</a></seealso>
+<seealso><a href="../urlmapping.html#documentroot">Mapping URLs to Filesystem
+Locations</a></seealso>
 </directivesynopsis>
 
 <directivesynopsis>

Modified: httpd/httpd/trunk/docs/manual/urlmapping.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/urlmapping.html.en?rev=413683&r1=413682&r2=413683&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/urlmapping.html.en (original)
+++ httpd/httpd/trunk/docs/manual/urlmapping.html.en Mon Jun 12 08:28:52 2006
@@ -54,6 +54,12 @@
     make up the basic document tree which will be visible from the
     web.</p>
 
+    <p>For example, if <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code>
+    were set to <code>/var/www/html</code> then a request for
+    <code>http://www.example.com/fish/guppies.html</code> would result
+    in the file <code>/var/www/html/fish/guppies.html</code> being
+    served to the requesting client.</p>
+
     <p>Apache is also capable of <a href="vhosts/">Virtual
     Hosting</a>, where the server receives requests for more than one
     host. In this case, a different <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code>
can be specified for each
@@ -62,6 +68,10 @@
     be used to dynamically determine the appropriate place from which
     to serve content based on the requested IP address or
     hostname.</p>
+
+    <p>The <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code>
directive
+    is set in your main server configuration file
+    (<code>httpd.conf</code>) and, possibly, once per additional <a href="vhosts/">Virtual
Host</a> you create.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif"
/></a></div>
 <div class="section">
 <h2><a name="outside" id="outside">Files Outside the DocumentRoot</a></h2>

Modified: httpd/httpd/trunk/docs/manual/urlmapping.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/urlmapping.xml?rev=413683&r1=413682&r2=413683&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/urlmapping.xml (original)
+++ httpd/httpd/trunk/docs/manual/urlmapping.xml Mon Jun 12 08:28:52 2006
@@ -74,6 +74,12 @@
     make up the basic document tree which will be visible from the
     web.</p>
 
+    <p>For example, if <directive module="core">DocumentRoot</directive>
+    were set to <code>/var/www/html</code> then a request for
+    <code>http://www.example.com/fish/guppies.html</code> would result
+    in the file <code>/var/www/html/fish/guppies.html</code> being
+    served to the requesting client.</p>
+
     <p>Apache is also capable of <a href="vhosts/">Virtual
     Hosting</a>, where the server receives requests for more than one
     host. In this case, a different <directive
@@ -83,6 +89,11 @@
     be used to dynamically determine the appropriate place from which
     to serve content based on the requested IP address or
     hostname.</p>
+
+    <p>The <directive module="core">DocumentRoot</directive> directive
+    is set in your main server configuration file
+    (<code>httpd.conf</code>) and, possibly, once per additional <a
+    href="vhosts/">Virtual Host</a> you create.</p>
 </section>
 
 <section id="outside"><title>Files Outside the DocumentRoot</title>



Mime
View raw message