CVS: tmda/htdocs ChangeLog, 1.169, 1.170 Makefile, 1.9, 1.10 TMDAGenerator.py, 1.19, 1.20 config-vars.html, 1.96, 1.97 index.ht, 1.21, 1.22 index.html, 1.59, 1.60 links.h, 1.15, 1.16 challengeresponse.ht, 1.4, NONE challengeresponse.html, 1.17, NONE config-client.ht, 1.34, NONE config-client.html, 1.75, NONE config-filter.ht, 1.31, NONE config-filter.html, 1.69, NONE config-pre.ht, 1.23, NONE config-pre.html, 1.62, NONE config-server.ht, 1.30, NONE config-server.html, 1.72, NONE config.ht, 1.17, NONE config.html, 1.54, NONE donations.ht, 1.5, NONE donations.html, 1.15, NONE download.ht, 1.34, NONE download.html, 1.75, NONE features.ht, 1.22, NONE features.html, 1.64, NONE filter-sources.ht, 1.10, NONE filter-sources.html, 1.40, NONE history.ht, 1.5, NONE history.html, 1.45, NONE howto-template.ht, 1.12, NONE howto-template.html, 1.38, NONE install.ht, 1.16, NONE i

"Jason R. Mastaler" <[email protected]> Thu, 14 Sep 2006 16:37:02 -0700
Newsgroups gmane.mail.spam.tmda.cvs
Message-ID <[email protected]>
Update of /cvsroot/tmda/tmda/htdocs
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20801

Modified Files:
	ChangeLog Makefile TMDAGenerator.py config-vars.html index.ht 
	index.html links.h 
Removed Files:
	challengeresponse.ht challengeresponse.html config-client.ht 
	config-client.html config-filter.ht config-filter.html 
	config-pre.ht config-pre.html config-server.ht 
	config-server.html config.ht config.html donations.ht 
	donations.html download.ht download.html features.ht 
	features.html filter-sources.ht filter-sources.html history.ht 
	history.html howto-template.ht howto-template.html install.ht 
	install.html logos.ht logos.html requirements.ht 
	requirements.html tmda-ofmipd.ht tmda-ofmipd.html 
	tmda-vdomains.ht tmda-vdomains.html trouble.ht trouble.html 
	upgrade.ht upgrade.html 
Log Message:
All documentation has been moved into wiki.tmda.net.  For the reasons behind this, see

http://thread.gmane.org/gmane.mail.spam.tmda.devel/6396/



Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda/htdocs/ChangeLog,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- ChangeLog	23 Sep 2003 00:03:52 -0000	1.169
+++ ChangeLog	14 Sep 2006 23:36:56 -0000	1.170
@@ -1,3 +1,17 @@
+2006-09-14  Jason R. Mastaler  <[email protected]>
+
+	* links.h: All docs now reside at wiki.tmda.net.  Just include a
+	few essential links on this top-level homepage.
+
+	* TMDAGenerator.py: Move back to blue-style template.  Remove the
+	links to mirror sites - that was a PITA to maintain, and the wiki
+	will now contain the definitive list.  
+
+	* index.ht: Add a note about the docs being moved to TmdaWiki.
+
+	* Makefile: Master site is now tmda.net rather than sourceforge,
+	so we rsync to there.
+
 2003-07-11  Tim Legant  <[email protected]>
 
 	* filter-sources.ht: Removed {from,to}-mysql documentation, moved

Index: Makefile
===================================================================
RCS file: /cvsroot/tmda/tmda/htdocs/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile	4 Feb 2004 05:57:38 -0000	1.9
+++ Makefile	14 Sep 2006 23:36:56 -0000	1.10
@@ -29,7 +29,7 @@
 TARGETS =	$(filter-out *.html,$(SOURCES:%.ht=%.html)) $(EXTRA_TARGETS)
 GENERATED_HTML= $(SOURCES:.ht=.html)
 
-DEST =          [email protected]:/home/groups/t/tm/tmda/htdocs/unstable
+DEST =          [email protected]:/www/tmda.net/htdocs
 EXCLUDES =      --exclude "*"
 INCLUDES =	--include "*.html"
 ARGS =          -e ssh -v -a -z --delete $(INCLUDES) $(EXCLUDES)

Index: TMDAGenerator.py
===================================================================
RCS file: /cvsroot/tmda/tmda/htdocs/TMDAGenerator.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TMDAGenerator.py	5 Feb 2004 22:15:52 -0000	1.19
+++ TMDAGenerator.py	14 Sep 2006 23:36:56 -0000	1.20
@@ -1,6 +1,6 @@
 # -*- python -*-
 #
