- Update to version 1.1.16

- Add SSL support

PR:		59387
Submitted by:	maintainer

6 files changed, 500 insertions, 499 deletions

diff --git a/irc/epic4/Makefile b/irc/epic4/Makefile
index 07431bd544e9..eabcb9fc4698 100644
--- a/irc/epic4/Makefile
+++ b/irc/epic4/Makefile
@@ -6,34 +6,32 @@
 #
 
 PORTNAME=	epic4
-PORTVERSION=	1.0.1
-# Make these variables overridable for slave ports
-PORTREVISION?=	3
-CATEGORIES?=	irc ipv6
-MASTER_SITES=	http://ftp.prbh.org/pub/epic/EPIC4-PRODUCTION/ \
-		ftp://ftp.icm.edu.pl/vol/rzm0/irc/EPIC/%SUBDIR%/ \
-		ftp://ftp.archive.de.uu.net/pub/unix/irc/epic/%SUBDIR%/ \
-		ftp://ftp.nl.uu.net/pub/unix/irc/epic/%SUBDIR%/ \
-MASTER_SITE_SUBDIR=	EPIC4-PRODUCTION
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTFILE_HELP}
-DIST_SUBDIR=	epic4
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-
-PATCH_SITES=	http://www.t17.ds.pwr.wroc.pl/~misiek/ipv6/
-PATCHFILES=	${DISTNAME}-ipv6-20010418.patch.gz
-PATCH_DIST_STRIP=	-p1
-
-MAINTAINER?=	anders@andersa.net
-COMMENT?=	The (E)nhanced (P)rogrammable (I)RC-II (C)lient
-
-USE_BZIP2=	yes
-USE_AUTOCONF=	yes
-
-DISTFILE_HELP=	${PORTNAME}pre2-help.tar.gz
+PORTVERSION=	1.1.16
+CATEGORIES=	irc ipv6
+MASTER_SITES=	ftp://ftp.epicsol.org/pub/epic/EPIC4-ALPHA/ \
+		ftp://ftp.archive.de.uu.net/pub/unix/irc/epic/EPIC4-ALPHA/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${DISTFILE_HELP}
+
+MAINTAINER=	anders@andersa.net
+COMMENT=	The (E)nhanced (P)rogrammable (I)RC-II (C)lient
+
+LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84
+
+USE_REINPLACE=	yes
+USE_PERL5=	yes
+USE_OPENSSL=	yes
+GNU_CONFIGURE=	yes
 
 MAN1=		epic.1
+DISTFILE_HELP=	${PORTNAME}-help-20031106.tar.gz
+
+post-patch:
+	${REINPLACE_CMD} -e 's|8.3|8.4|g' ${WRKSRC}/configure
+	${FIND} . -type d -name CVS | ${XARGS} ${RM} -rf
+	${RM} ${WRKDIR}/help/Makefile
 
 post-install:
