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:24:34 UTC
svn commit: r601534 - in /httpd/mod_ftp/trunk/docs/manual:
ftp/ftp_intro.html.en mod/mod_ftp.html.en
Author: wrowe
Date: Wed Dec 5 13:24:30 2007
New Revision: 601534
URL: http://svn.apache.org/viewvc?rev=601534&view=rev
Log:
regenerate
Modified:
httpd/mod_ftp/trunk/docs/manual/ftp/ftp_intro.html.en
httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.html.en
Modified: httpd/mod_ftp/trunk/docs/manual/ftp/ftp_intro.html.en
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/ftp/ftp_intro.html.en?rev=601534&r1=601533&r2=601534&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/ftp/ftp_intro.html.en (original)
+++ httpd/mod_ftp/trunk/docs/manual/ftp/ftp_intro.html.en Wed Dec 5 13:24:30 2007
@@ -93,11 +93,10 @@
in practice all sessions are authenticated. Typically, FTP servers
authenticate against the user database of the server on which they
run. To facilitate downloads by the general public, FTP servers
-generally support a special username (by convention
-<em>‘anonymous’</em> or <em>‘ftp’</em>) to
-provide read-only access. Users are asked (but often not required) to
-provide their e-mail address as response to the <code>Password</code>
-prompt.
+generally support a special username (by convention <em>"anonymous"</em>
+or <em>"ftp"</em>) to provide read-only access. Users are asked (but
+often not required) to provide their e-mail address as response to the
+<code>Password</code> prompt.
</p>
<p>For more information on the basic functionality of the FTP protocol
Modified: httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.html.en
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.html.en?rev=601534&r1=601533&r2=601534&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.html.en (original)
+++ httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.html.en Wed Dec 5 13:24:30 2007
@@ -331,19 +331,20 @@
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Set the location for the Login Limit DB file</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>FTPLimitDBFile <em>file-path</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code><em>unset</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>logs/ftplogins</code></td></tr>
<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>External</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ftp</td></tr>
</table>
- <p>To provide <code class="directive"><a href="#ftplimitloginuser">FTPLimitLoginUser</a></code>
- and <code class="directive"><a href="#ftplimitloginserver">FTPLimitLoginServer</a></code>
+ <p>To provide <code class="directive"><a href="#ftplimitloginuser">FTPLimitLoginUser</a></code>,
+ <code class="directive"><a href="#ftplimitloginserver">FTPLimitLoginServer</a></code> and
+ <code class="directive"><a href="#ftplimitloginip">FTPLimitLoginIP</a></code>
features, mod_ftp uses a small DBM file to store login data. This
directive determines the filename-path of that database file.
If either <code>FTPLimit</code> directive is used, this directive
must specify a filename for this DBM, writeable by the server.</p>
<div class="example"><p><code><code>FTPLimitDBFile logs/ftplogins</code></code></p></div>
-
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="FTPLimitLoginIP" id="FTPLimitLoginIP">FTPLimitLoginIP</a> <a name="ftplimitloginip" id="ftplimitloginip">Directive</a></h2>
@@ -351,12 +352,15 @@
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Set the maximum number of concurrent logins per IP
address</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code /></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code /></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>0 <em>(unlimited)</em></code></td></tr>
<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>External</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ftp</td></tr>
</table>
- <div class="note">Not documented</div>
+ <p>This directive allows the administrator to limit the total
+ number of concurrent/simultaneous FTP logins. For example, if
+ set to 10, no more than 10 FTP logins from the same IP address
+ would be allowed. The default value is 0 (unlimited).</p>
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -365,15 +369,15 @@
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Set the maximum number of concurrent logins per
server</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>FTPLimitLoginServer <em>number</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>FTPLimitLoginServer 0 (unlimited)</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>0 <em>(unlimited)</em></code></td></tr>
<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>External</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ftp</td></tr>
</table>
<p>This directive allows the administrator to limit the total
number of concurrent/simultaneous FTP logins. For example, if
- set to 10, no more than 10 FTP logins would be allowed. The
- default value is 0 (unlimited).</p>
+ set to 100, no more than 100 FTP logins to the same virtual host
+ would be allowed. The default value is 0 (unlimited).</p>
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -382,11 +386,12 @@
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Set the maximum number of concurrent logins per
user</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>FTPLimitLoginUser <em>number</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>FTPLimitLoginUser 0 (unlimited)</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>0 <em>(unlimited)</em></code></td></tr>
<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>External</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ftp</td></tr>
-</table><p>This directive allows the administrator to limit the
+</table>
+ <p>This directive allows the administrator to limit the
number of concurrent/simultaneous logins of a single FTP user.
For example, if set to 3, then no single FTP account would be
allowed to have more than 3 concurrent logins (including the