-# Copyright (C) 2001,2002,2003,2004 Jason R. Mastaler <[email protected]>
+# Copyright (C) 2001,2002,2003,2004,2005,2006 Jason R. Mastaler <[email protected]>
 #
 # This file is part of TMDA.
 #
@@ -25,6 +25,7 @@
 import os
 import time
 
+from email.Utils import formatdate
 from Skeleton import Skeleton
 from Sidebar import Sidebar, BLANKCELL
 from Banner import Banner
@@ -32,37 +33,22 @@
 from LinkFixer import LinkFixer
 
 
-
 sitelinks = [
 
-    ('%(rootdir)s/index.html', 'Home'),
-
-    ('%(rootdir)s/trouble.html', 'Help'),
-   
-    ('../tmda-cgi', 'TMDA-CGI'),
-
-    ('http://sourceforge.net/projects/tmda', 'SourceForge'),
- 
-    (None, '[\
-    <a href="http://www.au.tmda.net/" title="Australia Mirror">AU</a> |\
-    <a href="http://www.de.tmda.net/" title="Germany Mirror">DE</a> |\
-    <a href="http://www.it.tmda.net/" title="Italy Mirror">IT</a> |\
-    <a href="http://www.pl.tmda.net/" title="Poland Mirror">PL</a> |\
-    <a href="http://www.us.tmda.net/" title="USA Mirror">US</a> \
-    mirror ]'),
-
-    ('http://tmda.net/faq.cgi', 'FAQ'),
+    ('http://wiki.tmda.net/', 'TmdaWiki'),
 
-    ('http://wiki.tmda.net/', 'Wiki'),
+    ('http://sourceforge.net/projects/tmda', 'TMDA @ SourceForge'),
+  
+    ('tmda-cgi', 'TMDA-CGI'),
  
-    ('http://www.cafeshops.com/TMDA/', 'Store'),
+    ('http://www.cafepress.com/TMDA/', 'TMDA Store'),
 
     ]
 
-
+
 class TMDAGenerator(Skeleton, Sidebar, Banner):
-    AUTHOR = 'TMDA Workers List'
-    EMAIL = '[email protected]'
+    AUTHOR = 'TMDA Users List'
+    EMAIL = '[email protected]'
 
     def __init__(self, file, rootdir, relthis):
         root, ext = os.path.splitext(file)
@@ -81,9 +67,9 @@
         copyright = self.__parser.get('copyright', '2001-%d' %
                                       time.localtime()[0])
         p.sidebar.append((None, '&copy; ' + copyright))
-        #last_modified = self.__parser.get('last_modified', '%s' %
-        #                              time.asctime(time.gmtime(time.time())))
-        #p.sidebar.append('Updated: ' + last_modified)
+        last_modified = self.__parser.get('last_modified', '%s' %
+                                      formatdate(usegmt=True))
+        p.sidebar.append('Last Updated: ' + last_modified)
         # Fix up our site links, no relthis because the site links are
         # relative to the root of our web pages.
         sitelink_fixer = LinkFixer(f.myurl(), rootdir)
@@ -113,14 +99,8 @@
     def get_corner(self):
         # It is important not to have newlines between the img tag and the end
         # anchor and end center tags, otherwise layout gets messed up
-        #return '''<center><font size="+2"
-        #>&gt;&gt;&gt;&nbsp;TMDA&nbsp</font></center>'''
-        rootdir = self.__linkfixer.rootdir()
-        return '''
-<center>
-    <a href="%(rootdir)s/index.html">
-    <img border=0 src="%(rootdir)s/img/blocksmall.png"></a></center>''' \
-    % self.__d
+        return '''<center><font size="+2"
+        >&gt;&gt;&gt;&nbsp;TMDA&nbsp</font></center>'''
 
     def get_body(self):
         self.__grokbody()
@@ -141,39 +121,19 @@
                 # there is no wide body
                 self.__body = text
 
-    # TMDA 1.1 Scotch/Sea color scheme            
+
+    # python.org color scheme overrides
     def get_lightshade(self):
-        #return '#fffedc'
-        #return '#ffccff'
-        #return '#e5e5e5'
-        #return '#F5DEB3'
-        #return '#8FBC8F'
-        return '#7FFFD4'
+        return '#cccccc'
         
     def get_mediumshade(self):
         return '#9862cb'
 
     def get_darkshade(self):
