Return-Path: 
 <cvs-return-28414-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 5986 invoked from network); 5 Dec 2007 02:26:52 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 5 Dec 2007 02:26:52 -0000
Received: (qmail 74459 invoked by uid 500); 5 Dec 2007 02:26:40 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 74395 invoked by uid 500); 5 Dec 2007 02:26:40 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 74381 invoked by uid 99); 5 Dec 2007 02:26:40 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2007 18:26:40 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Dec 2007 02:26:50 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 13E151A9832; Tue,  4 Dec 2007 18:26:29 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r601192 -
 /httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml
Date: Wed, 05 Dec 2007 02:26:28 -0000
To: cvs@httpd.apache.org
From: wrowe@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071205022629.13E151A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: wrowe
Date: Tue Dec  4 18:26:27 2007
New Revision: 601192

URL: http://svn.apache.org/viewvc?rev=601192&view=rev
Log:
Fix file contexts

Modified:
    httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml

Modified: httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml?rev=601192&r1=601191&r2=601192&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml (original)
+++ httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml Tue Dec  4 18:26:27 2007
@@ -154,8 +154,13 @@
     <description>Set the umask for created directory</description>
     <syntax>FTPDirUmask <em>umask</em></syntax>
     <default>Unknown</default>
-    <contextlist><context>server config</context>
-      <context>virtual host</context></contextlist>
+    <contextlist>
+      <context>server config</context>
+      <context>virtual host</context>
+      <context>directory</context>
+      <context>.htaccess</context>
+    </contextlist>
+    <override>FileInfo</override>
     <usage>
       <p>This directive sets the permission mask for directory creation
 	access. The default is 022 which gives the owner complete
@@ -556,6 +561,7 @@
       <context>directory</context>
       <context>.htaccess</context>
     </contextlist>
+    <override>Any</override>
     <usage><p>This directive sets a <em>message</em> that is displayed
 	to the client upon entering a new directory.  This can either
 	be a string, or a path to a file.  The message can contain a
@@ -622,8 +628,13 @@
     <description>Set the umask for created files</description>
     <syntax>FTPUmask <em>umask</em></syntax>
     <default>FTPUmask 022</default>
-    <contextlist><context>server config</context>
-      <context>virtual host</context></contextlist>
+    <contextlist>
+      <context>server config</context>
+      <context>virtual host</context>
+      <context>directory</context>
+      <context>.htaccess</context>
+    </contextlist>
+    <override>FileInfo</override>
     <usage>
       <p>This directive sets the permission mask for file creation
 	access. The default is 022 which gives the owner complete