diff options
author | Rich Bowen <rbowen@apache.org> | 2006-06-12 17:28:52 +0200 |
---|---|---|
committer | Rich Bowen <rbowen@apache.org> | 2006-06-12 17:28:52 +0200 |
commit | 25099ab25afacefaf130f1c1e69c7b8846b76cc7 (patch) | |
tree | 6b3dcf5180d97883564af9b5b60aa82a3fabbce1 | |
parent | Typo correction. (diff) | |
download | apache2-25099ab25afacefaf130f1c1e69c7b8846b76cc7.tar.xz apache2-25099ab25afacefaf130f1c1e69c7b8846b76cc7.zip |
A little bit more detail, and an example, for how DocumentRoot is
handled. Examples good.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413683 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | docs/manual/mod/core.html.en | 4 | ||||
-rw-r--r-- | docs/manual/mod/core.xml | 4 | ||||
-rw-r--r-- | docs/manual/urlmapping.html.en | 10 | ||||
-rw-r--r-- | docs/manual/urlmapping.xml | 11 |
4 files changed, 25 insertions, 4 deletions
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 5f60d1ca9d..90101ba1a4 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -801,8 +801,8 @@ from the web</td></tr> <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> diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index 616430d86f..8e377dafd2 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -770,8 +770,8 @@ from the web</description> <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> diff --git a/docs/manual/urlmapping.html.en b/docs/manual/urlmapping.html.en index 718b04aab5..c638ecf45e 100644 --- a/docs/manual/urlmapping.html.en +++ b/docs/manual/urlmapping.html.en @@ -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> diff --git a/docs/manual/urlmapping.xml b/docs/manual/urlmapping.xml index d7c597b753..fc4724de58 100644 --- a/docs/manual/urlmapping.xml +++ b/docs/manual/urlmapping.xml @@ -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> |