-        #return '#000000'
-        #return '#8B4513'
-        #return '#008B45'
-        return '#2E8B57'
-    
-    def get_corner_bgcolor(self):
-        return '#7FFFD4'
+        return '#191970'
 
-    # TMDA 1.0.x color scheme
-    #def get_lightshade(self):
-    #    return '#cccccc'
-    #    
-    #def get_mediumshade(self):
-    #    return '#9862cb'
-    #
-    #def get_darkshade(self):
-    #    return '#191970'
-    #
-    #def get_corner_bgcolor(self):
-    #    return '#afeeee'
+    def get_corner_bgcolor(self):
+        return '#afeeee'
     
 # jython.org color scheme
 #     def get_lightshade(self):

Index: config-vars.html
===================================================================
RCS file: /cvsroot/tmda/tmda/htdocs/config-vars.html,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- config-vars.html	6 Mar 2004 01:27:23 -0000	1.96
+++ config-vars.html	14 Sep 2006 23:36:56 -0000	1.97
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <!-- THIS PAGE IS AUTOMATICALLY GENERATED.  DO NOT EDIT. -->
-<!-- Fri Mar  5 18:34:35 2004 -->
+<!-- Thu Sep 14 17:31:35 2006 -->
 <!-- USING HT2HTML 2.0 -->
 <!-- SEE http://ht2html.sf.net -->
 <!-- User-specified headers:
@@ -26,44 +26,29 @@
 <!-- start of banner row -->
 <tr>
 <!-- start of corner cells -->
-<td width="150" valign="middle" bgcolor="#7FFFD4" class="corner">
-
-<center>
-    <a href="./index.html">
-    <img border=0 src="./img/blocksmall.png"></a></center> </td>
-<td width="15" bgcolor="#7FFFD4">&nbsp;&nbsp;</td><!--spacer-->
+<td width="150" valign="middle" bgcolor="#afeeee" class="corner">
+<center><font size="+2"
+        >&gt;&gt;&gt;&nbsp;TMDA&nbsp</font></center> </td>
+<td width="15" bgcolor="#cccccc">&nbsp;&nbsp;</td><!--spacer-->
 <!-- end of corner cells -->
 <!-- start of banner -->
-<td width="90%" bgcolor="#7FFFD4" class="banner">
+<td width="90%" bgcolor="#cccccc" class="banner">
 <!-- start of site links table -->
 <table width="100%" border="0"
 CELLSPACING=0 CELLPADDING=0
        bgcolor="#ffffff">
 <tr>
-    <td bgcolor="#7FFFD4">
-<a href="./index.html">Home</a>
-    </td>
-    <td bgcolor="#7FFFD4">
-<a href="./trouble.html">Help</a>
-    </td>
-    <td bgcolor="#7FFFD4">
-<a href="../tmda-cgi">TMDA-CGI</a>
-    </td>
-    <td bgcolor="#7FFFD4">
-<a href="http://sourceforge.net/projects/tmda">SourceForge</a>
-    </td>
-</tr><tr>
-    <td bgcolor="#7FFFD4">
-[    <a href="http://www.au.tmda.net/" title="Australia Mirror">AU</a> |    <a href="http://www.de.tmda.net/" title="Germany Mirror">DE</a> |    <a href="http://www.it.tmda.net/" title="Italy Mirror">IT</a> |    <a href="http://www.pl.tmda.net/" title="Poland Mirror">PL</a> |    <a href="http://www.us.tmda.net/" title="USA Mirror">US</a>     mirror ]
+    <td bgcolor="#cccccc">
+<a href="http://wiki.tmda.net/">TmdaWiki</a>
     </td>
-    <td bgcolor="#7FFFD4">
-<a href="http://tmda.net/faq.cgi">FAQ</a>
+    <td bgcolor="#cccccc">
+<a href="http://sourceforge.net/projects/tmda">TMDA @ SourceForge</a>
     </td>
-    <td bgcolor="#7FFFD4">
-<a href="http://wiki.tmda.net/">Wiki</a>
+    <td bgcolor="#cccccc">
+<a href="tmda-cgi">TMDA-CGI</a>
     </td>
-    <td bgcolor="#7FFFD4">
-<a href="http://www.cafeshops.com/TMDA/">Store</a>
+    <td bgcolor="#cccccc">
+<a href="http://www.cafepress.com/TMDA/">TMDA Store</a>
     </td>
 </tr>
 </table><!-- end of site links table -->
@@ -72,135 +57,48 @@
 </tr><!-- end of banner row -->
 <tr><!-- start of sidebar/body row -->
 <!-- start of sidebar cells -->
