Removing more links to the castaglia.org site from the documentation.

proftpd · Aug 14, 2016 · 42d2014 · 42d2014
1 parent e168c7b
commit 42d2014
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 79 deletions.
diff --git a/doc/contrib/mod_quotatab_sql.html b/doc/contrib/mod_quotatab_sql.html
@@ -1,6 +1,3 @@
-<!-- $Id: mod_quotatab_sql.html,v 1.2 2013-08-14 21:40:18 castaglia Exp $ -->
-<!-- $Source: /home/proftpd-core/backup/proftp-cvsroot/proftpd/doc/contrib/mod_quotatab_sql.html,v $ -->
-
 <html>
 <head>
 <title>ProFTPD module mod_quotatab_sql</title>
@@ -119,7 +116,7 @@ <h2>Thanks</h2>
 Also note that SQL-based tally tables have an issue with proper synchronization
 of updates, especially when multiple sessions involving the same tally
 are ocurring.  In order to prevent the tally table from becoming out of
-sync, you are <b>strongly</b> encouraged to define a <a href="http://www.castaglia.org/proftpd/modules/mod_quotatab.html#QuotaLock"><code>QuotaLock</code></a>
+sync, you are <b>strongly</b> encouraged to define a <a href="../contrib/mod_quotatab.html#QuotaLock"><code>QuotaLock</code></a>
 file.
 
 <p>
@@ -279,19 +276,12 @@ <h2>Thanks</h2>
 calculations. NULL values should be avoided whenever possible.
 
 <p>
-<hr><br>
-
-Author: <i>$Author: castaglia $</i><br>
-Last Updated: <i>$Date: 2013-08-14 21:40:18 $</i><br>
-
-<br><hr>
-
+<hr>
 <font size=2><b><i>
 &copy; Copyright 2000-2003 TJ Saunders<br>
  All Rights Reserved<br>
 </i></b></font>
-
-<hr><br>
+<hr>
 
 </body>
 </html>

diff --git a/doc/contrib/mod_sftp_sql.html b/doc/contrib/mod_sftp_sql.html
@@ -12,11 +12,11 @@ <h2><b>ProFTPD module <code>mod_sftp_sql</code></b></h2>
 <hr><br>
 
 <p>
-The <a href="http://www.castaglia.org/proftpd/modules/mod_sftp.html"><code>mod_sftp</code></a> module for ProFTPD can support different storage formats for
-its user- and host-based authorized keys.  By default, the <code>mod_sftp</code>
-module supports storing authorized keys in flats.  This
-<code>mod_sftp_sql</code> module allows for authorized SSH keys to be stored
-in SQL tables.
+The <a href="../contrib/mod_sftp.html"><code>mod_sftp</code></a> module for
+ProFTPD can support different storage formats for its user- and host-based
+authorized keys.  By default, the <code>mod_sftp</code> module supports storing
+authorized keys in flat files.  This <code>mod_sftp_sql</code> module allows
+for authorized SSH keys to be stored in SQL tables.
 
 <p>
 This module is contained in the <code>mod_sftp_sql.c</code> file for

diff --git a/doc/howto/AuthFiles.html b/doc/howto/AuthFiles.html
@@ -1,15 +1,12 @@
-<!-- $Id: AuthFiles.html,v 1.1 2006-01-11 13:55:37 castaglia Exp $ -->
-<!-- $Source: /home/proftpd-core/backup/proftp-cvsroot/proftpd/doc/howto/AuthFiles.html,v $ -->
-
 <html>
 <head>
-<title>ProFTPD mini-HOWTO - Using AuthUserFiles</title>
+<title>ProFTPD: Using AuthUserFiles</title>
 </head>
 
 <body bgcolor=white>
 
 <hr>
-<center><h2><b><i>Using <code>AuthUserFile</code>s</i></b></h2></center>
+<center><h2><b><i>ProFTPD: Using <code>AuthUserFile</code>s</i></b></h2></center>
 <hr>
 
 <p>
