uncommitted - ircii

Ready changes

Summary

Import uploads missing from VCS:

Diff

diff --git a/ChangeLog b/ChangeLog
index 23e18fd..ad0071e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,9 +8,53 @@
  *
  * See the COPYRIGHT file, or do a HELP IRCII COPYRIGHT
  *
- * @(#)$eterna: ChangeLog,v 2.812 2021/03/14 18:22:30 mrg Exp $
+ * @(#)$eterna: ChangeLog,v 2.817 2021/04/27 19:00:13 mrg Exp $
  */
 
+Tue Apr 27 03:06:24 PDT 2021 - matthew green <mrg@eterna.com.au>
+	source/alias.c:
+		avoid uninitialised variable access, from clang.
+
+Sun Apr 11 20:58:01 UTC 2021 - matthew green <mrg@eterna.com.au>
+	source/exec.c:
+		use a simpler method to strip trailing crnl.
+	source/history.c:
+		avoid returning stack buffer.
+
+Sat Mar 20 21:27:05 PDT 2021 - matthew green <mrg@eterna.com.au>
+	help/assign, help/basics, help/dquery, help/expressions,
+	help/foreach, help/if, help/intro, help/list, help/menus, help/mode,
+	help/names, help/newuser, help/servlist, help/who, help/xecho,
+	help/xtype, help/alias/special, help/bind/keys, help/ctcp/ctcp,
+	help/load/action, help/load/alias, help/load/autoop,
+	help/load/autoquery, help/load/basical, help/load/commander,
+	help/load/deutsch, help/load/english, help/load/fnet,
+	help/load/functions, help/load/local, help/load/oper,
+	help/load/recursion, help/load/wallopstat, help/load/window,
+	help/note/deny, help/note/find, help/note/flag, help/note/ls,
+	help/note/news, help/note/send, help/note/spy, help/note/user,
+	help/note/waitfor, help/note/wall, help/note/wallops,
+	help/on/channel_nick, help/on/ctcp_reply, help/on/dcc_list,
+	help/on/disconnect, help/on/exec, help/on/exec_errors,
+	help/on/exec_exit, help/on/exec_prompt, help/on/flood, help/on/hook,
+	help/on/input, help/on/mode, help/on/nickname, help/on/notice,
+	help/on/on, help/on/server_notice, help/on/timer, help/on/window,
+	help/set/debug, help/set/display_encoding, help/set/input_encoding,
+	help/set/irc_encoding, help/set/status_format, help/window/show:
+		remove tabs and reformat a bunch.  the html output is now 
+		not entirely broken for a bunch of pages i checked.
+
+Sat Mar 20 13:48:07 PDT 2021 - matthew green <mrg@eterna.com.au>
+	doc/help2html.pl, help/@, help/alias/functions, help/alias/special:
+		handle help files without Usage: and properly format
+		alias/functions list of functions, which also makes
+		alias/special come out mostly OK.
+
+Fri Mar 19 21:47:07 PDT 2021 - matthew green <mrg@eterna.com.au>
+	doc/help2html.pl:
+		properly handle "pre" vs non-pre sections, makes many
+		of the pages display correctly or almost so.
+
 20210314
 Sun Mar 14 11:19:32 PDT 2021 - matthew green <mrg@eterna.com.au>
 	 configure, configure.in, include/defs.h.in, include/irc_std.h:
diff --git a/NEWS b/NEWS
index 442240b..b1c29a0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,11 @@
-@(#)$eterna: NEWS,v 1.148 2021/03/14 18:42:16 mrg Exp $
+@(#)$eterna: NEWS,v 1.150 2021/03/20 04:49:24 mrg Exp $
 
 Changes in ircII 20210314:
 
-  o  fix two memory leaks, one from michael ortmann <ortmann@posteo.de>.
+  o  fix two memory leaks, one from michael ortmann <ortmann@posteo.de>
   o  removed support for non-host getaddrinfo(), getnameinfo(),
-     inet_pton(), inet_ntop(), and snprintf().  all are part of C99.
-  o  fixes for various issues by michael ortmann <ortmann@posteo.de>.
+     inet_pton(), inet_ntop(), and snprintf()
+  o  fixes for various issues by michael ortmann <ortmann@posteo.de>
 
 Changes in ircII 20210225:
 
@@ -134,7 +134,7 @@ Changes in ircII 20110228:
   o  disallow many IRC commands on ICB 
   o  /ping works on ICB
   o  revert the utf-8 changes for large lastlog performance reasons.
-     there should be a re-implementation coming in the future.
+     there should be a re-implementation coming in the future
   o  make /on nickname, /on channel_nick, $chanusers() and $onchannel()
      work with ICB
   o  make /save save /ignore'd things
diff --git a/debian/changelog b/debian/changelog
index f94181f..1ae7d35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+ircii (20210328-2) unstable; urgency=medium
+
+  * Upload to unstable 
+
+ -- Anibal Monsalve Salazar <anibal@debian.org>  Mon, 30 Aug 2021 01:20:52 +1000
+
+ircii (20210328-1) experimental; urgency=medium
+
+  * New upstream release
+  * New maintainer
+    Closes: #485996
+
+ -- Anibal Monsalve Salazar <anibal@debian.org>  Thu, 17 Jun 2021 19:59:16 +1000
+
+ircii (20210314+really20190117-1) unstable; urgency=medium
+
+  * QA upload.
+  * Revert to previous release, because of freeze.
+  * Add patch to Fix CVE-2021-29376 Closes: #986214
+
+ -- Håvard Flaget Aasen <haavard_aasen@yahoo.no>  Sun, 30 May 2021 22:39:28 +0200
+
 ircii (20210314-1) unstable; urgency=medium
 
   * QA Upload.
diff --git a/debian/control b/debian/control
index 1dc707d..531e1f3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: ircii
 Section: net
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
 Build-Depends:
  debhelper-compat (= 13),
  libncurses5-dev,
diff --git a/doc/help2html.pl b/doc/help2html.pl
index f2728ae..12abacf 100644
--- a/doc/help2html.pl
+++ b/doc/help2html.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/env perl -w
 
-# Copyright (c) 2017, 2018 Matthew R. Green
+# Copyright (c) 2017, 2018, 2021 Matthew R. Green
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-$rcsid = '$eterna: help2html.pl,v 1.7 2019/01/15 10:31:36 mrg Exp $';
+$rcsid = '$eterna: help2html.pl,v 1.9 2021/03/20 21:34:52 mrg Exp $';
 
 # convert help files into help files.
 #
@@ -37,6 +37,38 @@ my $usage = "help2html.pl <helpdir> <htmloutputdir>\n";
 my $debug = 0;
 my $total_files = 1;
 
+my %no_usage_list = (
+	':' => 1,
+	'alias/functions' => 1,
+	'alias/quote' => 1,
+	'alias/special' => 1,
+	'alias/width' => 1,
+	'basics' => 1,
+	'bind/examples' => 1,
+	'bind/keys' => 1,
+	'bye' => 1,
+	'channel' => 1,
+	'commands' => 1,
+	'etiquette' => 1,
+	'exit' => 1,
+	'expressions' => 1,
+	'intro' => 1,
+	'ircii/copyright' => 1,
+	'ircii/environment_vars' => 1,
+	'ircii/programming' => 1,
+	'ircii/server_lists' => 1,
+	'load/edit' => 1,
+	'load/lynx_ircrc' => 1,
+	'load/suggestions' => 1,
+	'menus' => 1,
+	'news' => 1,
+	'newuser' => 1,
+	'on/serial_numbers' => 1,
+	'part' => 1,
+	'signoff' => 1,
+	'time' => 1
+);
+
 sub dirname($) {
 	my ($path) = @_;
 
@@ -173,13 +205,20 @@ sub convert_one_file($$$) {
 
 	print OUT $header;
 
-	my $in;
 	# phases:
 	# 1 - beginning, looking for Usage
 	# 2 - got Usage, doing main doc
 	# 3 - doing SEE ALSO, etc.
+	# 4 - special case no "Usage:" files 
 	my $phase = 1;
-	my $matching_indent = 0;
+	# these help files don't have a Usage:
+	if ($no_usage_list{$inpath}) {
+		$phase = 2;
+	}
+
+	my $in_pre = 0;
+
+	my $in;
 	while ($in = <IN>) {
 		if ($in =~ /^!/) {
 			chomp $in;
@@ -194,27 +233,36 @@ sub convert_one_file($$$) {
 		$in =~ s/^$/<p>\n/;
 		$in =~ s/^$/<p>\n/;
 		$in =~ s/\002//g;
-		while ($in =~ m/^ /) {
-			$in =~ s/^( *) /$1\&nbsp;/g;
-		}
-		#$in =~ s/\037//g;
 		if ($phase == 1) {
 			$in =~ s/$/\n<p>\n/;
 		} elsif ($phase == 2) {
-			if ($in =~ m/^    (.*)/) {
-				my $extra_br;
+			if ($inpath eq "alias/functions" && $in =~ m/^  [A-Z]+\([^)]+\)/) {
+				$phase = 4;
+			}
 
-				if ($matching_indent) {
-					$extra_br = "";
-				} else {
-					$extra_br = "<br>\n";
+			# display regions with 4-leading spaces as "pre".
+			if ($in =~ m/^    (.*)/) {
+				if (!$in_pre) {
+					print OUT "<pre>\n";
 				}
-				$in =~ s/^    (.*)/$extra_br&nbsp;&nbsp;$1 <br>\n/;
-				$matching_indent = 1;
+				$in_pre = 1;
 			} else {
-				$matching_indent = 0;
+				if ($in_pre) {
+					print OUT "</pre>\n";
+				}
+				$in_pre = 0;
 			}
 		}
+		if ($phase == 4) {
+			if ($in =~ m/^  ([A-Z]+\([^)]*\))\s+(.*)/) {
+				$func = $1;
+				print OUT "<p><br>$func<br>\n";
+				$in = $2;
+			} else {
+				$in =~ s/^\s+/ /;
+			}
+		}
+
 		# convert "^_one^_ ^_two^_" into "one/two", recursively
 		# ugly do it converting "^_ ^_" into "/"
 		$in =~ s/ /\//g;
diff --git a/doc/ircii.spec b/doc/ircii.spec
deleted file mode 100644
index 0e8aada..0000000
--- a/doc/ircii.spec
+++ /dev/null
@@ -1,637 +0,0 @@
-# $eterna: ircii.spec.in,v 1.2 2019/01/18 01:39:36 mrg Exp $
-Summary: ircII is an IRC and ICB client that runs under most UNIX platforms
-Name: ircii
-Version: 20210314
-Release: 1
-License: BSD
-Group: Networking/Chat
-Source: ftp://ircii.warped.com/pub/ircII/ircii-20210314.tar.bz2
-URL: http://www.eterna.com.au/ircii/
-Vendor: The ircII Project
-Packager: The ircII Project <ircii@eterna.com.au>
-Requires: ncurses openssl
-
-%description
-ircII is an IRC and ICB client that runs under most UNIX platforms. It comes
-in source form and is completely free of any charges or fees. The ircII
-project is a group of people who maintain the source code, incorporating
-fixes and new features.
-
-%prep
-%setup
-
-%build
-CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" \
-	./configure
-make
-
-%install
-make DESTDIR=%{buildroot} install
-
-%files
-/usr/local/bin/irc
-/usr/local/bin/irc-20210314
-/usr/local/bin/ircbug
-/usr/local/bin/ircflush
-/usr/local/libexec/ircio
-/usr/local/libexec/wserv
-/usr/local/share/irc/help/!
-/usr/local/share/irc/help/.date
-/usr/local/share/irc/help/:
-/usr/local/share/irc/help/@
-/usr/local/share/irc/help/abort
-/usr/local/share/irc/help/admin
-/usr/local/share/irc/help/alias/alias
-/usr/local/share/irc/help/alias/functions
-/usr/local/share/irc/help/alias/quote
-/usr/local/share/irc/help/alias/special
-/usr/local/share/irc/help/alias/width
-/usr/local/share/irc/help/assign
-/usr/local/share/irc/help/away
-/usr/local/share/irc/help/basics
-/usr/local/share/irc/help/beep
-/usr/local/share/irc/help/bind/backspace
-/usr/local/share/irc/help/bind/backward_character
-/usr/local/share/irc/help/bind/backward_history
-/usr/local/share/irc/help/bind/backward_word
-/usr/local/share/irc/help/bind/beginning_of_line
-/usr/local/share/irc/help/bind/bind
-/usr/local/share/irc/help/bind/clear_screen
-/usr/local/share/irc/help/bind/command_completion
-/usr/local/share/irc/help/bind/delete_character
-/usr/local/share/irc/help/bind/delete_next_word
-/usr/local/share/irc/help/bind/delete_previous_word
-/usr/local/share/irc/help/bind/end_of_line
-/usr/local/share/irc/help/bind/enter_digraph
-/usr/local/share/irc/help/bind/enter_menu
-/usr/local/share/irc/help/bind/erase_line
-/usr/local/share/irc/help/bind/erase_to_beg_of_line
-/usr/local/share/irc/help/bind/erase_to_end_of_line
-/usr/local/share/irc/help/bind/examples
-/usr/local/share/irc/help/bind/forward_character
-/usr/local/share/irc/help/bind/forward_history
-/usr/local/share/irc/help/bind/forward_word
-/usr/local/share/irc/help/bind/help_character
-/usr/local/share/irc/help/bind/keys
-/usr/local/share/irc/help/bind/meta1_character
-/usr/local/share/irc/help/bind/meta2_character
-/usr/local/share/irc/help/bind/meta3_character
-/usr/local/share/irc/help/bind/meta4_character
-/usr/local/share/irc/help/bind/meta5_character
-/usr/local/share/irc/help/bind/meta6_character
-/usr/local/share/irc/help/bind/meta7_character
-/usr/local/share/irc/help/bind/meta8_character
-/usr/local/share/irc/help/bind/next_window
-/usr/local/share/irc/help/bind/nothing
-/usr/local/share/irc/help/bind/parse_command
-/usr/local/share/irc/help/bind/previous_window
-/usr/local/share/irc/help/bind/quit_irc
-/usr/local/share/irc/help/bind/quote_character
-/usr/local/share/irc/help/bind/refresh_inputline
-/usr/local/share/irc/help/bind/refresh_screen
-/usr/local/share/irc/help/bind/scroll_backward
-/usr/local/share/irc/help/bind/scroll_end
-/usr/local/share/irc/help/bind/scroll_forward
-/usr/local/share/irc/help/bind/scroll_start
-/usr/local/share/irc/help/bind/self_insert
-/usr/local/share/irc/help/bind/send_line
-/usr/local/share/irc/help/bind/stop_irc
-/usr/local/share/irc/help/bind/switch_channels
-/usr/local/share/irc/help/bind/toggle_insert_mode
-/usr/local/share/irc/help/bind/toggle_stop_screen
-/usr/local/share/irc/help/bind/transpose_characters
-/usr/local/share/irc/help/bind/type_text
-/usr/local/share/irc/help/bind/unstop_all_windows
-/usr/local/share/irc/help/bind/yank_from_cutbuffer
-/usr/local/share/irc/help/brick
-/usr/local/share/irc/help/bye
-/usr/local/share/irc/help/cat
-/usr/local/share/irc/help/cd
-/usr/local/share/irc/help/channel
-/usr/local/share/irc/help/clear
-/usr/local/share/irc/help/commands
-/usr/local/share/irc/help/comment
-/usr/local/share/irc/help/connect
-/usr/local/share/irc/help/ctcp/action
-/usr/local/share/irc/help/ctcp/clientinfo
-/usr/local/share/irc/help/ctcp/ctcp
-/usr/local/share/irc/help/ctcp/echo
-/usr/local/share/irc/help/ctcp/finger
-/usr/local/share/irc/help/ctcp/ping
-/usr/local/share/irc/help/ctcp/time
-/usr/local/share/irc/help/ctcp/userinfo
-/usr/local/share/irc/help/ctcp/utc
-/usr/local/share/irc/help/ctcp/version
-/usr/local/share/irc/help/date
-/usr/local/share/irc/help/dcc/chat
-/usr/local/share/irc/help/dcc/close
-/usr/local/share/irc/help/dcc/dcc
-/usr/local/share/irc/help/dcc/get
-/usr/local/share/irc/help/dcc/list
-/usr/local/share/irc/help/dcc/raw
-/usr/local/share/irc/help/dcc/rename
-/usr/local/share/irc/help/dcc/send
-/usr/local/share/irc/help/deop
-/usr/local/share/irc/help/describe
-/usr/local/share/irc/help/die
-/usr/local/share/irc/help/digraph
-/usr/local/share/irc/help/disconnect
-/usr/local/share/irc/help/dmsg
-/usr/local/share/irc/help/dquery
-/usr/local/share/irc/help/echo
-/usr/local/share/irc/help/encrypt
-/usr/local/share/irc/help/etiquette
-/usr/local/share/irc/help/eval
-/usr/local/share/irc/help/exec
-/usr/local/share/irc/help/exit
-/usr/local/share/irc/help/expressions
-/usr/local/share/irc/help/flush
-/usr/local/share/irc/help/for
-/usr/local/share/irc/help/foreach
-/usr/local/share/irc/help/help
-/usr/local/share/irc/help/history
-/usr/local/share/irc/help/hook
-/usr/local/share/irc/help/icb
-/usr/local/share/irc/help/if
-/usr/local/share/irc/help/ignore
-/usr/local/share/irc/help/info
-/usr/local/share/irc/help/input
-/usr/local/share/irc/help/intro
-/usr/local/share/irc/help/invite
-/usr/local/share/irc/help/ircii/command_line_args
-/usr/local/share/irc/help/ircii/copyright
-/usr/local/share/irc/help/ircii/environment_vars
-/usr/local/share/irc/help/ircii/programming
-/usr/local/share/irc/help/ircii/server_lists
-/usr/local/share/irc/help/ison
-/usr/local/share/irc/help/join
-/usr/local/share/irc/help/kick
-/usr/local/share/irc/help/kill
-/usr/local/share/irc/help/lastlog
-/usr/local/share/irc/help/leave
-/usr/local/share/irc/help/links
-/usr/local/share/irc/help/list
-/usr/local/share/irc/help/load/2.9script
-/usr/local/share/irc/help/load/action
-/usr/local/share/irc/help/load/alias
-/usr/local/share/irc/help/load/autoop
-/usr/local/share/irc/help/load/autoquery
-/usr/local/share/irc/help/load/basical
-/usr/local/share/irc/help/load/bigcheese
-/usr/local/share/irc/help/load/brc
-/usr/local/share/irc/help/load/channel
-/usr/local/share/irc/help/load/columns
-/usr/local/share/irc/help/load/commander
-/usr/local/share/irc/help/load/cursor
-/usr/local/share/irc/help/load/dccchan
-/usr/local/share/irc/help/load/deutsch
-/usr/local/share/irc/help/load/disc
-/usr/local/share/irc/help/load/edit
-/usr/local/share/irc/help/load/english
-/usr/local/share/irc/help/load/events
-/usr/local/share/irc/help/load/extensions
-/usr/local/share/irc/help/load/finger
-/usr/local/share/irc/help/load/finger.who
-/usr/local/share/irc/help/load/flood
-/usr/local/share/irc/help/load/fnet
-/usr/local/share/irc/help/load/functions
-/usr/local/share/irc/help/load/help
-/usr/local/share/irc/help/load/history
-/usr/local/share/irc/help/load/icb
-/usr/local/share/irc/help/load/irciihelp
-/usr/local/share/irc/help/load/ircprimer
-/usr/local/share/irc/help/load/kickmenu
-/usr/local/share/irc/help/load/killpath
-/usr/local/share/irc/help/load/kpstat
-/usr/local/share/irc/help/load/list
-/usr/local/share/irc/help/load/listidle
-/usr/local/share/irc/help/load/load
-/usr/local/share/irc/help/load/local
-/usr/local/share/irc/help/load/lynx_ircrc
-/usr/local/share/irc/help/load/meta1
-/usr/local/share/irc/help/load/meta2
-/usr/local/share/irc/help/load/msg
-/usr/local/share/irc/help/load/mudlike
-/usr/local/share/irc/help/load/nemesis
-/usr/local/share/irc/help/load/netsplit
-/usr/local/share/irc/help/load/newaway
-/usr/local/share/irc/help/load/nicks
-/usr/local/share/irc/help/load/nicksearch
-/usr/local/share/irc/help/load/oldping
-/usr/local/share/irc/help/load/oper
-/usr/local/share/irc/help/load/prefix
-/usr/local/share/irc/help/load/recursion
-/usr/local/share/irc/help/load/repeat
-/usr/local/share/irc/help/load/screen
-/usr/local/share/irc/help/load/service
-/usr/local/share/irc/help/load/shell
-/usr/local/share/irc/help/load/silent
-/usr/local/share/irc/help/load/smileys
-/usr/local/share/irc/help/load/suggestions
-/usr/local/share/irc/help/load/tabkey
-/usr/local/share/irc/help/load/time
-/usr/local/share/irc/help/load/traces
-/usr/local/share/irc/help/load/troy
-/usr/local/share/irc/help/load/uhnotify
-/usr/local/share/irc/help/load/version
-/usr/local/share/irc/help/load/wallopstat
-/usr/local/share/irc/help/load/whowas
-/usr/local/share/irc/help/load/window
-/usr/local/share/irc/help/lusers
-/usr/local/share/irc/help/me
-/usr/local/share/irc/help/menus
-/usr/local/share/irc/help/mload
-/usr/local/share/irc/help/mode
-/usr/local/share/irc/help/motd
-/usr/local/share/irc/help/msg
-/usr/local/share/irc/help/names
-/usr/local/share/irc/help/news
-/usr/local/share/irc/help/newuser
-/usr/local/share/irc/help/nick
-/usr/local/share/irc/help/note/antiwall
-/usr/local/share/irc/help/note/count
-/usr/local/share/irc/help/note/deny
-/usr/local/share/irc/help/note/find
-/usr/local/share/irc/help/note/flag
-/usr/local/share/irc/help/note/key
-/usr/local/share/irc/help/note/log
-/usr/local/share/irc/help/note/ls
-/usr/local/share/irc/help/note/news
-/usr/local/share/irc/help/note/note
-/usr/local/share/irc/help/note/rm
-/usr/local/share/irc/help/note/save
-/usr/local/share/irc/help/note/send
-/usr/local/share/irc/help/note/sent
-/usr/local/share/irc/help/note/service
-/usr/local/share/irc/help/note/spy
-/usr/local/share/irc/help/note/stats
-/usr/local/share/irc/help/note/user
-/usr/local/share/irc/help/note/waitfor
-/usr/local/share/irc/help/note/wall
-/usr/local/share/irc/help/note/wallops
-/usr/local/share/irc/help/notice
-/usr/local/share/irc/help/notify
-/usr/local/share/irc/help/nuser
-/usr/local/share/irc/help/on/action
-/usr/local/share/irc/help/on/channel_nick
-/usr/local/share/irc/help/on/channel_signoff
-/usr/local/share/irc/help/on/connect
-/usr/local/share/irc/help/on/ctcp
-/usr/local/share/irc/help/on/ctcp_reply
-/usr/local/share/irc/help/on/dcc_chat
-/usr/local/share/irc/help/on/dcc_list
-/usr/local/share/irc/help/on/dcc_raw
-/usr/local/share/irc/help/on/disconnect
-/usr/local/share/irc/help/on/exec
-/usr/local/share/irc/help/on/exec_errors
-/usr/local/share/irc/help/on/exec_exit
-/usr/local/share/irc/help/on/exec_prompt
-/usr/local/share/irc/help/on/flood
-/usr/local/share/irc/help/on/help
-/usr/local/share/irc/help/on/hook
-/usr/local/share/irc/help/on/icb_cmdout
-/usr/local/share/irc/help/on/icb_error
-/usr/local/share/irc/help/on/icb_status
-/usr/local/share/irc/help/on/icb_who
-/usr/local/share/irc/help/on/idle
-/usr/local/share/irc/help/on/input
-/usr/local/share/irc/help/on/invite
-/usr/local/share/irc/help/on/join
-/usr/local/share/irc/help/on/leave
-/usr/local/share/irc/help/on/list
-/usr/local/share/irc/help/on/mail
-/usr/local/share/irc/help/on/mode
-/usr/local/share/irc/help/on/msg
-/usr/local/share/irc/help/on/msg_group
-/usr/local/share/irc/help/on/names
-/usr/local/share/irc/help/on/nickname
-/usr/local/share/irc/help/on/note
-/usr/local/share/irc/help/on/notice
-/usr/local/share/irc/help/on/notify_signoff
-/usr/local/share/irc/help/on/notify_signon
-/usr/local/share/irc/help/on/numeric
-/usr/local/share/irc/help/on/on
-/usr/local/share/irc/help/on/os_signal
-/usr/local/share/irc/help/on/public
-/usr/local/share/irc/help/on/public_msg
-/usr/local/share/irc/help/on/public_notice
-/usr/local/share/irc/help/on/public_other
-/usr/local/share/irc/help/on/raw_irc
-/usr/local/share/irc/help/on/raw_send
-/usr/local/share/irc/help/on/send_action
-/usr/local/share/irc/help/on/send_dcc_chat
-/usr/local/share/irc/help/on/send_msg
-/usr/local/share/irc/help/on/send_notice
-/usr/local/share/irc/help/on/send_public
-/usr/local/share/irc/help/on/serial_numbers
-/usr/local/share/irc/help/on/server_notice
-/usr/local/share/irc/help/on/signoff
-/usr/local/share/irc/help/on/timer
-/usr/local/share/irc/help/on/topic
-/usr/local/share/irc/help/on/wall
-/usr/local/share/irc/help/on/wallop
-/usr/local/share/irc/help/on/who
-/usr/local/share/irc/help/on/window
-/usr/local/share/irc/help/on/window_kill
-/usr/local/share/irc/help/on/window_list
-/usr/local/share/irc/help/on/window_swap
-/usr/local/share/irc/help/oper
-/usr/local/share/irc/help/parsekey
-/usr/local/share/irc/help/part
-/usr/local/share/irc/help/ping
-/usr/local/share/irc/help/query
-/usr/local/share/irc/help/quit
-/usr/local/share/irc/help/quote
-/usr/local/share/irc/help/rbind
-/usr/local/share/irc/help/redirect
-/usr/local/share/irc/help/rehash
-/usr/local/share/irc/help/restart
-/usr/local/share/irc/help/save
-/usr/local/share/irc/help/say
-/usr/local/share/irc/help/send
-/usr/local/share/irc/help/sendline
-/usr/local/share/irc/help/server
-/usr/local/share/irc/help/servlist
-/usr/local/share/irc/help/set/always_split_biggest
-/usr/local/share/irc/help/set/auto_unmark_away
-/usr/local/share/irc/help/set/auto_whowas
-/usr/local/share/irc/help/set/background_colour
-/usr/local/share/irc/help/set/beep
-/usr/local/share/irc/help/set/beep_max
-/usr/local/share/irc/help/set/beep_on_msg
-/usr/local/share/irc/help/set/beep_when_away
-/usr/local/share/irc/help/set/bind_local_dcchost
-/usr/local/share/irc/help/set/bold_video
-/usr/local/share/irc/help/set/channel_name_width
-/usr/local/share/irc/help/set/client_information
-/usr/local/share/irc/help/set/clock
-/usr/local/share/irc/help/set/clock_24hour
-/usr/local/share/irc/help/set/clock_alarm
-/usr/local/share/irc/help/set/cmdchars
-/usr/local/share/irc/help/set/colour
-/usr/local/share/irc/help/set/command_mode
-/usr/local/share/irc/help/set/continued_line
-/usr/local/share/irc/help/set/ctcp_reply_backlog_seconds
-/usr/local/share/irc/help/set/ctcp_reply_flood_size
-/usr/local/share/irc/help/set/ctcp_reply_ignore_seconds
-/usr/local/share/irc/help/set/dcc_block_size
-/usr/local/share/irc/help/set/dcchost
-/usr/local/share/irc/help/set/dccport
-/usr/local/share/irc/help/set/debug
-/usr/local/share/irc/help/set/decrypt_program
-/usr/local/share/irc/help/set/display
-/usr/local/share/irc/help/set/display_encoding
-/usr/local/share/irc/help/set/eight_bit_characters
-/usr/local/share/irc/help/set/encrypt_program
-/usr/local/share/irc/help/set/exec_protection
-/usr/local/share/irc/help/set/flood_after
-/usr/local/share/irc/help/set/flood_rate
-/usr/local/share/irc/help/set/flood_users
-/usr/local/share/irc/help/set/flood_warning
-/usr/local/share/irc/help/set/foreground_colour
-/usr/local/share/irc/help/set/full_status_line
-/usr/local/share/irc/help/set/help_pager
-/usr/local/share/irc/help/set/help_path
-/usr/local/share/irc/help/set/help_prompt
-/usr/local/share/irc/help/set/help_window
-/usr/local/share/irc/help/set/hide_channel_keys
-/usr/local/share/irc/help/set/hide_private_channels
-/usr/local/share/irc/help/set/highlight_char
-/usr/local/share/irc/help/set/history
-/usr/local/share/irc/help/set/history_file
-/usr/local/share/irc/help/set/hold_mode
-/usr/local/share/irc/help/set/hold_mode_max
-/usr/local/share/irc/help/set/indent
-/usr/local/share/irc/help/set/input_aliases
-/usr/local/share/irc/help/set/input_encoding
-/usr/local/share/irc/help/set/input_prompt
-/usr/local/share/irc/help/set/input_protection
-/usr/local/share/irc/help/set/insert_mode
-/usr/local/share/irc/help/set/inverse_video
-/usr/local/share/irc/help/set/irc_encoding
-/usr/local/share/irc/help/set/irchost
-/usr/local/share/irc/help/set/lastlog
-/usr/local/share/irc/help/set/lastlog_level
-/usr/local/share/irc/help/set/load_path
-/usr/local/share/irc/help/set/log
-/usr/local/share/irc/help/set/logfile
-/usr/local/share/irc/help/set/mail
-/usr/local/share/irc/help/set/make_notice_msg
-/usr/local/share/irc/help/set/max_recursions
-/usr/local/share/irc/help/set/menu
-/usr/local/share/irc/help/set/minimum_servers
-/usr/local/share/irc/help/set/minimum_users
-/usr/local/share/irc/help/set/no_ask_nickname
-/usr/local/share/irc/help/set/no_ctcp_flood
-/usr/local/share/irc/help/set/notify_handler
-/usr/local/share/irc/help/set/notify_level
-/usr/local/share/irc/help/set/notify_on_termination
-/usr/local/share/irc/help/set/novice
-/usr/local/share/irc/help/set/old_encrypt_program
-/usr/local/share/irc/help/set/realname
-/usr/local/share/irc/help/set/same_window_only
-/usr/local/share/irc/help/set/scroll
-/usr/local/share/irc/help/set/scroll_lines
-/usr/local/share/irc/help/set/send_ignore_msg
-/usr/local/share/irc/help/set/set
-/usr/local/share/irc/help/set/shell
-/usr/local/share/irc/help/set/shell_flags
-/usr/local/share/irc/help/set/shell_limit
-/usr/local/share/irc/help/set/show_away_once
-/usr/local/share/irc/help/set/show_channel_names
-/usr/local/share/irc/help/set/show_end_of_msgs
-/usr/local/share/irc/help/set/show_numerics
-/usr/local/share/irc/help/set/show_stars
-/usr/local/share/irc/help/set/show_status_all
-/usr/local/share/irc/help/set/show_who_hopcount
-/usr/local/share/irc/help/set/ssl_ca_chain_file
-/usr/local/share/irc/help/set/ssl_ca_file
-/usr/local/share/irc/help/set/ssl_ca_path
-/usr/local/share/irc/help/set/ssl_ca_private_key_file
-/usr/local/share/irc/help/set/star_prefix
-/usr/local/share/irc/help/set/status_away
-/usr/local/share/irc/help/set/status_channel
-/usr/local/share/irc/help/set/status_chanop
-/usr/local/share/irc/help/set/status_clock
-/usr/local/share/irc/help/set/status_format
-/usr/local/share/irc/help/set/status_hold
-/usr/local/share/irc/help/set/status_hold_lines
-/usr/local/share/irc/help/set/status_insert
-/usr/local/share/irc/help/set/status_mail
-/usr/local/share/irc/help/set/status_mode
-/usr/local/share/irc/help/set/status_notify
-/usr/local/share/irc/help/set/status_oper
-/usr/local/share/irc/help/set/status_overwrite
-/usr/local/share/irc/help/set/status_query
-/usr/local/share/irc/help/set/status_scrolled
-/usr/local/share/irc/help/set/status_scrolled_lines
-/usr/local/share/irc/help/set/status_server
-/usr/local/share/irc/help/set/status_umode
-/usr/local/share/irc/help/set/status_user
-/usr/local/share/irc/help/set/status_voice
-/usr/local/share/irc/help/set/status_window
-/usr/local/share/irc/help/set/suppress_server_motd
-/usr/local/share/irc/help/set/tab
-/usr/local/share/irc/help/set/tab_max
-/usr/local/share/irc/help/set/underline_video
-/usr/local/share/irc/help/set/user_information
-/usr/local/share/irc/help/set/user_wallops
-/usr/local/share/irc/help/set/verbose_ctcp
-/usr/local/share/irc/help/set/warn_of_ignores
-/usr/local/share/irc/help/set/xterm_geomoptstr
-/usr/local/share/irc/help/set/xterm_options
-/usr/local/share/irc/help/set/xterm_path
-/usr/local/share/irc/help/signoff
-/usr/local/share/irc/help/sleep
-/usr/local/share/irc/help/squery
-/usr/local/share/irc/help/squit
-/usr/local/share/irc/help/stats
-/usr/local/share/irc/help/summon
-/usr/local/share/irc/help/time
-/usr/local/share/irc/help/timer
-/usr/local/share/irc/help/topic
-/usr/local/share/irc/help/trace
-/usr/local/share/irc/help/type
-/usr/local/share/irc/help/userhost
-/usr/local/share/irc/help/users
-/usr/local/share/irc/help/version
-/usr/local/share/irc/help/wait
-/usr/local/share/irc/help/wallops
-/usr/local/share/irc/help/which
-/usr/local/share/irc/help/while
-/usr/local/share/irc/help/who
-/usr/local/share/irc/help/whois
-/usr/local/share/irc/help/whowas
-/usr/local/share/irc/help/window/add
-/usr/local/share/irc/help/window/addgroup
-/usr/local/share/irc/help/window/back
-/usr/local/share/irc/help/window/balance
-/usr/local/share/irc/help/window/bind
-/usr/local/share/irc/help/window/channel
-/usr/local/share/irc/help/window/create
-/usr/local/share/irc/help/window/delete
-/usr/local/share/irc/help/window/delgroup
-/usr/local/share/irc/help/window/double
-/usr/local/share/irc/help/window/goto
-/usr/local/share/irc/help/window/grow
-/usr/local/share/irc/help/window/hide
-/usr/local/share/irc/help/window/hide_others
-/usr/local/share/irc/help/window/hold_mode
-/usr/local/share/irc/help/window/kill
-/usr/local/share/irc/help/window/kill_others
-/usr/local/share/irc/help/window/lastlog_level
-/usr/local/share/irc/help/window/level
-/usr/local/share/irc/help/window/list
-/usr/local/share/irc/help/window/log
-/usr/local/share/irc/help/window/logfile
-/usr/local/share/irc/help/window/move
-/usr/local/share/irc/help/window/name
-/usr/local/share/irc/help/window/new
-/usr/local/share/irc/help/window/next
-/usr/local/share/irc/help/window/nostatus
-/usr/local/share/irc/help/window/notify
-/usr/local/share/irc/help/window/notify_level
-/usr/local/share/irc/help/window/number
-/usr/local/share/irc/help/window/pop
-/usr/local/share/irc/help/window/previous
-/usr/local/share/irc/help/window/prompt
-/usr/local/share/irc/help/window/push
-/usr/local/share/irc/help/window/query
-/usr/local/share/irc/help/window/refnum
-/usr/local/share/irc/help/window/remove
-/usr/local/share/irc/help/window/scroll
-/usr/local/share/irc/help/window/server
-/usr/local/share/irc/help/window/show
-/usr/local/share/irc/help/window/shrink
-/usr/local/share/irc/help/window/stack
-/usr/local/share/irc/help/window/sticky
-/usr/local/share/irc/help/window/swap
-/usr/local/share/irc/help/window/unbind
-/usr/local/share/irc/help/window/where
-/usr/local/share/irc/help/window/window
-/usr/local/share/irc/help/xecho
-/usr/local/share/irc/help/xtype
-/usr/local/share/irc/script/2.8script
-/usr/local/share/irc/script/2.9script
-/usr/local/share/irc/script/action
-/usr/local/share/irc/script/alias
-/usr/local/share/irc/script/autoop
-/usr/local/share/irc/script/autoquery
-/usr/local/share/irc/script/basical
-/usr/local/share/irc/script/bigcheese
-/usr/local/share/irc/script/brc
-/usr/local/share/irc/script/channel
-/usr/local/share/irc/script/columns
-/usr/local/share/irc/script/commander
-/usr/local/share/irc/script/compl.mods
-/usr/local/share/irc/script/complete
-/usr/local/share/irc/script/cursor
-/usr/local/share/irc/script/dccchan
-/usr/local/share/irc/script/default
-/usr/local/share/irc/script/deutsch
-/usr/local/share/irc/script/disc
-/usr/local/share/irc/script/dmsg
-/usr/local/share/irc/script/edit
-/usr/local/share/irc/script/english
-/usr/local/share/irc/script/events
-/usr/local/share/irc/script/extensions
-/usr/local/share/irc/script/finger
-/usr/local/share/irc/script/fkeys
-/usr/local/share/irc/script/flood
-/usr/local/share/irc/script/fnet
-/usr/local/share/irc/script/functions
-/usr/local/share/irc/script/global
-/usr/local/share/irc/script/help
-/usr/local/share/irc/script/history
-/usr/local/share/irc/script/history-match
-/usr/local/share/irc/script/icb
-/usr/local/share/irc/script/imap
-/usr/local/share/irc/script/ircIIhelp
-/usr/local/share/irc/script/ircprimer
-/usr/local/share/irc/script/ircrc
-/usr/local/share/irc/script/kickmenu
-/usr/local/share/irc/script/killpath
-/usr/local/share/irc/script/kpstat
-/usr/local/share/irc/script/list
-/usr/local/share/irc/script/listidle
-/usr/local/share/irc/script/log
-/usr/local/share/irc/script/lynx_ircrc
-/usr/local/share/irc/script/meta1
-/usr/local/share/irc/script/meta2
-/usr/local/share/irc/script/msg
-/usr/local/share/irc/script/mudlike
-/usr/local/share/irc/script/multichan
-/usr/local/share/irc/script/nemesis
-/usr/local/share/irc/script/netsplit
-/usr/local/share/irc/script/newaway
-/usr/local/share/irc/script/newformat
-/usr/local/share/irc/script/nicks
-/usr/local/share/irc/script/nocolour
-/usr/local/share/irc/script/oldping
-/usr/local/share/irc/script/oper
-/usr/local/share/irc/script/otherstatus
-/usr/local/share/irc/script/ping
-/usr/local/share/irc/script/prefix
-/usr/local/share/irc/script/recursion
-/usr/local/share/irc/script/redirx
-/usr/local/share/irc/script/repeat
-/usr/local/share/irc/script/screen
-/usr/local/share/irc/script/service
-/usr/local/share/irc/script/shell
-/usr/local/share/irc/script/silent
-/usr/local/share/irc/script/smileys
-/usr/local/share/irc/script/tabkey
-/usr/local/share/irc/script/time
-/usr/local/share/irc/script/times
-/usr/local/share/irc/script/traces
-/usr/local/share/irc/script/troy
-/usr/local/share/irc/script/uhnotify
-/usr/local/share/irc/script/undernet
-/usr/local/share/irc/script/version
-/usr/local/share/irc/script/voice
-/usr/local/share/irc/script/wallopstat
-/usr/local/share/irc/script/whowas
-/usr/local/share/irc/script/window
-/usr/local/share/man/man1/irc.1
-/usr/local/share/man/man1/ircII.1
-/usr/local/share/man/man1/ircbug.1
diff --git a/help/@ b/help/@
index c386bf9..6f6b876 100644
--- a/help/@
+++ b/help/@
@@ -1,4 +1,4 @@
-!	 $eterna: @,v 1.2 2018/06/10 08:17:36 mrg Exp $
+!	 $eterna: @,v 1.3 2021/03/20 21:34:53 mrg Exp $
 !
 ! Copyright (c) 2003-2018  Matthew Green.
 !
@@ -12,13 +12,13 @@ Usage: @ <expression>
   as it provides a nicer syntax than ASSIGN does in some
   contexts.  These are the same thing:
 
-	@ foo = [bar]
-	assign foo bar
+    @ foo = [bar]
+    assign foo bar
 
   as are these:
 
-	@ foo = C
-	assign foo $C
+    @ foo = C
+    assign foo $C
 
 See Also:
   ASSIGN
diff --git a/help/alias/functions b/help/alias/functions
index a031e9c..41e0489 100644
--- a/help/alias/functions
+++ b/help/alias/functions
@@ -1,4 +1,4 @@
-!	 $eterna: functions,v 1.22 2018/06/10 08:17:38 mrg Exp $
+!	 $eterna: functions,v 1.23 2021/03/20 21:34:53 mrg Exp $
 !
 ! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
@@ -54,7 +54,7 @@ IRCII Functions
                         use as an ircII variable or alias name.  Any special
                         including spaces can be encoded into the string.
   FILESTAT(filename)    Performs a stat(2) on the specified filename.  The
-			returned values are size, uid, gid, mode and filename.
+                        returned values are size, uid, gid, mode and filename.
   HASVOICE(nick channel) Returns 1 if nick has voice on the given channel.
                         Note that if the person is an operator on the given
                         channel, this function is unreliable: It returns 1.
@@ -65,9 +65,9 @@ IRCII Functions
                         this NICK and TYPE of ignorance.  TYPE must be one
                         of MSGS, PUBLIC, WALLS, WALLOPS, INVITES, NOTICES,
                         NOTES, CTCP or CRAP.  If TYPE is missing, all of the
-			ignore types matching NICK are returned, or "0".
-			If both NICK and TYPE are missing, all ignored
-			nicks, including full user@hosts, are returned.
+                        ignore types matching NICK are returned, or "0".
+                        If both NICK and TYPE are missing, all ignored
+                        nicks, including full user@hosts, are returned.
   INDEX(CHARLIST STRING) Returns the index to the first character in STRING
                         which appears in CHARLIST. If the first char in
                         CHARLIST is a '^' returns the index to first char in
diff --git a/help/alias/special b/help/alias/special
index afc3f7b..2d10800 100644
--- a/help/alias/special
+++ b/help/alias/special
@@ -1,6 +1,6 @@
-!	 $eterna: special,v 1.9 2018/06/10 02:25:31 mrg Exp $
+!	 $eterna: special,v 1.10 2021/03/21 04:29:43 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -32,12 +32,12 @@ Special character sequences for ALIAS:
          tried.  If 2 doesn't match, 3 is tried, etc.
          See ASSIGN for more details.
     $[number]variable  Expands the variable and shows only 'number' of
-	 characters. e.g. $blue == "nonsense"  $[3]blue == "non"
-	 and $[20]blue == "nonsense           "	
-	 In the second case note it is left justified in the space.
+         characters. e.g. $blue == "nonsense"  $[3]blue == "non"
+         and $[20]blue == "nonsense           "
+         In the second case note it is left justified in the space.
     $[-number]variable Expands as above but it is right justified when
-	 the 'number'  is bigger than the number of chars in variable.
-	    $[-20]blue == "           nonsense"
+         the 'number'  is bigger than the number of chars in variable.
+            $[-20]blue == "           nonsense"
     $#variable  Expands to the number of words in the variable.
     $@variable  Expands to the number of letters in the variable.
     $(sub-alias)  This expands out the sub-aliases, then uses that
diff --git a/help/assign b/help/assign
index 911de08..2d02760 100644
--- a/help/assign
+++ b/help/assign
@@ -1,6 +1,6 @@
-!	 $eterna: assign,v 1.8 2018/06/10 02:25:30 mrg Exp $
+!	 $eterna: assign,v 1.9 2021/03/21 04:29:43 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -50,8 +50,8 @@ Usage: ASSIGN [[-]<user-variable> [<whatever>]]
   will cause NESTING to display "Hey You!"
 
   The following format are also legal:
-    $#name	evaluates to the number of words in name
-    $@name	evaluates to the number of characters in name
+    $#name     evaluates to the number of words in name
+    $@name     evaluates to the number of characters in name
   You can use these with the mathematical expressions as well, 
   for example:
     ASSIGN foo Testing One Two
diff --git a/help/basics b/help/basics
index 6729280..13d072e 100644
--- a/help/basics
+++ b/help/basics
@@ -1,6 +1,6 @@
-!	 $eterna: basics,v 1.8 2018/06/10 08:17:36 mrg Exp $
+!	 $eterna: basics,v 1.9 2021/03/21 04:29:43 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -15,24 +15,24 @@ Anything that does not begin with a / is assumed to be a message
 that is sent to everyone on your channel.  Here is a list of
 basic commands to help you get started:
 
-    /LIST		Lists all current irc channels, number of
-			users, and topic.
-    /NAMES		Shows the nicknames of all users on each
-			channel
-    /JOIN <channel>	Join the named channel.  All non-commands
-			you type will now go to everyone on that
-			channel
-    /MSG <nick> <msg>	Sends a private message to the specified
-			person.  Only the specified nickname will
-			see this message.
-    /NICK		Change your nickname
-    /QUIT		Exits irc.
-    /HELP <topic>	Gets help on all IRCII commands.
-    /WHO <channel>	Shows who is on a given channel,
-			including nickname, user name and host,
-			and realname.
-    /WHOIS <nick>	Shows the "true" indentity of someone
+    /LIST              Lists all current irc channels, number
+                           of users, and topic.
+    /NAMES             Shows the nicknames of all users on
+                           each channel.
+    /JOIN <channel>    Join the named channel.  All
+                           non-commands you type will now go to
+                           everyone on that channel.
+    /MSG <nick> <msg>  Sends a private message to the
+                           specified person.  Only the specified
+                           nickname will see this message.
+    /NICK              Change your nickname
+    /QUIT              Exits irc.
+    /HELP <topic>      Gets help on all IRCII commands.
+    /WHO <channel>     Shows who is on a given channel,
+                           including nickname, user name and
+                           host, and realname.
+    /WHOIS <nick>      Shows the "true" indentity of someone.
 
 These commands should get you started on irc.  Use the /HELP
-command to find out more about things on irc, or ask someone...
+command to find out more about things on irc, or ask someone,
 most would be happy to help you out.
diff --git a/help/bind/keys b/help/bind/keys
index a5b0167..5ef30c5 100644
--- a/help/bind/keys
+++ b/help/bind/keys
@@ -1,25 +1,26 @@
-!	 $eterna: keys,v 1.8 2018/06/10 08:17:38 mrg Exp $
+!	 $eterna: keys,v 1.9 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
 ! information.
 !
 Allowable key sequences for use with the BIND function:
-  c          where c is any key (case sensitive)
-  ^c         where c is one of A thru Z or one of
-             the following quoted set '?[]\^@'
-	     (^? == delete key)
-  METAn-c    where n is 1, 2, 3 ... 8 and c is the same as the 
-             first form above
-  METAn-^c   where n is 1, 2, 3 ... 8 and c is the same as the
-             second form above
-  mc         where m has been previously bound to META1_CHARACTER,
-             META2_CHARACTER, META3_CHARACTER, ... META8_CHARACTER 
-	     and c is the same as the first form above.  m may be 
-	     either of the first two forms above (m or ^m).
-  m^c        where m has been previously bound to META1_CHARACTER
-             META2_CHARACTER, META3_CHARACTER, ... META8_CHARACTER
-             and c is the same as the second form above.  m may be
-             either of the first two forms above (m or ^m).
+
+    c          where c is any key (case sensitive)
+    ^c         where c is one of A thru Z or one of
+               the following quoted set '?[]\^@'
+               (^? == delete key)
+    METAn-c    where n is 1, 2, 3 ... 8 and c is the same as the 
+               first form above
+    METAn-^c   where n is 1, 2, 3 ... 8 and c is the same as the
+               second form above
+    mc         where m has been previously bound to META1_CHARACTER,
+               META2_CHARACTER, META3_CHARACTER, ... META8_CHARACTER 
+               and c is the same as the first form above.  m may be 
+               either of the first two forms above (m or ^m).
+    m^c        where m has been previously bound to META1_CHARACTER
+               META2_CHARACTER, META3_CHARACTER, ... META8_CHARACTER
+               and c is the same as the second form above.  m may be
+               either of the first two forms above (m or ^m).
diff --git a/help/ctcp/ctcp b/help/ctcp/ctcp
index 35dc7ee..491004f 100644
--- a/help/ctcp/ctcp
+++ b/help/ctcp/ctcp
@@ -1,6 +1,6 @@
-!	 $eterna: ctcp,v 1.7 2018/06/10 08:17:39 mrg Exp $
+!	 $eterna: ctcp,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -15,7 +15,7 @@ Usage: CTCP <nick> <command> [<args>]
   an error message, unless you sent it to a channel.
 
   For example, if you do:
-    CTCP BigCheese VERSION	
+    CTCP BigCheese VERSION
   you will receive:
     *** CTCP REPLY VERSION from BigCheese: ircII 2.2.2 *IX.
 
diff --git a/help/dquery b/help/dquery
index eb6eae4..be1f44b 100644
--- a/help/dquery
+++ b/help/dquery
@@ -1,6 +1,6 @@
-!	 $eterna: dquery,v 1.7 2018/06/10 08:17:36 mrg Exp $
+!	 $eterna: dquery,v 1.8 2021/03/21 04:29:43 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -10,7 +10,7 @@ Usage: DQUERY [<nickname>]
   DQUERY is an alias for QUERY =<nickname>, thus allowing you
   to QUERY a DCC CHAT connection.
 
-See Also:	
+See Also:
   DCC CHAT
   MSG
   QUERY
diff --git a/help/expressions b/help/expressions
index d368a1c..ceef730 100644
--- a/help/expressions
+++ b/help/expressions
@@ -1,6 +1,6 @@
-!	 $eterna: expressions,v 1.9 2018/06/10 08:17:36 mrg Exp $
+!	 $eterna: expressions,v 1.10 2021/03/21 04:29:43 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -68,11 +68,11 @@
   Thus, the following expressions would result in the following results:
    ( recall A = 3 and B = 7 )
 
-	A == B			FALSE	0
-	A == 3			TRUE	1
-	A > 3			FALSE	0
-	A >= 3			TRUE	1
-	A != 3			TRUE	1
+      A == B             FALSE     0
+      A == 3             TRUE      1
+      A > 3              FALSE     0
+      A >= 3             TRUE      1
+      A != 3             TRUE      1
 
   These expressions can be combined with || (OR), && (AND) and ^^ (XOR).
   So (A == 3) || (B==3) would be TRUE, and (A == 2) && (B == 7) would be
@@ -161,34 +161,33 @@
 
   The following is the parse tree for expressions such as  those
 
-	NU_EXPR = NU_CONJ
-	NU_CONJ = NU_CONJ && NU_CONJ	|
-		  NU_CONJ || NU_CONJ	|
-		  NU_CONJ ^^ NU_CONJ	|
-		  NU_ASSN
-	NU_ASSN = varexp = NU_ASSN	|
-		  NU_COMP
-	NU_COMP = NU_COMP == NU_COMP	|
-		  NU_COMP != NU_COMP	|
-		  NU_COMP >  NU_COMP	|
-		  NU_COMP >= NU_COMP	|
-		  NU_COMP <  NU_COMP	|
-		  NU_COMP <= NU_COMP	|
-		  NU_ADD
-	NU_ADD  = NU_ADD + NU_ADD	|
-		  NU_ADD - NU_ADD	|
-		  NU_ADD ## NU_ADD	|
-		  NU_MULT
-	NU_MULT = NU_MULT * NU_MULT	|
-		  NU_MULT / NU_MULT	|
-		  NU_UNIT
-	NU_UNIT = token NUX_MODIF	|
-		 unaryop token		|
-		( NU_EXPR )		|
-		[ expression ] NUX_MODIF
-
-	NUX_MODIF = ( expression ) NUX_MODIF |
-		    [ expression ] NUX_MODIF
+    NU_EXPR = NU_CONJ
+    NU_CONJ = NU_CONJ && NU_CONJ            |
+              NU_CONJ || NU_CONJ            |
+              NU_CONJ ^^ NU_CONJ            |
+              NU_ASSN
+    NU_ASSN = varexp = NU_ASSN              |
+              NU_COMP
+    NU_COMP = NU_COMP == NU_COMP            |
+              NU_COMP != NU_COMP            |
+              NU_COMP >  NU_COMP            |
+              NU_COMP >= NU_COMP            |
+              NU_COMP <  NU_COMP            |
+              NU_COMP <= NU_COMP            |
+              NU_ADD
+    NU_ADD  = NU_ADD + NU_ADD               |
+              NU_ADD - NU_ADD               |
+              NU_ADD ## NU_ADD              |
+              NU_MULT
+    NU_MULT = NU_MULT * NU_MULT             |
+              NU_MULT / NU_MULT             |
+              NU_UNIT
+    NU_UNIT = token NUX_MODIF               |
+              unaryop token                 |
+              ( NU_EXPR )                   |
+              [ expression ] NUX_MODIF
+    NUX_MODIF = ( expression ) NUX_MODIF    |
+                [ expression ] NUX_MODIF
 
 Special cases:
   If a (...) or {...} construct is quoted with \(...\) or \{...\}
diff --git a/help/foreach b/help/foreach
index 0d51e4e..a83062f 100644
--- a/help/foreach
+++ b/help/foreach
@@ -1,6 +1,6 @@
-!	 $eterna: foreach,v 1.9 2018/06/10 08:17:36 mrg Exp $
+!	 $eterna: foreach,v 1.10 2021/03/21 04:29:43 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -33,7 +33,7 @@ Usage: FOREACH <structure> <variable> { <commands> }
       {
         foreach blue.$ii jj
         {
-	  echo $ii $jj $blue[$ii][$jj]
+          echo $ii $jj $blue[$ii][$jj]
         }
       }
     }
diff --git a/help/if b/help/if
index 6d73421..dc3661c 100644
--- a/help/if
+++ b/help/if
@@ -1,4 +1,4 @@
-!	 $eterna: if,v 1.7 2018/06/10 08:17:36 mrg Exp $
+!	 $eterna: if,v 1.8 2021/03/21 04:29:43 mrg Exp $
 !
 ! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
@@ -13,11 +13,11 @@ Usage: IF (<variable-expression>) {<true-command/s>} [{<false-command/s>}]
   executed. If it is false, and the false-commands are given, they
   are executed. Usually the expressions will be formed by using
   combinations of the following:
-	( exp )				( exp1 ^^ exp2 )
-	( exp1 == exp2 )		( exp1 >= exp2 )
-	( exp1 != exp2 )		( exp1 <= exp2 )
-	( exp1 >  exp2 )		( exp1 || exp2 )
-	( exp1 <  exp2 )		( exp1 && exp2 )
+    ( exp )               ( exp1 ^^ exp2 )
+    ( exp1 == exp2 )      ( exp1 >= exp2 )
+    ( exp1 != exp2 )      ( exp1 <= exp2 )
+    ( exp1 >  exp2 )      ( exp1 || exp2 )
+    ( exp1 <  exp2 )      ( exp1 && exp2 )
         
   Here exp is evaluated as though it were in ${} which means that 
   if (blah)  expands the contents of $blah.  Numbers are treated 
@@ -27,16 +27,16 @@ Usage: IF (<variable-expression>) {<true-command/s>} [{<false-command/s>}]
   IF (!exp)  is also possible which will negate a number or a string.
   In the other expressions, if both exp1 and exp2 expand to numbers, 
   then the following cause true-command to be executed:
-	== 	if exp1 is equal to exp2
-	!=	if exp1 is not equal to exp2
-	>	if exp1 is greater than exp2
-	<	if exp1 is less than exp2
-	>=      if exp1 is greater than or equal to exp2
-	<= 	if exp1 is less than or equal  to exp2
-	^^ 	Logical XOR of exp1 and exp2 (1 ^^ 1) == 0 
- 		(1 ^^ 0) or (0 ^^ 1) == 1
-	|| 	Logical OR of exp1 and exp2
-	&&	Logical AND or exp1 and exp2
+    ==     if exp1 is equal to exp2
+    !=     if exp1 is not equal to exp2
+    >      if exp1 is greater than exp2
+    <      if exp1 is less than exp2
+    >=     if exp1 is greater than or equal to exp2
+    <=     if exp1 is less than or equal  to exp2
+    ^^     Logical XOR of exp1 and exp2 (1 ^^ 1) == 0 
+           (1 ^^ 0) or (0 ^^ 1) == 1
+    ||     Logical OR of exp1 and exp2
+    &&     Logical AND or exp1 and exp2
 
   Otherwise, false-command (if present) is executed.
   If both exp1 and exp2 are non-numeric, then the above operations
diff --git a/help/intro b/help/intro
index a882ef2..ff060d7 100644
--- a/help/intro
+++ b/help/intro
@@ -1,6 +1,6 @@
-!	 $eterna: intro,v 1.7 2018/06/10 08:17:37 mrg Exp $
+!	 $eterna: intro,v 1.8 2021/03/21 04:29:43 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -15,27 +15,27 @@ Anything that does not begin with a / is assumed to be a message
 that is sent to everyone on your channel.  Here is a list of
 basic commands to help you get started:
 
-    /LIST		Lists all current irc channels, number of
-			users, and topic.
-    /NAMES		Shows the nicknames of all users on each
-			channel
-    /JOIN <channel>	Join the named channel.  All non-commands
-			you type will now go to everyone on that
-			channel
-    /MSG <nick> <msg>	Sends a private message to the specified
-			person.  Only the specified nickname will
-			see this message.
-    /NICK		Change your nickname
-    /QUIT		Exits irc.
-    /HELP <topic>	Gets help on all IRCII commands.
-    /WHO <channel>	Shows who is on a given channel,
-			including nickname, user name and host,
-			and realname.
-    /WHOIS <nick>	Shows the "true" indentity of someone
-			Use this often to make sure you know who 
-			you are talking to, because nicknames are
-			NOT owned so any number of people could
-			use a nickname.
+    /LIST               Lists all current irc channels, number
+                            of users, and topic.
+    /NAMES              Shows the nicknames of all users on
+                            each channel.
+    /JOIN <channel>     Join the named channel.  All
+                            non-commands you type will now go to
+                            everyone on that channel.
+    /MSG <nick> <msg>   Sends a private message to the
+                            specified person.  Only the specified
+                            nickname will see this message.
+    /NICK               Change your nickname
+    /QUIT               Exits irc.
+    /HELP <topic>       Gets help on all IRCII commands.
+    /WHO <channel>      Shows who is on a given channel,
+                            including nickname, user name and host,
+                            and realname.
+    /WHOIS <nick>       Shows the "true" indentity of someone
+                            Use this often to make sure you know
+                            who  you are talking to, because
+                            nicknames are NOT owned so any
+                            number of people could use a nickname.
 
 These commands should get you started on irc.  Use the /HELP
 command to find out more about things on irc, or ask question of
diff --git a/help/list b/help/list
index fe06336..7f3333f 100644
--- a/help/list
+++ b/help/list
@@ -1,6 +1,6 @@
-!	 $eterna: list,v 1.7 2018/06/10 08:17:37 mrg Exp $
+!	 $eterna: list,v 1.8 2021/03/21 04:29:43 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -15,15 +15,15 @@ Usage: LIST [<flag> [<arg>]] [<channel>]
   information for the current channel.
   The displayed list may also be limited by using one or more of 
   the following flags:
-	-MIN n		When n the minimum number of user.  Channels
-			with less than n users are not shown.
-	-MAX n		When n the maximum number of user.  Channels
-			with more than n users are not shown.
-	-PUBLIC		Only shows Public channels
-	-PRIVATE	Only shows Private (*) channels
-	-ALL		Overrides previous -PUBLIC and/or -PRIVATE
-	-TOPIC		Show channels with topic set
-	-WIDE		Shows channel names and sizes in as little
-			space as possible. Listing can be sorted using:
-		-NAME	Sort by name of the channel
-		-USERS	Sort by number of users in the channel
+    -MIN n       When n the minimum number of user.  Channels
+                 with less than n users are not shown.
+    -MAX n       When n the maximum number of user.  Channels
+                 with more than n users are not shown.
+    -PUBLIC      Only shows Public channels
+    -PRIVATE     Only shows Private (*) channels
+    -ALL         Overrides previous -PUBLIC and/or -PRIVATE
+    -TOPIC       Show channels with topic set
+    -WIDE        Shows channel names and sizes in as little
+                 space as possible. Listing can be sorted using:
+    -NAME        Sort by name of the channel
+    -USERS       Sort by number of users in the channel
diff --git a/help/load/action b/help/load/action
index 2c4de08..8d79cc2 100644
--- a/help/load/action
+++ b/help/load/action
@@ -1,6 +1,6 @@
-!	 $eterna: action,v 1.7 2018/06/10 08:17:40 mrg Exp $
+!	 $eterna: action,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -15,41 +15,43 @@ Usage: LOAD action
 
   These commands can be used with or without an adverb of your
   choice:
-	APPLAUD		BOUNCE		CHUCKLE		CLAP
-	GIGGLE		GRIN		GROAN		MOAN
-	NOD		PURR		SCRATCH		SHRUG
-	SIGH		SMILE		WAVE		WINK
-	YAWN
+    APPLAUD     BOUNCE      CHUCKLE      CLAP
+    GIGGLE      GRIN        GROAN        MOAN
+    NOD         PURR        SCRATCH      SHRUG
+    SIGH        SMILE       WAVE         WINK
+    YAWN
 
   These act differently depending on presence of arguments:
-	LAUGH [<how>]	SING [<lyrics>]
+    LAUGH [<how>]
+    SING [<lyrics>]
 
   The following can only be used without arguments.
-	BOW		BURP		COUGH		CRY
-	GASP		SCREAM		SHIVER		SNAP
-	SNEEZE		SNORE		WHISTLE		WIGGLE
+    BOW         BURP        COUGH        CRY
+    GASP        SCREAM      SHIVER       SNAP
+    SNEEZE      SNORE       WHISTLE      WIGGLE
 
   These instead, require a nickname as argument
   (or 'you' if you are in a /query):
-	COMFORT		CUDDLE		HUG		KISS
-	LOVE		PAT		POKE		SLAP
-	SPIT		THANK
+    COMFORT     CUDDLE      HUG          KISS
+    LOVE        PAT         POKE         SLAP
+    SPIT        THANK
 
   These can be used with or without a nickname:
-	DANCE		SHAKE
+    DANCE       SHAKE
 
   Some of these commands use a possessive pronoun, the pronoun
   is generated at loading time depending on the setting of a
   variable 'GENDER'. If you care, you should include a line
 
-	assign gender f
+    assign gender f
 
   (or 'm' for male) in your .ircrc before 'load action'.
   However sentences will make sense even if GENDER is undefined.
 
   New commands have been added which act like 'private-msg actions':
-	PING <person> [<beeps to wake person up>]
-  and	PONG <person>
+    PING <person> [<beeps to wake person up>]
+  and
+    PONG <person>
 
 See also:
   ME
diff --git a/help/load/alias b/help/load/alias
index 723aa09..7766a0b 100644
--- a/help/load/alias
+++ b/help/load/alias
@@ -1,6 +1,6 @@
-!	 $eterna: alias,v 1.7 2018/06/10 08:17:40 mrg Exp $
+!	 $eterna: alias,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -8,34 +8,34 @@
 !
 Usage: LOAD alias
   Aliases defined here are:
-  MA <text>	Send another message to the person you last sent one.
-		Same as: /m . <text>
-  MR <text>	Send a reply to the person who last sent you a msg.
-		Same as: /m , <text>
-  WA		Show the WHOIS of the person you last sent a message to.
-  IA		Invite the person you last sent a message to.
+  MA <text>     Send another message to the person you last sent one.
+                Same as: /m . <text>
+  MR <text>     Send a reply to the person who last sent you a msg.
+                Same as: /m , <text>
+  WA            Show the WHOIS of the person you last sent a message to.
+  IA            Invite the person you last sent a message to.
 
-  UNALIAS <aliasname>	An alias to unalias an alias ;-)
-  UNSET <variablename>	An alias to unset a set.. huh? :)
-  ALARM <time>		Set the alarm of the clock.
-  CLOCK <on/off>	Switch the clock.
+  UNALIAS <aliasname>   An alias to unalias an alias ;-)
+  UNSET <variablename>  An alias to unset a set.. huh? :)
+  ALARM <time>          Set the alarm of the clock.
+  CLOCK <on/off>        Switch the clock.
 
-  NO	= NOTICE	to avoid collision with /NOTIFY
-  LA	= LASTLOG	to avoid collision with /LAUGH from ACTION
-  LF	= SET LOGFILE	for lazy ones.. 
-  NF	= NOTIFY	"       "
-  "	= QUOTE		"       "
+  NO    = NOTICE        to avoid collision with /NOTIFY.
+  LA    = LASTLOG       to avoid collision with /LAUGH from ACTION.
+  LF    = SET LOGFILE   for lazy ones.
+  NF    = NOTIFY        "
+  "     = QUOTE         "
 
-  H+ and H-		Quickies for /set hold_mode on and off.
+  H+ and H-             Quickies for /set hold_mode on and off.
 
   Contributed by various ircers...
-  SHIELDS_UP		ignore messages and notices from the person
-			that last sent you a msg
-  PROTECT		make your channel invite-only and writeprotected
-  UNPROTECT		remove that state of protection again
-  CHOPS			get a list of the channel operators on the channel
-  WJOIN <channel>	join a channel and open a special window for it
-  TALKTO <target>	open a window and start a query with <target> in it
-  OOPS <right_person>	excuse yourself for a msg that went to the wrong
-			person and send it to the person that should have
-			got it.
+  SHIELDS_UP            Ignore messages and notices from the person
+                        that last sent you a msg.
+  PROTECT               Make your channel invite-only and writeprotected.
+  UNPROTECT             Remove that state of protection again.
+  CHOPS                 Get a list of the channel operators on the channel.
+  WJOIN <channel>       Join a channel and open a special window for it.
+  TALKTO <target>       Open a window and start a query with <target> in it.
+  OOPS <right_person>   Excuse yourself for a msg that went to the wrong
+                        person and send it to the person that should have
+                        got it.
diff --git a/help/load/autoop b/help/load/autoop
index 3e770a2..57134cf 100644
--- a/help/load/autoop
+++ b/help/load/autoop
@@ -1,30 +1,36 @@
-!	 $eterna: autoop,v 1.7 2018/06/10 08:17:40 mrg Exp $
+!	 $eterna: autoop,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
 ! information.
 !
 Usage: LOAD autoop
-  There have been all too many complaints over the years the the current
-  automatic chanop alias and such act too fast, and thus you get this
-  slew of garbage as 10 people all op the same person the instant they
-  join the channel.  This script tries to alleviate this problem in the
-  following manner.  When someone on your autoop list joins a channel
-  on your channel list, the client will wait 10 seconds + a random
-  time and then CHECK to see if that person is opped yet, and if not,
-  op them.  This allows people to do it by hand in the meantime, but
-  it should cut the number of repetitive MODE commands by about 90%.
+  There have been all too many complaints over the years the the
+  current automatic chanop alias and such act too fast, and thus
+  you get this slew of garbage as 10 people all op the same person
+  the instant they join the channel.  This script tries to
+  alleviate this problem in the following manner.  When someone on
+  your autoop list joins a channel on your channel list, the
+  client will wait 10 seconds + a random time and then CHECK to
+  see if that person is opped yet, and if not, op them.  This
+  allows people to do it by hand in the meantime, but it should
+  cut the number of repetitive MODE commands by about 90%.
 
-  The other big feature of this script is the user-friendly interface.
-  Try it, use it, and remember BE PATIENT.  It will work, it just isn't
-  instant.  It's designed to work the way it does for a reason.
+  The other big feature of this script is the user-friendly
+  interface.  Try it, use it, and remember BE PATIENT.  It will
+  work, it just isn't instant.  It's designed to work the way it
+  does for a reason.
 
 Additionnal commands available:
-  showop	Show list of people on autoop list.
-  showchan	Show list of channels for which you will op people
-  addop		Add a nick!user@host to the autoop list. wildcards are allowed
-  addchan	Add a #channel to the channel list. wildcards are allowed
-  delop		Delete an item from the op list by number.  Use showop first.
-  delchan	Delete a channel from the channel list. Use showchan first.
+  showop        Show list of people on autoop list.
+  showchan      Show list of channels for which you will op people.
+  addop         Add a nick!user@host to the autoop list. wildcards
+                are allowed.
+  addchan       Add a #channel to the channel list. wildcards are
+                allowed.
+  delop         Delete an item from the op list by number.  Use
+                showop first.
+  delchan       Delete a channel from the channel list. Use
+                showchan first.
diff --git a/help/load/autoquery b/help/load/autoquery
index d887ad5..76c87fa 100644
--- a/help/load/autoquery
+++ b/help/load/autoquery
@@ -1,6 +1,6 @@
-!	 $eterna: autoquery,v 1.2 2018/06/10 08:17:40 mrg Exp $
+!	 $eterna: autoquery,v 1.3 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 2002-2018  Matthew Green.
+! Copyright (c) 2002-2021  Matthew Green.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
 ! information.
@@ -13,5 +13,5 @@ Usage: LOAD autoquery
 Additionnal commands available:
   talkto <nick>   Start a message window for <nick>
   reply [<nick>]  Start a message window for <nick>, or for the
-		  last person a message was received from, if no
-		  <nick> is specified.
+                  last person a message was received from, if no
+                  <nick> is specified.
diff --git a/help/load/basical b/help/load/basical
index 1b2fccc..7dc24ee 100644
--- a/help/load/basical
+++ b/help/load/basical
@@ -1,6 +1,6 @@
-!	 $eterna: basical,v 1.7 2018/06/10 08:17:40 mrg Exp $
+!	 $eterna: basical,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -12,7 +12,7 @@ Usage: LOAD basical
   the global ircrc, you should already have these things defined.
 
 Additionnal commands available:
-  CHOP <nick>	   Make a person channel-op of your current channel.
+  CHOP <nick>      Make a person channel-op of your current channel.
   K <nick>         Kick person from current channel.
   MO <modechange>  Make a mode change on the current channel.
   UMODE <mode>     Make a mode change upon yourself (user mode).
@@ -23,5 +23,5 @@ Additionnal commands available:
   DMSG             Send a message through a DCC CHAT link.
   DQUERY           Enter query with a person on a DCC CHAT link.
 
-  ^r is bound to type the 'reverse' character.
+  ^R is bound to type the 'reverse' character.
   Also some output representations are fixed.
diff --git a/help/load/commander b/help/load/commander
index cfc0d8a..edda2dd 100644
--- a/help/load/commander
+++ b/help/load/commander
@@ -1,6 +1,6 @@
-!	 $eterna: commander,v 1.7 2018/06/10 08:17:40 mrg Exp $
+!	 $eterna: commander,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -10,29 +10,35 @@ Usage: LOAD commander
   This file contains a big set of key bindings, one command for
   almost every key you have on your keyboard, prefixed by ESC.
   Here's the definition of the keys after pressing ESC:
-    A	Prompts you for an away message, ENTER will un-away you.
-    C	Shows you the /NAMES entry of your current channel.
-    D	Shows the Who-list of people of your country. ( = /countrywho )
-    E	Prompts you for the launch of an external command with /EXEC.
-    F	Follows an invitation to a channel.
-    G	"Greet" - Enter a query with the last person whose signon has been
-		detected by /notify.
-    H	"Here" - Shows Who-list of users from your site. ( = /localwho )
-    I	Invite the user who last sent you a message to the current channel.
-    J	Shows the WHOIS of the person who last joined your channel.
-    L	List of channels with at least 3 persons on unless with topic.
-    M	"More" - Enter a query with the person you last sent a msg to.
-    N	Names list of public channels having at least 2 persons on.
-    O	Who-list of operators online.
-    P	Make your channel private.
-    Q	Quit querying.
-    R	"Reply" - Enter a query with the person who last sent you a msg.
-    S	Prompts you for a new server, ENTER gives a list of stored ones.
-    T	Prompts you for a topic for the current channel.
-    U	Tells you how many users and servers are on IRC. ( = /lusers )
-    W	Gives you the Who-list of the people on your channel.
-    X	"eXamine" - WHOIS of the person who last sent you a message.
-    Y	Toggles the SCROLL mode.
-    Z	Toggles the HOLD_MODE.
-    ,	Flushes the server output.
-   TAB	Clears the window.
+    A    Prompts you for an away message, ENTER will un-away you.
+    C    Shows you the /NAMES entry of your current channel.
+    D    Shows the Who-list of people of your country.
+    E    Prompts you for the launch of an external command with
+         /EXEC.
+    F    Follows an invitation to a channel.
+    G    "Greet" - Enter a query with the last person whose signon
+         has been detected by /notify.
+    H    "Here" - Shows Who-list of users from your site.
+    I    Invite the user who last sent you a message to the current
+         channel.
+    J    Shows the WHOIS of the person who last joined your channel.
+    L    List of channels with at least 3 persons on unless with
+         topic.
+    M    "More" - Enter a query with the person you last sent a msg
+         to.
+    N    Names list of public channels having at least 2 persons on.
+    O    Who-list of operators online.
+    P    Make your channel private.
+    Q    Quit querying.
+    R    "Reply" - Enter a query with the person who last sent you
+         a msg.
+    S    Prompts you for a new server, ENTER gives a list of stored
+         ones.
+    T    Prompts you for a topic for the current channel.
+    U    Tells you how many users and servers are on IRC.
+    W    Gives you the Who-list of the people on your channel.
+    X    "eXamine" - WHOIS of the person who last sent you a message.
+    Y    Toggles the SCROLL mode.
+    Z    Toggles the HOLD_MODE.
+    ,    Flushes the server output.
+    TAB  Clears the window.
diff --git a/help/load/deutsch b/help/load/deutsch
index c05fa84..0dee6d6 100644
--- a/help/load/deutsch
+++ b/help/load/deutsch
@@ -1,6 +1,6 @@
-!	 $eterna: deutsch,v 1.7 2018/06/10 08:17:40 mrg Exp $
+!	 $eterna: deutsch,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -10,14 +10,14 @@ Usage: LOAD deutsch
   This is only for the german-speaking part of the IRC community.
   Hier ist nix sinnvolles drin, nur eine kleine Sammlung von Tastenbelegungen,
   die mit META2 erreichbar ist. META2 ist per default auf ^w gelegt (CTRL-W).
-	f	*fauch*
-	g	*grins*
-	G	*gaehn*
-	k	*kicher*
-	l	*lach*
-	M	moin <letzter joiner>!
-	R	rehi <letzter joiner>!
-	s	*seufz*
-	S	*schmoll*
-	t	*troest*
-	T	tach <letzter joiner>!
+    f    *fauch*
+    g    *grins*
+    G    *gaehn*
+    k    *kicher*
+    l    *lach*
+    M    moin <letzter joiner>!
+    R    rehi <letzter joiner>!
+    s    *seufz*
+    S    *schmoll*
+    t    *troest*
+    T    tach <letzter joiner>!
diff --git a/help/load/english b/help/load/english
index f8570a0..329e822 100644
--- a/help/load/english
+++ b/help/load/english
@@ -1,6 +1,6 @@
-!	 $eterna: english,v 1.7 2018/06/10 08:17:40 mrg Exp $
+!	 $eterna: english,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -14,19 +14,19 @@ Usage: LOAD english
   If you load this script you get the following strings typed into your
   ircII line as you type META2, that is usually ^w (CTRL-W), plus one
   of the letters listed here:
-	a	*applaud*
-	A	*gasp*
-	b	*blush*
-	B	*bow*
-	c	*cry*
-	C	*cough*
-	f	*frown*
-	g	*grin*
-	G	*giggle*
-	h	*hug*
-	k	*kiss*
-	l	*laugh*
-	r	*purr*
-	s	*sigh*
-	S	*shrug*
-	y	*yawn*
+    a    *applaud*
+    A    *gasp*
+    b    *blush*
+    B    *bow*
+    c    *cry*
+    C    *cough*
+    f    *frown*
+    g    *grin*
+    G    *giggle*
+    h    *hug*
+    k    *kiss*
+    l    *laugh*
+    r    *purr*
+    s    *sigh*
+    S    *shrug*
+    y    *yawn*
diff --git a/help/load/fnet b/help/load/fnet
index b2a7d45..b71af77 100644
--- a/help/load/fnet
+++ b/help/load/fnet
@@ -1,6 +1,6 @@
-!	 $eterna: fnet,v 1.7 2018/06/10 08:17:40 mrg Exp $
+!	 $eterna: fnet,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -11,24 +11,24 @@ Usage: LOAD fnet
 
 Additionnal commands available:
   Group commands
-    group	name	Change to group +name
-    status    [s|p|h|u] Change group status
-    boot	nick	Expel nick from group
-    invite	nick	Invite nick to the group
-    pass	nick	Make nick a group moderator
-    nm		nick	Remove moderation from nick
-    w			List groups and users
-    topic	topic	Change the topic of the group
+    group     name        Change to group +name.
+    status    [s|p|h|u]   Change group status.
+    boot      nick        Expel nick from group.
+    invite    nick        Invite nick to the group.
+    pass      nick        Make nick a group moderator.
+    nm        nick        Remove moderation from nick.
+    w                     List groups and users.
+    topic     topic       Change the topic of the group.
 
   Message commands
-    m		nick	Send a message to nick
-    beep	nick	Send a beep to nick
-    hclear		Clear /m history
+    m         nick        Send a message to nick.
+    beep      nick        Send a beep to nick.
+    hclear                Clear /m history.
 
   General commands
-    commands		Show this command list
-    display 	n	Redisplay the last n messages
-    nick	newnick	Change your nickname to newnick
-    motd		Read the current message of the day
-    q			Quit IRC
-    fset	var	Set or display an IRC variable.
+    commands              Show this command list.
+    display   n           Redisplay the last n messages.
+    nick      newnick     Change your nickname to newnick.
+    motd                  Read the current message of the day.
+    q                     Quit IRC.
+    fset      var         Set or display an IRC variable.
diff --git a/help/load/functions b/help/load/functions
index 500ddbb..a2dbb1e 100644
--- a/help/load/functions
+++ b/help/load/functions
@@ -1,6 +1,6 @@
-!	 $eterna: functions,v 1.7 2018/06/10 08:17:40 mrg Exp $
+!	 $eterna: functions,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -27,6 +27,6 @@ Additionnal commands and functions available:
   $pop(listname)                like pop but returns that item
   $pluck(listname word)         pluck the word from the list listname and
                                 return the new list
-  $sort(<list of words>)	Sorts the given list of words case insensitive
+  $sort(<list of words>)        Sorts the given list of words case insensitive
  
- (Daemon 93)
+(Daemon 93)
diff --git a/help/load/local b/help/load/local
index 00a4721..489eb2b 100644
--- a/help/load/local
+++ b/help/load/local
@@ -1,6 +1,6 @@
-!	 $eterna: local,v 1.7 2018/06/10 08:17:41 mrg Exp $
+!	 $eterna: local,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -12,7 +12,7 @@ Usage: LOAD local
 
 Additionnal commands available:
   The most important aliases in here, are these two aliases:
-    COUNTRYWHO	Who-list of the people of your country.
-    LOCALWHO	Who-list of the people at your site.
+    COUNTRYWHO    Who-list of the people of your country.
+    LOCALWHO      Who-list of the people at your site.
 
   With 'commander' you have these commands on ESC-d and ESC-h respectively.
diff --git a/help/load/oper b/help/load/oper
index 32f7fcc..9b3c18b 100644
--- a/help/load/oper
+++ b/help/load/oper
@@ -1,6 +1,6 @@
-!	 $eterna: oper,v 1.7 2018/06/10 08:17:41 mrg Exp $
+!	 $eterna: oper,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -11,16 +11,16 @@ Usage: LOAD oper
 
 Additionnal commands available:
   So you don't have to type the port number:
-    STICK <new> <target>	/connect <new> 6667 <target>
+    STICK <new> <target>    /connect <new> 6667 <target>
   So you don't have to type the channel name:
-    joinzone	join #Twilight_Zone
-    partzone	part #Twilight_Zone
-    joineuop	join #EU-Opers
-    parteuop	part #EU-Opers
-    joinusop	join #US-Opers
-    partusop	part #US-Opers
-    joinozop	join #OZ-Opers
-    partozop	part #OZ-Opers
+    joinzone    join #Twilight_Zone
+    partzone    part #Twilight_Zone
+    joineuop    join #EU-Opers
+    parteuop    part #EU-Opers
+    joinusop    join #US-Opers
+    partusop    part #US-Opers
+    joinozop    join #OZ-Opers
+    partozop    part #OZ-Opers
 
 Note:
   The wallops automatisms are now handled by the
diff --git a/help/load/recursion b/help/load/recursion
index f9ab329..4be8fea 100644
--- a/help/load/recursion
+++ b/help/load/recursion
@@ -1,6 +1,6 @@
-!	 $eterna: recursion,v 1.7 2018/06/10 08:17:41 mrg Exp $
+!	 $eterna: recursion,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -9,13 +9,13 @@
 Usage: LOAD recursion
   These are just a bunch of useful examples of recursive aliases.
   Stuff like.. 
-    conbunch <server list>		Connect to several servers.
-    squitbunch <server list>		Squit several servers.
-    versbunch <server|user list>	check version for several servers
-  and my favorite
-    opalot <+/-> <nickname list>	Op or deop several people.
+    conbunch <server list>              Connect to several servers.
+    squitbunch <server list>            Squit several servers.
+    versbunch <server|user list>        check version for several
+					servers and my favorite
+    opalot <+/-> <nickname list>        Op or deop several people.
   
-  There are more.. Take a look at the file and the format of how things
+  There are more. Take a look at the file and the format of how things
   are done.  And be sure to remember the MAX_RECURSIONS limit.
 
 See Also:
diff --git a/help/load/wallopstat b/help/load/wallopstat
index e346f02..b21e747 100644
--- a/help/load/wallopstat
+++ b/help/load/wallopstat
@@ -1,6 +1,6 @@
-!	 $eterna: wallopstat,v 1.7 2018/06/10 08:17:41 mrg Exp $
+!	 $eterna: wallopstat,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -11,10 +11,10 @@ Usage: LOAD wallopstat
   wallops.  When loaded wallops are displayed normally.
 
 Additionnal commands available:
-    loud-	Make user wallops appear normally.
-    loud+	Make oper wallops appear normally.
-    loudS	Make server wallops appear normally.
+    loud-       Make user wallops appear normally.
+    loud+       Make oper wallops appear normally.
+    loudS       Make server wallops appear normally.
 
-    silent-	Put user wallops in status line. 
-    silent+ 	Put oper wallops in status line.
-    silentS 	Put server wallops in status line.
+    silent-     Put user wallops in status line. 
+    silent+     Put oper wallops in status line.
+    silentS     Put server wallops in status line.
diff --git a/help/load/window b/help/load/window
index 7b62f21..58e2bfe 100644
--- a/help/load/window
+++ b/help/load/window
@@ -1,6 +1,6 @@
-!	 $eterna: window,v 1.7 2018/06/10 08:17:41 mrg Exp $
+!	 $eterna: window,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -10,9 +10,9 @@ Usage: LOAD window
   This script contains bindings for Window handling in an EMACS-like
   fashion. After pressing the META2 key (either CTRL-X or TAB) you
   can press one of these:
-    2		Open a new window.
-    + or z	Grow the current window by one line.
-    - or ^z	Shrink the current window by one line.
-    =		Balance the size of all windows.
-    0		Kill the current window!
-    1		Kill all other windows!
+    2           Open a new window.
+    + or z      Grow the current window by one line.
+    - or ^z     Shrink the current window by one line.
+    =           Balance the size of all windows.
+    0           Kill the current window!
+    1           Kill all other windows!
diff --git a/help/menus b/help/menus
index ad773a6..03c7d85 100644
--- a/help/menus
+++ b/help/menus
@@ -1,6 +1,6 @@
-!	 $eterna: menus,v 1.8 2018/06/10 08:17:37 mrg Exp $
+!	 $eterna: menus,v 1.9 2021/03/21 04:29:43 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -36,16 +36,16 @@ The following is a test menu to show how it it can be used.
 # Test menu to see how our menu reader works
 
 MENU Main Menu
-	OPTION "This menu" MENU Main Menu
-	OPTION "List Channels" COMMAND LIST
-	OPTION "Join Channel" COMMAND INPUT "Join Channel: " JOIN $*
-	OPTION "Leave Channel" COMMAND PART *
-	OPTION "Change Name" COMMAND INPUT "New NickName: " NICK $*
-	OPTION "Private Message" COMMAND INPUT "Person to send message to: " INPUT "Text of message: " MSG $* $$*
-	OPTION "Say something" COMMAND INPUT "Say: " SAY $*
-	OPTION "Exit Menu" EXIT
-	OPTION "Exit IRC" COMMAND INPUT "Really quit? " if ( [$0] == [y] ) { QUIT }
-	OPTION "Kill Menu" COMMAND set -menu
+    OPTION "This menu" MENU Main Menu
+    OPTION "List Channels" COMMAND LIST
+    OPTION "Join Channel" COMMAND INPUT "Join Channel: " JOIN $*
+    OPTION "Leave Channel" COMMAND PART *
+    OPTION "Change Name" COMMAND INPUT "New NickName: " NICK $*
+    OPTION "Private Message" COMMAND INPUT "Person to send message to: " INPUT "Text of message: " MSG $* $$*
+    OPTION "Say something" COMMAND INPUT "Say: " SAY $*
+    OPTION "Exit Menu" EXIT
+    OPTION "Exit IRC" COMMAND INPUT "Really quit? " if ( [$0] == [y] ) { QUIT }
+    OPTION "Kill Menu" COMMAND set -menu
 
 # Cut off this line and take everything up to the previous Cut line ----
 
diff --git a/help/mode b/help/mode
index 0c7c2c3..04d0a73 100644
--- a/help/mode
+++ b/help/mode
@@ -1,6 +1,6 @@
-!	 $eterna: mode,v 1.8 2018/06/10 08:17:37 mrg Exp $
+!	 $eterna: mode,v 1.9 2021/03/21 04:29:43 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -14,23 +14,28 @@ Usage: MODE *|<channel> [+|-]<modechars> [<parameters>]
   operators to change channel mode, or any user to change
   their personal mode. For a channel mode, <modechars> is one of 
   the following:
-    i                - channel is invite only
-    k <key>          - Adds join key <key> to the channel.  Keys can added or
-		       removed (MODE <channel> -k <key>), but not changed.
+    i                - channel is invite only.
+    k <key>          - Adds join key <key> to the channel.  Keys can
+                       added or removed (MODE <channel> -k <key>),
+                       but not changed.
     l <number>       - channel is limited, where <number> is the
-                       maximum number of users allowed
-    m                - channel is moderated (only channel operators talk)
+                       maximum number of users allowed.
+    m                - channel is moderated (only channel operators
+                       talk).
     n                - No MSGs to the channel are allowed
-		       from someone outside the channel.
-    o <nick>         - Makes <nick> a channel operator
-    p                - channel is private
-    s                - channel is secret
-                       Note: On 2.8 servers you cannot set both +p and +s modes
-    t                - topic limits, only the channel operators may change it
-    v <nick>         - Gives someone a voice to talk on a moderated channel. 
-    b user!nick@host - Adds ban
-    e user!nick@host - Adds ban exception
-    I user!nick@host - Adds need-invite exception (notice uppercase I)
+                       from someone outside the channel.
+    o <nick>         - Makes <nick> a channel operator.
+    p                - channel is private.
+    s                - channel is secret.
+                       Note: On 2.8 servers you cannot set both +p
+                       and +s modes
+    t                - Topic limits, only the channel operators may
+                       change it.
+    v <nick>         - Gives someone a voice to talk on a moderated
+                       channel.
+    b user!nick@host - Adds ban.
+    e user!nick@host - Adds ban exception.
+    I user!nick@host - Adds need-invite exception (notice uppercase I).
 
   A + or - sign determines whether the specified mode should be
   added or deleted.
diff --git a/help/names b/help/names
index c113196..4ad79da 100644
--- a/help/names
+++ b/help/names
@@ -1,6 +1,6 @@
-!	 $eterna: names,v 1.7 2018/06/10 08:17:37 mrg Exp $
+!	 $eterna: names,v 1.8 2021/03/21 04:29:43 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -14,10 +14,10 @@ Usage: NAMES [<flag> [<arg>]] [<channel>]
   only information only about your current channel.  The displayed
   list may also be limited by using one or more of the
   following flags:
-	-MIN n		When n the minimum number of user.  Channels
-			with less than n users are not shown.
-	-MAX n		When n the maximum number of user.  Channels
-			with more than n users are not shown.
-	-PUBLIC		Only shows Public channels
-	-PRIVATE	Only shows Private (*) channels
-	-ALL		Overrides previous -PUBLIC and/or -PRIVATE
+    -MIN n          When n the minimum number of user.  Channels
+                    with less than n users are not shown.
+    -MAX n          When n the maximum number of user.  Channels
+                    with more than n users are not shown.
+    -PUBLIC         Only shows Public channels.
+    -PRIVATE        Only shows Private (*) channels.
+    -ALL            Overrides previous -PUBLIC and/or -PRIVATE.
diff --git a/help/newuser b/help/newuser
index 14004a8..3b68479 100644
--- a/help/newuser
+++ b/help/newuser
@@ -1,4 +1,4 @@
-!	 $eterna: newuser,v 1.7 2018/06/10 02:25:30 mrg Exp $
+!	 $eterna: newuser,v 1.8 2021/03/21 04:29:43 mrg Exp $
 !
 ! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
@@ -7,7 +7,7 @@
 ! information.
 !
 
-		NEW USER INFORMATION FOR IRC
+        NEW USER INFORMATION FOR IRC
 
 This file contains some caveats for people new to IRC. It is not a
 guide to commands for IRC. For a brief guide to commands for new
diff --git a/help/note/deny b/help/note/deny
index e53a3a5..a3233de 100644
--- a/help/note/deny
+++ b/help/note/deny
@@ -1,13 +1,13 @@
-!	 $eterna: deny,v 1.8 2018/06/10 08:17:41 mrg Exp $
+!	 $eterna: deny,v 1.9 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
 ! information.
 !
 Usage: NOTE DENY [&<passwd>] [+|-<flags>] [+|-<maxtime>]
-		<nick!user@host> <msg>
+        <nick!user@host> <msg>
   DENY is an alias for USER +RZ (default max 1 day)
   This command makes it impossible for any matching recipient to
   queue any Note requests until timeout.
diff --git a/help/note/find b/help/note/find
index e197cd0..29accee 100644
--- a/help/note/find
+++ b/help/note/find
@@ -1,13 +1,13 @@
-!	 $eterna: find,v 1.7 2018/06/10 08:17:41 mrg Exp $
+!	 $eterna: find,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
 ! information.
 !
 Usage: NOTE FIND [&<passwd>] [+|-<flags>] [+|-<maxtime>]
-		<nick!username@host> <msg>
+        <nick!username@host> <msg>
   FIND is an alias for USER +FLR (default max 1 day)
   This command makes the server search for any matching recipient, and
   send a note message back if this is found. If <msg> field is used, this 
diff --git a/help/note/flag b/help/note/flag
index 9d054ff..52be879 100644
--- a/help/note/flag
+++ b/help/note/flag
@@ -1,13 +1,13 @@
-!	 $eterna: flag,v 1.8 2018/06/10 08:17:41 mrg Exp $
+!	 $eterna: flag,v 1.9 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
 ! information.
 !
 Usage: NOTE FLAG [&<passwd>] [+|-<flags>] [#<ID>]
-		<nick!username@host> <+|-flags>
+        <nick!username@host> <+|-flags>
   You can add or delete as many flags as you wish with +/-<flag>.
   + switch the flag on, and - switch it off. Example: -S+RL
   Following flags with its default set specified first are available:
diff --git a/help/note/ls b/help/note/ls
index 1b1db8f..a2d1637 100644
--- a/help/note/ls
+++ b/help/note/ls
@@ -1,13 +1,13 @@
-!	 $eterna: ls,v 1.7 2018/06/10 08:17:41 mrg Exp $
+!	 $eterna: ls,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
 ! information.
 !
 Usage: NOTE LS [&<passwd>] [+|-<flags>] [#<ID>]
-		<nick!username@host> [<date>]
+        <nick!username@host> [<date>]
   Displays requests you have queued. No arguments would show you
   all requests without the message field.
   Use flags for matching all messages which have the specified flags set
diff --git a/help/note/news b/help/note/news
index 53ad58f..f1012b8 100644
--- a/help/note/news
+++ b/help/note/news
@@ -1,13 +1,13 @@
-!	 $eterna: news,v 1.8 2018/06/10 08:17:41 mrg Exp $
+!	 $eterna: news,v 1.9 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
 ! information.
 !
 Usage: NOTE NEWS [&<passwd>] [+|-<flags>] [+|-<maxtime>]
-		<group!username@host>
+        <group!username@host>
   NEWS with no message is an alias for USER +RS (default max 60 days)
   This command is for subscribing on a specified newsgroup from any
   user(s) or host(s). Wildcards may be used anywhere. Example:
diff --git a/help/note/send b/help/note/send
index 857f6d3..945e699 100644
--- a/help/note/send
+++ b/help/note/send
@@ -1,13 +1,13 @@
-!	 $eterna: send,v 1.7 2018/06/10 08:17:41 mrg Exp $
+!	 $eterna: send,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
 ! information.
 !
 Usage: NOTE SEND [&<passwd>] [+|-<flags>] [+|-<maxtime>]
-		<nick!username@host> <msg>
+        <nick!username@host> <msg>
   SEND is an alias for USER +D (default max 60 days)
   This command is for sending a message to recipient, and let the server
   send a note + a notice to sender if this is on IRC - if message is sent.
diff --git a/help/note/spy b/help/note/spy
index 8ccc034..eb887ad 100644
--- a/help/note/spy
+++ b/help/note/spy
@@ -1,13 +1,13 @@
-!	 $eterna: spy,v 1.7 2018/06/10 08:17:41 mrg Exp $
+!	 $eterna: spy,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
 ! information.
 !
 Usage: NOTE SPY [&<passwd>] [+|-<flags>] [+|-<maxtime>]
-		<nick!username@host> [msg]
+        <nick!username@host> [msg]
   SPY is an alias for USER +RX (default 1 max day)
   SPY makes the server tell you if any matching recipient sign(s)
   on/off IRC or change nick name. No message needs to be specified.
diff --git a/help/note/user b/help/note/user
index 246443e..163c4e1 100644
--- a/help/note/user
+++ b/help/note/user
@@ -1,13 +1,13 @@
-!	 $eterna: user,v 1.7 2018/06/10 08:17:42 mrg Exp $
+!	 $eterna: user,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
 ! information.
 !
 Usage: NOTE USER [&<passwd>] [+|-<flags>] [+|-<maxtime>]
-		<nick!username@host> <msg>
+        <nick!username@host> <msg>
   With USER you can queue a message in the server, and when the recipient
   signs on/off IRC, change nick or join any channel, note checks for
   valid messages. This works even if the sender is not on IRC. See HELP
diff --git a/help/note/waitfor b/help/note/waitfor
index 391a17e..19286cf 100644
--- a/help/note/waitfor
+++ b/help/note/waitfor
@@ -1,13 +1,13 @@
-!	 $eterna: waitfor,v 1.7 2018/06/10 08:17:42 mrg Exp $
+!	 $eterna: waitfor,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
 ! information.
 !
 Usage: NOTE WAITFOR [&<pwd>] [+|-<flags>] [+|-<maxtime>]
-		<nick!username@host> [<msg>]
+        <nick!username@host> [<msg>]
   WAITFOR is an alias for USER +YD (default max 1 day)
   Default message is [Waiting]
   This command is for telling the recipient if this appears on IRC that
diff --git a/help/note/wall b/help/note/wall
index 61ac78e..5270db5 100644
--- a/help/note/wall
+++ b/help/note/wall
@@ -1,13 +1,13 @@
-!	 $eterna: wall,v 1.8 2018/06/10 08:17:42 mrg Exp $
+!	 $eterna: wall,v 1.9 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
 ! information.
 !
 Usage: NOTE WALL [&<passwd>] [+|-<flags>] [+|-<maxtime>]
-			<nick!user@host> <msg>
+      <nick!user@host> <msg>
   WALL is an alias for USER +BR (default max 1 day)
   This command is for sending a message once to every matching user
   on IRC. Be careful using this command. WALL creates a list of 
diff --git a/help/note/wallops b/help/note/wallops
index fb516d5..df5e187 100644
--- a/help/note/wallops
+++ b/help/note/wallops
@@ -1,13 +1,13 @@
-!	 $eterna: wallops,v 1.8 2018/06/10 08:17:42 mrg Exp $
+!	 $eterna: wallops,v 1.9 2021/03/21 04:29:44 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
 ! information.
 !
 Usage: NOTE WALLOPS [&<passwd>] [+|-<flags>] [+|-<maxtime>]
-		<nick!user@host> <msg>
+        <nick!user@host> <msg>
   WALLOPS is an alias for USER +BRW (default max 1 day)
   This command is same as WALL, except only opers could receive it.
 
diff --git a/help/on/channel_nick b/help/on/channel_nick
index 5056021..89c3b43 100644
--- a/help/on/channel_nick
+++ b/help/on/channel_nick
@@ -1,4 +1,4 @@
-!	 $eterna: channel_nick,v 1.7 2018/06/10 08:17:42 mrg Exp $
+!	 $eterna: channel_nick,v 1.8 2021/03/21 04:29:44 mrg Exp $
 !
 ! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
@@ -11,4 +11,4 @@ Usage: ON [#|+|-|^|&|@]CHANNEL_NICK [-|^]"<channel> [<nick>]" [action]
   changes their nickname. The parameters for this function are:
     $0  The channel from which that person has changed nick
     $1  Original nickname for that person
-    $2	New nickname for that person
+    $2  New nickname for that person
diff --git a/help/on/ctcp_reply b/help/on/ctcp_reply
index 0b5d095..a9f1517 100644
--- a/help/on/ctcp_reply
+++ b/help/on/ctcp_reply
@@ -1,6 +1,6 @@
-!	 $eterna: ctcp_reply,v 1.8 2018/06/10 08:17:42 mrg Exp $
+!	 $eterna: ctcp_reply,v 1.9 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -18,10 +18,10 @@ Usage: ON [#|+|-|^|&|@]CTCP_REPLY [-|^]<parameters> [action]
   and did the CTCP show above, you would get something like:
     BigCheese is using IRCII 2.1beta2 Unix
   The parameters are:
-	$0	nick of person who sent the reply
-	$1	target of the reply
-	$2	The CTCP command being replied to
-	$3-	The reply itself (depends on $1)
+    $0    nick of person who sent the reply
+    $1    target of the reply
+    $2    The CTCP command being replied to
+    $3-    The reply itself (depends on $1)
   Note: You may NOT use the CTCP command in an ON CTCP_REPLY.  
   It simply will report an error message to you and not work.  
   It is illegal to do this and it is not supported.
@@ -30,8 +30,8 @@ Usage: ON [#|+|-|^|&|@]CTCP_REPLY [-|^]<parameters> [action]
   the reply, but the CTCP command, and $2- is the message.  For
   example:
 
-  IF (V > 20020902) {
-	ON CTCP_REPLY "% % % *" ECHO ctcp reply type $2 from $0 to $1: $3-
-  } {
-	ON CTCP_REPLY "% % *" ECHO ctcp reply type $1 to $0: $2-
-  }
+    IF (V > 20020902) {
+      ON CTCP_REPLY "% % % *" ECHO ctcp reply type $2 from $0 to $1: $3-
+    } {
+      ON CTCP_REPLY "% % *" ECHO ctcp reply type $1 to $0: $2-
+    }
diff --git a/help/on/dcc_list b/help/on/dcc_list
index e40aa14..a726cc8 100644
--- a/help/on/dcc_list
+++ b/help/on/dcc_list
@@ -1,6 +1,6 @@
-!	 $eterna: dcc_list,v 1.3 2018/06/10 08:17:42 mrg Exp $
+!	 $eterna: dcc_list,v 1.4 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 2002-2018  Matthew Green.
+! Copyright (c) 2002-2021  Matthew Green.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
 ! information.
@@ -9,7 +9,7 @@ Usage: ON [#|+|-|^|&|@]DCC_LIST [-|^]<parameters> [action]
   This hook is called for the DCC LIST command, and can reformat
   the output in any fashion required.
   The parameters are:
-	"Type", "Nick", "Status", "Start time", "Sent", "Read", "Arguments"
+    "Type", "Nick", "Status", "Start time", "Sent", "Read", "Arguments"
     $0    Type of DCC
     $1    Nick for this DCC
     $2    Status of the DCC
diff --git a/help/on/disconnect b/help/on/disconnect
index d516307..56ac55f 100644
--- a/help/on/disconnect
+++ b/help/on/disconnect
@@ -1,6 +1,6 @@
-!	 $eterna: disconnect,v 1.7 2018/06/10 08:17:42 mrg Exp $
+!	 $eterna: disconnect,v 1.8 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -13,4 +13,4 @@ Usage: ON [#|+|-|^|&|@]DISCONNECT [-|^]<parameters> [action]
   which you would see
     *** Use /SERVER to connect to a server
   Parameters:
-	$0	Last server you were connected to
+    $0   Last server you were connected to
diff --git a/help/on/exec b/help/on/exec
index 522e006..9424993 100644
--- a/help/on/exec
+++ b/help/on/exec
@@ -1,6 +1,6 @@
-!	 $eterna: exec,v 1.7 2018/06/10 08:17:42 mrg Exp $
+!	 $eterna: exec,v 1.8 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -11,8 +11,8 @@ Usage: ON [#|+|-|^|&|@]EXEC [-|^]<paramters> [action]
   to its standard output channel.  The process number is the
   number assigned by EXEC to the process (see HELP EXEC).  The
   parameters to this function are:
-    $0	The process number that activated the ON
-	If the EXEC was called with EXEC -name <process name>
-	then $0 matches this name instead. This is very useful
-	for keeping the processes separated out.
-    $1-	The line of output to stdout
+    $0  The process number that activated the ON
+        If the EXEC was called with EXEC -name <process name>
+        then $0 matches this name instead. This is very useful
+        for keeping the processes separated out.
+    $1- The line of output to stdout
diff --git a/help/on/exec_errors b/help/on/exec_errors
index 8c20824..d19676d 100644
--- a/help/on/exec_errors
+++ b/help/on/exec_errors
@@ -1,6 +1,6 @@
-!	 $eterna: exec_errors,v 1.7 2018/06/10 08:17:42 mrg Exp $
+!	 $eterna: exec_errors,v 1.8 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -12,5 +12,5 @@ Usage: ON [#|+|-|^|&|@]EXEC_ERRORS [-|^]<parameters> [action]
   number assigned by EXEC to the process (see HELP EXEC).  The
   parameters to this function are:
     $0  The process number that activated the ON
-	This may also use the process name.  (See ON EXEC)
+        This may also use the process name.  (See ON EXEC)
     $1- The line of output to stderr
diff --git a/help/on/exec_exit b/help/on/exec_exit
index 807f535..be498c6 100644
--- a/help/on/exec_exit
+++ b/help/on/exec_exit
@@ -1,6 +1,6 @@
-!	 $eterna: exec_exit,v 1.7 2018/06/10 08:17:42 mrg Exp $
+!	 $eterna: exec_exit,v 1.8 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -9,6 +9,6 @@
 Usage: ON [#|+|-|^|&|@]EXEC_EXIT [-|^]<parameters> [action]
   This is activated when any EXEC'd process exits.  The parameters
   are:
-	$0	Process number or logical name (if assigned)
-	$1	Signal that killed the process (or 0 if it exited normally)
-	$2	Exit code for process (non-zero only if $1 is 0)
+    $0    Process number or logical name (if assigned)
+    $1    Signal that killed the process (or 0 if it exited normally)
+    $2    Exit code for process (non-zero only if $1 is 0)
diff --git a/help/on/exec_prompt b/help/on/exec_prompt
index 45bd9c3..8a105e2 100644
--- a/help/on/exec_prompt
+++ b/help/on/exec_prompt
@@ -1,6 +1,6 @@
-!	 $eterna: exec_prompt,v 1.7 2018/06/10 08:17:42 mrg Exp $
+!	 $eterna: exec_prompt,v 1.8 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -11,5 +11,5 @@ Usage: ON [#|+|-|^|&|@]EXEC_PROMPT [-|^]<parameters> [action]
   "prompt".  A "prompt" is defined as any line of output from
   a process that doesn't end in a carriage return - line feed.
   The parameters are:
-	$0	process number or logical name (if assigned)
-	$1	The prompt string
+    $0    Process number or logical name (if assigned).
+    $1    The prompt string.
diff --git a/help/on/flood b/help/on/flood
index ef3b90a..2972af5 100644
--- a/help/on/flood
+++ b/help/on/flood
@@ -1,6 +1,6 @@
-!	 $eterna: flood,v 1.8 2018/06/10 02:25:31 mrg Exp $
+!	 $eterna: flood,v 1.9 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -11,9 +11,9 @@ Usage: ON [#|+|-|^|&|@]FLOOD [-|^]<parameters> [action]
   information very rapidly to you, your channel, or the system at 
   large (ie: a wallop).  Usually, this is caused when someone dumps
   a file to your channel or to you.  The parameters for this are:
-    $0	The nick of the flooder
-    $1	The target of the flooder
-    $2	The type of flooding being done 
+    $0  The nick of the flooder
+    $1  The target of the flooder
+    $2  The type of flooding being done 
     $3- The content of the flooding message
 
   General use for ON FLOOD is as follows:
@@ -37,11 +37,11 @@ Usage: ON [#|+|-|^|&|@]FLOOD [-|^]<parameters> [action]
   the flooder, but the type of flooding being done, and $2- is the
   content of the message.  For example:
 
-  IF (V > 20020902) {
-	ON FLOOD "% % % *" ECHO Flood type $2 from $0 to $1: $3-
-  } {
-	ON FLOOD "% % *" ECHO Flood type $1 to $0: $2-
-  }
+    IF (V > 20020902) {
+      ON FLOOD "% % % *" ECHO Flood type $2 from $0 to $1: $3-
+    } {
+      ON FLOOD "% % *" ECHO Flood type $1 to $0: $2-
+    }
 
 See Also:
   SET FLOOD_AFTER
diff --git a/help/on/hook b/help/on/hook
index 3b70d19..506fa5f 100644
--- a/help/on/hook
+++ b/help/on/hook
@@ -1,6 +1,6 @@
-!	 $eterna: hook,v 1.7 2018/06/10 02:25:31 mrg Exp $
+!	 $eterna: hook,v 1.8 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -10,9 +10,9 @@ Usage: ON [#|+|-|^]HOOK [-|^]<any pattern> [action]
   This is activated whenever you receive a HOOK.  HOOKs are generated
   by the user for one purpose, which is to activate ON HOOK.
   The parameters for the action are as follows:
-	$0   First word of text
-	$1   Second word of text..
-	$2-  Rest of pattern.   Can use whatever you like.
+    $0   First word of text
+    $1   Second word of text..
+    $2-  Rest of pattern.   Can use whatever you like.
   Basically if you have an ON HOOK pattern, you can send a HOOK command
   that matches the pattern and it will be activated.  This is useful for
   testing ON patterns, and sending commands from within scripts and 
diff --git a/help/on/input b/help/on/input
index d8d1b52..de75afb 100644
--- a/help/on/input
+++ b/help/on/input
@@ -1,6 +1,6 @@
-!	 $eterna: input,v 1.7 2018/06/10 08:17:42 mrg Exp $
+!	 $eterna: input,v 1.8 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -17,7 +17,7 @@ Note: The fact that you can capture any line and suppress further
   by accident or on purpose.  Don't use this function if you don't
   know exactly what you are trying to do.
   Parameters are:
-	$0	Text of line
+    $0    Text of line
   If you use ^ to suppress the processing of the line, you can 
   do your own pre-processing and send the line back to the client 
   with a call to SENDLINE.
diff --git a/help/on/mode b/help/on/mode
index 560b305..a383ba1 100644
--- a/help/on/mode
+++ b/help/on/mode
@@ -1,6 +1,6 @@
-!	 $eterna: mode,v 1.7 2018/06/10 08:17:42 mrg Exp $
+!	 $eterna: mode,v 1.8 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -11,5 +11,5 @@ Usage: ON [#|+|-|^|&|@]MODE_CHANGE [-|^]<parameters> [action]
   changes the mode for that channel (see HELP MODE).  The 
   parameters for this function are:
     $0  The nickname of the person who changed the mode
-    $1	The channel on which the mode was changed
+    $1  The channel on which the mode was changed
     $2- The new mode settings for that channel
diff --git a/help/on/nickname b/help/on/nickname
index 120f5b2..d04c3d9 100644
--- a/help/on/nickname
+++ b/help/on/nickname
@@ -1,6 +1,6 @@
-!	 $eterna: nickname,v 1.7 2018/06/10 08:17:42 mrg Exp $
+!	 $eterna: nickname,v 1.8 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -10,4 +10,4 @@ Usage: ON [#|+|-|^|&|@]NICKNAME [-|^]<parameters> [action]
   This is activated whenever someone on a channel you are on
   changes their nickname. The parameters for this function are:
     $0  Original nickname for that person
-    $1	New nickname for that person
+    $1  New nickname for that person
diff --git a/help/on/notice b/help/on/notice
index 960fe56..3aa5d6e 100644
--- a/help/on/notice
+++ b/help/on/notice
@@ -1,6 +1,6 @@
-!	 $eterna: notice,v 1.8 2018/06/10 02:25:31 mrg Exp $
+!	 $eterna: notice,v 1.9 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -25,8 +25,8 @@ Usage: ON [#|+|-|^|&|@]NOTICE [-|^]<parameters> [action]
   Note that in ircII 20020902 and earlier, $1 is not the target of
   the NOTICE, instead $1- is the message.  For example:
 
-  IF (V > 20020902) {
-	ON NOTICE "% % % *" ECHO notice from $0 to $1: $2-
-  } {
-	ON NOTICE "% % *" ECHO notice from $0: $1-
-  }
+    IF (V > 20020902) {
+      ON NOTICE "% % % *" ECHO notice from $0 to $1: $2-
+    } {
+      ON NOTICE "% % *" ECHO notice from $0: $1-
+    }
diff --git a/help/on/on b/help/on/on
index b7000d5..9ad3eb4 100644
--- a/help/on/on
+++ b/help/on/on
@@ -1,6 +1,6 @@
-!	 $eterna: on,v 1.8 2018/06/10 02:25:31 mrg Exp $
+!	 $eterna: on,v 1.9 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -17,37 +17,37 @@ Usage: ON [#|+|-|^|&|@]<event> [serial] [-|^]<match> [action]
   people entering or leaving your channel is extremely poor
   etiquette. See /HELP ETIQUETTE.
 
-ON [mode]<event> [-|^]<match> [action]
-ON [mode]#<event> <serial number> [-|^]<match> [action]
+    ON [mode]<event> [-|^]<match> [action]
+    ON [mode]#<event> <serial number> [-|^]<match> [action]
 
   There are seven modes for each event.  I've shown the # mode
   as a separate line because it requires a serial number.
   Different modes are specified by preceeding the event with
   one of the following characters:
-    +           Make event very noisy.  It will display
-                everything it does.
-    -           Make event quiet.  It will not display any of
-                its actions.
-    ^           Make event silent.  Just like - above except it
-                inhibits the normal event display as well.  The
-                only command that will cause output in this mode
-                is the ECHO command.  This can be used to redefine 
-                how event messages look.
-    &		Make the /ON local to only your own server.  e.g.
-		/on -&msg * echo One of mine
-		Will echo "One of mine" ONLY when someone from my own
-		current server sends me a message.  If nothing matches
-		in this list, then it will resort to the default ONs.
-		Of if there was an /ON ^msg * echo :$0: $1- then it 
- 		it will use that for anyone not on your server.
-    @ 		This is like & except that it is exclusive to your
-		server.  It will NOT look at the default ONs if 
-		there is no match for your own server.
-    #           Allows you to assign a serial number to the specific
-		<event> such that you can have multiple ON's trigger
-		of one <event>.  Further discussion of this below.
- 		Note this is a pound sign NOT a number. The serial
-		number comes right after the <event>.
+    +    Make event very noisy.  It will display
+         everything it does.
+    -    Make event quiet.  It will not display any of
+         its actions.
+    ^    Make event silent.  Just like - above except it
+         inhibits the normal event display as well.  The
+         only command that will cause output in this mode
+         is the ECHO command.  This can be used to redefine 
+         how event messages look.
+    &    Make the /ON local to only your own server.  e.g.
+           /on -&msg * echo One of mine
+         Will echo "One of mine" ONLY when someone from my own
+         current server sends me a message.  If nothing matches
+         in this list, then it will resort to the default ONs.
+         Of if there was an /ON ^msg * echo :$0: $1- then it 
+         it will use that for anyone not on your server.
+    @    This is like & except that it is exclusive to your
+         server.  It will NOT look at the default ONs if 
+         there is no match for your own server.
+    #    Allows you to assign a serial number to the specific
+         <event> such that you can have multiple ON's trigger
+         of one <event>.  Further discussion of this below.
+         Note this is a pound sign NOT a number. The serial
+         number comes right after the <event>.
   If no character is specified, you will be warned upon activation 
   of an event (this is somewhere between the + and - modes).
 
diff --git a/help/on/server_notice b/help/on/server_notice
index a2e8aa0..c9e5d51 100644
--- a/help/on/server_notice
+++ b/help/on/server_notice
@@ -1,6 +1,6 @@
-!	 $eterna: server_notice,v 1.8 2018/06/10 08:17:42 mrg Exp $
+!	 $eterna: server_notice,v 1.9 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -14,5 +14,5 @@ Usage: ON [#|+|-|^|&|@]SERVER_NOTICE [-|^]<parameters> [action]
   The parameters for the action are as follows:
     $0    The name of the server which sent you the message
     $1    The first word of the text sent - probably "***" or "MOTD"
-	  or the name of a channel, eg, "&LOCAL"
+          or the name of a channel, eg, "&LOCAL"
     $2-   The message
diff --git a/help/on/timer b/help/on/timer
index 3b98b19..225bcc2 100644
--- a/help/on/timer
+++ b/help/on/timer
@@ -1,6 +1,6 @@
-!	 $eterna: timer,v 1.7 2018/06/10 08:17:42 mrg Exp $
+!	 $eterna: timer,v 1.8 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -10,8 +10,8 @@ Usage: ON [#|+|-|^|&|@]TIMER [-|^]<time> [action]
   This is activated whenever the real-time clock is equal to the
   time specification you gave it.  The time specifications should
   be one of two forms:
-	HH:MM[AM|PM]	where 1<=HH<=12 and 0<=MM<=59
-	HH:MM		where 0<=HH<=23 and 0<=MM<=59
+        HH:MM[AM|PM]    where 1<=HH<=12 and 0<=MM<=59
+        HH:MM           where 0<=HH<=23 and 0<=MM<=59
   which form you use depends on the current setting of
   CLOCK_24HOUR.  Time specification may include wildcards as
   well.  The matching of the real-time clock and the time
diff --git a/help/on/window b/help/on/window
index 2138bc9..3dcd1e6 100644
--- a/help/on/window
+++ b/help/on/window
@@ -1,6 +1,6 @@
-!	 $eterna: window,v 1.7 2018/06/10 08:17:43 mrg Exp $
+!	 $eterna: window,v 1.8 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -12,5 +12,5 @@ Usage: ON [#|+|-|^|&|@]WINDOW [-|^]<parameters> [action]
   channel.  WARNING!!!  If you aren't careful you can get into some
   infinite sending loops!  Use with care!
   Parameters:
-	$0	Refnum or name of window
-	$1-	text of line sent to window
+    $0    Refnum or name of window.
+    $1-   Text of line sent to window.
diff --git a/help/servlist b/help/servlist
index 25c6773..6b07165 100644
--- a/help/servlist
+++ b/help/servlist
@@ -1,6 +1,6 @@
-!	 $eterna: servlist,v 1.3 2018/06/10 08:17:37 mrg Exp $
+!	 $eterna: servlist,v 1.4 2021/03/21 04:29:43 mrg Exp $
 !
-! Copyright (c) 1997-2018 Matthew Green.
+! Copyright (c) 1997-2021 Matthew Green.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
 ! information.
@@ -8,17 +8,17 @@
 Usage: SERVLIST [<mask> [<type>]]
   SERVLIST gives the list of services currently present on the
   IRC network.  It can take two arguments.
-	<mask> limits the output to the services which names matches
-	  the mask.
-	<type> limits the output to the services of the specified type.
+    <mask> limits the output to the services which names matches
+      the mask.
+    <type> limits the output to the services of the specified type.
   
   The fields returned are:
-	Service name.
-	Server who introduced the service.
-	Distribution mask.
-	Service type.
-	Hop count to the service.
-	A comment.
+    Service name.
+    Server who introduced the service.
+    Distribution mask.
+    Service type.
+    Hop count to the service.
+    A comment.
 
 See Also:
   SQUERY
diff --git a/help/set/debug b/help/set/debug
index 332fa99..67a2f1c 100644
--- a/help/set/debug
+++ b/help/set/debug
@@ -1,6 +1,6 @@
-!	 $eterna: debug,v 1.7 2018/06/10 02:25:32 mrg Exp $
+!	 $eterna: debug,v 1.8 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -9,10 +9,10 @@
 Usage: SET DEBUG <debug level>
   The DEBUG variable enables three types of debugging
   output dependant on the settings of various bits.
-	bit	value	purpose
-	 0	  1	Display all commands executed
-	 1	  2	Display all alias substitutions made
-	 2	  4	Display all function calls and return values
+    bit    value    purpose
+      0        1    Display all commands executed
+      1        2    Display all alias substitutions made
+      2        4    Display all function calls and return values
   DEBUG 3 will show all command executed and all alias expansions.
   DEBUG 7 will show EVERYTHING.  It is pretty messy so you might
   want to set HOLD_MODE on when you use this.
diff --git a/help/set/display_encoding b/help/set/display_encoding
index 9cb027d..50d67f9 100644
--- a/help/set/display_encoding
+++ b/help/set/display_encoding
@@ -1,6 +1,10 @@
-!	 $eterna: display_encoding,v 1.4 2018/06/10 02:25:32 mrg Exp $
+!	 $eterna: display_encoding,v 1.5 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 2004 Joel Yliluoma.
+! Copyright (c) 2004-2021  Joel Yliluoma, Matthew Green,
+! and other ircII contributors.
+!
+! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
+! information.
 !
 Usage: SET DISPLAY_ENCODING <encoding>
   The DISPLAY_ENCODING variable defines which character encoding
@@ -17,7 +21,7 @@ Usage: SET DISPLAY_ENCODING <encoding>
     ISO-8859-8          Modern Hebrew encoding
     ISO-8859-9          Turkish, Maltese, Esperanto
     ISO-8859-10         Estonian, Latvian, Lithuanian, Greenlandic, Saami
-    ISO-8859-11		Thai
+    ISO-8859-11         Thai
     ISO-8859-15         Latin1 revised, with Euro for Finnish and French
     ISO-8859-16         Albanian, Croatian, Romanian, Gaelic etc with Euro
     EUC-JP              Doublebyte Japanese JIS-X-0208 encoding
diff --git a/help/set/input_encoding b/help/set/input_encoding
index 78c557a..c372e0b 100644
--- a/help/set/input_encoding
+++ b/help/set/input_encoding
@@ -1,6 +1,10 @@
-!	 $eterna: input_encoding,v 1.4 2018/06/10 02:25:32 mrg Exp $
+!	 $eterna: input_encoding,v 1.5 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 2004 Joel Yliluoma.
+! Copyright (c) 2004-2021  Joel Yliluoma, Matthew Green,
+! and other ircII contributors.
+!
+! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
+! information.
 !
 Usage: SET INPUT_ENCODING <encoding>
   The INPUT_ENCODING variable defines which character encoding
@@ -17,7 +21,7 @@ Usage: SET INPUT_ENCODING <encoding>
     ISO-8859-8          Modern Hebrew encoding
     ISO-8859-9          Turkish, Maltese, Esperanto
     ISO-8859-10         Estonian, Latvian, Lithuanian, Greenlandic, Saami
-    ISO-8859-11		Thai
+    ISO-8859-11         Thai
     ISO-8859-15         Latin1 revised, with Euro for Finnish and French
     ISO-8859-16         Albanian, Croatian, Romanian, Gaelic etc with Euro
     EUC-JP              Doublebyte Japanese JIS-X-0208 encoding
diff --git a/help/set/irc_encoding b/help/set/irc_encoding
index 23e8e88..dbf7c24 100644
--- a/help/set/irc_encoding
+++ b/help/set/irc_encoding
@@ -1,6 +1,10 @@
-!	 $eterna: irc_encoding,v 1.4 2018/06/10 02:25:32 mrg Exp $
+!	 $eterna: irc_encoding,v 1.5 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 2004 Joel Yliluoma.
+! Copyright (c) 2004-2021  Joel Yliluoma, Matthew Green,
+! and other ircII contributors.
+!
+! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
+! information.
 !
 Usage: SET IRC_ENCODING <encoding>
   The IRC_ENCODING variable defines which character encoding
@@ -21,7 +25,7 @@ Usage: SET IRC_ENCODING <encoding>
     ISO-8859-8          Modern Hebrew encoding
     ISO-8859-9          Turkish, Maltese, Esperanto
     ISO-8859-10         Estonian, Latvian, Lithuanian, Greenlandic, Saami
-    ISO-8859-11		Thai
+    ISO-8859-11         Thai
     ISO-8859-15         Latin1 revised, with Euro for Finnish and French
     ISO-8859-16         Albanian, Croatian, Romanian, Gaelic etc with Euro
     WINDOWS-1252        M$ version of latin1, overlaps with control bytes
diff --git a/help/set/status_format b/help/set/status_format
index 0ef3f2c..04fb791 100644
--- a/help/set/status_format
+++ b/help/set/status_format
@@ -1,6 +1,6 @@
-!	 $eterna: status_format,v 1.8 2018/06/10 02:25:32 mrg Exp $
+!	 $eterna: status_format,v 1.9 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -12,29 +12,29 @@ Usage: SET STATUS_FORMAT <format description for status line>
   this format line and replaced with various bits of status line
   information.  Each of these special characters is preceeded by
   a '%'.  Here is a list of these characters:
-       N          Your current nickname.
-       C          Your current channel.
-       R          Current window refnum or name.
-       W          Value of STATUS_WINDOW variable. *
-       +          Value of STATUS_MODE variable. *
-       Q          Value of STATUS_QUERY variable. *
-       I          Value of STATUS_INSERT variable. *
-       S          Value of STATUS_SERVER variable. *
-       F          Value of STATUS_NOTIFY variable. *
-       O          Value of STATUS_OVERWRITE variables. *
-       A          Value of STATUS_AWAY variable. *
-       T          Value of STATUS_CLOCK variable. *
-       U          Value of STATUS_USER variable. *
-       X Y Z      Value of STATUS_USER1,2,3 variables. *
-       H          Value of STATUS_HOLD variable. *
-       *          Value of STATUS_OPER variable. *
-       @          Value of STATUS_CHANOP variable. *
-       M          Value of STATUS_MAIL variable. *
-       #	  Value of STATUS_UMODE variable.
-       B	  Value of STATUS_HOLD_LINES variable. *
-       V          Current IRCII version
-       >          Makes anything beyond it right justified.
-       %          Replaced by %
+    N          Your current nickname.
+    C          Your current channel.
+    R          Current window refnum or name.
+    W          Value of STATUS_WINDOW variable. *
+    +          Value of STATUS_MODE variable. *
+    Q          Value of STATUS_QUERY variable. *
+    I          Value of STATUS_INSERT variable. *
+    S          Value of STATUS_SERVER variable. *
+    F          Value of STATUS_NOTIFY variable. *
+    O          Value of STATUS_OVERWRITE variables. *
+    A          Value of STATUS_AWAY variable. *
+    T          Value of STATUS_CLOCK variable. *
+    U          Value of STATUS_USER variable. *
+    X Y Z      Value of STATUS_USER1,2,3 variables. *
+    H          Value of STATUS_HOLD variable. *
+    *          Value of STATUS_OPER variable. *
+    @          Value of STATUS_CHANOP variable. *
+    M          Value of STATUS_MAIL variable. *
+    #          Value of STATUS_UMODE variable.
+    B          Value of STATUS_HOLD_LINES variable. *
+    V          Current IRCII version
+    >          Makes anything beyond it right justified.
+    %          Replaced by %
 
   Those marked with * are only displayed in the status line when
   certain conditions are met.  Please get help on the variables
diff --git a/help/who b/help/who
index 5a94459..5577fce 100644
--- a/help/who
+++ b/help/who
@@ -1,6 +1,6 @@
-!	 $eterna: who,v 1.7 2018/06/10 08:17:37 mrg Exp $
+!	 $eterna: who,v 1.8 2021/03/21 04:29:43 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -16,17 +16,17 @@ Usage: WHO [-switch [<arg>]] [<wildcard expression>]
   irc are shown.  The following switches are also recognized 
   and used to limit the listing:
     -OPERATORS            - lists only operators
-    -LUSERS		  - lists only non operators
-    -CHOPS		  - lists only channel operators
+    -LUSERS               - lists only non operators
+    -CHOPS                - lists only channel operators
     -NAME <username>      - lists only people with matching 
                             user-ids
     -FILE <filename>      - lists only people listed in the
-			    file
-    -HOST		  - Lists users from the specified host.
-    -SERVER		  - Lists users from the specified server.
-    -HERE		  - Lists only those marked as here.
-    -AWAY		  - Lists only those marked away.
-    -NICK 		  - Match only the given nickname
+                            file
+    -HOST                 - Lists users from the specified host.
+    -SERVER               - Lists users from the specified server.
+    -HERE                 - Lists only those marked as here.
+    -AWAY                 - Lists only those marked away.
+    -NICK                 - Match only the given nickname
 
   The switches may be abbreviated unambiguously.  All matching of
   usernames, hostnames, and servernames may contain wildcards (*).
diff --git a/help/window/show b/help/window/show
index 517696e..a96c949 100644
--- a/help/window/show
+++ b/help/window/show
@@ -1,11 +1,11 @@
-!	 $eterna: show,v 1.7 2018/06/10 08:17:46 mrg Exp $
+!	 $eterna: show,v 1.8 2021/03/21 04:29:45 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
 ! information.
 !
-Usage: WINDOW SHOW <r>	 
+Usage: WINDOW SHOW <r>
   Makes the hidden window with refnum <r> visible again and become
   the current window.
diff --git a/help/xecho b/help/xecho
index 321effd..5cb7098 100644
--- a/help/xecho
+++ b/help/xecho
@@ -1,6 +1,6 @@
-!	 $eterna: xecho,v 1.7 2018/06/10 08:17:37 mrg Exp $
+!	 $eterna: xecho,v 1.8 2021/03/21 04:29:43 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -10,14 +10,14 @@ Usage: XECHO [<flags>] <text>
   XECHO is like ECHO, except that it takes flag arguments.
 
 Available flags:
-  -LEVEL <level>  displays the message with the specified lastlog
-                  level. This is useful to change the window some
-                  messages are displayed in. This is the only way
-                  to generate a message with the USERLOG1-4 lastlog
-                  levels.
-  -WINDOW <winname> displays the text in the named window, if it can. 
-		  If the window doesn't exist, then the -WINDOW flag
- 		  is ignored.
+  -LEVEL <level>      Displays the message with the specified
+                          lastlog level. This is useful to change the
+                          window some messages are displayed in. This
+                          is the only way to generate a message with
+                          the USERLOG1-4 lastlog levels.
+  -WINDOW <winname>   Displays the text in the named window, if
+                          it can.  If the window doesn't exist, then
+                          the -WINDOW flag is ignored.
 See Also:
   ECHO
   ON
diff --git a/help/xtype b/help/xtype
index a449d09..0b583e4 100644
--- a/help/xtype
+++ b/help/xtype
@@ -1,6 +1,6 @@
-!	 $eterna: xtype,v 1.7 2018/06/10 08:17:37 mrg Exp $
+!	 $eterna: xtype,v 1.8 2021/03/21 04:29:43 mrg Exp $
 !
-! Copyright (c) 1990-2018  Michael Sandrof, Troy Rollo, Matthew Green,
+! Copyright (c) 1990-2021  Michael Sandrof, Troy Rollo, Matthew Green,
 ! and other ircII contributors.
 !
 ! All rights reserved.  See the HELP IRCII COPYRIGHT file for more
@@ -10,8 +10,8 @@ Usage: XTYPE [-LITERAL] <text>
   XTYPE is like TYPE, except that it takes flag arguments.
 
 Available flags:
-  -LITERAL	Adds text to the input cursor, like /type does,
-		but bindings are ignored.
+  -LITERAL     Adds text to the input cursor, like /type does,
+                   but bindings are ignored.
 
 See also:
   TYPE
diff --git a/script/complete b/script/complete
index 952a7d3..3600221 100644
--- a/script/complete
+++ b/script/complete
@@ -2,7 +2,7 @@
 # inspired by the tcsh shell 'complete' command
 # version .8 (alpha) Do NOT distribute
 # Tue Jul 13 13:16:01 MDT 1993
-@ RCS.complete = [$$Header: /home/cvs/ircii/script/complete,v 1.2 2001/08/12 15:44:17 mrg Exp $$]
+@ RCS.complete = [$$Header: /local/cvs/ircii/script/complete,v 1.2 2001/08/12 15:44:17 mrg Exp $$]
 #
 # Commands:
 #   compl.add [-null] [-nomatch] <command pattern> <command parser name>
diff --git a/script/dccchan b/script/dccchan
index ca2b046..4282419 100644
--- a/script/dccchan
+++ b/script/dccchan
@@ -12,7 +12,7 @@
 #
 # /dpart to leave
 
-@ RCS.dccchan = [$$Header: /home/cvs/ircii/script/dccchan,v 1.2 2001/08/12 15:44:17 mrg Exp $$]
+@ RCS.dccchan = [$$Header: /local/cvs/ircii/script/dccchan,v 1.2 2001/08/12 15:44:17 mrg Exp $$]
 @ dchan.portnum = 7000
 
 # open listening connection on the specified port number
diff --git a/script/functions b/script/functions
index 2cd0503..9f8c512 100644
--- a/script/functions
+++ b/script/functions
@@ -1,7 +1,7 @@
 # Some misc functions..  for 2.2 and beyond.
 # by: Ian Frechette  (frechett@spot.colorado.edu)
 # Wed Aug 18 00:26:53 MDT 1993
-@ RCS.functions = [$$Header: /home/cvs/ircii/script/functions,v 1.3 2001/08/12 15:44:17 mrg Exp $$]
+@ RCS.functions = [$$Header: /local/cvs/ircii/script/functions,v 1.3 2001/08/12 15:44:17 mrg Exp $$]
 
 
 # ircII scripting note.  @ var = <expression> is used a lot. One case
diff --git a/script/history-match b/script/history-match
index 2970080..f08f11e 100644
--- a/script/history-match
+++ b/script/history-match
@@ -9,7 +9,7 @@
 # modify the pattern or hit return it will reset the search to something
 # new.. 
 
-@ RCS.ircIId = [$$Header: /home/cvs/ircii/script/history-match,v 1.2 2001/08/12 15:44:17 mrg Exp $$]
+@ RCS.ircIId = [$$Header: /local/cvs/ircii/script/history-match,v 1.2 2001/08/12 15:44:17 mrg Exp $$]
 
 bind meta2-p parse history.expn $L
 
diff --git a/script/imap b/script/imap
index 90b1c0e..3fe3432 100644
--- a/script/imap
+++ b/script/imap
@@ -29,7 +29,7 @@
 ^set novice off
 ^set max_recursion 50
 
-@ RCS.imap = [$$Header: /home/cvs/ircii/script/imap,v 1.5 2003/12/08 05:05:59 mrg Exp $$]
+@ RCS.imap = [$$Header: /local/cvs/ircii/script/imap,v 1.5 2003/12/08 05:05:59 mrg Exp $$]
 eval @ map.mask = encode(*.)
 # @ map.str = [| | | | | | | | | | | | | | | | | | | | | | | ]
 
diff --git a/script/newformat b/script/newformat
index 58d8d06..8043385 100644
--- a/script/newformat
+++ b/script/newformat
@@ -3,7 +3,7 @@
 # formatting.
 
 
-@ RCS.newformat = [$$Header: /home/cvs/ircii/script/newformat,v 1.3 2001/08/12 15:44:17 mrg Exp $$]
+@ RCS.newformat = [$$Header: /local/cvs/ircii/script/newformat,v 1.3 2001/08/12 15:44:17 mrg Exp $$]
 # An operator command. ESC-t turns this option on and off.
 # It allows one to see users or not see them in a TRACE.
 # It also effects the output of STAT l
diff --git a/source/alias.c b/source/alias.c
index 4fd3a84..1d94f83 100644
--- a/source/alias.c
+++ b/source/alias.c
@@ -33,7 +33,7 @@
  */
 
 #include "irc.h"
-IRCII_RCSID("@(#)$eterna: alias.c,v 1.183 2021/02/27 08:02:14 mrg Exp $");
+IRCII_RCSID("@(#)$eterna: alias.c,v 1.184 2021/04/27 19:00:13 mrg Exp $");
 
 #include "alias.h"
 #include "dcc.h"
@@ -2528,7 +2528,7 @@ function_userhost(u_char *input)
 static u_char	*
 function_strip(u_char *input)
 {
-	u_char	tmpbuf[128], *result;
+	u_char	tmpbuf[128], *result = NULL;
 	u_char	*retval = NULL;
 	u_char	*chars;
 	u_char	*cp, *dp;
diff --git a/source/exec.c b/source/exec.c
index 435d786..0939666 100644
--- a/source/exec.c
+++ b/source/exec.c
@@ -33,7 +33,7 @@
  */
 
 #include "irc.h"
-IRCII_RCSID("@(#)$eterna: exec.c,v 1.108 2021/03/02 10:20:53 mrg Exp $");
+IRCII_RCSID("@(#)$eterna: exec.c,v 1.109 2021/04/11 21:02:32 mrg Exp $");
 
 #include <sys/wait.h>
 
@@ -300,14 +300,10 @@ do_processes(fd_set *rd)
 					proc->counter++;
 					exec_buffer[sizeof(exec_buffer) - 1] = '\0';	/* blah... */
 					ptr = exec_buffer + my_strlen(exec_buffer) - 1;
-					if (ptr >= exec_buffer && (*ptr == '\n' || *ptr == '\r'))
+					while (ptr >= exec_buffer && (*ptr == '\n' || *ptr == '\r'))
 					{
 						*ptr = '\0';
-						if (ptr > exec_buffer) {
-							--ptr;
-							if (*ptr == '\n' || *ptr == '\r')
-								*ptr = '\0';
-						}
+						--ptr;
 					}
 					if (proc->logical)
 						flag = do_hook(EXEC_LIST, "%s %s", proc->logical, exec_buffer);
diff --git a/source/history.c b/source/history.c
index 774166c..e3ccfb7 100644
--- a/source/history.c
+++ b/source/history.c
@@ -33,7 +33,7 @@
  */
 
 #include "irc.h"
-IRCII_RCSID("@(#)$eterna: history.c,v 1.38 2017/07/03 13:05:14 mrg Exp $");
+IRCII_RCSID("@(#)$eterna: history.c,v 1.39 2021/04/11 21:02:32 mrg Exp $");
 
 #include "ircaux.h"
 #include "vars.h"
@@ -329,7 +329,7 @@ static	u_char	*
 get_from_history_file(int which)
 {
 	u_char	*ptr;
-	u_char	buffer[FS_BUFFER_SIZE];
+	static u_char	buffer[FS_BUFFER_SIZE];
 
 	if (last_dir == -1)
 		last_dir = which;
@@ -367,9 +367,6 @@ get_from_history_buffer(int which)
 {
 	if ((get_int_var(HISTORY_VAR) == 0) || (hist_size == 0))
 		return NULL;
-	/*
-	 * if (last_dir != which) { last_dir = which; get_from_history(which); }
-	 */
 	if (which == NEXT)
 	{
 		if (command_history_pos)
diff --git a/source/server.c b/source/server.c
index 049e4e5..a9e3cf3 100644
--- a/source/server.c
+++ b/source/server.c
@@ -33,7 +33,7 @@
  */
 
 #include "irc.h"
-IRCII_RCSID("@(#)$eterna: server.c,v 1.249 2021/03/14 18:22:31 mrg Exp $");
+IRCII_RCSID("@(#)$eterna: server.c,v 1.250 2021/03/24 01:40:12 mrg Exp $");
 
 #ifdef HAVE_SYS_UN_H
 # include <sys/un.h>
@@ -1151,6 +1151,8 @@ connect_to_server_direct(u_char *server_name, int port, u_char *nick, int server
 			    e, error ? ": " : "", error ? strerror(error) : "");
 		if (is_server_open(from_server))
 			say("Connection to server %s resumed...", server_list[from_server].name);
+		if (r0)
+			freeaddrinfo(r0);
 		return (-1);
 	}
 
diff --git a/source/vars.c b/source/vars.c
index 2cb185a..67706e6 100644
--- a/source/vars.c
+++ b/source/vars.c
@@ -33,7 +33,7 @@
  */
 
 #include "irc.h"
-IRCII_RCSID("@(#)$eterna: vars.c,v 1.108 2019/01/16 06:27:37 mrg Exp $");
+IRCII_RCSID("@(#)$eterna: vars.c,v 1.109 2021/03/16 05:07:21 mrg Exp $");
 
 #include "status.h"
 #include "window.h"
@@ -799,4 +799,4 @@ var_settings(int idx)
 	else if (idx == TOGGLE)
 		return "TOGGLE";
 	return "<internal error>";
-};
+}

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in second set of .debs but not in first

-rw-r--r--  root/root   /usr/lib/debug/.build-id/1c/f921eb2f7ba569d82cdfefa8fe455da4541529.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/35/d9cb7c50d218a485d6efd6fd5cd7f4a8e3a656.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/3f/65a6f8d124a60a75592fa47673e2d019f8d6be.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/f7/37598df59ab6d1ad6919c99004c1d63285bfb6.debug

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/lib/debug/.build-id/18/6721960a107c0a4d3fe7857f03587c3197cce4.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/63/ef10da6e1c5a0981d6e208ec5ffbe16e8ab4ed.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/78/5c5c540d746d5995a95fbfc3cf7e1e4ee468d7.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/f7/7b69d0b92bcf5a150109d7fae2316b28bb7a4e.debug

Control files of package ircii: lines which differ (wdiff format)

  • Maintainer: Debian QA Group  Anibal Monsalve Salazar 

Control files of package ircii-dbgsym: lines which differ (wdiff format)

  • Build-Ids: 186721960a107c0a4d3fe7857f03587c3197cce4 63ef10da6e1c5a0981d6e208ec5ffbe16e8ab4ed 785c5c540d746d5995a95fbfc3cf7e1e4ee468d7 f77b69d0b92bcf5a150109d7fae2316b28bb7a4e 1cf921eb2f7ba569d82cdfefa8fe455da4541529 35d9cb7c50d218a485d6efd6fd5cd7f4a8e3a656 3f65a6f8d124a60a75592fa47673e2d019f8d6be f737598df59ab6d1ad6919c99004c1d63285bfb6
  • Maintainer: Debian QA Group  Anibal Monsalve Salazar 

Run locally

More details

Full run details