-<td width="150" valign="top" bgcolor="#7FFFD4" class="sidebar">
+<td width="150" valign="top" bgcolor="#cccccc" class="sidebar">
 <!-- start of sidebar table -->
 <table width="100%" border="0" cellspacing="0" cellpadding="3"
        bgcolor="#ffffff">
-<tr><td bgcolor="#2E8B57"><b><font color="#ffffff">
-About
-</font></b></td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="index.html">Introduction</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="history.html">History</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="features.html">Features</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="challengeresponse.html">Challenge / Response</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="donations.html">Donations</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="http://wiki.tmda.net/index.cgi/TmdaAdvocacy">Advocacy</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">&nbsp;
-<tr><td bgcolor="#2E8B57"><b><font color="#ffffff">
-Install
-</font></b></td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="requirements.html">Requirements</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="download.html">Download</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="install.html">Installation</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="upgrade.html">Upgrading</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">&nbsp;
-<tr><td bgcolor="#2E8B57"><b><font color="#ffffff">
-Configuration
+<tr><td bgcolor="#191970"><b><font color="#ffffff">
+Quick Links
 </font></b></td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="config.html">Overview</a>
+<tr><td bgcolor="#cccccc">
+<a href="http://wiki.tmda.net/AboutTmda">About TMDA</a>
 </td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="config-pre.html">Pre-Config</a>
+<tr><td bgcolor="#cccccc">
+<a href="http://wiki.tmda.net/TmdaDownload">Download</a>
 </td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="config-server.html">Server Config</a>
+<tr><td bgcolor="#cccccc">
+<a href="http://wiki.tmda.net/TmdaDocumentation">Documentation</a>
 </td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="config-client.html">Client Config</a>
+<tr><td bgcolor="#cccccc">
+<a href="http://wiki.tmda.net/TmdaSupport">Support</a>
 </td></tr>
-<tr><td bgcolor="#7FFFD4">
-<b>Config Variables</b>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="config-filter.html">Filter Spec</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="filter-sources.html">Filter Sources</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="howto-template.html">Templates</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="tmda-vdomains.html">Virtual Domains</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="tmda-ofmipd.html">tmda-ofmipd</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="http://wiki.tmda.net/index.cgi/TmdaHowtos">User HOWTOs</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">&nbsp;
-<tr><td bgcolor="#2E8B57"><b><font color="#ffffff">
-Support
-</font></b></td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="trouble.html">Help</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
+<tr><td bgcolor="#cccccc">
 <a href="http://tmda.net/faq.cgi">FAQ</a>
 </td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="http://wiki.tmda.net/index.cgi/TmdaMailingListsAndNewsgroups">Lists &amp; Newsgroups</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="http://wiki.tmda.net/index.cgi/TmdaMailingListArchives">List Archives</a> 
+<tr><td bgcolor="#cccccc">
+<a href="http://wiki.tmda.net/TmdaDonations">Donations</a>
 </td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="http://wiki.tmda.net/index.cgi/TmdaCommercialSupport">Commercial Support</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="http://wiki.tmda.net/index.cgi/TmdaDocumentation">External Docs</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="http://wiki.tmda.net/">TmdaWiki</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">&nbsp;
-<tr><td bgcolor="#2E8B57"><b><font color="#ffffff">
-Miscellaneous
-</font></b></td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="http://wiki.tmda.net/index.cgi/TmdaMirrors">Mirrors</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="logos.html">Logos</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="http://www.cafeshops.com/TMDA/" TARGET="Resource Window">Merchandise</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">&nbsp;
-<tr><td bgcolor="#2E8B57"><b><font color="#ffffff">
+<tr><td bgcolor="#cccccc">&nbsp;
+<tr><td bgcolor="#191970"><b><font color="#ffffff">
 Contact
 </font></b></td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="mailto:[email protected]">TMDA Workers List</a>
+<tr><td bgcolor="#cccccc">
+<a href="mailto:[email protected]">TMDA Users List</a>
 </td></tr>
-<tr><td bgcolor="#7FFFD4">
+<tr><td bgcolor="#cccccc">
 &nbsp;
 </td></tr>
-<tr><td bgcolor="#7FFFD4">
-&copy; 2001-2004
+<tr><td bgcolor="#cccccc">
+&copy; 2001-2006
 </td></tr>