@@ -46,12 +43,11 @@
 <code>/etc/passwd</code>, not <b>instead of</b> it (prior to 1.2.8rc1, however,
 an <code>AuthUserFile</code> was used instead of <code>/etc/passwd</code>);
 similarly for <code>AuthGroupFile</code> and <code>/etc/group</code>.  The
-<a href="http://www.castaglia.org/proftpd/doc/contrib/ProFTPD-mini-HOWTO-Authentication.html#order"><code>AuthOrder</code></a> directive can be used if
-you want <code>proftpd</code> to use only the <code>AuthUserFile</code>. The
-format of an <code>AuthUserFile</code> is the same as <code>/etc/passwd</code>
-(<code>man passwd(5)</code>), and the format of an <code>AuthGroupFile</code>
-is the same as <code>/etc/group</code> (<code>man group(5)</code>).  There is
-an <a href="http://www.castaglia.org/proftpd/contrib/ftpasswd.html"><code>ftpasswd</code></a> script available that can be used to create and update
+<a href="Authentication.html#order"><code>AuthOrder</code></a> directive can be used if you want <code>proftpd</code> to use only the <code>AuthUserFile</code>.
+The format of an <code>AuthUserFile</code> is the same as
+<code>/etc/passwd</code> (<code>man passwd(5)</code>), and the format of an
+<code>AuthGroupFile</code> is the same as <code>/etc/group</code> (<code>man
+group(5)</code>).  There is an <a href="../contrib/ftpasswd.html"><code>ftpasswd</code></a> script available that can be used to create and update
 these files.
 
 <p>
@@ -71,7 +67,8 @@
 <pre>
   groupname:grouppasswd:gid:member1,member2,...member<i>N</i>
 </pre>
-The <a href="http://www.castaglia.org/proftpd/contrib/ftpasswd.html"><code>ftpasswd</code></a> script mentioned creates files in these required formats.
+The <a href="../contrib/ftpasswd.html"><code>ftpasswd</code></a> script
+mentioned creates files in these required formats.
 
 <p>
 <b>Choice of IDs</b><br>

diff --git a/doc/howto/ConnectionACLs.html b/doc/howto/ConnectionACLs.html
@@ -1,15 +1,12 @@
-<!-- $Id: ConnectionACLs.html,v 1.3 2011-01-05 19:26:53 castaglia Exp $ -->
-<!-- $Source: /home/proftpd-core/backup/proftp-cvsroot/proftpd/doc/howto/ConnectionACLs.html,v $ -->
-
 <html>
 <head>
-<title>ProFTPD mini-HOWTO - Connection ACLs</title>
+<title>ProFTPD: Connection ACLs</title>
 </head>
 
 <body bgcolor=white>
 
 <hr>
-<center><h2><b>Connection ACLs</b></h2></center>
+<center><h2><b>ProFTPD: Connection ACLs</b></h2></center>
 <hr>
 
 <p>
@@ -186,8 +183,7 @@
 <p>
 And if you find yourself starting to block large blocks of addresses from
 countries/regions, you should start thinking about connection ACLs in terms of
-geolocation information.  For this, the <a href="http://www.castaglia.org/proftpd/modules/mod_geoip.html"><code>mod_geoip</code></a> module for proftpd is
-quite useful.
+geolocation information.  For this, the <a href="../contrib/mod_geoip.html"><code>mod_geoip</code></a> module for ProFTPD is quite useful.
 
 <p><a name="FAQ">
 <b>Frequently Asked Questions</b><br>

diff --git a/doc/howto/DNS.html b/doc/howto/DNS.html
@@ -1,15 +1,12 @@
-<!-- $Id: DNS.html,v 1.2 2009-02-12 22:41:32 castaglia Exp $ -->
-<!-- $Source: /home/proftpd-core/backup/proftp-cvsroot/proftpd/doc/howto/DNS.html,v $ -->
-
 <html>
 <head>
-<title>ProFTPD mini-HOWTO - DNS</title>
+<title>ProFTPD: DNS</title>
 </head>
 
 <body bgcolor=white>
 
 <hr>
-<center><h2><b>ProFTPD and DNS</b></h2></center>
+<center><h2><b>ProFTPD: DNS</b></h2></center>
 <hr>
 
 <p>
