From: Astrid Malo <kess@apache.org>
Date: Sat, 21 Jun 2003 23:33:59 +0000 (+0000)
Subject: - mention that DocumentRoot is interpreted relativ to ServerRoot if it is
X-Git-Tag: pre_ajp_proxy~1521
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52060154654637bdcf016feb5299899b03d37c81;p=thirdparty%2Fapache%2Fhttpd.git

- mention that DocumentRoot is interpreted relativ to ServerRoot if it is
  not absolute
- remove description of absolute pathes (beginning with a slash) because
  this is valid only for some OS


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

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 76666133df1..2298bddce0d 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -771,7 +771,8 @@ from the web</td></tr>
 
     <p>then an access to
     <code>http://www.my.host.com/index.html</code> refers to
-    <code>/usr/web/index.html</code>.</p>
+    <code>/usr/web/index.html</code>. If the <var>directory-path</var> is 
+    not absolute then it is assumed to be relative to the <code class="directive"><a href="#serverroot">ServerRoot</a></code>.</p>
 
     <p>The <code class="directive">DocumentRoot</code> should be specified without
     a trailing slash.</p>
@@ -975,8 +976,8 @@ in case of an error</td></tr>
 </table>
     <p>The <code class="directive">ErrorLog</code> directive sets the name of
     the file to which the server will log any errors it encounters. If
-    the <var>file-path</var> is not absolute (in general: does not begin
-    with a slash (/)) then it is assumed to be relative to the <code class="directive"><a href="#serverroot">ServerRoot</a></code>.</p>
+    the <var>file-path</var> is not absolute then it is assumed to be 
+    relative to the <code class="directive"><a href="#serverroot">ServerRoot</a></code>.</p>
 
     <div class="example"><h3>Example</h3><p><code>
     ErrorLog /var/log/httpd/error_log
@@ -1368,9 +1369,8 @@ the server configuration files</td></tr>
     files in a directory that can cause <code>httpd</code> to
     fail.</p>
 
-    <p>The file path specified may be an absolute path (i.e.
-    starting with a slash), or may be relative to the
-    <code class="directive"><a href="#serverroot">ServerRoot</a></code> directory.</p>
+    <p>The file path specified may be an absolute path, or may be relative 
+    to the <code class="directive"><a href="#serverroot">ServerRoot</a></code> directory.</p>
 
     <p>Examples:</p>
 
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index c167f484d29..d759ad66dc2 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -709,7 +709,9 @@ from the web</description>
 
     <p>then an access to
     <code>http://www.my.host.com/index.html</code> refers to
-    <code>/usr/web/index.html</code>.</p>
+    <code>/usr/web/index.html</code>. If the <var>directory-path</var> is 
+    not absolute then it is assumed to be relative to the <directive 
+    module="core">ServerRoot</directive>.</p>
 
     <p>The <directive>DocumentRoot</directive> should be specified without
     a trailing slash.</p>
@@ -914,9 +916,8 @@ in case of an error</description>
 <usage>
     <p>The <directive>ErrorLog</directive> directive sets the name of
     the file to which the server will log any errors it encounters. If
-    the <var>file-path</var> is not absolute (in general: does not begin
-    with a slash (/)) then it is assumed to be relative to the <directive
-    module="core">ServerRoot</directive>.</p>
+    the <var>file-path</var> is not absolute then it is assumed to be 
+    relative to the <directive module="core">ServerRoot</directive>.</p>
 
     <example><title>Example</title>
     ErrorLog /var/log/httpd/error_log
@@ -1319,9 +1320,8 @@ the server configuration files</description>
     files in a directory that can cause <code>httpd</code> to
     fail.</p>
 
-    <p>The file path specified may be an absolute path (i.e.
-    starting with a slash), or may be relative to the
-    <directive module="core">ServerRoot</directive> directory.</p>
+    <p>The file path specified may be an absolute path, or may be relative 
+    to the <directive module="core">ServerRoot</directive> directory.</p>
 
     <p>Examples:</p>