+<tr><td bgcolor="#cccccc">&nbsp;
+<tr><td bgcolor="#191970"><b><font color="#ffffff">
+Last Updated: Thu, 14 Sep 2006 23:31:35 GMT
+</font></b></td></tr>
 </table><!-- end of sidebar table -->
 
 </td>

Index: index.ht
===================================================================
RCS file: /cvsroot/tmda/tmda/htdocs/index.ht,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- index.ht	6 Nov 2003 23:59:08 -0000	1.21
+++ index.ht	14 Sep 2006 23:36:56 -0000	1.22
@@ -7,16 +7,20 @@
 </table>
 
 <br>
+<hr>
+<b>NOTE:</b> All documentation and further information about TMDA has been moved into the 
+<a href="http://wiki.tmda.net/">TmdaWiki</a>!
+<hr>
+<br>
 
 TMDA is an 
 <a href="http://www.opensource.org/" TARGET="Resource Window">
 open source</a> software application designed to significantly
 reduce the amount of 
-<a href="http://spam.abuse.net/" TARGET="Resource Window">spam</a>
+<a href="http://en.wikipedia.org/wiki/E-mail_spam" TARGET="Resource Window">spam</a>
 (Internet junk-mail) you receive.  TMDA strives to be more effective, 
 yet less time-consuming than traditional spam filters. 
-TMDA can also be used as a general purpose 
-<a href="config-filter.html">local mail delivery agent</a> 
+TMDA can also be used as a general purpose local mail delivery agent</a> 
 to filter, sort, deliver and dispose of incoming mail.
 <br><br>
 
@@ -28,16 +32,17 @@
 
 <li><b>blacklists</b>: refuse mail from undesired senders.<br><br>
 
-<li><b><a href="challengeresponse.html">challenge/response</a></b>: 
+<li><b><a href="http://wiki.tmda.net/ChallengeResponse">challenge/response</a></b>: 
 allows unknown senders which
 aren't on the whitelist or blacklist the chance to confirm that their message 
 is legitimate (non-spam).<br><br>
 
-<li<b><a href="config-client.html">tagged addresses</a></b>: 
+<li<b><a href="http://wiki.tmda.net/ClientConfiguration">tagged addresses</a></b>: 
 special-purpose e-mail addresses such as time-dependent addresses, or
 addresses which only accept certain kinds of communication.  These
 increase the transparency of TMDA for unknown senders by allowing them
 to safely circumvent the challenge/response system.
+
 </ul>
 
 This combination was chosen based on the following assumptions about the
@@ -57,3 +62,6 @@
 <li>spam will not cease until it becomes prohibitively expensive for spammers to operate.
 </ol>
 
+<br>
+<hr>
+

Index: index.html
===================================================================
RCS file: /cvsroot/tmda/tmda/htdocs/index.html,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- index.html	6 Feb 2004 17:57:05 -0000	1.59
+++ index.html	14 Sep 2006 23:36:56 -0000	1.60
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <!-- THIS PAGE IS AUTOMATICALLY GENERATED.  DO NOT EDIT. -->
-<!-- Fri Feb  6 10:40:30 2004 -->
+<!-- Thu Sep 14 17:31:36 2006 -->
 <!-- USING HT2HTML 2.0 -->
 <!-- SEE http://ht2html.sf.net -->
 <!-- User-specified headers:
@@ -26,44 +26,29 @@
 <!-- start of banner row -->
 <tr>
 <!-- start of corner cells -->
-<td width="150" valign="middle" bgcolor="#7FFFD4" class="corner">
-
-<center>
-    <a href="./index.html">
-    <img border=0 src="./img/blocksmall.png"></a></center> </td>
-<td width="15" bgcolor="#7FFFD4">&nbsp;&nbsp;</td><!--spacer-->
+<td width="150" valign="middle" bgcolor="#afeeee" class="corner">
+<center><font size="+2"
+        >&gt;&gt;&gt;&nbsp;TMDA&nbsp</font></center> </td>
+<td width="15" bgcolor="#cccccc">&nbsp;&nbsp;</td><!--spacer-->
 <!-- end of corner cells -->
 <!-- start of banner -->
-<td width="90%" bgcolor="#7FFFD4" class="banner">
+<td width="90%" bgcolor="#cccccc" class="banner">
 <!-- start of site links table -->
 <table width="100%" border="0"
 CELLSPACING=0 CELLPADDING=0
        bgcolor="#ffffff">
 <tr>