@@ -58,8 +55,9 @@
 the name displayed by typing <code>`hostname`</code>.  Why does
 <code>proftpd</code> need to know this?  There is always at least one
 server that <code>proftpd</code> will handle: the &quot;server config&quot;
-server (see the <a href="http://www.castaglia.org/proftpd/doc/contrib/ProFTPD-mini-HOWTO-Vhost.html">virtual host</a> howto).  This &quot;server config&quot;
-server defaults to the IP address of the hostname of the machine.
+server (see the <a href="Vhost.html">virtual host</a> howto).  This
+&quot;server config&quot; server defaults to the IP address of the hostname of
+the machine.
 
 <p>
 Once <code>proftpd</code> has the complete list of IP addresses with which
@@ -146,12 +144,12 @@
 To specify the desired IP address, use <code>-S</code> when starting
 <code>proftpd</code>, <i>e.g.</i>:
 <pre>
-  /usr/local/sbin/proftpd -S 1.2.3.4 ...
+  $ /usr/local/sbin/proftpd -S 1.2.3.4 ...
 </pre>
 And if you want <code>proftpd</code> to listen on all interfaces, you can
 specify a wildcard socket using an IP address of 0.0.0.0:
 <pre>
-  /usr/local/sbin/proftpd -S 0.0.0.0 ...
+  $ /usr/local/sbin/proftpd -S 0.0.0.0 ...
 </pre>
 
 <p>

diff --git a/doc/howto/Directory.html b/doc/howto/Directory.html
@@ -147,10 +147,10 @@
 subdirectories of the given directory, <code>upload/</code>.
 
 <p>
-Also, it is good to keep in mind the <a href="http://www.castaglia.org/proftpd/doc/devel-guide/internals/ftpaccess.html">similarity</a> between a
-<code>&lt;Directory&gt;</code> section and a <code>.ftpaccess</code> file.
-In some cases, using <code>.ftpaccess</code> files might be more convenient.
-The
+Also, it is good to keep in mind the <a href="ftpaccess.html">similarity</a>
+between a <code>&lt;Directory&gt;</code> section and a <code>.ftpaccess</code>
+file.  In some cases, using <code>.ftpaccess</code> files might be more
+convenient.  The
 <a href="../modules/mod_core.html#AllowOverride"><code>AllowOverride</code></a>
 configuration directive (which first appeared in the 1.2.7rc1 release) provides
 fine-grained control over when <code>.ftpaccess</code> files will be honored.

diff --git a/doc/howto/Quotas.html b/doc/howto/Quotas.html
@@ -1,15 +1,12 @@
-<!-- $Id: Quotas.html,v 1.8 2009-07-23 15:04:05 castaglia Exp $ -->
-<!-- $Source: /home/proftpd-core/backup/proftp-cvsroot/proftpd/doc/howto/Quotas.html,v $ -->
-
 <html>
 <head>
-<title>ProFTPD mini-HOWTO - Quotas</title>
+<title>ProFTPD: Quotas</title>
 </head>
 
 <body bgcolor=white>
 
 <hr>
-<center><h2><b>ProFTPD Quotas</b></h2></center>
+<center><h2><b>ProFTPD: Quotas</b></h2></center>
 <hr>
 
 <p>
@@ -53,20 +50,14 @@
     QuotaLog /var/log/ftpd/quota.log
 
     # For more information on using files for storing the limit and tally
-    # table quota data, please see the mod_quotatab_file documentation:
-    #
-    #   <a href="../contrib/mod_quotatab_file.html">http://www.castaglia.org/proftpd/modules/mod_quotatab_file.html</a>
-    #
+    # table quota data, please see the <a href="../contrib/mod_quotatab_file.html">mod_quotatab_file</a> documentation.
     &lt;IfModule mod_quotatab_file.c&gt;
       QuotaLimitTable file:/etc/ftpd/ftpquota.limittab
       QuotaTallyTable file:/etc/ftpd/ftpquota.tallytab
     &lt;/IfModule&gt;
 
     # For more information on using a SQL database for storing the limit and
