You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2007/12/05 22:43:39 UTC
svn commit: r601543 - /httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml
Author: wrowe
Date: Wed Dec 5 13:43:39 2007
New Revision: 601543
URL: http://svn.apache.org/viewvc?rev=601543&view=rev
Log:
Simplify and consistify some defaults. Wish there was a way to
drop out of <code> in the context of a <default> block (?)
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=601543&r1=601542&r2=601543&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml (original)
+++ httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml Wed Dec 5 13:43:39 2007
@@ -69,8 +69,7 @@
<description>Ports the server will use for connecting to the
client</description>
<syntax>FTPActiveRange <em>min [max]</em></syntax>
- <default>If this directive is not specified, the server will use
- an arbitrary ephemeral high-numbered port</default>
+ <default><em>an ephemeral high-numbered port</em></default>
<contextlist><context>server config</context>
<context>virtual host</context></contextlist>
<usage>
@@ -135,7 +134,7 @@
<name>FTPDataBlockSize</name>
<description>Block size in bytes between control channel tests</description>
<syntax>FTPDataBlockSize <em>bytes</em></syntax>
- <default>48000 bytes</default>
+ <default>FTPDataBlockSize 48000</default>
<contextlist><context>server config</context>
<context>virtual host</context></contextlist>
<usage>
@@ -153,7 +152,7 @@
<name>FTPDirUmask</name>
<description>Set the umask for created directory</description>
<syntax>FTPDirUmask <em>umask</em></syntax>
- <default>Unknown</default>
+ <default>FTPDirUmask 022</default>
<contextlist>
<context>server config</context>
<context>virtual host</context>
@@ -175,7 +174,7 @@
<description>Set the DocumentRoot based on the given environment
variable, such as a per-user LDAP property</description>
<syntax>FTPDocRootEnv <em>envvar</em></syntax>
- <default><em>unset</em></default>
+ <default><em>none</em></default>
<contextlist><context>server config</context>
<context>virtual host</context></contextlist>
<usage>
@@ -200,7 +199,7 @@
<description>Force EPSV to ignore the requested IP family
(IPv4 vs. IPv6)</description>
<syntax>FTPEPSVIgnoreFamily <em>On</em></syntax>
- <default>Off</default>
+ <default>FTPEPSVIgnoreFamily Off</default>
<contextlist><context>server config</context>
<context>virtual host</context></contextlist>
<usage>
@@ -232,7 +231,7 @@
<name>FTPHomeDir</name> <description>Set the path to directory
containing user's home directories</description>
<syntax>FTPHomeDir /directory</syntax>
- <default><em>unset</em></default>
+ <default><em>none</em></default>
<contextlist><context>server config</context>
<context>virtual host</context></contextlist>
<usage><p>This directive defines where the user home <em>directory</em>
@@ -302,7 +301,7 @@
<name>FTPLimitDBFile</name>
<description>Set the location for the Login Limit DB file</description>
<syntax>FTPLimitDBFile <em>file-path</em></syntax>
- <default>logs/ftplogins</default>
+ <default>FTPLimitDBFile logs/ftplogins</default>
<contextlist><context>server config</context>
</contextlist>
<usage>
@@ -322,7 +321,7 @@
<description>Set the maximum number of concurrent logins per IP
address</description>
<syntax></syntax>
- <default>0 <em>(unlimited)</em></default>
+ <default>FTPLimitLoginIP 0 <em>(unlimited)</em></default>
<contextlist><context>server config</context>
<context>virtual host</context></contextlist>
<usage>
@@ -338,7 +337,7 @@
<description>Set the maximum number of concurrent logins per
server</description>
<syntax>FTPLimitLoginServer <em>number</em></syntax>
- <default>0 <em>(unlimited)</em></default>
+ <default>FTPLimitLoginServer 0 <em>(unlimited)</em></default>
<contextlist><context>server config</context>
</contextlist>
<usage>
@@ -354,7 +353,7 @@
<description>Set the maximum number of concurrent logins per
user</description>
<syntax>FTPLimitLoginUser <em>number</em></syntax>
- <default>0 <em>(unlimited)</em></default>
+ <default>FTPLimitLoginUser 0 <em>(unlimited)</em></default>
<contextlist><context>server config</context>
</contextlist>
<usage>
@@ -384,7 +383,7 @@
<name>FTPOptions</name>
<description>Set options for this server</description>
<syntax>FTPOptions <em>option1 [option2] ...</em></syntax>
- <default>None</default>
+ <default><em>none</em></default>
<contextlist><context>server config</context>
<context>virtual host</context></contextlist>
<usage>
@@ -485,8 +484,8 @@
<description>Set the apparent server IP address for PASV data
channels</description>
<syntax>FTPPASVAddr <em>IP address</em></syntax>
- <default>The server's actual IP address of the control channel
- connection.</default>
+ <default><em>The server's actual IP address of the control channel
+ connection</em></default>
<contextlist><context>server config</context>
<context>virtual host</context></contextlist>
<usage>
@@ -507,8 +506,10 @@
<description>Set and bind the allowed PASV server IP address for
the data channel</description>
<syntax>FTPPASVbindaddr <em>IP address</em></syntax>
- <default>The specified FTPPASVaddr, or in it's absense, the server's
- actual IP address of the control channel connection.</default>
+ <default><em>The specified
+ <directive module="mod_ftp">FTPPASVaddr</directive>, or in its
+ absense, the server's actual IP address of the control channel
+ connection</em></default>
<contextlist><context>server config</context>
<context>virtual host</context></contextlist>
<usage>
@@ -529,8 +530,7 @@
<name>FTPPASVrange</name>
<description>Set the allowed passive port range</description>
<syntax>FTPPASVrange <em>number number</em></syntax>
- <default>If this directive is not specified, the server will use
- an arbitrary ephemeral high-numbered port</default>
+ <default><em>an ephemeral high-numbered port</em></default>
<contextlist><context>server config</context>
<context>virtual host</context></contextlist>
<usage>