-    <td bgcolor="#7FFFD4">
-<b>Home</b>
-    </td>
-    <td bgcolor="#7FFFD4">
-<a href="./trouble.html">Help</a>
-    </td>
-    <td bgcolor="#7FFFD4">
-<a href="../tmda-cgi">TMDA-CGI</a>
-    </td>
-    <td bgcolor="#7FFFD4">
-<a href="http://sourceforge.net/projects/tmda">SourceForge</a>
+    <td bgcolor="#cccccc">
+<a href="http://wiki.tmda.net/">TmdaWiki</a>
     </td>
-</tr><tr>
-    <td bgcolor="#7FFFD4">
-[    <a href="http://www.au.tmda.net/" title="Australia Mirror">AU</a> |    <a href="http://www.de.tmda.net/" title="Germany Mirror">DE</a> |    <a href="http://www.it.tmda.net/" title="Italy Mirror">IT</a> |    <a href="http://www.pl.tmda.net/" title="Poland Mirror">PL</a> |    <a href="http://www.us.tmda.net/" title="USA Mirror">US</a>     mirror ]
+    <td bgcolor="#cccccc">
+<a href="http://sourceforge.net/projects/tmda">TMDA @ SourceForge</a>
     </td>
-    <td bgcolor="#7FFFD4">
-<a href="http://tmda.net/faq.cgi">FAQ</a>
+    <td bgcolor="#cccccc">
+<a href="tmda-cgi">TMDA-CGI</a>
     </td>
-    <td bgcolor="#7FFFD4">
-<a href="http://wiki.tmda.net/">Wiki</a>
-    </td>
-    <td bgcolor="#7FFFD4">
-<a href="http://www.cafeshops.com/TMDA/">Store</a>
+    <td bgcolor="#cccccc">
+<a href="http://www.cafepress.com/TMDA/">TMDA Store</a>
     </td>
 </tr>
 </table><!-- end of site links table -->
@@ -72,135 +57,48 @@
 </tr><!-- end of banner row -->
 <tr><!-- start of sidebar/body row -->
 <!-- start of sidebar cells -->
-<td width="150" valign="top" bgcolor="#7FFFD4" class="sidebar">
+<td width="150" valign="top" bgcolor="#cccccc" class="sidebar">
 <!-- start of sidebar table -->
 <table width="100%" border="0" cellspacing="0" cellpadding="3"
        bgcolor="#ffffff">
-<tr><td bgcolor="#2E8B57"><b><font color="#ffffff">
-About
+<tr><td bgcolor="#191970"><b><font color="#ffffff">
+Quick Links
 </font></b></td></tr>
-<tr><td bgcolor="#7FFFD4">
-<b>Introduction</b>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="history.html">History</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="features.html">Features</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="challengeresponse.html">Challenge / Response</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="donations.html">Donations</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="http://wiki.tmda.net/index.cgi/TmdaAdvocacy">Advocacy</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">&nbsp;
-<tr><td bgcolor="#2E8B57"><b><font color="#ffffff">
-Install
-</font></b></td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="requirements.html">Requirements</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="download.html">Download</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="install.html">Installation</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="upgrade.html">Upgrading</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">&nbsp;
-<tr><td bgcolor="#2E8B57"><b><font color="#ffffff">
-Configuration
-</font></b></td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="config.html">Overview</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="config-pre.html">Pre-Config</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="config-server.html">Server Config</a>
+<tr><td bgcolor="#cccccc">
+<a href="http://wiki.tmda.net/AboutTmda">About TMDA</a>
 </td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="config-client.html">Client Config</a>
+<tr><td bgcolor="#cccccc">
+<a href="http://wiki.tmda.net/TmdaDownload">Download</a>
 </td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="config-vars.html">Config Variables</a>
+<tr><td bgcolor="#cccccc">
+<a href="http://wiki.tmda.net/TmdaDocumentation">Documentation</a>
 </td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="config-filter.html">Filter Spec</a>
+<tr><td bgcolor="#cccccc">
+<a href="http://wiki.tmda.net/TmdaSupport">Support</a>
 </td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="filter-sources.html">Filter Sources</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="howto-template.html">Templates</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="tmda-vdomains.html">Virtual Domains</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="tmda-ofmipd.html">tmda-ofmipd</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="http://wiki.tmda.net/index.cgi/TmdaHowtos">User HOWTOs</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">&nbsp;