-	cd ${PREFIX}/share/epic && ${TAR} zxf ${_DISTDIR}/${DISTFILE_HELP}
+	${CP} -R ${WRKDIR}/help/* ${PREFIX}/share/epic/help
 
 .include <bsd.port.mk>
diff --git a/irc/epic4/distinfo b/irc/epic4/distinfo
index 9e5c3a54a95e..d96db18fb68b 100644
--- a/irc/epic4/distinfo
+++ b/irc/epic4/distinfo
@@ -1,3 +1,2 @@
-MD5 (epic4/epic4-1.0.1.tar.bz2) = 5502b7141a5bad145cac0e6762162816
-MD5 (epic4/epic4pre2-help.tar.gz) = 176f77c1e372fc3ca184eca951cb86f5
-MD5 (epic4/epic4-1.0.1-ipv6-20010418.patch.gz) = 27a4ae0240cd75f73b3ce7d1e3b84e65
+MD5 (epic4-1.1.16.tar.gz) = 15bf478f826505a72a8e3b88e079c842
+MD5 (epic4-help-20031106.tar.gz) = 246a2185ef88bbb0fe0da365be70706b
diff --git a/irc/epic4/files/patch-ctcp.c b/irc/epic4/files/patch-ctcp.c
deleted file mode 100644
index b8f4eef94264..000000000000
--- a/irc/epic4/files/patch-ctcp.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- source/ctcp.c.orig  Tue Dec  5 01:11:56 2000
-+++ source/ctcp.c       Tue May 27 16:55:04 2003
-@@ -897,7 +897,8 @@
-	int	len;
-
- 	/* Make sure that the final \001 doesnt get truncated */
--	len = IRCD_BUFFER_SIZE - (12 + strlen(to));
-+	if ((len = IRCD_BUFFER_SIZE - (12 + strlen(to))) < 0)
-+		return;
- 	putbuf2 = alloca(len);
- 
- 	if (format)
diff --git a/irc/epic4/files/patch-dcc.c b/irc/epic4/files/patch-dcc.c
deleted file mode 100644
index bb588180d6b7..000000000000
--- a/irc/epic4/files/patch-dcc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/dcc.c.orig	Mon May  6 03:36:21 2002
-+++ source/dcc.c	Mon May  6 03:36:44 2002
-@@ -1366,7 +1366,7 @@
- 		/*
- 		 * Figure out something sane for the xfer speed.
- 		 */
--		if (Client->bytes_sent)
-+		if (act_sent)
- 		{
- 			strlcpy(speed, calc_speed(act_sent, 
- 				Client->starttime.tv_sec, time(NULL)), 9);
diff --git a/irc/epic4/pkg-descr b/irc/epic4/pkg-descr
index 21047bf2950b..bb7295632170 100644
--- a/irc/epic4/pkg-descr
+++ b/irc/epic4/pkg-descr
@@ -7,4 +7,4 @@ make EPIC the best ircII client available.
 EPIC no longer shares any file names with ircII, so they should happily
 co-exist.
 
-WWW: http://www.prbh.org/
+WWW: http://www.epicsol.org/
diff --git a/irc/epic4/pkg-plist b/irc/epic4/pkg-plist
index 23192eb22aee..abf71299ee32 100644
--- a/irc/epic4/pkg-plist
+++ b/irc/epic4/pkg-plist
@@ -1,34 +1,10 @@
 bin/epic
-bin/epic-EPIC4-1.0.1
-libexec/wserv
+bin/epic-EPIC4-1.1.16
+libexec/wserv4
+share/epic/help/1_General/1_General
 share/epic/help/1_General/away
-share/epic/help/1_General/describe
-share/epic/help/1_General/disconnect
-share/epic/help/1_General/ignore
-share/epic/help/1_General/invite
-share/epic/help/1_General/kick
-share/epic/help/1_General/me
-share/epic/help/1_General/mode
-share/epic/help/1_General/msg
-share/epic/help/1_General/nick
-share/epic/help/1_General/notice
-share/epic/help/1_General/notify
-share/epic/help/1_General/ping
-share/epic/help/1_General/query
-share/epic/help/1_General/reconnect
-share/epic/help/1_General/say
-share/epic/help/1_General/server
-share/epic/help/1_General/silence
-share/epic/help/1_General/topic
-share/epic/help/1_General/join
-share/epic/help/1_General/part
-share/epic/help/1_General/quit
-share/epic/help/1_General/channel
-share/epic/help/1_General/leave
 share/epic/help/1_General/bye
-share/epic/help/1_General/signoff
-share/epic/help/1_General/exit
-share/epic/help/1_General/help
+share/epic/help/1_General/channel
 share/epic/help/1_General/ctcp/action
 share/epic/help/1_General/ctcp/clientinfo
 share/epic/help/1_General/ctcp/ctcp
@@ -41,20 +17,40 @@ share/epic/help/1_General/ctcp/utc
 share/epic/help/1_General/ctcp/version
 share/epic/help/1_General/dcc/chat
 share/epic/help/1_General/dcc/close
-share/epic/help/1_General/dcc/get
+share/epic/help/1_General/dcc/closeall
 share/epic/help/1_General/dcc/dcc
+share/epic/help/1_General/dcc/get
 share/epic/help/1_General/dcc/list
 share/epic/help/1_General/dcc/raw
 share/epic/help/1_General/dcc/rename
-share/epic/help/1_General/dcc/send
 share/epic/help/1_General/dcc/resume
-share/epic/help/1_General/dcc/closeall
+share/epic/help/1_General/dcc/send
+share/epic/help/1_General/describe
+share/epic/help/1_General/disconnect
+share/epic/help/1_General/help
+share/epic/help/1_General/ignore
+share/epic/help/1_General/invite
+share/epic/help/1_General/join
+share/epic/help/1_General/kick
 share/epic/help/1_General/lastlog
-share/epic/help/1_General/1_General
+share/epic/help/1_General/me
+share/epic/help/1_General/mode
+share/epic/help/1_General/msg
+share/epic/help/1_General/nick
+share/epic/help/1_General/notice
+share/epic/help/1_General/notify
+share/epic/help/1_General/part
+share/epic/help/1_General/ping
+share/epic/help/1_General/query
+share/epic/help/1_General/quit
+share/epic/help/1_General/reconnect
+share/epic/help/1_General/say
+share/epic/help/1_General/server
+share/epic/help/1_General/silence
+share/epic/help/1_General/topic
+share/epic/help/2_Queries/2_Queries
 share/epic/help/2_Queries/admin
-share/epic/help/2_Queries/date
 share/epic/help/2_Queries/flush
-share/epic/help/2_Queries/host
 share/epic/help/2_Queries/info
 share/epic/help/2_Queries/ison
 share/epic/help/2_Queries/links
@@ -64,16 +60,16 @@ share/epic/help/2_Queries/map
 share/epic/help/2_Queries/motd
 share/epic/help/2_Queries/names
 share/epic/help/2_Queries/stats
+share/epic/help/2_Queries/time
 share/epic/help/2_Queries/trace
-share/epic/help/2_Queries/users
+share/epic/help/2_Queries/userhost
+share/epic/help/2_Queries/userip
+share/epic/help/2_Queries/usrip
 share/epic/help/2_Queries/version
 share/epic/help/2_Queries/who
 share/epic/help/2_Queries/whois
 share/epic/help/2_Queries/whowas
-share/epic/help/2_Queries/time
-share/epic/help/2_Queries/userhost
-share/epic/help/2_Queries/2_Queries
-share/epic/help/2_Queries/userip
+share/epic/help/3_Operators/3_Operators
 share/epic/help/3_Operators/connect
 share/epic/help/3_Operators/deop
 share/epic/help/3_Operators/die
@@ -86,23 +82,26 @@ share/epic/help/3_Operators/rping
 share/epic/help/3_Operators/squit
 share/epic/help/3_Operators/uping
 share/epic/help/3_Operators/wallops
-share/epic/help/3_Operators/3_Operators
+share/epic/help/4_Misc/4_Misc
+share/epic/help/4_Misc/abort
+share/epic/help/4_Misc/beep
+share/epic/help/4_Misc/bind/altcharset
 share/epic/help/4_Misc/bind/backspace
 share/epic/help/4_Misc/bind/backward_character
 share/epic/help/4_Misc/bind/backward_history
 share/epic/help/4_Misc/bind/backward_word
 share/epic/help/4_Misc/bind/beginning_of_line
 share/epic/help/4_Misc/bind/bind
+share/epic/help/4_Misc/bind/blink
 share/epic/help/4_Misc/bind/bold
 share/epic/help/4_Misc/bind/clear_screen
 share/epic/help/4_Misc/bind/command_completion
+share/epic/help/4_Misc/bind/cpu_saver
 share/epic/help/4_Misc/bind/delete_character
 share/epic/help/4_Misc/bind/delete_next_word
 share/epic/help/4_Misc/bind/delete_previous_word
 share/epic/help/4_Misc/bind/delete_to_previous_space
 share/epic/help/4_Misc/bind/end_of_line
-share/epic/help/4_Misc/bind/enter_digraph
-share/epic/help/4_Misc/bind/enter_menu
 share/epic/help/4_Misc/bind/erase_line
 share/epic/help/4_Misc/bind/erase_to_beg_of_line
 share/epic/help/4_Misc/bind/erase_to_end_of_line
@@ -110,8 +109,6 @@ share/epic/help/4_Misc/bind/forward_character
 share/epic/help/4_Misc/bind/forward_history
 share/epic/help/4_Misc/bind/forward_word
 share/epic/help/4_Misc/bind/highlight_off
-share/epic/help/4_Misc/bind/meta1_character
-share/epic/help/4_Misc/bind/meta4_character
 share/epic/help/4_Misc/bind/next_window
 share/epic/help/4_Misc/bind/nothing
 share/epic/help/4_Misc/bind/parse_command
@@ -120,6 +117,7 @@ share/epic/help/4_Misc/bind/quit_irc
 share/epic/help/4_Misc/bind/quote_character
 share/epic/help/4_Misc/bind/refresh_inputline
 share/epic/help/4_Misc/bind/refresh_screen
+share/epic/help/4_Misc/bind/refresh_status
 share/epic/help/4_Misc/bind/reverse
 share/epic/help/4_Misc/bind/scroll_backward
 share/epic/help/4_Misc/bind/scroll_end
@@ -137,76 +135,66 @@ share/epic/help/4_Misc/bind/toggle_insert_mode
 share/epic/help/4_Misc/bind/toggle_stop_screen
 share/epic/help/4_Misc/bind/transpose_characters
 share/epic/help/4_Misc/bind/type_text
+share/epic/help/4_Misc/bind/unclear_screen
 share/epic/help/4_Misc/bind/underline
 share/epic/help/4_Misc/bind/unstop_all_windows
 share/epic/help/4_Misc/bind/yank_from_cutbuffer
-share/epic/help/4_Misc/bind/meta2_character
-share/epic/help/4_Misc/bind/meta3_character
-share/epic/help/4_Misc/bind/meta5_character
-share/epic/help/4_Misc/bind/meta6_character
-share/epic/help/4_Misc/bind/meta7_character
-share/epic/help/4_Misc/bind/meta8_character
-share/epic/help/4_Misc/bind/meta9_character
-share/epic/help/4_Misc/bind/unclear_screen
-share/epic/help/4_Misc/bind/meta10_character
-share/epic/help/4_Misc/bind/meta11_character
-share/epic/help/4_Misc/bind/meta12_character
-share/epic/help/4_Misc/bind/meta13_character
-share/epic/help/4_Misc/bind/meta14_character
-share/epic/help/4_Misc/bind/meta15_character
-share/epic/help/4_Misc/bind/meta16_character
-share/epic/help/4_Misc/bind/meta17_character
-share/epic/help/4_Misc/bind/meta18_character
-share/epic/help/4_Misc/bind/meta19_character
-share/epic/help/4_Misc/bind/blink
-share/epic/help/4_Misc/bind/meta20_character
-share/epic/help/4_Misc/bind/meta21_character
-share/epic/help/4_Misc/bind/meta22_character
-share/epic/help/4_Misc/bind/meta23_character
-share/epic/help/4_Misc/bind/meta24_character
-share/epic/help/4_Misc/bind/meta25_character
-share/epic/help/4_Misc/bind/meta26_character
-share/epic/help/4_Misc/bind/meta27_character
-share/epic/help/4_Misc/bind/meta28_character
-share/epic/help/4_Misc/bind/meta29_character
-share/epic/help/4_Misc/bind/meta30_character
-share/epic/help/4_Misc/bind/meta31_character
-share/epic/help/4_Misc/bind/meta32_character
-share/epic/help/4_Misc/bind/meta33_character
-share/epic/help/4_Misc/bind/meta34_character
-share/epic/help/4_Misc/bind/meta35_character
-share/epic/help/4_Misc/bind/meta36_character
-share/epic/help/4_Misc/bind/meta37_character
-share/epic/help/4_Misc/bind/meta38_character
-share/epic/help/4_Misc/bind/meta39_character
+share/epic/help/4_Misc/cd
+share/epic/help/4_Misc/clear
+share/epic/help/4_Misc/encrypt
+share/epic/help/4_Misc/history
+share/epic/help/4_Misc/hostname
+share/epic/help/4_Misc/ircuser
+share/epic/help/4_Misc/mesg
 share/epic/help/4_Misc/note
-share/epic/help/4_Misc/set/beep
+share/epic/help/4_Misc/rbind
+share/epic/help/4_Misc/realname
+share/epic/help/4_Misc/set/alt_charset
 share/epic/help/4_Misc/set/always_split_biggest
 share/epic/help/4_Misc/set/auto_new_nick
+share/epic/help/4_Misc/set/auto_reconnect
+share/epic/help/4_Misc/set/auto_reconnect_delay
 share/epic/help/4_Misc/set/auto_rejoin
+share/epic/help/4_Misc/set/auto_rejoin_delay
 share/epic/help/4_Misc/set/auto_unmark_away
 share/epic/help/4_Misc/set/auto_whowas
+share/epic/help/4_Misc/set/bad_style
+share/epic/help/4_Misc/set/banner
+share/epic/help/4_Misc/set/banner_expand
+share/epic/help/4_Misc/set/beep
 share/epic/help/4_Misc/set/beep_max
 share/epic/help/4_Misc/set/beep_on_msg
 share/epic/help/4_Misc/set/beep_when_away
+share/epic/help/4_Misc/set/blink_video
 share/epic/help/4_Misc/set/bold_video
 share/epic/help/4_Misc/set/channel_name_width
 share/epic/help/4_Misc/set/client_information
 share/epic/help/4_Misc/set/clock
 share/epic/help/4_Misc/set/clock_24hour
-share/epic/help/4_Misc/set/clock_alarm
+share/epic/help/4_Misc/set/clock_format
+share/epic/help/4_Misc/set/clock_interval
 share/epic/help/4_Misc/set/cmdchars
+share/epic/help/4_Misc/set/color
 share/epic/help/4_Misc/set/command_mode
 share/epic/help/4_Misc/set/comment_hack
+share/epic/help/4_Misc/set/connect_timeout
 share/epic/help/4_Misc/set/continued_line
+share/epic/help/4_Misc/set/cpu_saver_after
+share/epic/help/4_Misc/set/cpu_saver_every
+share/epic/help/4_Misc/set/current_window_level
+share/epic/help/4_Misc/set/dcc_auto_send_rejects
 share/epic/help/4_Misc/set/dcc_long_pathnames
 share/epic/help/4_Misc/set/dcc_sliding_window
 share/epic/help/4_Misc/set/dcc_store_path
+share/epic/help/4_Misc/set/dcc_timeout
+share/epic/help/4_Misc/set/dcc_use_gateway_addr
 share/epic/help/4_Misc/set/debug
+share/epic/help/4_Misc/set/dispatch_unknown_commands
 share/epic/help/4_Misc/set/display
 share/epic/help/4_Misc/set/display_ansi
+share/epic/help/4_Misc/set/display_pc_characters
+share/epic/help/4_Misc/set/do_notify_immediately
 share/epic/help/4_Misc/set/eight_bit_characters
-share/epic/help/4_Misc/set/encrypt_program
 share/epic/help/4_Misc/set/floating_point_math
 share/epic/help/4_Misc/set/flood_after
 share/epic/help/4_Misc/set/flood_rate
@@ -216,12 +204,13 @@ share/epic/help/4_Misc/set/full_status_line
 share/epic/help/4_Misc/set/help_pager
 share/epic/help/4_Misc/set/help_path
 share/epic/help/4_Misc/set/help_prompt
-share/epic/help/4_Misc/set/status_voice
 share/epic/help/4_Misc/set/help_window
 share/epic/help/4_Misc/set/hide_private_channels
+share/epic/help/4_Misc/set/high_bit_escape
 share/epic/help/4_Misc/set/highlight_char
 share/epic/help/4_Misc/set/history
-share/epic/help/4_Misc/set/history_file
+share/epic/help/4_Misc/set/history_circleq
+share/epic/help/4_Misc/set/hold_interval
 share/epic/help/4_Misc/set/hold_mode
 share/epic/help/4_Misc/set/indent
 share/epic/help/4_Misc/set/input_aliases
@@ -232,29 +221,45 @@ share/epic/help/4_Misc/set/lastlog
 share/epic/help/4_Misc/set/lastlog_level
 share/epic/help/4_Misc/set/load_path
 share/epic/help/4_Misc/set/log
+share/epic/help/4_Misc/set/log_rewrite
 share/epic/help/4_Misc/set/logfile
 share/epic/help/4_Misc/set/mail
-share/epic/help/4_Misc/set/max_recursions
-share/epic/help/4_Misc/set/menu
+share/epic/help/4_Misc/set/mail_interval
+share/epic/help/4_Misc/set/mangle_inbound
+share/epic/help/4_Misc/set/mangle_logfiles
+share/epic/help/4_Misc/set/mangle_outbound
+share/epic/help/4_Misc/set/max_reconnects
+share/epic/help/4_Misc/set/meta_states
+share/epic/help/4_Misc/set/mirc_broken_dcc_resume
 share/epic/help/4_Misc/set/mode_stripper
+share/epic/help/4_Misc/set/nd_space_max
+share/epic/help/4_Misc/set/new_server_lastlog_level
+share/epic/help/4_Misc/set/no_control_log
+share/epic/help/4_Misc/set/no_ctcp_flood
+share/epic/help/4_Misc/set/no_fail_disconnect
 share/epic/help/4_Misc/set/notify_handler
+share/epic/help/4_Misc/set/notify_interval
 share/epic/help/4_Misc/set/notify_level
 share/epic/help/4_Misc/set/notify_on_termination
-share/epic/help/4_Misc/set/novice
-share/epic/help/4_Misc/set/no_ctcp_flood
+share/epic/help/4_Misc/set/notify_userhost_automatic
 share/epic/help/4_Misc/set/num_of_whowas
+share/epic/help/4_Misc/set/output_rewrite
 share/epic/help/4_Misc/set/pad_char
+share/epic/help/4_Misc/set/quit_message
+share/epic/help/4_Misc/set/random_local_ports
+share/epic/help/4_Misc/set/random_source
 share/epic/help/4_Misc/set/realname
+share/epic/help/4_Misc/set/reverse_status_line
 share/epic/help/4_Misc/set/screen_options
 share/epic/help/4_Misc/set/scroll
 share/epic/help/4_Misc/set/scroll_lines
+share/epic/help/4_Misc/set/scrollback
+share/epic/help/4_Misc/set/scrollback_ratio
 share/epic/help/4_Misc/set/security
-share/epic/help/4_Misc/set/send_ignore_msg
 share/epic/help/4_Misc/set/set
 share/epic/help/4_Misc/set/shell
 share/epic/help/4_Misc/set/shell_flags
 share/epic/help/4_Misc/set/shell_limit
-share/epic/help/4_Misc/set/show_away_once
 share/epic/help/4_Misc/set/show_channel_names
 share/epic/help/4_Misc/set/show_end_of_msgs
 share/epic/help/4_Misc/set/show_numerics
@@ -264,103 +269,69 @@ share/epic/help/4_Misc/set/status_away
 share/epic/help/4_Misc/set/status_channel
 share/epic/help/4_Misc/set/status_chanop
 share/epic/help/4_Misc/set/status_clock
+share/epic/help/4_Misc/set/status_cpu_saver
+share/epic/help/4_Misc/set/status_does_expandos
 share/epic/help/4_Misc/set/status_format
+share/epic/help/4_Misc/set/status_format1
+share/epic/help/4_Misc/set/status_format2
 share/epic/help/4_Misc/set/status_hold
 share/epic/help/4_Misc/set/status_hold_lines
 share/epic/help/4_Misc/set/status_insert
 share/epic/help/4_Misc/set/status_mail
 share/epic/help/4_Misc/set/status_mode
-share/epic/help/4_Misc/set/tab
-share/epic/help/4_Misc/set/status_notify
+share/epic/help/4_Misc/set/status_nickname
 share/epic/help/4_Misc/set/status_no_repeat
+share/epic/help/4_Misc/set/status_notify
 share/epic/help/4_Misc/set/status_oper
 share/epic/help/4_Misc/set/status_overwrite
 share/epic/help/4_Misc/set/status_query
+share/epic/help/4_Misc/set/status_scrollback
 share/epic/help/4_Misc/set/status_server
+share/epic/help/4_Misc/set/status_truncate_rhs
 share/epic/help/4_Misc/set/status_umode
 share/epic/help/4_Misc/set/status_user
-share/epic/help/4_Misc/set/status_user1
-share/epic/help/4_Misc/set/status_user2
-share/epic/help/4_Misc/set/status_user3
-share/epic/help/4_Misc/set/status_user4
-share/epic/help/4_Misc/set/status_user5
-share/epic/help/4_Misc/set/status_user6
-share/epic/help/4_Misc/set/status_user7
-share/epic/help/4_Misc/set/status_user8
-share/epic/help/4_Misc/set/status_user9
+share/epic/help/4_Misc/set/status_voice
 share/epic/help/4_Misc/set/status_window
 share/epic/help/4_Misc/set/suppress_from_remote_server
 share/epic/help/4_Misc/set/suppress_server_motd
+share/epic/help/4_Misc/set/switch_channel_on_part
+share/epic/help/4_Misc/set/tab
 share/epic/help/4_Misc/set/tab_max
+share/epic/help/4_Misc/set/term_does_bright_blink
 share/epic/help/4_Misc/set/underline_video
 share/epic/help/4_Misc/set/user_information
 share/epic/help/4_Misc/set/verbose_ctcp
-share/epic/help/4_Misc/set/warn_of_ignores
-share/epic/help/4_Misc/set/xterm_options
-share/epic/help/4_Misc/set/status_format1
-share/epic/help/4_Misc/set/status_format2
-share/epic/help/4_Misc/set/connect_timeout
-share/epic/help/4_Misc/set/banner
-share/epic/help/4_Misc/set/dispatch_unknown_command
-share/epic/help/4_Misc/set/quit_message
-share/epic/help/4_Misc/set/auto_rejoin_delay
-share/epic/help/4_Misc/set/auto_reconnect_delay
-share/epic/help/4_Misc/set/notify_interval
-share/epic/help/4_Misc/set/do_notify_immediately
+share/epic/help/4_Misc/set/word_break
 share/epic/help/4_Misc/set/xterm
-share/epic/help/4_Misc/set/notify_userhost_automatic
-share/epic/help/4_Misc/set/nd_space_max
-share/epic/help/4_Misc/set/clock_format
-share/epic/help/4_Misc/set/banner_expand
-share/epic/help/4_Misc/set/status_nick
-share/epic/help/4_Misc/set/no_control_log
-share/epic/help/4_Misc/set/status_does_expandos
-share/epic/help/4_Misc/set/status_scrollback
-share/epic/help/4_Misc/set/no_fail_disconnect
-share/epic/help/4_Misc/set/scrollback
-share/epic/help/4_Misc/set/cpu_saver_after
-share/epic/help/4_Misc/set/cpu_saver_every
-share/epic/help/4_Misc/set/blink_video
-share/epic/help/4_Misc/set/reverse_video
-share/epic/help/4_Misc/set/high_bit_escape
-share/epic/help/4_Misc/set/dcc_auto_timeout
-share/epic/help/4_Misc/set/color
-share/epic/help/4_Misc/set/mirc_broken_dcc_resume
-share/epic/help/4_Misc/set/scrollback_ratio
-share/epic/help/4_Misc/set/current_window_level
-share/epic/help/4_Misc/set/status_truncate_rhs
-share/epic/help/4_Misc/set/reverse_status_line
-share/epic/help/4_Misc/abort
-share/epic/help/4_Misc/beep
-share/epic/help/4_Misc/cd
-share/epic/help/4_Misc/clear
-share/epic/help/4_Misc/hostname
-share/epic/help/4_Misc/ircuser
-share/epic/help/4_Misc/mesg
-share/epic/help/4_Misc/mload
-share/epic/help/4_Misc/mlist
-share/epic/help/4_Misc/rbind
-share/epic/help/4_Misc/realname
-share/epic/help/4_Misc/summon
+share/epic/help/4_Misc/set/xterm_options
+share/epic/help/4_Misc/unclear
 share/epic/help/4_Misc/which
-share/epic/help/4_Misc/ircname
-share/epic/help/4_Misc/digraph
-share/epic/help/4_Misc/history
 share/epic/help/4_Misc/window/add
 share/epic/help/4_Misc/window/back
 share/epic/help/4_Misc/window/balance
+share/epic/help/4_Misc/window/beep_always
+share/epic/help/4_Misc/window/bind
 share/epic/help/4_Misc/window/channel
+share/epic/help/4_Misc/window/clear
 share/epic/help/4_Misc/window/create
 share/epic/help/4_Misc/window/delete
+share/epic/help/4_Misc/window/describe
+share/epic/help/4_Misc/window/discon
+share/epic/help/4_Misc/window/double
+share/epic/help/4_Misc/window/echo
+share/epic/help/4_Misc/window/fixed
+share/epic/help/4_Misc/window/flush
 share/epic/help/4_Misc/window/goto
 share/epic/help/4_Misc/window/grow
 share/epic/help/4_Misc/window/hide
 share/epic/help/4_Misc/window/hide_others
+share/epic/help/4_Misc/window/hold_interval
 share/epic/help/4_Misc/window/hold_mode
 share/epic/help/4_Misc/window/kill
-share/epic/help/4_Misc/window/bind
 share/epic/help/4_Misc/window/kill_others
+share/epic/help/4_Misc/window/killswap
 share/epic/help/4_Misc/window/last
+share/epic/help/4_Misc/window/lastlog
 share/epic/help/4_Misc/window/lastlog_level
 share/epic/help/4_Misc/window/level
 share/epic/help/4_Misc/window/list
@@ -369,7 +340,10 @@ share/epic/help/4_Misc/window/logfile
 share/epic/help/4_Misc/window/move
 share/epic/help/4_Misc/window/name
 share/epic/help/4_Misc/window/new
+share/epic/help/4_Misc/window/new_hide
 share/epic/help/4_Misc/window/next
+share/epic/help/4_Misc/window/noserv
+share/epic/help/4_Misc/window/notified
 share/epic/help/4_Misc/window/notify
 share/epic/help/4_Misc/window/notify_level
 share/epic/help/4_Misc/window/number
@@ -377,40 +351,42 @@ share/epic/help/4_Misc/window/pop
 share/epic/help/4_Misc/window/previous
 share/epic/help/4_Misc/window/prompt
 share/epic/help/4_Misc/window/push
+share/epic/help/4_Misc/window/query
 share/epic/help/4_Misc/window/refnum
+share/epic/help/4_Misc/window/refnum_or_swap
+share/epic/help/4_Misc/window/refresh
 share/epic/help/4_Misc/window/remove
+share/epic/help/4_Misc/window/scratch
 share/epic/help/4_Misc/window/scroll
+share/epic/help/4_Misc/window/scrollback
 share/epic/help/4_Misc/window/server
 share/epic/help/4_Misc/window/show
+share/epic/help/4_Misc/window/show_all
 share/epic/help/4_Misc/window/shrink
 share/epic/help/4_Misc/window/size
+share/epic/help/4_Misc/window/skip
 share/epic/help/4_Misc/window/stack
+share/epic/help/4_Misc/window/status_format
+share/epic/help/4_Misc/window/status_format1
+share/epic/help/4_Misc/window/status_format2
+share/epic/help/4_Misc/window/status_special
 share/epic/help/4_Misc/window/swap
-share/epic/help/4_Misc/window/window
-share/epic/help/4_Misc/window/killswap
 share/epic/help/4_Misc/window/unbind
-share/epic/help/4_Misc/window/double
-share/epic/help/4_Misc/window/beep_always
-share/epic/help/4_Misc/window/lastlog
-share/epic/help/4_Misc/window/fixed
-share/epic/help/4_Misc/window/skip
-share/epic/help/4_Misc/window/discon
-share/epic/help/4_Misc/window/scratch
-share/epic/help/4_Misc/window/noserv
-share/epic/help/4_Misc/window/echo
-share/epic/help/4_Misc/window/query
-share/epic/help/4_Misc/window/status_special
-share/epic/help/4_Misc/encrypt
-share/epic/help/4_Misc/irchost
-share/epic/help/4_Misc/4_Misc
-share/epic/help/4_Misc/unclear
+share/epic/help/4_Misc/window/window
+share/epic/help/4_Misc/xdebug
+share/epic/help/5_Programming/5_Programming
 share/epic/help/5_Programming/alias
 share/epic/help/5_Programming/assign
+share/epic/help/5_Programming/bless
+share/epic/help/5_Programming/break
 share/epic/help/5_Programming/call
 share/epic/help/5_Programming/comment
+share/epic/help/5_Programming/continue
+share/epic/help/5_Programming/do
 share/epic/help/5_Programming/dump
 share/epic/help/5_Programming/echo
 share/epic/help/5_Programming/eval
+share/epic/help/5_Programming/exec
 share/epic/help/5_Programming/fe
 share/epic/help/5_Programming/fec
 share/epic/help/5_Programming/for
@@ -418,47 +394,35 @@ share/epic/help/5_Programming/foreach
 share/epic/help/5_Programming/hook
 share/epic/help/5_Programming/if
 share/epic/help/5_Programming/input
-share/epic/help/5_Programming/parsekey
-share/epic/help/5_Programming/pop
-share/epic/help/5_Programming/push
-share/epic/help/5_Programming/queue
-share/epic/help/5_Programming/quote
-share/epic/help/5_Programming/send
-share/epic/help/5_Programming/sendline
-share/epic/help/5_Programming/shift
-share/epic/help/5_Programming/sleep
-share/epic/help/5_Programming/stub
-share/epic/help/5_Programming/switch
-share/epic/help/5_Programming/timer
-share/epic/help/5_Programming/type
-share/epic/help/5_Programming/unless
-share/epic/help/5_Programming/until
-share/epic/help/5_Programming/wait
-share/epic/help/5_Programming/while
-share/epic/help/5_Programming/xecho
-share/epic/help/5_Programming/xtype
-share/epic/help/5_Programming/do
-share/epic/help/5_Programming/on/ctcp
-share/epic/help/5_Programming/on/send_to_server
+share/epic/help/5_Programming/load
+share/epic/help/5_Programming/local
 share/epic/help/5_Programming/on/action
 share/epic/help/5_Programming/on/channel_nick
 share/epic/help/5_Programming/on/channel_signoff
+share/epic/help/5_Programming/on/channel_sync
 share/epic/help/5_Programming/on/connect
+share/epic/help/5_Programming/on/ctcp
 share/epic/help/5_Programming/on/ctcp_reply
+share/epic/help/5_Programming/on/ctcp_request
 share/epic/help/5_Programming/on/dcc_chat
 share/epic/help/5_Programming/on/dcc_connect
+share/epic/help/5_Programming/on/dcc_list
 share/epic/help/5_Programming/on/dcc_lost
+share/epic/help/5_Programming/on/dcc_offer
 share/epic/help/5_Programming/on/dcc_raw
 share/epic/help/5_Programming/on/dcc_request
 share/epic/help/5_Programming/on/disconnect
 share/epic/help/5_Programming/on/encrypted_notice
 share/epic/help/5_Programming/on/encrypted_privmsg
+share/epic/help/5_Programming/on/error
 share/epic/help/5_Programming/on/exec
 share/epic/help/5_Programming/on/exec_errors
 share/epic/help/5_Programming/on/exec_exit
 share/epic/help/5_Programming/on/exec_prompt
 share/epic/help/5_Programming/on/exit
 share/epic/help/5_Programming/on/flood
+share/epic/help/5_Programming/on/general_notice
+share/epic/help/5_Programming/on/general_privmsg
 share/epic/help/5_Programming/on/help
 share/epic/help/5_Programming/on/hook
 share/epic/help/5_Programming/on/idle
@@ -466,6 +430,7 @@ share/epic/help/5_Programming/on/input
 share/epic/help/5_Programming/on/invite
 share/epic/help/5_Programming/on/join
 share/epic/help/5_Programming/on/kick
+share/epic/help/5_Programming/on/kill
 share/epic/help/5_Programming/on/leave
 share/epic/help/5_Programming/on/list
 share/epic/help/5_Programming/on/mail
@@ -479,175 +444,98 @@ share/epic/help/5_Programming/on/note
 share/epic/help/5_Programming/on/notice
 share/epic/help/5_Programming/on/notify_signoff
 share/epic/help/5_Programming/on/notify_signon
+share/epic/help/5_Programming/on/odd_server_stuff
+share/epic/help/5_Programming/on/on
+share/epic/help/5_Programming/on/oper_notice
 share/epic/help/5_Programming/on/pong
 share/epic/help/5_Programming/on/public
 share/epic/help/5_Programming/on/public_msg
 share/epic/help/5_Programming/on/public_notice
 share/epic/help/5_Programming/on/public_other
 share/epic/help/5_Programming/on/raw_irc
+share/epic/help/5_Programming/on/redirect
 share/epic/help/5_Programming/on/send_action
+share/epic/help/5_Programming/on/send_ctcp
 share/epic/help/5_Programming/on/send_dcc_chat
 share/epic/help/5_Programming/on/send_msg
 share/epic/help/5_Programming/on/send_notice
 share/epic/help/5_Programming/on/send_public
+share/epic/help/5_Programming/on/send_to_server
+share/epic/help/5_Programming/on/server_established
+share/epic/help/5_Programming/on/server_lost
 share/epic/help/5_Programming/on/server_notice
+share/epic/help/5_Programming/on/set
 share/epic/help/5_Programming/on/signoff
 share/epic/help/5_Programming/on/silence
+share/epic/help/5_Programming/on/status_update
+share/epic/help/5_Programming/on/switch_channels
+share/epic/help/5_Programming/on/switch_windows
 share/epic/help/5_Programming/on/timer
 share/epic/help/5_Programming/on/topic
+share/epic/help/5_Programming/on/unload
 share/epic/help/5_Programming/on/wall
 share/epic/help/5_Programming/on/wallop
 share/epic/help/5_Programming/on/who
 share/epic/help/5_Programming/on/widelist
 share/epic/help/5_Programming/on/window
-share/epic/help/5_Programming/on/window_kill
-share/epic/help/5_Programming/on/on
-share/epic/help/5_Programming/on/odd_server_stuff
-share/epic/help/5_Programming/on/status_update
-share/epic/help/5_Programming/on/set
-share/epic/help/5_Programming/on/oper_notice
-share/epic/help/5_Programming/on/kill
-share/epic/help/5_Programming/on/dcc_list
 share/epic/help/5_Programming/on/window_create
-share/epic/help/5_Programming/on/redirect
+share/epic/help/5_Programming/on/window_kill
 share/epic/help/5_Programming/on/yell
-share/epic/help/5_Programming/on/dcc_offer
-share/epic/help/5_Programming/on/server_lost
-share/epic/help/5_Programming/on/unload
-share/epic/help/5_Programming/on/send_ctcp
-share/epic/help/5_Programming/stack
-share/epic/help/5_Programming/unshift
+share/epic/help/5_Programming/package
+share/epic/help/5_Programming/parsekey
+share/epic/help/5_Programming/pop
 share/epic/help/5_Programming/pretend
-share/epic/help/5_Programming/load
-share/epic/help/5_Programming/exec
+share/epic/help/5_Programming/push
+share/epic/help/5_Programming/queue
+share/epic/help/5_Programming/quote
 share/epic/help/5_Programming/redirect
-share/epic/help/5_Programming/save
-share/epic/help/5_Programming/input_char
-share/epic/help/5_Programming/pause
-share/epic/help/5_Programming/5_Programming
 share/epic/help/5_Programming/repeat
-share/epic/help/5_Programming/local
+share/epic/help/5_Programming/return
+share/epic/help/5_Programming/save
+share/epic/help/5_Programming/send
+share/epic/help/5_Programming/sendline
 share/epic/help/5_Programming/setenv
 share/epic/help/5_Programming/shook
-share/epic/help/5_Programming/continue
-share/epic/help/5_Programming/break
-share/epic/help/5_Programming/return
-share/epic/help/5_Programming/bless
-share/epic/help/5_Programming/xeval
-share/epic/help/5_Programming/package
+share/epic/help/5_Programming/sleep
+share/epic/help/5_Programming/stack
+share/epic/help/5_Programming/stub
+share/epic/help/5_Programming/switch
+share/epic/help/5_Programming/timer
+share/epic/help/5_Programming/type
 share/epic/help/5_Programming/unload
-share/epic/help/5_Programming/blah
+share/epic/help/5_Programming/unshift
 share/epic/help/5_Programming/usleep
+share/epic/help/5_Programming/wait
+share/epic/help/5_Programming/while
+share/epic/help/5_Programming/xecho
+share/epic/help/5_Programming/xeval
+share/epic/help/5_Programming/xtype
+share/epic/help/6_Functions/6_Functions
+share/epic/help/6_Functions/abs
+share/epic/help/6_Functions/acos
+share/epic/help/6_Functions/acosh
 share/epic/help/6_Functions/after
-share/epic/help/6_Functions/writeb
-share/epic/help/6_Functions/write
-share/epic/help/6_Functions/word
-share/epic/help/6_Functions/winvisible
-share/epic/help/6_Functions/winsize
-share/epic/help/6_Functions/winserv
-share/epic/help/6_Functions/winnum
-share/epic/help/6_Functions/winnam
-share/epic/help/6_Functions/which
-share/epic/help/6_Functions/version
-share/epic/help/6_Functions/utime
-share/epic/help/6_Functions/usermode
-share/epic/help/6_Functions/userhost
-share/epic/help/6_Functions/unshift
-share/epic/help/6_Functions/unlink
-share/epic/help/6_Functions/uniq
-share/epic/help/6_Functions/umask
-share/epic/help/6_Functions/twiddle
-share/epic/help/6_Functions/trunc
-share/epic/help/6_Functions/tr
-share/epic/help/6_Functions/tow
-share/epic/help/6_Functions/toupper
-share/epic/help/6_Functions/tolower
-share/epic/help/6_Functions/time
-share/epic/help/6_Functions/tdiff2
-share/epic/help/6_Functions/tdiff
-share/epic/help/6_Functions/notw
-share/epic/help/6_Functions/shift
-share/epic/help/6_Functions/strlen
-share/epic/help/6_Functions/fromw
-share/epic/help/6_Functions/stripansi
-share/epic/help/6_Functions/strip
-share/epic/help/6_Functions/strftime
-share/epic/help/6_Functions/stime
-share/epic/help/6_Functions/srand
-share/epic/help/6_Functions/split
-share/epic/help/6_Functions/splice
-share/epic/help/6_Functions/sort
-share/epic/help/6_Functions/setitem
-share/epic/help/6_Functions/servername
-share/epic/help/6_Functions/sar
-share/epic/help/6_Functions/pass
-share/epic/help/6_Functions/numsort
-share/epic/help/6_Functions/rmdir
-share/epic/help/6_Functions/revw
-share/epic/help/6_Functions/reverse
-share/epic/help/6_Functions/restw
-share/epic/help/6_Functions/repeat
-share/epic/help/6_Functions/rename
-share/epic/help/6_Functions/remw
-share/epic/help/6_Functions/read
-share/epic/help/6_Functions/rand
-share/epic/help/6_Functions/ppid
-share/epic/help/6_Functions/pop
-share/epic/help/6_Functions/pid
-share/epic/help/6_Functions/pattern
-share/epic/help/6_Functions/matchitem
-share/epic/help/6_Functions/match
-share/epic/help/6_Functions/index
-share/epic/help/6_Functions/leftw
-share/epic/help/6_Functions/mid
-share/epic/help/6_Functions/left
-share/epic/help/6_Functions/filter
-share/epic/help/6_Functions/rpattern
-share/epic/help/6_Functions/rmatchitem
-share/epic/help/6_Functions/rmatch
-share/epic/help/6_Functions/rindex
-share/epic/help/6_Functions/rightw
-share/epic/help/6_Functions/right
-share/epic/help/6_Functions/rfilter
-share/epic/help/6_Functions/push
-share/epic/help/6_Functions/open
-share/epic/help/6_Functions/onchannel
-share/epic/help/6_Functions/numwords
-share/epic/help/6_Functions/numonchannel
-share/epic/help/6_Functions/numitems
-share/epic/help/6_Functions/numarrays
-share/epic/help/6_Functions/notify
 share/epic/help/6_Functions/afterw
-share/epic/help/6_Functions/nametoip
-share/epic/help/6_Functions/myservers
-share/epic/help/6_Functions/mychannels
-share/epic/help/6_Functions/mkdir
-share/epic/help/6_Functions/midw
-share/epic/help/6_Functions/listen
-share/epic/help/6_Functions/lastserver
-share/epic/help/6_Functions/key
-share/epic/help/6_Functions/itemtoindex
-share/epic/help/6_Functions/isdigit
-share/epic/help/6_Functions/isalpha
-share/epic/help/6_Functions/ischanop
-share/epic/help/6_Functions/ischannel
-share/epic/help/6_Functions/iptoname
-share/epic/help/6_Functions/indextoitem
-share/epic/help/6_Functions/igetitem
-share/epic/help/6_Functions/ifinditem
-share/epic/help/6_Functions/ifindfirst
-share/epic/help/6_Functions/jot
-share/epic/help/6_Functions/info
-share/epic/help/6_Functions/insertw
 share/epic/help/6_Functions/aliasctl
-share/epic/help/6_Functions/chanusers
 share/epic/help/6_Functions/ascii
+share/epic/help/6_Functions/asin
+share/epic/help/6_Functions/asinh
+share/epic/help/6_Functions/atan
+share/epic/help/6_Functions/atanh
 share/epic/help/6_Functions/before
 share/epic/help/6_Functions/beforew
+share/epic/help/6_Functions/bindctl
+share/epic/help/6_Functions/builtin_expando
+share/epic/help/6_Functions/ceil
 share/epic/help/6_Functions/center
+share/epic/help/6_Functions/cexist
 share/epic/help/6_Functions/chanmode
+share/epic/help/6_Functions/channel
+share/epic/help/6_Functions/chanusers
+share/epic/help/6_Functions/chanwin
 share/epic/help/6_Functions/chmod
 share/epic/help/6_Functions/chngw
+share/epic/help/6_Functions/chop
 share/epic/help/6_Functions/chops
 share/epic/help/6_Functions/chr
 share/epic/help/6_Functions/close
@@ -655,210 +543,338 @@ share/epic/help/6_Functions/common
 share/epic/help/6_Functions/connect
 share/epic/help/6_Functions/convert
 share/epic/help/6_Functions/copattern
+share/epic/help/6_Functions/cos
+share/epic/help/6_Functions/cosh
+share/epic/help/6_Functions/count
+share/epic/help/6_Functions/cparse
 share/epic/help/6_Functions/crypt
 share/epic/help/6_Functions/curpos
+share/epic/help/6_Functions/currchans
 share/epic/help/6_Functions/decode
-share/epic/help/6_Functions/eof
 share/epic/help/6_Functions/delarray
 share/epic/help/6_Functions/delitem
+share/epic/help/6_Functions/deuhc
 share/epic/help/6_Functions/diff
 share/epic/help/6_Functions/encode
+share/epic/help/6_Functions/eof
 share/epic/help/6_Functions/epic
+share/epic/help/6_Functions/exec
+share/epic/help/6_Functions/exp
 share/epic/help/6_Functions/fexist
+share/epic/help/6_Functions/filter
 share/epic/help/6_Functions/finditem
+share/epic/help/6_Functions/findw
+share/epic/help/6_Functions/floor
+share/epic/help/6_Functions/fnexist
+share/epic/help/6_Functions/fromw
 share/epic/help/6_Functions/fsize
+share/epic/help/6_Functions/ftime
+share/epic/help/6_Functions/functioncall
 share/epic/help/6_Functions/geom
 share/epic/help/6_Functions/getarrays
+share/epic/help/6_Functions/getcap
+share/epic/help/6_Functions/getcommands
+share/epic/help/6_Functions/getenv
+share/epic/help/6_Functions/getgid
 share/epic/help/6_Functions/getitem
+share/epic/help/6_Functions/getlogin
 share/epic/help/6_Functions/getmatches
+share/epic/help/6_Functions/getopt
+share/epic/help/6_Functions/getpgrp
 share/epic/help/6_Functions/getrmatches
+share/epic/help/6_Functions/getset
+share/epic/help/6_Functions/getsets
+share/epic/help/6_Functions/gettmatch
+share/epic/help/6_Functions/getuid
 share/epic/help/6_Functions/glob
+share/epic/help/6_Functions/globi
+share/epic/help/6_Functions/hash_32bit
 share/epic/help/6_Functions/idle
-share/epic/help/6_Functions/nochops
-share/epic/help/6_Functions/6_Functions
-share/epic/help/6_Functions/status
-share/epic/help/6_Functions/chanwin
-share/epic/help/6_Functions/findw
-share/epic/help/6_Functions/uhc
-share/epic/help/6_Functions/winbound
+share/epic/help/6_Functions/ifindfirst
+share/epic/help/6_Functions/ifinditem
+share/epic/help/6_Functions/igetitem
+share/epic/help/6_Functions/igetmatches
+share/epic/help/6_Functions/igmask
+share/epic/help/6_Functions/igtype
+share/epic/help/6_Functions/index
+share/epic/help/6_Functions/indextoitem
+share/epic/help/6_Functions/indextoword
+share/epic/help/6_Functions/info
+share/epic/help/6_Functions/insert
+share/epic/help/6_Functions/insertw
+share/epic/help/6_Functions/iptolong
+share/epic/help/6_Functions/iptoname
 share/epic/help/6_Functions/irclib
-share/epic/help/6_Functions/ftime
-share/epic/help/6_Functions/substr
-share/epic/help/6_Functions/deuhc
-share/epic/help/6_Functions/nohighlight
-share/epic/help/6_Functions/winnicklist
-share/epic/help/6_Functions/winchan
-share/epic/help/6_Functions/fnexist
-share/epic/help/6_Functions/servernick
+share/epic/help/6_Functions/isalpha
+share/epic/help/6_Functions/isaway
+share/epic/help/6_Functions/ischannel
+share/epic/help/6_Functions/ischanop
+share/epic/help/6_Functions/ischanvoice
 share/epic/help/6_Functions/isconnected
-share/epic/help/6_Functions/currchans
-share/epic/help/6_Functions/cexist
-share/epic/help/6_Functions/regex
-share/epic/help/6_Functions/regcomp
-share/epic/help/6_Functions/regexec
-share/epic/help/6_Functions/regerror
-share/epic/help/6_Functions/regfree
-share/epic/help/6_Functions/getenv
-share/epic/help/6_Functions/msar
-share/epic/help/6_Functions/pipe
-share/epic/help/6_Functions/count
-share/epic/help/6_Functions/igmask
-share/epic/help/6_Functions/randread
-share/epic/help/6_Functions/rigmask
+share/epic/help/6_Functions/iscurchan
+share/epic/help/6_Functions/isdigit
+share/epic/help/6_Functions/isdisplaying
+share/epic/help/6_Functions/isencrypted
+share/epic/help/6_Functions/ishalfop
+share/epic/help/6_Functions/isnumber
+share/epic/help/6_Functions/itemtoindex
+share/epic/help/6_Functions/jn
+share/epic/help/6_Functions/jot
+share/epic/help/6_Functions/key
+share/epic/help/6_Functions/killpid
+share/epic/help/6_Functions/lastlog
+share/epic/help/6_Functions/lastserver
+share/epic/help/6_Functions/left
 share/epic/help/6_Functions/leftpc
-share/epic/help/6_Functions/cparse
-share/epic/help/6_Functions/uname
-share/epic/help/6_Functions/querywin
-share/epic/help/6_Functions/winrefs
+share/epic/help/6_Functions/leftw
+share/epic/help/6_Functions/levelwindow
+share/epic/help/6_Functions/line
+share/epic/help/6_Functions/listarray
+share/epic/help/6_Functions/listen
+share/epic/help/6_Functions/loadinfo
+share/epic/help/6_Functions/log
+share/epic/help/6_Functions/log10
+share/epic/help/6_Functions/longtoip
 share/epic/help/6_Functions/mask
-share/epic/help/6_Functions/ischanvoice
-share/epic/help/6_Functions/chop
-share/epic/help/6_Functions/winlevel
-share/epic/help/6_Functions/igtype
-share/epic/help/6_Functions/rigtype
-share/epic/help/6_Functions/getuid
-share/epic/help/6_Functions/getgid
-share/epic/help/6_Functions/getpgrp
-share/epic/help/6_Functions/getlogin
-share/epic/help/6_Functions/iscurchan
-share/epic/help/6_Functions/channel
+share/epic/help/6_Functions/match
+share/epic/help/6_Functions/matchitem
+share/epic/help/6_Functions/maxlen
+share/epic/help/6_Functions/mid
+share/epic/help/6_Functions/midw
+share/epic/help/6_Functions/mkdir
+share/epic/help/6_Functions/msar
+share/epic/help/6_Functions/mychannels
+share/epic/help/6_Functions/myservers
+share/epic/help/6_Functions/nametoip
+share/epic/help/6_Functions/nochops
+share/epic/help/6_Functions/nohighlight
+share/epic/help/6_Functions/notify
+share/epic/help/6_Functions/notifywindows
+share/epic/help/6_Functions/notw
+share/epic/help/6_Functions/numarrays
+share/epic/help/6_Functions/numitems
+share/epic/help/6_Functions/numonchannel
+share/epic/help/6_Functions/numsort
+share/epic/help/6_Functions/numwords
+share/epic/help/6_Functions/onchannel
+share/epic/help/6_Functions/open
+share/epic/help/6_Functions/outputinfo
 share/epic/help/6_Functions/pad
-share/epic/help/6_Functions/remws
+share/epic/help/6_Functions/pass
+share/epic/help/6_Functions/pattern
+share/epic/help/6_Functions/perl
+share/epic/help/6_Functions/perlxcall
+share/epic/help/6_Functions/pid
+share/epic/help/6_Functions/pipe
+share/epic/help/6_Functions/pop
+share/epic/help/6_Functions/ppid
+share/epic/help/6_Functions/prefix
 share/epic/help/6_Functions/printlen
-share/epic/help/6_Functions/stripansicodes
-share/epic/help/6_Functions/isnumber
+share/epic/help/6_Functions/push
+share/epic/help/6_Functions/querywin
+share/epic/help/6_Functions/rand
+share/epic/help/6_Functions/randread
+share/epic/help/6_Functions/read
+share/epic/help/6_Functions/realpath
+share/epic/help/6_Functions/regcomp
+share/epic/help/6_Functions/regerror
+share/epic/help/6_Functions/regex
+share/epic/help/6_Functions/regexec
+share/epic/help/6_Functions/regfree
+share/epic/help/6_Functions/remw
+share/epic/help/6_Functions/remws
+share/epic/help/6_Functions/rename
+share/epic/help/6_Functions/repeat
 share/epic/help/6_Functions/rest
-share/epic/help/6_Functions/getsets
-share/epic/help/6_Functions/servnum
+share/epic/help/6_Functions/restw
+share/epic/help/6_Functions/reverse
+share/epic/help/6_Functions/revw
+share/epic/help/6_Functions/rfilter
+share/epic/help/6_Functions/right
+share/epic/help/6_Functions/rightw
+share/epic/help/6_Functions/rigmask
+share/epic/help/6_Functions/rigtype
+share/epic/help/6_Functions/rindex
+share/epic/help/6_Functions/rmatch
+share/epic/help/6_Functions/rmatchitem
+share/epic/help/6_Functions/rmdir
+share/epic/help/6_Functions/rpattern
+share/epic/help/6_Functions/rsubstr
+share/epic/help/6_Functions/sar
+share/epic/help/6_Functions/serverctl
+share/epic/help/6_Functions/servergroup
+share/epic/help/6_Functions/servername
+share/epic/help/6_Functions/servernick
+share/epic/help/6_Functions/servernum
+share/epic/help/6_Functions/serverourname
+share/epic/help/6_Functions/servertype
+share/epic/help/6_Functions/serverwin
 share/epic/help/6_Functions/servports
-share/epic/help/6_Functions/igetmatches
-share/epic/help/6_Functions/igetrmatches
-share/epic/help/6_Functions/gettmatch
+share/epic/help/6_Functions/setitem
+share/epic/help/6_Functions/shift
+share/epic/help/6_Functions/sin
+share/epic/help/6_Functions/sinh
+share/epic/help/6_Functions/sort
+share/epic/help/6_Functions/splice
+share/epic/help/6_Functions/split
+share/epic/help/6_Functions/srand
+share/epic/help/6_Functions/ssl
+share/epic/help/6_Functions/stat
+share/epic/help/6_Functions/status
+share/epic/help/6_Functions/stime
+share/epic/help/6_Functions/strftime
+share/epic/help/6_Functions/strip
+share/epic/help/6_Functions/stripansi
+share/epic/help/6_Functions/stripansicodes
 share/epic/help/6_Functions/stripc
-share/epic/help/7_Docs/New_User
-share/epic/help/7_Docs/Etiquette
+share/epic/help/6_Functions/stripcrap
+share/epic/help/6_Functions/strlen
+share/epic/help/6_Functions/substr
+share/epic/help/6_Functions/tan
+share/epic/help/6_Functions/tanh
+share/epic/help/6_Functions/tdiff
+share/epic/help/6_Functions/tdiff2
+share/epic/help/6_Functions/time
+share/epic/help/6_Functions/tolower
+share/epic/help/6_Functions/toupper
+share/epic/help/6_Functions/tow
+share/epic/help/6_Functions/tr
+share/epic/help/6_Functions/trunc
+share/epic/help/6_Functions/ttyname
+share/epic/help/6_Functions/twiddle
+share/epic/help/6_Functions/uhc
+share/epic/help/6_Functions/umask
+share/epic/help/6_Functions/uname
+share/epic/help/6_Functions/uniq
+share/epic/help/6_Functions/unlink
+share/epic/help/6_Functions/unshift
+share/epic/help/6_Functions/unsplit
+share/epic/help/6_Functions/urldecode
+share/epic/help/6_Functions/urlencode
+share/epic/help/6_Functions/userhost
+share/epic/help/6_Functions/usermode
+share/epic/help/6_Functions/utime
+share/epic/help/6_Functions/version
+share/epic/help/6_Functions/which
+share/epic/help/6_Functions/winbound
+share/epic/help/6_Functions/winchan
+share/epic/help/6_Functions/wincursorline
+share/epic/help/6_Functions/winlevel
+share/epic/help/6_Functions/winnam
+share/epic/help/6_Functions/winnicklist
+share/epic/help/6_Functions/winnum
+share/epic/help/6_Functions/winrefs
+share/epic/help/6_Functions/winsbsize
+share/epic/help/6_Functions/winscreen
+share/epic/help/6_Functions/winscrollbacksize
+share/epic/help/6_Functions/winserv
+share/epic/help/6_Functions/winsize
+share/epic/help/6_Functions/winstatsize
+share/epic/help/6_Functions/winstatussize
+share/epic/help/6_Functions/winvisible
+share/epic/help/6_Functions/word
+share/epic/help/6_Functions/wordtoindex
+share/epic/help/6_Functions/write
+share/epic/help/6_Functions/writeb
+share/epic/help/6_Functions/yn
+share/epic/help/7_Docs/7_Docs
+share/epic/help/7_Docs/About_EPIC
+share/epic/help/7_Docs/Arrays
+share/epic/help/7_Docs/Command_Line
+share/epic/help/7_Docs/Compile_Opts
 share/epic/help/7_Docs/Copyright
-share/epic/help/7_Docs/Text_Highlight
-share/epic/help/7_Docs/Server_List
-share/epic/help/7_Docs/Signals
-share/epic/help/7_Docs/Expressions
+share/epic/help/7_Docs/Debugging
 share/epic/help/7_Docs/Environment
-share/epic/help/7_Docs/Updates
+share/epic/help/7_Docs/Etiquette
+share/epic/help/7_Docs/Expressions
+share/epic/help/7_Docs/IPv6
 share/epic/help/7_Docs/Introduction
-share/epic/help/7_Docs/About_EPIC
-share/epic/help/7_Docs/Command_Line
+share/epic/help/7_Docs/Key_Bindings
+share/epic/help/7_Docs/New_User
 share/epic/help/7_Docs/Patterns
-share/epic/help/7_Docs/Serial_Numbers
-share/epic/help/7_Docs/Status_Line
+share/epic/help/7_Docs/Perl
 share/epic/help/7_Docs/Programming
-share/epic/help/7_Docs/Special_Vars
-share/epic/help/7_Docs/Arrays
 share/epic/help/7_Docs/Security
-share/epic/help/7_Docs/Key_Bindings
-share/epic/help/7_Docs/Compile_Opts
-share/epic/help/7_Docs/7_Docs
+share/epic/help/7_Docs/Serial_Numbers
+share/epic/help/7_Docs/Server_List
 share/epic/help/7_Docs/Server_Numerics
+share/epic/help/7_Docs/Signals
+share/epic/help/7_Docs/Special_Vars
+share/epic/help/7_Docs/Status_Line
+share/epic/help/7_Docs/Text_Highlight
+share/epic/help/7_Docs/Updates
 share/epic/help/8_Scripts/2.8script
-share/epic/help/8_Scripts/action
+share/epic/help/8_Scripts/8_Scripts
 share/epic/help/8_Scripts/alias
 share/epic/help/8_Scripts/autokick
 share/epic/help/8_Scripts/autoop
 share/epic/help/8_Scripts/away
 share/epic/help/8_Scripts/basical
-share/epic/help/8_Scripts/bigcheese
-share/epic/help/8_Scripts/brc
-share/epic/help/8_Scripts/channel
 share/epic/help/8_Scripts/columns
-share/epic/help/8_Scripts/commander
-share/epic/help/8_Scripts/compl.mods
-share/epic/help/8_Scripts/complete
 share/epic/help/8_Scripts/country
-share/epic/help/8_Scripts/cursor
 share/epic/help/8_Scripts/deban
-share/epic/help/8_Scripts/deutsch
-share/epic/help/8_Scripts/disc
+share/epic/help/8_Scripts/debug.irc
 share/epic/help/8_Scripts/edit
-share/epic/help/8_Scripts/english
 share/epic/help/8_Scripts/environment
 share/epic/help/8_Scripts/events
 share/epic/help/8_Scripts/events.hop
 share/epic/help/8_Scripts/fake-dcc
 share/epic/help/8_Scripts/fe
 share/epic/help/8_Scripts/files
-share/epic/help/8_Scripts/finger
-share/epic/help/8_Scripts/guh
-share/epic/help/8_Scripts/fnet
-share/epic/help/8_Scripts/follow
 share/epic/help/8_Scripts/functions
-share/epic/help/8_Scripts/funnyban
 share/epic/help/8_Scripts/genalias
 share/epic/help/8_Scripts/global
-share/epic/help/8_Scripts/history
-share/epic/help/8_Scripts/history-match
+share/epic/help/8_Scripts/guh
+share/epic/help/8_Scripts/hybrid6
 share/epic/help/8_Scripts/imap
 share/epic/help/8_Scripts/ircprimer
-share/epic/help/8_Scripts/ircrc
 share/epic/help/8_Scripts/keybinds
-share/epic/help/8_Scripts/kickmenu
 share/epic/help/8_Scripts/killpath
 share/epic/help/8_Scripts/kpstat
+share/epic/help/8_Scripts/less
 share/epic/help/8_Scripts/list
 share/epic/help/8_Scripts/local
-share/epic/help/8_Scripts/log
 share/epic/help/8_Scripts/ls
-share/epic/help/8_Scripts/lynx_ircrc
+share/epic/help/8_Scripts/man
 share/epic/help/8_Scripts/meta
-share/epic/help/8_Scripts/meta1
-share/epic/help/8_Scripts/modes
 share/epic/help/8_Scripts/more
-share/epic/help/8_Scripts/msg
 share/epic/help/8_Scripts/mudirc
-share/epic/help/8_Scripts/mudlike
-share/epic/help/8_Scripts/multi
-share/epic/help/8_Scripts/nemesis
 share/epic/help/8_Scripts/netsplit
 share/epic/help/8_Scripts/netsplit.env
 share/epic/help/8_Scripts/newaway
 share/epic/help/8_Scripts/newformat
-share/epic/help/8_Scripts/ping
 share/epic/help/8_Scripts/nicks
 share/epic/help/8_Scripts/old-dcc
-share/epic/help/8_Scripts/oldping
+share/epic/help/8_Scripts/pipe
 share/epic/help/8_Scripts/prefix
 share/epic/help/8_Scripts/recursion
 share/epic/help/8_Scripts/repeat
 share/epic/help/8_Scripts/screen
-share/epic/help/8_Scripts/shell
 share/epic/help/8_Scripts/silent
-share/epic/help/8_Scripts/smileys
 share/epic/help/8_Scripts/sound
-share/epic/help/8_Scripts/spfix
 share/epic/help/8_Scripts/starutils
 share/epic/help/8_Scripts/stat
 share/epic/help/8_Scripts/tabkey
-share/epic/help/8_Scripts/tabkey.wc
 share/epic/help/8_Scripts/tc
 share/epic/help/8_Scripts/time
 share/epic/help/8_Scripts/tls
-share/epic/help/8_Scripts/troy
-share/epic/help/8_Scripts/uhnotify
-share/epic/help/8_Scripts/uping
-share/epic/help/8_Scripts/wallopstat
 share/epic/help/8_Scripts/webster
 share/epic/help/8_Scripts/window
-share/epic/help/8_Scripts/less
-share/epic/help/8_Scripts/8_Scripts
-share/epic/help/8_Scripts/pipe
-share/epic/help/8_Scripts/man
 share/epic/help/README_FIRST
 share/epic/script/2.8script
 share/epic/script/alias
+share/epic/script/altchan
+share/epic/script/autoget
 share/epic/script/autokick
 share/epic/script/autoop
 share/epic/script/away
 share/epic/script/basical
 share/epic/script/columns
+share/epic/script/commandqueues
 share/epic/script/country
+share/epic/script/data_array
+share/epic/script/data_struct
+share/epic/script/dcc_spacefix
 share/epic/script/dcc_timeout
 share/epic/script/deban
 share/epic/script/debug.irc
@@ -868,16 +884,20 @@ share/epic/script/edit
 share/epic/script/edit_topic
 share/epic/script/efnext
 share/epic/script/environment
+share/epic/script/epic-crypt-gpg
+share/epic/script/epic-crypt-gpg-aa
 share/epic/script/events
 share/epic/script/events.hop
 share/epic/script/fake-dcc
 share/epic/script/fe
+share/epic/script/fe.pf
 share/epic/script/files
 share/epic/script/functions
 share/epic/script/genalias
-share/epic/script/grep
 share/epic/script/global
+share/epic/script/grep
 share/epic/script/guh
+share/epic/script/hold_mode
 share/epic/script/hybrid6
 share/epic/script/imap
 share/epic/script/ip-to-int
@@ -891,8 +911,11 @@ share/epic/script/less-pipe
 share/epic/script/list
 share/epic/script/local.examp
 share/epic/script/ls
+share/epic/script/mail
 share/epic/script/man
+share/epic/script/map
 share/epic/script/meta
+share/epic/script/mkpdir
 share/epic/script/more
 share/epic/script/motd
 share/epic/script/mudirc
@@ -903,6 +926,7 @@ share/epic/script/newformat
 share/epic/script/nicks
 share/epic/script/nopaste
 share/epic/script/old-dcc
+share/epic/script/paste
 share/epic/script/pipe
 share/epic/script/prefix
 share/epic/script/recursion
@@ -918,7 +942,10 @@ share/epic/script/sound
 share/epic/script/starutils
 share/epic/script/stat
 share/epic/script/status_lag
+share/epic/script/suppressmotd
 share/epic/script/tabkey
+share/epic/script/tabkey.ce
+share/epic/script/tabkey.jm
 share/epic/script/tabkey.th
 share/epic/script/tc
 share/epic/script/time
@@ -928,19 +955,19 @@ share/epic/script/vi-binds
 share/epic/script/webster
 share/epic/script/window
 @dirrm share/epic/script
-@dirrm share/epic/help/1_General/ctcp
-@dirrm share/epic/help/1_General/dcc
-@dirrm share/epic/help/1_General
-@dirrm share/epic/help/2_Queries
-@dirrm share/epic/help/3_Operators
-@dirrm share/epic/help/4_Misc/bind
-@dirrm share/epic/help/4_Misc/set
-@dirrm share/epic/help/4_Misc/window
-@dirrm share/epic/help/4_Misc
+@dirrm share/epic/help/8_Scripts
+@dirrm share/epic/help/7_Docs
+@dirrm share/epic/help/6_Functions
 @dirrm share/epic/help/5_Programming/on
 @dirrm share/epic/help/5_Programming
-@dirrm share/epic/help/6_Functions
-@dirrm share/epic/help/7_Docs
-@dirrm share/epic/help/8_Scripts
+@dirrm share/epic/help/4_Misc/window
+@dirrm share/epic/help/4_Misc/set
+@dirrm share/epic/help/4_Misc/bind
+@dirrm share/epic/help/4_Misc
+@dirrm share/epic/help/3_Operators
+@dirrm share/epic/help/2_Queries
+@dirrm share/epic/help/1_General/dcc
+@dirrm share/epic/help/1_General/ctcp
+@dirrm share/epic/help/1_General
 @dirrm share/epic/help
 @dirrm share/epic