Be a little more consistent with the pathnames, and move some

DavLockDB details to its directive docs.

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

diff --git a/docs/manual/mod/mod_dav.html.en b/docs/manual/mod/mod_dav.html.en
index ad867f69e3c82bc2ba36e077e296575f19413818..5835670a96196b371c1b30dde2015802b10814ed 100644 (file)
--- a/docs/manual/mod/mod_dav.html.en
+++ b/docs/manual/mod/mod_dav.html.en
@@ -65,7 +65,8 @@
     
     <p>In addition, a location for the DAV lock database must be
     specified in the global section of your <code>httpd.conf</code>
-    file:</p>
+    file using the <code class="directive"><a href="../mod/mod_dav_fs.html#davlockdb">DavLockDB</a></code>
+    directive:</p>
 
     <div class="example"><p><code>
       DavLockDB /usr/local/apache2/var/DavLock
@@ -74,12 +75,7 @@
     <p>The directory containing the lock database file must be
     writable by the <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code>
     and <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code> under which
-    Apache is running.  For security reasons, you should create a
-    directory for this purpose rather than changing the permissions on
-    an existing directory.  In the above example, Apache will create
-    files in the <code>/usr/local/apache2/var/</code> directory
-    with the base filename <code>DavLock</code> and extension name
-    chosen by the server.</p>
+    Apache is running.</p>
 
     <p>You may wish to add a <code class="directive"><a href="../mod/core.html#limit">&lt;Limit&gt;</a></code> clause inside the <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> directive to limit access to
     DAV-enabled locations. If you want to set the maximum amount of
@@ -89,7 +85,7 @@
     requests.</p>
 
     <div class="example"><h3>Full Example</h3><p><code>
-      DavLockDB /tmp/DavLock<br />
+      DavLockDB /usr/local/apache2/var/DavLock<br />
       <br />
        &lt;Location /foo&gt;<br />
        <span class="indent">

diff --git a/docs/manual/mod/mod_dav.xml b/docs/manual/mod/mod_dav.xml
index fc8abf5ec85db5b8a937fc877b81aba94881bb68..286931c119a103b4c447afc89b5d36841dc4e35e 100644 (file)
--- a/docs/manual/mod/mod_dav.xml
+++ b/docs/manual/mod/mod_dav.xml
@@ -35,7 +35,8 @@
     
     <p>In addition, a location for the DAV lock database must be
     specified in the global section of your <code>httpd.conf</code>
-    file:</p>
+    file using the <directive module="mod_dav_fs">DavLockDB</directive>
+    directive:</p>
 
     <example>
       DavLockDB /usr/local/apache2/var/DavLock
@@ -44,12 +45,7 @@
     <p>The directory containing the lock database file must be
     writable by the <directive module="mpm_common">User</directive>
     and <directive module="mpm_common" >Group</directive> under which
-    Apache is running.  For security reasons, you should create a
-    directory for this purpose rather than changing the permissions on
-    an existing directory.  In the above example, Apache will create
-    files in the <code>/usr/local/apache2/var/</code> directory
-    with the base filename <code>DavLock</code> and extension name
-    chosen by the server.</p>
+    Apache is running.</p>
 
     <p>You may wish to add a <directive module="core" type="section"
     >Limit</directive> clause inside the <directive module="core"
@@ -62,7 +58,7 @@
     requests.</p>
 
     <example><title>Full Example</title>
-      DavLockDB /tmp/DavLock<br />
+      DavLockDB /usr/local/apache2/var/DavLock<br />
       <br />
        &lt;Location /foo&gt;<br />
        <indent>

diff --git a/docs/manual/mod/mod_dav_fs.html.en b/docs/manual/mod/mod_dav_fs.html.en
index 98ce88a69ca79de1522000fa9f0e96a011cb6cae..99801165d4e2b17e6d32c65e6260a874b08392ba 100644 (file)
--- a/docs/manual/mod/mod_dav_fs.html.en
+++ b/docs/manual/mod/mod_dav_fs.html.en
@@ -67,9 +67,19 @@
     
 
     <div class="example"><h3>Example</h3><p><code>
-      DavLockDB logs/DavLock
+      DavLockDB var/DavLock
     </code></p></div>
 
+    <p>The directory containing the lock database file must be
+    writable by the <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code>
+    and <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code> under which
+    Apache is running.  For security reasons, you should create a
+    directory for this purpose rather than changing the permissions on
+    an existing directory.  In the above example, Apache will create
+    files in the <code>var/</code> directory under the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> with the base filename
+    <code>DavLock</code> and extension name chosen by the server.</p>
+
+
 </div>
 </div>
 <div id="footer">

diff --git a/docs/manual/mod/mod_dav_fs.xml b/docs/manual/mod/mod_dav_fs.xml
index 1a4b06d2899ef8347ae3c6c4daed767bf3003230..737f9da56d5da6058ec6252fa87028bb97096a3e 100644 (file)
--- a/docs/manual/mod/mod_dav_fs.xml
+++ b/docs/manual/mod/mod_dav_fs.xml
@@ -48,8 +48,19 @@
     the server to display all locks in a lock database.</p> -->
 
     <example><title>Example</title>
-      DavLockDB logs/DavLock
+      DavLockDB var/DavLock
     </example>
+
+    <p>The directory containing the lock database file must be
+    writable by the <directive module="mpm_common">User</directive>
+    and <directive module="mpm_common" >Group</directive> under which
+    Apache is running.  For security reasons, you should create a
+    directory for this purpose rather than changing the permissions on
+    an existing directory.  In the above example, Apache will create
+    files in the <code>var/</code> directory under the <directive
+    module="core">ServerRoot</directive> with the base filename
+    <code>DavLock</code> and extension name chosen by the server.</p>
+
 </usage>
 </directivesynopsis>