-<tr><td bgcolor="#2E8B57"><b><font color="#ffffff">
-Support
-</font></b></td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="trouble.html">Help</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
+<tr><td bgcolor="#cccccc">
 <a href="http://tmda.net/faq.cgi">FAQ</a>
 </td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="http://wiki.tmda.net/index.cgi/TmdaMailingListsAndNewsgroups">Lists &amp; Newsgroups</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="http://wiki.tmda.net/index.cgi/TmdaMailingListArchives">List Archives</a> 
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="http://wiki.tmda.net/index.cgi/TmdaCommercialSupport">Commercial Support</a>
+<tr><td bgcolor="#cccccc">
+<a href="http://wiki.tmda.net/TmdaDonations">Donations</a>
 </td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="http://wiki.tmda.net/index.cgi/TmdaDocumentation">External Docs</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="http://wiki.tmda.net/">TmdaWiki</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">&nbsp;
-<tr><td bgcolor="#2E8B57"><b><font color="#ffffff">
-Miscellaneous
-</font></b></td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="http://wiki.tmda.net/index.cgi/TmdaMirrors">Mirrors</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="logos.html">Logos</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="http://www.cafeshops.com/TMDA/" TARGET="Resource Window">Merchandise</a>
-</td></tr>
-<tr><td bgcolor="#7FFFD4">&nbsp;
-<tr><td bgcolor="#2E8B57"><b><font color="#ffffff">
+<tr><td bgcolor="#cccccc">&nbsp;
+<tr><td bgcolor="#191970"><b><font color="#ffffff">
 Contact
 </font></b></td></tr>
-<tr><td bgcolor="#7FFFD4">
-<a href="mailto:[email protected]">TMDA Workers List</a>
+<tr><td bgcolor="#cccccc">
+<a href="mailto:[email protected]">TMDA Users List</a>
 </td></tr>
-<tr><td bgcolor="#7FFFD4">
+<tr><td bgcolor="#cccccc">
 &nbsp;
 </td></tr>
-<tr><td bgcolor="#7FFFD4">
-&copy; 2001-2004
+<tr><td bgcolor="#cccccc">
+&copy; 2001-2006
 </td></tr>
+<tr><td bgcolor="#cccccc">&nbsp;
+<tr><td bgcolor="#191970"><b><font color="#ffffff">
+Last Updated: Thu, 14 Sep 2006 23:31:36 GMT
+</font></b></td></tr>
 </table><!-- end of sidebar table -->
 
 </td>
@@ -215,16 +113,20 @@
 </table>
 
 <br>
+<hr>
+<b>NOTE:</b> All documentation and further information about TMDA has been moved into the 
+<a href="http://wiki.tmda.net/">TmdaWiki</a>!
+<hr>
+<br>
 
 TMDA is an 
 <a href="http://www.opensource.org/" TARGET="Resource Window">
 open source</a> software application designed to significantly
 reduce the amount of 
-<a href="http://spam.abuse.net/" TARGET="Resource Window">spam</a>
+<a href="http://en.wikipedia.org/wiki/E-mail_spam" TARGET="Resource Window">spam</a>
 (Internet junk-mail) you receive.  TMDA strives to be more effective, 
 yet less time-consuming than traditional spam filters. 
-TMDA can also be used as a general purpose 
-<a href="config-filter.html">local mail delivery agent</a> 
+TMDA can also be used as a general purpose local mail delivery agent</a> 
 to filter, sort, deliver and dispose of incoming mail.
 <br><br>
 
@@ -236,16 +138,17 @@
 
 <li><b>blacklists</b>: refuse mail from undesired senders.<br><br>
 
-<li><b><a href="challengeresponse.html">challenge/response</a></b>: 
+<li><b><a href="http://wiki.tmda.net/ChallengeResponse">challenge/response</a></b>: 
 allows unknown senders which
 aren't on the whitelist or blacklist the chance to confirm that their message 
 is legitimate (non-spam).<br><br>
 
-<li<b><a href="config-client.html">tagged addresses</a></b>: 
+<li<b><a href="http://wiki.tmda.net/ClientConfiguration">tagged addresses</a></b>: 
 special-purpose e-mail addresses such as time-dependent addresses, or
 addresses which only accept certain kinds of communication.  These
 increase the transparency of TMDA for unknown senders by allowing them
 to safely circumvent the challenge/response system.
+
 </ul>
 
 This combination was chosen based on the following assumptions about the
@@ -265,6 +168,9 @@
 <li>spam will not cease until it becomes prohibitively expensive for spammers to operate.
 </ol>
 
+<br>
+<hr>
+
 
 </td><!-- end of body cell -->
 </tr><!-- end of sidebar/body row -->