-    # tally table quota data, please see the mod_quotatab_file documentation:
-    #
-    #   <a href="../contrib/mod_quotatab_sql.html">http://www.castaglia.org/proftpd/modules/mod_quotatab_sql.html</a>
-    #
+    # tally table quota data, please see the <a href="../contrib/mod_quotatab_sql.html">mod_quotatab_sql</a> documentation
     &lt;IfModule mod_quotatab_sql.c&gt;
       SQLNamedQuery get-quota-limit SELECT "* FROM quotalimits WHERE name = '%{0}' AND quota_type = '%{1}'"
       SQLNamedQuery get-quota-tally SELECT "* FROM quotatallies WHERE name = '%{0}' AND quota_type = '%{1}'"
@@ -185,7 +176,7 @@
 
 <p><a name="QuotasCreatingFileTables" title="#QuotasCreatingFileTables"></a>
 <font color=red>Question</font>: How do I construct the limit and tally files for file-based quotas?<br>
-<font color=blue>Answer</font>: There is a Perl script called <a href="http://www.castaglia.org/proftpd/contrib/ftpquota.html"><code>ftpquota</code></a> which
+<font color=blue>Answer</font>: There is a Perl script called <a href="http://www.proftpd.org/docs/contrib/ftpquota.html"><code>ftpquota</code></a> which
 can create the necessary files.  This script can also be found under the
 <code>contrib/</code> directory of the <code>proftpd</code> source
 distribution.

diff --git a/doc/howto/Stopping.html b/doc/howto/Stopping.html
@@ -1,15 +1,12 @@
-<!-- $Id: Stopping.html,v 1.6 2013-07-02 05:46:51 castaglia Exp $ -->
-<!-- $Source: /home/proftpd-core/backup/proftp-cvsroot/proftpd/doc/howto/Stopping.html,v $ -->
-
 <html>
 <head>
-<title>ProFTPD mini-HOWTO - Stopping and Starting</title>
+<title>ProFTPD: Stopping and Starting</title>
 </head>
 
 <body bgcolor=white>
 
 <hr>
-<center><h2><b><i>Stopping and Starting ProFTPD</i></b></h2></center>
+<center><h2><b><i>ProFTPD: Stopping and Starting</i></b></h2></center>
 <hr>
 
 <p>
@@ -290,7 +287,7 @@
 
 <p>
 Read <code>ftpshut</code>'s
-<a href="http://www.castaglia.org/proftpd/doc/ftpshut.html">man</a> page
+<a href="http://www.proftpd.org/docs/utils/ftpshut.html">man</a> page
 for more detailed information on its usage.
 
 <p>

diff --git a/doc/howto/VirtualUsers.html b/doc/howto/VirtualUsers.html
@@ -1,15 +1,12 @@
-<!-- $Id: VirtualUsers.html,v 1.1 2005-07-05 16:11:15 castaglia Exp $ -->
-<!-- $Source: /home/proftpd-core/backup/proftp-cvsroot/proftpd/doc/howto/VirtualUsers.html,v $ -->
-
 <html>
 <head>
-<title>ProFTPD mini-HOWTO - ProFTPD Virtual Users</title>
+<title>ProFTPD: Virtual Users</title>
 </head>
 
 <body bgcolor=white>
 
 <hr>
-<center><h2><b>ProFTPD Virtual Users</b></h2></center>
+<center><h2><b>ProFTPD: Virtual Users</b></h2></center>
 <hr>
 
 <p>
@@ -124,10 +121,7 @@
 </pre>
 The <code>ftpasswd</code> tool is a Perl script, distributed with the
 ProFTPD source code, under the <code>contrib/</code> directory.  A copy
-can also be found online:
-<pre>
-  <a href="http://www.castaglia.org/proftpd/contrib/ftpasswd">http://www.castaglia.org/proftpd/contrib/ftpasswd</a>
-</pre>
+can also be found <a href="https://github.com/proftpd/proftpd/blob/master/contrib/ftpasswd">on GitHub</a>.
 
 <p>
 Another very popular authentication mechanism used for virtual users is a SQL