Spelling fixes.

seperate_rlists was renamed to separate_rlists.

20 files changed, 112 insertions, 93 deletions

diff --git a/Echolot/Config.pm b/Echolot/Config.pm
index c5a1c77..a88367a 100644
--- a/Echolot/Config.pm
+++ b/Echolot/Config.pm
@@ -1,7 +1,7 @@
 package Echolot::Config;
 
 # (c) 2002 Peter Palfrader <peter@palfrader.org>
-# $Id: Config.pm,v 1.39 2002/08/14 22:54:20 weasel Exp $
+# $Id: Config.pm,v 1.40 2002/09/12 15:41:49 weasel Exp $
 #
 
 =pod
@@ -75,7 +75,7 @@ sub init($) {
 		show_new                    => 1,
 
 		# Statistics Generation
-		seperate_rlists             => 0,
+		separate_rlists             => 0,
 		combined_list               => 0,
 		thesaurus                   => 1,
 		stats_sort_by_latency       => 0,
@@ -161,13 +161,13 @@ sub init($) {
 
 		remailerxxxtext => "Hello,\n".
 			"\n".
-			"This message requests remailer configation data. The pinging software thinks\n".
+			"This message requests remailer configuration data. The pinging software thinks\n".
 			"<TMPL_VAR NAME=\"address\"> is a remailer. Either it has been told so by the\n".
 			"maintainer of the pinger or it found the address in a remailer-conf or\n".
 			"remailer-key reply of some other remailer.\n".
 			"\n".
 			"If this is _not_ a remailer, you can tell this pinger that and it will stop\n".
-			"sending you those requests immediatly (otherwise it will try a few more times).\n".
+			"sending you those requests immediately (otherwise it will try a few more times).\n".
 			"Just reply and make sure the following is the first line of your message:\n".
 			"	not a remailer\n".
 			"\n".
@@ -206,6 +206,20 @@ sub init($) {
 	}
 	
 
+	for my $key (keys %$CONFIG) {
+		warn("Unkown option: $key\n") unless (exists $DEFAULT->{$key});
+	};
+	# Work around spelling bug until 2.0rc3
+	if (exists $CONFIG->{'seperate_rlists'}) {
+		if (exists  $CONFIG->{'separate_rlists'}) {
+			warn ("seperate_rlists has been superseded by separate_rlists.");
+		} else {
+			warn ("seperate_rlists has been superseded by separate_rlists, please change it in your config file.\n");
+			$CONFIG->{'separate_rlists'} = $CONFIG->{'seperate_rlists'};
+		};
+		delete $CONFIG->{'seperate_rlists'};
+	}
+
 	for my $key (keys %$DEFAULT) {
 		$CONFIG->{$key} = $DEFAULT->{$key} unless defined $CONFIG->{$key};
 	};
@@ -215,6 +229,7 @@ sub init($) {
 	for my $key (keys %$CONFIG) {
 		warn ("Config option $key is not defined\n") unless defined $CONFIG->{$key};
 	};
+
 };
 
 sub get() {
diff --git a/Echolot/Stats.pm b/Echolot/Stats.pm
index 160d451..693aca3 100644
--- a/Echolot/Stats.pm
+++ b/Echolot/Stats.pm
@@ -1,7 +1,7 @@
 package Echolot::Stats;
 
 # (c) 2002 Peter Palfrader <peter@palfrader.org>
-# $Id: Stats.pm,v 1.33 2002/09/05 15:12:01 weasel Exp $
+# $Id: Stats.pm,v 1.34 2002/09/12 15:41:49 weasel Exp $
 #
 
 =pod
@@ -510,12 +510,12 @@ sub build_lists() {
 	$stats{'cpunk_total'} = scalar @$pubrems;
 	$stats{'cpunk_98'} = scalar grep { $_->{'stats'}->{'avr_reliability'} >= 0.98 } @$pubrems;
 	$addresses{$_->{'address'}}=1 for @$pubrems;
-	if (Echolot::Config::get()->{'combined_list'} && ! Echolot::Config::get()->{'seperate_rlists'}) {
+	if (Echolot::Config::get()->{'combined_list'} && ! Echolot::Config::get()->{'separate_rlists'}) {
 		$clist->{'cpunk'} = $rems;
 		$pubclist->{'cpunk'} = $pubrems; $pubrems = undef;
 	};
 
-	if (Echolot::Config::get()->{'seperate_rlists'}) {
+	if (Echolot::Config::get()->{'separate_rlists'}) {
 		$rems = build_rems(['cpunk-rsa']);
 		@$pubrems = grep { $_->{'showit'} } @$rems;
 		build_rlist1( $rems, $broken1, $broken2, $sameop, Echolot::Config::get()->{'private_resultdir'}.'/'.'rlist-rsa', Echolot::Config::get()->{'templates'}->{'rlist-rsa'});
diff --git a/Echolot/Tools.pm b/Echolot/Tools.pm
index cd86f32..ff57c3e 100644
--- a/Echolot/Tools.pm
+++ b/Echolot/Tools.pm
@@ -1,7 +1,7 @@
 package Echolot::Tools;
 
 # (c) 2002 Peter Palfrader <peter@palfrader.org>
-# $Id: Tools.pm,v 1.9 2002/09/03 17:14:27 weasel Exp $
+# $Id: Tools.pm,v 1.10 2002/09/12 15:41:49 weasel Exp $
 #
 
 =pod
@@ -198,7 +198,7 @@ sub write_HTML_file($$;$%) {
 	$template->param ( %templateparams );
 	$template->param ( CURRENT_TIMESTAMP => scalar gmtime() );
 	$template->param ( SITE_NAME => Echolot::Config::get()->{'sitename'} );
-	$template->param ( seperate_rlist => Echolot::Config::get()->{'seperate_rlists'} );
+	$template->param ( separate_rlist => Echolot::Config::get()->{'separate_rlists'} );
 	$template->param ( combined_list => Echolot::Config::get()->{'combined_list'} );
 	$template->param ( thesaurus => Echolot::Config::get()->{'thesaurus'} );
 	$template->param ( version => Echolot::Globals::get()->{'version'} );
diff --git a/NEWS b/NEWS
index 181cdaf..574bccc 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ Changes in version 2.0rc3
 	  to front page.
 	* Add sendpings command.
 	* Have install-perl-modules tool.
+	* Spelling fixes.
+	* seperate_rlists was renamed to separate_rlists.
 
 Changes in version 2.0rc2 - 2002-09-08
 	* Reopen stdin to /dev/null instead of closing it to avoid
diff --git a/TODO b/TODO
index 43b4cf1..0d81a62 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.38 2002/09/05 15:12:09 weasel Exp $
+$Id: TODO,v 1.39 2002/09/12 15:41:49 weasel Exp $
 
 for 2.0:
  fix bugs
@@ -11,6 +11,6 @@ can be done later, nice if for 2.0:
  rotate secret
  get rid of dependency on mix
  get rid of dependency on gnupg
- seperate keys in remailer-key reply if they share the same armor (cmeclex is
+ separate keys in remailer-key reply if they share the same armor (cmeclex is
    the only one doing this. AARG)
  query other stat pages for new remailers
diff --git a/debian/pingd.conf b/debian/pingd.conf
index 49dd1a9..d1bebf4 100644
--- a/debian/pingd.conf
+++ b/debian/pingd.conf
@@ -3,7 +3,7 @@
 # see man pingd.conf(5) for a list of all available configuration options.
 
 $CONFIG = {
-            'seperate_rlists'  => 0,
+            'separate_rlists'  => 0,
             'combined_list'    => 0,
           };
 
diff --git a/doc/pingd.conf.pod b/doc/pingd.conf.pod
index 1735ae7..79dca05 100644
--- a/doc/pingd.conf.pod
+++ b/doc/pingd.conf.pod
@@ -2,12 +2,12 @@
 
 =head1 NAME
 
-pingd.conf - configuration file for the echolot ping daemon
+pingd.conf - configuration file for the Echolot ping daemon
 
 =head1 DESCRIPTION
 
-The file B<pingd.conf> sets configuration parameteres for the echolot pingd(1).
-It is a perl script that gets eval()ed from withing pingd. It has to set the
+The file B<pingd.conf> sets configuration parameters for the Echolot pingd(1).
+It is a Perl script that gets eval()ed from withing pingd. It has to set the
 values in the $CONFIG hash.
 
 =cut
@@ -27,7 +27,7 @@ A short name for your site/pinger. Is used in the statistics produced.
 
 =item B<my_localpart>
 
-The local part of the pingers email address.
+The local part of the pinger's email address.
 
 In C<pinger@example.com> the localpart is C<pinger>.
 
@@ -36,7 +36,7 @@ In C<pinger@example.com> the localpart is C<pinger>.
 
 =item B<my_domain>
 
-The domain part of the pingers email address.
+The domain part of the pinger's email address.
 
 In C<pinger@example.com> the localpart is C<example.com>.
 
@@ -94,7 +94,7 @@ parameters.
 =item B<hash_len> [integer]
 
 Echolot uses email addresses like C<foo+some_data=MAC@domain>. MAC
-is Message Authentification Code used to verify that the address
+is Message Authentication Code used to verify that the address
 was actually generated by this pinger using a secret which is set
 from random data the first time you run B<pingd>. Echolot uses MD5
 as the MAC hash function.
@@ -141,17 +141,17 @@ Show new remailers in public stats by default.
 
 =over
 
-=item B<seperate_rlists> [bool]
+=item B<separate_rlists> [bool]
 
-Also build sperate rlists with data from only DSA pings, only RSA pings and
-only plaintext pings.
+Also build separate rlists with data from only DSA pings, only RSA pings and
+only unencrypted pings.
 
-	Default: 'seperate_rlists' => 0,
-	Example: 'seperate_rlists' => 1,
+	Default: 'separate_realists' => 0,
+	Example: 'separate_rlists' => 1,
 
 =item B<combined_list> [bool]
 
-Build a combinded list of all different stats too. While this is no
+Build a combined list of all different stats too. While this is no
 standard format it is nice to read for a human eye.
 
 	Default: 'combined_list' => 0,
@@ -220,7 +220,7 @@ commit them to the list of remailers.
 
 =item B<expire> [seconds]
 
-How often to expire old keys, pingds and remailers
+How often to expire old keys, pings and remailers
 
 	Default: 'expire' => 24*60*60, # daily
 	Example: 'expire' => 8*60*60, # every 8 hours
@@ -243,26 +243,28 @@ B<getkeyconf_every_nth_time> time.
 
 How often to check assumed dead remailers for resurrection.
 
-	Default: 'getkeyconf' => 7*24*60*60, # weekly
-	Example: 'getkeyconf' => 24*24*60*60, # every other week
+	Default: 'check_resurrection' => 7*24*60*60, # weekly
+	Example: 'check_resurrection' => 24*24*60*60, # every other week
 
 =item B<pinger_interval> [seconds]
 
 =item B<ping_every_nth_time> [integer]
 
 How often to send pings. Pings are sent every B<pinger_interval> seconds. The
-same remailer is pinged every B<ping_every_nth_time>.  This is done this way in
-order to avoid spikes.
+same remailer is pinged every B<ping_every_nth_time> time pings are sent (This
+means the same remailer is pinged every B<pinger_interval> *
+B<ping_every_nth_time> seconds).  It is done this way in order to avoid
+spikes.
 
 	Default: 'pinger_interval'     => 5*60, # send out pings every 5 minutes
 	         'ping_every_nth_time' => 48,   # send out pings to the same remailer every 48 calls, i.e. every 4 hours
-	Example: 'pinger_interval'     => 60*60, # send out pings every minute
+	Example: 'pinger_interval'     => 60,    # send out pings every minute
 	         'ping_every_nth_time' => 60,    # send out pings to the same remailer every 60 calls, i.e. every hour
 
 =item B<addresses_default_ttl> [integer]
 
 How many times to request remailer-xxx from a remailer (done every
-B<getkeyconf> seconds, daily per default) without a reply before it is asumed
+B<getkeyconf> seconds, daily per default) without a reply before it is assumed
 dead.
 
 	Default: 'addresses_default_ttl' => 5, # getkeyconf seconds (days if getkeyconf is 24*60*60, the default)
@@ -334,7 +336,7 @@ After which time to expire files in the thesaurus directory.
 
 =item B<homedir>
 
-The base directory of the echolot installation. All other filenames and
+The base directory of the Echolot installation. All other filenames and
 directorynames are local to this directory. B<pingd> changes into this
 directory upon startup.
 
@@ -379,7 +381,7 @@ show set to false are shown here too).
 
 	Default: 'private_resultdir' => 'results',
 
-=item B<gnupghome>
+=item B<indexfilebasename>
 
 The file to write the index.html to (relative to the result directory).
 
@@ -395,10 +397,10 @@ encryption/decryption actions.
 
 =item B<gnupg>
 
-Name of the GnuPG executeable. If it is not in your PATH make sure to
+Name of the GnuPG executable. If it is not in your PATH make sure to
 include path information.
 
-If B<gnupg> is an empty string, the C<GnuPG::Interfae> default (usually B<gpg>)
+If B<gnupg> is an empty string, the C<GnuPG::Interface> default (usually B<gpg>)
 is used.
 
 	Default: 'gnupg' => '',
@@ -410,11 +412,11 @@ The directory which is used as temporal Mixmaster home for all keyring and
 encryption/decryption actions.
 
 	Default: 'mixhome' => 'mixhome',
-	Example: 'mixmaster' => '/home/pinger/Mix',
+	Example: 'mixhome' => '/home/pinger/Mix',
 
 =item B<mixmaster>
 
-Name of the mixmaster executeable. If it is not in your PATH make sure to
+Name of the mixmaster executable. If it is not in your PATH make sure to
 include path information.
 
 	Default: 'mixmaster' => 'mix',
@@ -437,7 +439,7 @@ to the daemon process which reads and empties the file.
 
 =item B<pidfile>
 
-The daemon's pid file. The daemon's Process ID is stored in this file.
+The daemon's PID file. The daemon's Process ID is stored in this file.
 As long as it exists pingd refuses to start up in daemon mode.
 
 	Default: 'pidfile' => 'pingd.pid',
@@ -512,7 +514,7 @@ Send out CPunk pings to CPunk remailers with their RSA key.
 
 =item B<cpunk-clear>
 
-Send out plaintext pings to CPunk remailers that don't have pgponly
+Send out unencrypted pings to CPunk remailers that don't have pgponly
 in their capsstring.
 
 =item B<mix>
@@ -538,7 +540,7 @@ Pings mixmaster remailers.
 
 =item B<templates>
 
-The template files are used to generate the HTML version of all echolot output.
+The template files are used to generate the HTML version of all Echolot output.
 It is a hash that has the following keys:
 B<thesaurusindexfile>,
 B<mlist>,
@@ -579,18 +581,18 @@ B<clist>.
 =item B<remailerxxxtext>
 
 The text to send along with remailer-xxx queries.
-The tempalte variables address and operator_address are substituted for their
+The template variables address and operator_address are substituted for their
 real values.
 
 	Default: 'remailerxxxtext' => "Hello,\n".
 	    "\n".
-	    "This message requests remailer configation data. The pinging software thinks\n".
+	    "This message requests remailer configuration data. The pinging software thinks\n".
 	    "<TMPL_VAR NAME=\"address\"> is a remailer. Either it has been told so by the\n".
 	    "maintainer of the pinger or it found the address in a remailer-conf or\n".
 	    "remailer-key reply of some other remailer.\n".
 	    "\n".
 	    "If this is _not_ a remailer, you can tell this pinger that and it will stop\n".
-	    "sending you those requests immediatly (otherwise it will try a few more times).\n".
+	    "sending you those requests immediately (otherwise it will try a few more times).\n".
 	    "Just reply and make sure the following is the first line of your message:\n".
 	    "   not a remailer\n".
 	    "\n".
diff --git a/pingd.conf.sample b/pingd.conf.sample
index 7b968fa..2b63f0c 100644
--- a/pingd.conf.sample
+++ b/pingd.conf.sample
@@ -11,7 +11,7 @@ $CONFIG = {
 
             #'mixmaster'        => '/home/pinger/Mix/mix',
 
-            'seperate_rlists'  => 0,
+            'separate_rlists'  => 0,
             'combined_list'    => 0,
           };
 1;
diff --git a/templates/clist.html b/templates/clist.html
index 37579e2..da2ec29 100644
--- a/templates/clist.html
+++ b/templates/clist.html
@@ -2,7 +2,7 @@
 <head>
 	<title>Remailers (combined list) [<TMPL_VAR NAME="SITE_NAME">]</title>
 	<META HTTP-EQUIV="Expires" CONTENT="<TMPL_VAR NAME="EXPIRES">">
-	<!-- $Id: clist.html,v 1.8 2002/09/10 20:44:45 weasel Exp $ -->
+	<!-- $Id: clist.html,v 1.9 2002/09/12 15:41:49 weasel Exp $ -->
 </head>
 <body>
 <h1>Remailer Reliability Stats [<TMPL_VAR NAME="SITE_NAME">]</h1>
@@ -14,7 +14,7 @@
 Available Stats:
 <table border=1>
 <tr>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <th colspan=4>Cypherpunk (Type I)</th>
 <TMPL_ELSE>
   <th>Cypherpunk (Type I)</th> 
@@ -26,7 +26,7 @@ Available Stats:
 </tr>
 <tr>
   <td><a href="rlist.html">v1</a></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><a href="rlist-rsa.html">(rsa)</a></td>
   <td><a href="rlist-dsa.html">(dsa)</a></td>
   <td><a href="rlist-clear.html">(cleartext)</a></td>
@@ -38,7 +38,7 @@ Available Stats:
 </tr>
 <tr>
   <td><a href="rlist2.html">v2</a></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><a href="rlist2-rsa.html">(rsa)</a></td>
   <td><a href="rlist2-dsa.html">(dsa)</a></td>
   <td><a href="rlist2-clear.html">(cleartext)</a></td>
diff --git a/templates/echolot.html b/templates/echolot.html
index 13247c5..161840c 100644
--- a/templates/echolot.html
+++ b/templates/echolot.html
@@ -2,7 +2,7 @@
 <head>
 	<title>Remailer Reliability Stats [<TMPL_VAR NAME="SITE_NAME">]</title>
 	<META HTTP-EQUIV="Expires" CONTENT="<TMPL_VAR NAME="EXPIRES">">
-	<!-- $Id: echolot.html,v 1.8 2002/09/10 20:44:45 weasel Exp $ -->
+	<!-- $Id: echolot.html,v 1.9 2002/09/12 15:41:49 weasel Exp $ -->
 </head>
 <body>
 <h1>Remailer Reliability Stats [<TMPL_VAR NAME="SITE_NAME">]</h1>
@@ -33,7 +33,7 @@ over 98.0% in terms of overall reliability.
 </tr>
 <tr>
   <td><a href="rlist.html"><code>rlist.html</code></a>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
      <SMALL>
      (<a href="rlist-rsa.html">rsa</a>,
       <a href="rlist-dsa.html">dsa</a>,
@@ -48,7 +48,7 @@ over 98.0% in terms of overall reliability.
 </tr>
 <tr>
   <td><a href="rlist2.html"><code>rlist2.html</code></a>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
      <SMALL>
 		 (<a href="rlist2-rsa.html">rsa</a>,
       <a href="rlist2-dsa.html">dsa</a>,
@@ -71,7 +71,7 @@ over 98.0% in terms of overall reliability.
 </tr>
 <tr>
   <td><a href="rlist.txt"><code>rlist.txt</code></a>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
      <SMALL>
      (<a href="rlist-rsa.txt">rsa</a>,
       <a href="rlist-dsa.txt">dsa</a>,
@@ -86,7 +86,7 @@ over 98.0% in terms of overall reliability.
 </tr>
 <tr>
   <td><a href="rlist2.txt"><code>rlist2.txt</code></a>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
      <SMALL>
 		 (<a href="rlist2-rsa.txt">rsa</a>,
       <a href="rlist2-dsa.txt">dsa</a>,
diff --git a/templates/mlist.html b/templates/mlist.html
index 57833e4..fa2e5bc 100644
--- a/templates/mlist.html
+++ b/templates/mlist.html
@@ -2,7 +2,7 @@
 <head>
 	<title>Mixmaster Remailers [<TMPL_VAR NAME="SITE_NAME">]</title>
 	<META HTTP-EQUIV="Expires" CONTENT="<TMPL_VAR NAME="EXPIRES">">
-	<!-- $Id: mlist.html,v 1.9 2002/08/14 22:54:20 weasel Exp $ -->
+	<!-- $Id: mlist.html,v 1.10 2002/09/12 15:41:49 weasel Exp $ -->
 </head>
 <body>
 <h1>Remailer Reliability Stats [<TMPL_VAR NAME="SITE_NAME">]</h1>
@@ -14,7 +14,7 @@
 Available Stats:
 <table border=1>
 <tr>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <th colspan=4>Cypherpunk (Type I)</th>
 <TMPL_ELSE>
   <th>Cypherpunk (Type I)</th> 
@@ -26,7 +26,7 @@ Available Stats:
 </tr>
 <tr>
   <td><a href="rlist.html">v1</a></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><a href="rlist-rsa.html">(rsa)</a></td>
   <td><a href="rlist-dsa.html">(dsa)</a></td>
   <td><a href="rlist-clear.html">(cleartext)</a></td>
@@ -38,7 +38,7 @@ Available Stats:
 </tr>
 <tr>
   <td><a href="rlist2.html">v2</a></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><a href="rlist2-rsa.html">(rsa)</a></td>
   <td><a href="rlist2-dsa.html">(dsa)</a></td>
   <td><a href="rlist2-clear.html">(cleartext)</a></td>
diff --git a/templates/mlist2.html b/templates/mlist2.html
index 45d24f5..4624f84 100644
--- a/templates/mlist2.html
+++ b/templates/mlist2.html
@@ -2,7 +2,7 @@
 <head>
 	<title>Mixmaster Remailers (v2) [<TMPL_VAR NAME="SITE_NAME">]</title>
 	<META HTTP-EQUIV="Expires" CONTENT="<TMPL_VAR NAME="EXPIRES">">
-	<!-- $Id: mlist2.html,v 1.9 2002/08/14 22:54:20 weasel Exp $ -->
+	<!-- $Id: mlist2.html,v 1.10 2002/09/12 15:41:49 weasel Exp $ -->
 </head>
 <body>
 <h1>Remailer Reliability Stats [<TMPL_VAR NAME="SITE_NAME">]</h1>
@@ -14,7 +14,7 @@
 Available Stats:
 <table border=1>
 <tr>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <th colspan=4>Cypherpunk (Type I)</th>
 <TMPL_ELSE>
   <th>Cypherpunk (Type I)</th> 
@@ -26,7 +26,7 @@ Available Stats:
 </tr>
 <tr>
   <td><a href="rlist.html">v1</a></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><a href="rlist-rsa.html">(rsa)</a></td>
   <td><a href="rlist-dsa.html">(dsa)</a></td>
   <td><a href="rlist-clear.html">(cleartext)</a></td>
@@ -38,7 +38,7 @@ Available Stats:
 </tr>
 <tr>
   <td><a href="rlist2.html">v2</a></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><a href="rlist2-rsa.html">(rsa)</a></td>
   <td><a href="rlist2-dsa.html">(dsa)</a></td>
   <td><a href="rlist2-clear.html">(cleartext)</a></td>
diff --git a/templates/rlist-clear.html b/templates/rlist-clear.html
index b4f80a0..fa0124b 100644
--- a/templates/rlist-clear.html
+++ b/templates/rlist-clear.html
@@ -2,7 +2,7 @@
 <head>
 	<title>Cypherpunk Remailers (cleartext only) [<TMPL_VAR NAME="SITE_NAME">]</title>
 	<META HTTP-EQUIV="Expires" CONTENT="<TMPL_VAR NAME="EXPIRES">">
-	<!-- $Id: rlist-clear.html,v 1.8 2002/08/14 22:54:20 weasel Exp $ -->
+	<!-- $Id: rlist-clear.html,v 1.9 2002/09/12 15:41:49 weasel Exp $ -->
 </head>
 <body>
 <h1>Remailer Reliability Stats [<TMPL_VAR NAME="SITE_NAME">]</h1>
@@ -14,7 +14,7 @@
 Available Stats:
 <table border=1>
 <tr>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <th colspan=4>Cypherpunk (Type I)</th>
 <TMPL_ELSE>
   <th>Cypherpunk (Type I)</th>
@@ -26,7 +26,7 @@ Available Stats:
 </tr>
 <tr>
   <td><a href="rlist.html">v1</a></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><a href="rlist-rsa.html">(rsa)</a></td>
   <td><a href="rlist-dsa.html">(dsa)</a></td>
   <td><strong>(cleartext)</strong></td>
@@ -38,7 +38,7 @@ Available Stats:
 </tr>
 <tr>
   <td><a href="rlist2.html">v2</a></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><a href="rlist2-rsa.html">(rsa)</a></td>
   <td><a href="rlist2-dsa.html">(dsa)</a></td>
   <td><a href="rlist2-clear.html">(cleartext)</a></td>
diff --git a/templates/rlist-dsa.html b/templates/rlist-dsa.html
index 3226399..a4ecaaf 100644
--- a/templates/rlist-dsa.html
+++ b/templates/rlist-dsa.html
@@ -2,7 +2,7 @@
 <head>
 	<title>Cypherpunk Remailers (DSA only) [<TMPL_VAR NAME="SITE_NAME">]</title>
 	<META HTTP-EQUIV="Expires" CONTENT="<TMPL_VAR NAME="EXPIRES">">
-	<!-- $Id: rlist-dsa.html,v 1.8 2002/08/14 22:54:20 weasel Exp $ -->
+	<!-- $Id: rlist-dsa.html,v 1.9 2002/09/12 15:41:49 weasel Exp $ -->
 </head>
 <body>
 <h1>Remailer Reliability Stats [<TMPL_VAR NAME="SITE_NAME">]</h1>
@@ -14,7 +14,7 @@
 Available Stats:
 <table border=1>
 <tr>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <th colspan=4>Cypherpunk (Type I)</th>
 <TMPL_ELSE>
   <th>Cypherpunk (Type I)</th>
@@ -26,7 +26,7 @@ Available Stats:
 </tr>
 <tr>
   <td><a href="rlist.html">v1</a></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><a href="rlist-rsa.html">(rsa)</a></td>
   <td><strong>(dsa)</strong></td>
   <td><a href="rlist-clear.html">(cleartext)</a></td>
@@ -38,7 +38,7 @@ Available Stats:
 </tr>
 <tr>
   <td><a href="rlist2.html">v2</a></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><a href="rlist2-rsa.html">(rsa)</a></td>
   <td><a href="rlist2-dsa.html">(dsa)</a></td>
   <td><a href="rlist2-clear.html">(cleartext)</a></td>
diff --git a/templates/rlist-rsa.html b/templates/rlist-rsa.html
index dfc3888..8476e47 100644
--- a/templates/rlist-rsa.html
+++ b/templates/rlist-rsa.html
@@ -2,7 +2,7 @@
 <head>
 	<title>Cypherpunk Remailers (RSA only) [<TMPL_VAR NAME="SITE_NAME">]</title>
 	<META HTTP-EQUIV="Expires" CONTENT="<TMPL_VAR NAME="EXPIRES">">
-	<!-- $Id: rlist-rsa.html,v 1.8 2002/08/14 22:54:20 weasel Exp $ -->
+	<!-- $Id: rlist-rsa.html,v 1.9 2002/09/12 15:41:49 weasel Exp $ -->
 </head>
 <body>
 <h1>Remailer Reliability Stats [<TMPL_VAR NAME="SITE_NAME">]</h1>
@@ -14,7 +14,7 @@
 Available Stats:
 <table border=1>
 <tr>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <th colspan=4>Cypherpunk (Type I)</th>
 <TMPL_ELSE>
   <th>Cypherpunk (Type I)</th>
@@ -26,7 +26,7 @@ Available Stats:
 </tr>
 <tr>
   <td><a href="rlist.html">v1</a></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><strong>(rsa)</strong></td>
   <td><a href="rlist-dsa.html">(dsa)</a></td>
   <td><a href="rlist-clear.html">(cleartext)</a></td>
@@ -38,7 +38,7 @@ Available Stats:
 </tr>
 <tr>
   <td><a href="rlist2.html">v2</a></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><a href="rlist2-rsa.html">(rsa)</a></td>
   <td><a href="rlist2-dsa.html">(dsa)</a></td>
   <td><a href="rlist2-clear.html">(cleartext)</a></td>
diff --git a/templates/rlist.html b/templates/rlist.html
index 0c59312..3ff82c0 100644
--- a/templates/rlist.html
+++ b/templates/rlist.html
@@ -2,7 +2,7 @@
 <head>
 	<title>Cypherpunk Remailers [<TMPL_VAR NAME="SITE_NAME">]</title>
 	<META HTTP-EQUIV="Expires" CONTENT="<TMPL_VAR NAME="EXPIRES">">
-	<!-- $Id: rlist.html,v 1.9 2002/08/14 22:54:20 weasel Exp $ -->
+	<!-- $Id: rlist.html,v 1.10 2002/09/12 15:41:49 weasel Exp $ -->
 </head>
 <body>
 <h1>Remailer Reliability Stats [<TMPL_VAR NAME="SITE_NAME">]</h1>
@@ -14,7 +14,7 @@
 Available Stats:
 <table border=1>
 <tr>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <th colspan=4>Cypherpunk (Type I)</th>
 <TMPL_ELSE>
   <th>Cypherpunk (Type I)</th>
@@ -26,7 +26,7 @@ Available Stats:
 </tr>
 <tr>
   <td><strong>v1</strong></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><a href="rlist-rsa.html">(rsa)</a></td>
   <td><a href="rlist-dsa.html">(dsa)</a></td>
   <td><a href="rlist-clear.html">(cleartext)</a></td>
@@ -38,7 +38,7 @@ Available Stats:
 </tr>
 <tr>
   <td><a href="rlist2.html">v2</a></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><a href="rlist2-rsa.html">(rsa)</a></td>
   <td><a href="rlist2-dsa.html">(dsa)</a></td>
   <td><a href="rlist2-clear.html">(cleartext)</a></td>
diff --git a/templates/rlist2-clear.html b/templates/rlist2-clear.html
index 46a1209..baa3669 100644
--- a/templates/rlist2-clear.html
+++ b/templates/rlist2-clear.html
@@ -2,7 +2,7 @@
 <head>
 	<title>Cypherpunk Remailers (v2, cleartext only) [<TMPL_VAR NAME="SITE_NAME">]</title>
 	<META HTTP-EQUIV="Expires" CONTENT="<TMPL_VAR NAME="EXPIRES">">
-	<!-- $Id: rlist2-clear.html,v 1.8 2002/08/14 22:54:20 weasel Exp $ -->
+	<!-- $Id: rlist2-clear.html,v 1.9 2002/09/12 15:41:49 weasel Exp $ -->
 </head>
 <body>
 <h1>Remailer Reliability Stats [<TMPL_VAR NAME="SITE_NAME">]</h1>
@@ -14,7 +14,7 @@
 Available Stats:
 <table border=1>
 <tr>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <th colspan=4>Cypherpunk (Type I)</th>
 <TMPL_ELSE>
   <th>Cypherpunk (Type I)</th>
@@ -26,7 +26,7 @@ Available Stats:
 </tr>
 <tr>
   <td><a href="rlist.html">v1</a></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><a href="rlist-rsa.html">(rsa)</a></td>
   <td><a href="rlist-dsa.html">(dsa)</a></td>
   <td><a href="rlist-clear.html">(cleartext)</a></td>
@@ -38,7 +38,7 @@ Available Stats:
 </tr>
 <tr>
   <td><a href="rlist2.html">v2</a></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><a href="rlist2-rsa.html">(rsa)</a></td>
   <td><a href="rlist2-dsa.html">(dsa)</a></td>
   <td><strong>(cleartext)</strong></td>
diff --git a/templates/rlist2-dsa.html b/templates/rlist2-dsa.html
index 7d186f3..6c22631 100644
--- a/templates/rlist2-dsa.html
+++ b/templates/rlist2-dsa.html
@@ -2,7 +2,7 @@
 <head>
 	<title>Cypherpunk Remailers (v2, DSA only) [<TMPL_VAR NAME="SITE_NAME">]</title>
 	<META HTTP-EQUIV="Expires" CONTENT="<TMPL_VAR NAME="EXPIRES">">
-	<!-- $Id: rlist2-dsa.html,v 1.8 2002/08/14 22:54:20 weasel Exp $ -->
+	<!-- $Id: rlist2-dsa.html,v 1.9 2002/09/12 15:41:49 weasel Exp $ -->
 </head>
 <body>
 <h1>Remailer Reliability Stats [<TMPL_VAR NAME="SITE_NAME">]</h1>
@@ -14,7 +14,7 @@
 Available Stats:
 <table border=1>
 <tr>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <th colspan=4>Cypherpunk (Type I)</th>
 <TMPL_ELSE>
   <th>Cypherpunk (Type I)</th>
@@ -26,7 +26,7 @@ Available Stats:
 </tr>
 <tr>
   <td><a href="rlist.html">v1</a></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><a href="rlist-rsa.html">(rsa)</a></td>
   <td><a href="rlist-dsa.html">(dsa)</a></td>
   <td><a href="rlist-clear.html">(cleartext)</a></td>
@@ -38,7 +38,7 @@ Available Stats:
 </tr>
 <tr>
   <td><a href="rlist2.html">v2</a></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><a href="rlist2-rsa.html">(rsa)</a></td>
   <td><strong>(dsa)</strong></td>
   <td><a href="rlist2-clear.html">(cleartext)</a></td>
diff --git a/templates/rlist2-rsa.html b/templates/rlist2-rsa.html
index 8977d23..915dbbe 100644
--- a/templates/rlist2-rsa.html
+++ b/templates/rlist2-rsa.html
@@ -2,7 +2,7 @@
 <head>
 	<title>Cypherpunk Remailers (v2, RSA only) [<TMPL_VAR NAME="SITE_NAME">]</title>
 	<META HTTP-EQUIV="Expires" CONTENT="<TMPL_VAR NAME="EXPIRES">">
-	<!-- $Id: rlist2-rsa.html,v 1.8 2002/08/14 22:54:20 weasel Exp $ -->
+	<!-- $Id: rlist2-rsa.html,v 1.9 2002/09/12 15:41:49 weasel Exp $ -->
 </head>
 <body>
 <h1>Remailer Reliability Stats [<TMPL_VAR NAME="SITE_NAME">]</h1>
@@ -14,7 +14,7 @@
 Available Stats:
 <table border=1>
 <tr>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <th colspan=4>Cypherpunk (Type I)</th>
 <TMPL_ELSE>
   <th>Cypherpunk (Type I)</th>
@@ -26,7 +26,7 @@ Available Stats:
 </tr>
 <tr>
   <td><a href="rlist.html">v1</a></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><a href="rlist-rsa.html">(rsa)</a></td>
   <td><a href="rlist-dsa.html">(dsa)</a></td>
   <td><a href="rlist-clear.html">(cleartext)</a></td>
@@ -38,7 +38,7 @@ Available Stats:
 </tr>
 <tr>
   <td><a href="rlist2.html">v2</a></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><strong>(rsa)</strong></td>
   <td><a href="rlist2-dsa.html">(dsa)</a></td>
   <td><a href="rlist2-clear.html">(cleartext)</a></td>
diff --git a/templates/rlist2.html b/templates/rlist2.html
index 97bd522..33e924b 100644
--- a/templates/rlist2.html
+++ b/templates/rlist2.html
@@ -2,7 +2,7 @@
 <head>
 	<title>Cypherpunk Remailers (v2) [<TMPL_VAR NAME="SITE_NAME">]</title>
 	<META HTTP-EQUIV="Expires" CONTENT="<TMPL_VAR NAME="EXPIRES">">
-	<!-- $Id: rlist2.html,v 1.9 2002/08/14 22:54:20 weasel Exp $ -->
+	<!-- $Id: rlist2.html,v 1.10 2002/09/12 15:41:49 weasel Exp $ -->
 </head>
 <body>
 <h1>Remailer Reliability Stats [<TMPL_VAR NAME="SITE_NAME">]</h1>
@@ -14,7 +14,7 @@
 Available Stats:
 <table border=1>
 <tr>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <th colspan=4>Cypherpunk (Type I)</th>
 <TMPL_ELSE>
   <th>Cypherpunk (Type I)</th> 
@@ -26,7 +26,7 @@ Available Stats:
 </tr>
 <tr>
   <td><a href="rlist.html">v1</a></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><a href="rlist-rsa.html">(rsa)</a></td>
   <td><a href="rlist-dsa.html">(dsa)</a></td>
   <td><a href="rlist-clear.html">(cleartext)</a></td>
@@ -38,7 +38,7 @@ Available Stats:
 </tr>
 <tr>
   <td><strong>v2</strong></td>
-<TMPL_IF NAME="seperate_rlist">
+<TMPL_IF NAME="separate_rlist">
   <td><a href="rlist2-rsa.html">(rsa)</a></td>
   <td><a href="rlist2-dsa.html">(dsa)</a></td>
   <td><a href="rlist2-clear.html">(cleartext)</a></td>