Index: links.h
===================================================================
RCS file: /cvsroot/tmda/tmda/htdocs/links.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- links.h	6 Feb 2004 17:57:05 -0000	1.15
+++ links.h	14 Sep 2006 23:36:56 -0000	1.16
@@ -1,37 +1,11 @@
 <!-- -*- html -*- -->
-<h3>About</h3>
-<li><a href="index.html">Introduction</a>
-<li><a href="history.html">History</a>
-<li><a href="features.html">Features</a>
-<li><a href="challengeresponse.html">Challenge / Response</a>
-<li><a href="donations.html">Donations</a>
-<li><a href="http://wiki.tmda.net/index.cgi/TmdaAdvocacy">Advocacy</a>
-<h3>Install</h3>
-<li><a href="requirements.html">Requirements</a>
-<li><a href="download.html">Download</a>
-<li><a href="install.html">Installation</a>
-<li><a href="upgrade.html">Upgrading</a>
-<h3>Configuration</h3>
-<li><a href="config.html">Overview</a>
-<li><a href="config-pre.html">Pre-Config</a>
-<li><a href="config-server.html">Server Config</a>
-<li><a href="config-client.html">Client Config</a>
-<li><a href="config-vars.html">Config Variables</a>
-<li><a href="config-filter.html">Filter Spec</a>
-<li><a href="filter-sources.html">Filter Sources</a>
-<li><a href="howto-template.html">Templates</a>
-<li><a href="tmda-vdomains.html">Virtual Domains</a>
-<li><a href="tmda-ofmipd.html">tmda-ofmipd</a>
-<li><a href="http://wiki.tmda.net/index.cgi/TmdaHowtos">User HOWTOs</a>
-<h3>Support</h3>
-<li><a href="trouble.html">Help</a>
+
+<h3>Quick Links</h3>
+
+<li><a href="http://wiki.tmda.net/AboutTmda">About TMDA</a>
+<li><a href="http://wiki.tmda.net/TmdaDownload">Download</a>
+<li><a href="http://wiki.tmda.net/TmdaDocumentation">Documentation</a>
+<li><a href="http://wiki.tmda.net/TmdaSupport">Support</a>
 <li><a href="http://tmda.net/faq.cgi">FAQ</a>
-<li><a href="http://wiki.tmda.net/index.cgi/TmdaMailingListsAndNewsgroups">Lists &amp; Newsgroups</a>
-<li><a href="http://wiki.tmda.net/index.cgi/TmdaMailingListArchives">List Archives</a> 
-<li><a href="http://wiki.tmda.net/index.cgi/TmdaCommercialSupport">Commercial Support</a>
-<li><a href="http://wiki.tmda.net/index.cgi/TmdaDocumentation">External Docs</a>
-<li><a href="http://wiki.tmda.net/">TmdaWiki</a>
-<h3>Miscellaneous</h3>
-<li><a href="http://wiki.tmda.net/index.cgi/TmdaMirrors">Mirrors</a>
-<li><a href="logos.html">Logos</a>
-<li><a href="http://www.cafeshops.com/TMDA/" TARGET="Resource Window">Merchandise</a>
+<li><a href="http://wiki.tmda.net/TmdaDonations">Donations</a>
+

--- challengeresponse.ht DELETED ---

--- challengeresponse.html DELETED ---

--- config-client.ht DELETED ---

--- config-client.html DELETED ---

--- config-filter.ht DELETED ---

--- config-filter.html DELETED ---

--- config-pre.ht DELETED ---

--- config-pre.html DELETED ---

--- config-server.ht DELETED ---

--- config-server.html DELETED ---

--- config.ht DELETED ---

--- config.html DELETED ---

--- donations.ht DELETED ---

--- donations.html DELETED ---

--- download.ht DELETED ---

--- download.html DELETED ---

--- features.ht DELETED ---

--- features.html DELETED ---

--- filter-sources.ht DELETED ---

--- filter-sources.html DELETED ---

--- history.ht DELETED ---

--- history.html DELETED ---

--- howto-template.ht DELETED ---

--- howto-template.html DELETED ---

--- install.ht DELETED ---

--- install.html DELETED ---

--- logos.ht DELETED ---

--- logos.html DELETED ---

--- requirements.ht DELETED ---

--- requirements.html DELETED ---

--- tmda-ofmipd.ht DELETED ---

--- tmda-ofmipd.html DELETED ---

--- tmda-vdomains.ht DELETED ---

--- tmda-vdomains.html DELETED ---

--- trouble.ht DELETED ---

--- trouble.html DELETED ---

--- upgrade.ht DELETED ---

--- upgrade.html DELETED ---