Get ready for the 6.3-RELEASE builds.

Approved by: re (implicit)
Add theoretical date of 6.3-RELEASE.
2026-10-30 12:25:10 +01:00 · 2008-01-15 15:46:21 +00:00 · 2008-01-15 15:45:07 +00:00 · 2008-01-15 15:41:30 +00:00 · 2008-01-15 02:34:11 +00:00 · 2008-01-14 22:56:18 +00:00
280 changed files with 71616 additions and 42248 deletions
@@ -4,7 +4,7 @@
 The compilation of software known as FreeBSD is distributed under the
 following terms:

-Copyright (C) 1992-2007 The FreeBSD Project. All rights reserved.
+Copyright (C) 1992-2008 The FreeBSD Project. All rights reserved.

 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -87,7 +87,7 @@ CLEANDIR=	cleandir
 .endif

 CVS?=		cvs
-CVSFLAGS?=	-r RELENG_6 -P -d -I!
+CVSFLAGS?=	-r RELENG_6_3 -P -d -I!
 SUP?=		/usr/bin/csup
 SUPFLAGS?=	-g -L 2
 .if defined(SUPHOST)
@@ -553,7 +553,6 @@ OLD_FILES+=usr/lib/libpam_ssh.a
 OLD_FILES+=usr/lib/libpam_ssh_p.a
 OLD_FILES+=usr/bin/help
 OLD_FILES+=usr/bin/sccs
-OLD_FILES+=usr/bin/gdbserver
 OLD_FILES+=usr/bin/ssh-keysign
 OLD_FILES+=usr/sbin/gifconfig
 OLD_FILES+=usr/sbin/prefix
@@ -8,6 +8,27 @@ Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before running
 portupgrade.

+20080118:
+	FreeBSD 6.3-RELEASE
+
+20080118:		FreeBSD-SA-08:01.pty, FreeBSD-SA-08:02.libc
+	Fix issues which allow snooping on ptys. [08:01]
+	Fix an off-by-one error in inet_network(3). [08:02]
+
+20071129:		FreeBSD-SA-07:09.random
+	Correct a random value disclosure in random(4).
+
+20071127:
+	The AT keyboard emulation of sunkbd(4) has been turned on
+	by default. In order to make the special symbols of the Sun
+	keyboards driven by sunkbd(4) work under X these now have
+	to be configured the same way as Sun USB keyboards driven
+	by ukbd(4) (which also does AT keyboard emulation), f.e.:
+
+	Option	"XkbLayout" "us"
+	Option	"XkbRules" "xorg"
+	Option	"XkbSymbols" "pc(pc105)+sun_vndr/usb(sun_usb)+us"
+
 20071024:
 	A breakage was introduced in libc and fixed later. Make sure
 	you have lib/Makefile rev 1.205.2.4. If it already breaks your
@@ -429,6 +429,16 @@ warning: this CVS does not support PreservePermissions");
 	    else if (strcmp (p, "stat") == 0)
 	      RereadLogAfterVerify = LOGMSG_REREAD_STAT;
 	}
+	else if (strcmp(line, "LocalKeyword") == 0)
+	{
+	    /* Recognize cvs-1.12-style keyword control rather than erroring out. */
+	    RCS_setlocalid(p);
+	}
+	else if (strcmp(line, "KeywordExpand") == 0)
+	{
+	    /* Recognize cvs-1.12-style keyword control rather than erroring out. */
+	    RCS_setincexc(p);
+	}
 	else
 	{
 	    /* We may be dealing with a keyword which was added in a
@@ -1,16 +0,0 @@
-#----------------------------------------------------------------
-# basis: file(1) magic for BBx/Pro5-files
-#      Oliver Dammer <[email protected]>	 2005/11/07
-# http://www.basis.com business-basic-files.
-#
-0	string		\074\074bbx\076\076	BBx
->7	string		\000			indexed file
->7	string		\001			serial file
->7	string		\002			keyed file
->>13	short		0			(sort)
->7	string		\004			program
->>18	byte		x			(LEVEL %d)
->>>23	string		>\000			psaved
->7	string		\006			mkeyed file
->>13	short		0			(sort)
->>8	string		\000			(mkey)
@@ -1,12 +0,0 @@
-#------------------------------------------------------------------------------
-# bFLT: file(1) magic for BFLT uclinux binary files
-#
-# From Philippe De Muyter <[email protected]>
-#
-0	string		bFLT		BFLT executable
->4	belong		x		- version %ld
->4	belong		4
->>36	belong&0x1	0x1		ram
->>36	belong&0x2	0x2		gotpic
->>36	belong&0x4	0x4		gzip
->>36	belong&0x8	0x8		gzdata
@@ -1,11 +0,0 @@
-#------------------------------------------------------------------------------
-# BTSnoop:  file(1) magic for BTSnoop files
-#
-# From <[email protected]>
-0	string		btsnoop\0		BTSnoop
->8	belong		x			version %d,
->12	belong		1001			Unencapsulated HCI
->12	belong		1002			HCI UART (H4)
->12	belong		1003			HCI BCSP
->12	belong		1004			HCI Serial (H5)
->>12	belong		x			type %d
@@ -1,21 +0,0 @@
-#------------------------------------------------------------------------------
-# Cafe Babes unite!
-#
-# Since Java bytecode and Mach-O fat-files have the same magic number, the test
-# must be performed in the same "magic" sequence to get both right.  The long
-# at offset 4 in a mach-O fat file tells the number of architectures; the short at
-# offset 4 in a Java bytecode file is the JVM minor version and the
-# short at offset 6 is the JVM major version.  Since there are only 
-# only 18 labeled Mach-O architectures at current, and the first released 
-# Java class format was version 43.0, we can safely choose any number
-# between 18 and 39 to test the number of architectures against
-# (and use as a hack). Let's not use 18, because the Mach-O people
-# might add another one or two as time goes by...
-#
-0	belong		0xcafebabe
->4	belong		>30		compiled Java class data,
->>6     beshort		x	        version %d.
->>4     beshort		x       	\b%d
->4	belong		1		Mach-O fat file with 1 architecture
->4	belong		>1
->>4	belong		<20		Mach-O fat file with %ld architectures
@@ -1,13 +0,0 @@
-
-#------------------------------------------------------------------------------
-# cracklib:  file (1) magic for cracklib v2.7
-
-0	lelong	0x70775631	Cracklib password index, little endian
->4	long	>0		(%i words)
->4	long	0		("64-bit")
->>8	long	>-1		(%i words)
-0	belong	0x70775631	Cracklib password index, big endian
->4	belong	>-1		(%i words)
-# really bellong 0x0000000070775631
-4	belong	0x70775631	Cracklib password index, big endian ("64-bit")
->12	belong	>0		(%i words)
@@ -1,22 +0,0 @@
-# ------------------------------------------------------------------------
-# mup: file(1) magic for Mup (Music Publisher) input file.
-#
-# From: Abel Cheung <abel (@) oaka.org>
-#
-# NOTE: This header is mainly proposed in the Arkkra mailing list,
-# and is not a mandatory header because of old mup input file
-# compatibility. Noteedit also use mup format, but is not forcing
-# user to use any header as well.
-#
-0		string		//!Mup		Mup music publication program input text
->6		string		-Arkkra		(Arkkra)
->>13		string		-		
->>>16		string		.		
->>>>14		string		x		\b, need V%.4s
->>>15		string		.		
->>>>14		string		x		\b, need V%.3s
->6		string		-		
->>9		string		.		
->>>7		string		x		\b, need V%.4s
->>8		string		.		
->>>7		string		x		\b, need V%.3s
@@ -1,37 +0,0 @@
-#------------------------------------------------------------------------------
-# os400:  file(1) magic for IBM OS/400 files
-#
-# IBM OS/400 (i5/OS) Save file (SAVF) - [email protected]
-# In spite of its quite variable format (due to internal memory page
-# length differences between CISC and RISC versions of the OS) the
-# SAVF structure hasn't suitable offsets to identify the catalog
-# header in the first descriptor where there are some useful infos,
-# so we must search in a somewhat large area for a particular string
-# that represents the EBCDIC encoding of 'QSRDSSPC' (save/restore
-# descriptor space) preceded by a two byte constant.
-#
-1090	 search/7393	\x19\xDB\xD8\xE2\xD9\xC4\xE2\xE2\xD7\xC3 IBM OS/400 save file data
->&212	 byte		0x01			 \b, created with SAVOBJ
->&212	 byte		0x02			 \b, created with SAVLIB
->&212	 byte		0x07			 \b, created with SAVCFG
->&212	 byte		0x08			 \b, created with SAVSECDTA
->&212	 byte		0x0A			 \b, created with SAVSECDTA
->&212	 byte		0x0B			 \b, created with SAVDLO
->&212	 byte		0x0D			 \b, created with SAVLICPGM
->&212	 byte		0x11			 \b, created with SAVCHGOBJ
->&213	 byte		0x44			 \b, at least V5R4 to open
->&213	 byte		0x43			 \b, at least V5R3 to open
->&213	 byte		0x42			 \b, at least V5R2 to open
->&213	 byte		0x41			 \b, at least V5R1 to open
->&213	 byte		0x40			 \b, at least V4R5 to open
->&213	 byte		0x3F			 \b, at least V4R4 to open
->&213	 byte		0x3E			 \b, at least V4R3 to open
->&213	 byte		0x3C			 \b, at least V4R2 to open
->&213	 byte		0x3D			 \b, at least V4R1M4 to open
->&213	 byte		0x3B			 \b, at least V4R1 to open
->&213	 byte		0x3A			 \b, at least V3R7 to open
->&213	 byte		0x35			 \b, at least V3R6 to open
->&213	 byte		0x36			 \b, at least V3R2 to open
->&213	 byte		0x34			 \b, at least V3R1 to open
->&213	 byte		0x31			 \b, at least V3R0M5 to open
->&213	 byte		0x30			 \b, at least V2R3 to open
@@ -1,60 +0,0 @@
-
-#------------------------------------------------------------------------------
-# scientific:  file(1) magic for scientific formats 
-#
-# From: Joe Krahn <[email protected]>
-
-########################################################
-# CCP4 data and plot files:
-0	string		MTZ\040		MTZ reflection file
-
-92	string		PLOT%%84	Plot84 plotting file
->52	byte		1		, Little-endian
->55	byte		1		, Big-endian
-
-########################################################
-# Electron density MAP/MASK formats
-
-0	string		EZD_MAP	NEWEZD Electron Density Map
-109	string		MAP\040(  Old EZD Electron Density Map
-
-0	string/c	:-)\040Origin	BRIX Electron Density Map
->170	string		>0	, Sigma:%.12s
-#>4	string		>0	%.178s
-#>4	addr		x	%.178s
-
-7	string		18\040!NTITLE	XPLOR ASCII Electron Density Map
-9	string		\040!NTITLE\012\040REMARK	CNS ASCII electron density map
-
-208	string		MAP\040	CCP4 Electron Density Map
-# Assumes same stamp for float and double (normal case)
->212	byte		17	\b, Big-endian
->212	byte		34	\b, VAX format
->212	byte		68	\b, Little-endian
->212	byte		85	\b, Convex native
-
-############################################################
-# X-Ray Area Detector images
-0	string	R-AXIS4\ \ \ 	R-Axis Area Detector Image:
->796	lelong	<20		Little-endian, IP #%d,
->>768	lelong	>0		Size=%dx
->>772	lelong	>0		\b%d
->796	belong	<20		Big-endian, IP #%d,
->>768	belong	>0		Size=%dx
->>772	belong	>0		\b%d
-
-0	string	RAXIS\ \ \ \ \ 	R-Axis Area Detector Image, Win32:
->796	lelong	<20		Little-endian, IP #%d,
->>768	lelong	>0		Size=%dx
->>772	lelong	>0		\b%d
->796	belong	<20		Big-endian, IP #%d,
->>768	belong	>0		Size=%dx
->>772	belong	>0		\b%d
-
-
-1028	string	MMX\000\000\000\000\000\000\000\000\000\000\000\000\000	MAR Area Detector Image,
->1072	ulong	>1		Compressed(%d),
->1100	ulong	>1		%d headers,
->1104	ulong	>0		%d x
->1108	ulong	>0		%d,
->1120	ulong	>0		%d bits/pixel
@@ -1,15 +0,0 @@
-
-#---------------------------------------------------------------------------
-# Unicode:  BOM prefixed text files - Adrian Havill <[email protected]>
-#
-0	string	+/v8			Unicode text, UTF-7
-0	string	+/v9			Unicode text, UTF-7
-0	string	+/v+			Unicode text, UTF-7
-0	string	+/v/			Unicode text, UTF-7
-0	string	\357\273\277		Unicode text, UTF-8
-0	string	\335\163\146\163	Unicode text, UTF-8-EBCDIC
-0	string	\376\377\000\000	Unicode text, UTF-32, big-endian
-0	string	\377\376\000\000	Unicode text, UTF-32, little-endian
-0	string	\376\377		Unicode text, UTF-16, big-endian
-0	string	\377\376		Unicode text, UTF-16, little-endian
-0	string	\016\376\377		Unicode text, SCSU (Standard Compression Scheme for Unicode)
@@ -91,7 +91,7 @@ _initialize_i386fbsd_nat (void)
 #ifdef KERN_PS_STRINGS
  {
    int mib[2];
-    int ps_strings;
+    u_long ps_strings;
    size_t len;

    mib[0] = CTL_KERN;
@@ -2,7 +2,7 @@
                          ------------

 Less
-Copyright (C) 1984-2005  Mark Nudelman
+Copyright (C) 1984-2007  Mark Nudelman

 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -1,58 +0,0 @@
-# Makefile for less.
-# MS-DOS version
-
-#### Start of system configuration section. ####
-
-CC = cl
-# Change the following directories to match your installation.
-LIBDIR = c:\msvc\lib
-INCDIR = c:\msvc\include
-
-# CFLAGS are compile-time options and LDFLAGS are link-time options. They are
-# customized for MSVC 1.0 (MSC 8.0). If you have a different version of the
-# compiler, you may need to change some of the options to their equivalents.
-# -Ot     optimize for speed
-# -AL     large memory model
-# -Za     ANSI C conformance
-# -nologo suppress MSVC banners
-# -onerror:noexe   no .EXE file if link errors occur
-CFLAGS = -Ot -AL -Za -nologo
-LDFLAGS = -onerror:noexe -nologo
-LIBS = $(LIBDIR)\llibce.lib $(LIBDIR)\graphics.lib
-
-#### End of system configuration section. ####
-
-# This rule allows us to supply the necessary -D options
-# in addition to whatever the user asks for.
-.c.obj:
-	$(CC) -c -I. -I$(INCDIR) $(CPPFLAGS) $(CFLAGS) $<
-
-OBJ =	main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj command.obj \
-	decode.obj edit.obj filename.obj forwback.obj help.obj ifile.obj \
-	input.obj jump.obj line.obj linenum.obj lsystem.obj \
-	mark.obj optfunc.obj option.obj opttbl.obj os.obj output.obj \
-	position.obj prompt.obj search.obj signal.obj tags.obj \
-	ttyin.obj version.obj
-
-all: less lesskey
-
-# This is really horrible, but the command line is too long for 
-# MS-DOS if we try to link $(OBJ).
-less: $(OBJ)
-	-if exist lesskey.obj del lesskey.obj
-	$(CC) $(LDFLAGS) -o $@ *.obj $(LIBS)
-
-lesskey: lesskey.obj version.obj
-	$(CC) $(LDFLAGS) -o $@ lesskey.obj version.obj $(LIBS)
-
-defines.h: defines.ds
-	-del defines.h
-	-copy defines.ds defines.h
-
-$(OBJ): less.h defines.h
-
-clean:
-	-del *.obj 
-	-del less.exe
-	-del lesskey.exe
-
@@ -13,6 +13,17 @@
 ======================================================================


+	Major changes between "less" versions 409 and 416
+
+* New --follow-name option makes F command follow the name of a file
+  rather than the file descriptor if an open file is renamed.
+
+* Make searching with -i/-I work correctly with non-ASCII text.
+
+* Fix DJGPP build.
+
+======================================================================
+
 	Major changes between "less" versions 406 and 409

 * Support CSI escape sequences, like SGR escape sequences.
@@ -698,3 +709,4 @@



+
@@ -1,7 +1,7 @@

-                            Less, version 409
+                            Less, version 416

-    This is the distribution of less, version 409, released 12 Oct 2007.
+    This is the distribution of less, version 416, released 22 Nov 2007.
    This program is part of the GNU project (http://www.gnu.org).

    This program is free software.  You may redistribute it and/or
@@ -21,6 +21,12 @@
 #include <windows.h>
 #endif

+#if HAVE_STAT_INO
+#include <sys/stat.h>
+extern dev_t curr_dev;
+extern ino_t curr_ino;
+#endif
+
 typedef POSITION BLOCKNUM;

 public int ignore_eoi;
@@ -98,6 +104,8 @@ static int maxbufs = -1;
 extern int autobuf;
 extern int sigs;
 extern int secure;
+extern int screen_trashed;
+extern int follow_mode;
 extern constant char helpdata[];
 extern constant int size_helpdata;
 extern IFILE curr_ifile;
@@ -195,7 +203,7 @@ fch_get()
 		 */
 		if (!(ch_flags & CH_CANSEEK))
 			return ('?');
-		if (lseek(ch_file, (off_t)pos, 0) == BAD_LSEEK)
+		if (lseek(ch_file, (off_t)pos, SEEK_SET) == BAD_LSEEK)
 		{
 			error("seek error", NULL_PARG);
 			clear_eol();
@@ -276,6 +284,25 @@ fch_get()
 #endif
 #endif
 			slept = TRUE;
+
+#if HAVE_STAT_INO
+			if (follow_mode == FOLLOW_NAME)
+			{
+				/* See whether the file's i-number has changed.
+				 * If so, force the file to be closed and
+				 * reopened. */
+				struct stat st;
+				int r = stat(get_filename(curr_ifile), &st);
+				if (r == 0 && (st.st_ino != curr_ino ||
+					st.st_dev != curr_dev))
+				{
+					/* screen_trashed=2 causes
+					 * make_display to reopen the file. */
+					screen_trashed = 2;
+					return (EOI);
+				}
+			}
+#endif
 		}
 		if (sigs)
 			return (EOI);
@@ -648,7 +675,7 @@ ch_flush()
 	}
 #endif

-	if (lseek(ch_file, (off_t)0, 0) == BAD_LSEEK)
+	if (lseek(ch_file, (off_t)0, SEEK_SET) == BAD_LSEEK)
 	{
 		/*
 		 * Warning only; even if the seek fails for some reason,
@@ -711,7 +738,7 @@ ch_delbufs()
 	while (ch_bufhead != END_OF_CHAIN)
 	{
 		bp = ch_bufhead;
-		bp->next->prev = bp->prev;;
+		bp->next->prev = bp->prev;
 		bp->prev->next = bp->next;
 		free(bp);
 	}
@@ -737,7 +764,7 @@ seekable(f)
 		return (0);
 	}
 #endif
-	return (lseek(f, (off_t)1, 0) != BAD_LSEEK);
+	return (lseek(f, (off_t)1, SEEK_SET) != BAD_LSEEK);
 }

 /*
@@ -557,6 +557,21 @@ mca_char(c)
 	return (MCA_MORE);
 }

+/*
+ * Discard any buffered file data.
+ */
+	static void
+clear_buffers()
+{
+	if (!(ch_getflags() & CH_CANSEEK))
+		return;
+	ch_flush();
+	clr_linenum();
+#if HILITE_SEARCH
+	clr_hilite();
+#endif
+}
+
 /*
 * Make sure the screen is displayed.
 */
@@ -580,11 +595,20 @@ make_display()
 			jump_loc(initial_scrpos.pos, initial_scrpos.ln);
 	} else if (screen_trashed)
 	{
-		int save_top_scroll;
-		save_top_scroll = top_scroll;
+		int save_top_scroll = top_scroll;
+		int save_ignore_eoi = ignore_eoi;
 		top_scroll = 1;
+		ignore_eoi = 0;
+		if (screen_trashed == 2)
+		{
+			/* Special case used by ignore_eoi: re-open the input file
+			 * and jump to the end of the file. */
+			reopen_curr_ifile();
+			jump_forw();
+		}
 		repaint();
 		top_scroll = save_top_scroll;
+		ignore_eoi = save_ignore_eoi;
 	}
 }

@@ -1115,7 +1139,10 @@ commands()
 			ignore_eoi = 1;
 			hit_eof = 0;
 			while (!sigs)
+			{
+				make_display();
 				forward(1, 0, 0);
+			}
 			ignore_eoi = 0;
 			/*
 			 * This gets us back in "F mode" after processing 
@@ -1154,14 +1181,7 @@ commands()
 			 * Flush buffers, then repaint screen.
 			 * Don't flush the buffers on a pipe!
 			 */
-			if (ch_getflags() & CH_CANSEEK)
-			{
-				ch_flush();
-				clr_linenum();
-#if HILITE_SEARCH
-				clr_hilite();
-#endif
-			}
+			clear_buffers();
 			/* FALLTHRU */
 		case A_REPAINT:
 			/*
@@ -1263,7 +1283,8 @@ commands()
 /*
 * Define abbreviation for a commonly used sequence below.
 */
-#define	DO_SEARCH()	if (number <= 0) number = 1;	\
+#define	DO_SEARCH() \
+			if (number <= 0) number = 1;	\
 			mca_search();			\
 			cmd_exec();			\
 			multi_search((char *)NULL, (int) number);
@@ -3611,6 +3611,73 @@ fi


 # Checks for general libraries.
+{ echo "$as_me:$LINENO: checking for tgoto in -ltinfo" >&5
+echo $ECHO_N "checking for tgoto in -ltinfo... $ECHO_C" >&6; }
+if test "${ac_cv_lib_tinfo_tgoto+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltinfo  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tgoto ();
+int
+main ()
+{
+return tgoto ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_tinfo_tgoto=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_tinfo_tgoto=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_tinfo_tgoto" >&5
+echo "${ECHO_T}$ac_cv_lib_tinfo_tgoto" >&6; }
+if test $ac_cv_lib_tinfo_tgoto = yes; then
+  have_tinfo=yes
+else
+  have_tinfo=no
+fi
+
 { echo "$as_me:$LINENO: checking for initscr in -lxcurses" >&5
 echo $ECHO_N "checking for initscr in -lxcurses... $ECHO_C" >&6; }
 if test "${ac_cv_lib_xcurses_initscr+set}" = set; then
@@ -4246,6 +4313,61 @@ fi
 fi

 if test $curses_broken = 0; then
+
+# -- Try tinfo.
+if test "x$TERMLIBS" = x; then
+  if test $have_tinfo = yes; then
+    TERMLIBS="-ltinfo"
+    SAVE_LIBS=$LIBS
+    LIBS="$LIBS $TERMLIBS"
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  termok=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	termok=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+    LIBS=$SAVE_LIBS
+    if test $termok = no; then TERMLIBS=""; fi
+  fi
+fi
+
 # -- Try xcurses.
 if test "x$TERMLIBS" = x; then
  if test $have_xcurses = yes; then
@@ -4895,7 +5017,8 @@ done



-for ac_header in ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h sys/ioctl.h sys/stream.h
+
+for ac_header in ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h sys/ioctl.h sys/stream.h wctype.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -5443,6 +5566,10 @@ fi



+
+
+
+



@@ -5655,6 +5782,55 @@ sed 's/^/| /' conftest.$ac_ext >&5
 echo "${ECHO_T}no" >&6; }
 fi

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: checking for st_ino in struct stat" >&5
+echo $ECHO_N "checking for st_ino in struct stat... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/stat.h>
+int
+main ()
+{
+struct stat s; dev_t dev = s.st_dev; ino_t ino = s.st_ino;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
+#define HAVE_STAT_INO 1
+_ACEOF
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 # Checks for library functions.
@@ -6515,6 +6691,7 @@ fi

 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
      conftest$ac_exeext conftest.$ac_ext
+
 { echo "$as_me:$LINENO: checking for ctype functions" >&5
 echo $ECHO_N "checking for ctype functions... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
@@ -6566,6 +6743,57 @@ sed 's/^/| /' conftest.$ac_ext >&5
 echo "${ECHO_T}no" >&6; }
 fi

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+
+{ echo "$as_me:$LINENO: checking for wctype functions" >&5
+echo $ECHO_N "checking for wctype functions... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <wctype.h>
+int
+main ()
+{
+iswlower(0); iswupper(0); towlower(0); towupper(0);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
+#define HAVE_WCTYPE 1
+_ACEOF
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
      conftest$ac_exeext conftest.$ac_ext

@@ -23,6 +23,7 @@ AC_PROG_INSTALL
 AC_SYS_LARGEFILE

 # Checks for general libraries.
+AC_CHECK_LIB(tinfo, tgoto, [have_tinfo=yes], [have_tinfo=no])
 AC_CHECK_LIB(xcurses, initscr, [have_xcurses=yes], [have_xcurses=no])
 AC_CHECK_LIB(ncursesw, initscr, [have_ncursesw=yes], [have_ncursesw=no])
 AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no])
@@ -51,6 +52,20 @@ fi
 fi

 if test $curses_broken = 0; then
+
+# -- Try tinfo.
+if test "x$TERMLIBS" = x; then
+  if test $have_tinfo = yes; then
+    TERMLIBS="-ltinfo"
+    SAVE_LIBS=$LIBS
+    LIBS="$LIBS $TERMLIBS"
+    AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
+      [termok=yes], [termok=no])
+    LIBS=$SAVE_LIBS
+    if test $termok = no; then TERMLIBS=""; fi
+  fi
+fi
+
 # -- Try xcurses.
 if test "x$TERMLIBS" = x; then
  if test $have_xcurses = yes; then
@@ -154,7 +169,7 @@ LIBS="$LIBS $TERMLIBS"

 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h sys/ioctl.h sys/stream.h])
+AC_CHECK_HEADERS([ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h sys/ioctl.h sys/stream.h wctype.h])

 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STAT
@@ -182,6 +197,8 @@ AH_TEMPLATE([HAVE_VOID],
 	[Define HAVE_VOID if your compiler supports the "void" type.])
 AH_TEMPLATE([HAVE_CONST],
 	[Define HAVE_CONST if your compiler supports the "const" modifier.])
+AH_TEMPLATE([HAVE_STAT_INO],
+	[Define HAVE_STAT_INO if your struct stat has st_ino and st_dev.])
 AH_TEMPLATE([HAVE_TIME_T],
 	[Define HAVE_TIME_T if your system supports the "time_t" type.])
 AH_TEMPLATE([HAVE_STRERROR],
@@ -204,6 +221,8 @@ AH_TEMPLATE([HAVE_TERMIOS_FUNCS],
 	[Define HAVE_TERMIOS_FUNCS if you have tcgetattr/tcsetattr.])
 AH_TEMPLATE([HAVE_UPPER_LOWER],
 	[Define HAVE_UPPER_LOWER if you have isupper, islower, toupper, tolower.])
+AH_TEMPLATE([HAVE_WCTYPE],
+	[Define HAVE_WCTYPE if you have iswupper, iswlower, towupper, towlower.])
 AH_TEMPLATE([HAVE_SIGSET_T],
 	[Define HAVE_SIGSET_T you have the sigset_t type.])
 AH_TEMPLATE([HAVE_SIGEMPTYSET],
@@ -224,6 +243,11 @@ AC_TRY_COMPILE(, [const int foo = 0;],
 AC_MSG_CHECKING(for time_t)
 AC_TRY_COMPILE([#include <time.h>], [time_t t = 0;],
  [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TIME_T)], [AC_MSG_RESULT(no)])
+AC_MSG_CHECKING(for st_ino in struct stat)
+AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/stat.h>],
+  [struct stat s; dev_t dev = s.st_dev; ino_t ino = s.st_ino;],
+  [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STAT_INO)], [AC_MSG_RESULT(no)])

 # Checks for library functions.
 AC_TYPE_SIGNAL
@@ -307,6 +331,7 @@ AC_TRY_LINK([#include <locale.h>
 #include <ctype.h>
 #include <langinfo.h>], [setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);],
  [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LOCALE)], [AC_MSG_RESULT(no)])
+
 AC_MSG_CHECKING(for ctype functions)
 AC_TRY_LINK([
 #if HAVE_CTYPE_H
@@ -314,6 +339,10 @@ AC_TRY_LINK([
 #endif], [static int x; x = isupper(x); x = tolower(x); x = toupper(x);],
  [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_UPPER_LOWER)], [AC_MSG_RESULT(no)])

+AC_MSG_CHECKING(for wctype functions)
+AC_TRY_LINK([#include <wctype.h>], [iswlower(0); iswupper(0); towlower(0); towupper(0);],
+  [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_WCTYPE)], [AC_MSG_RESULT(no)])
+
 # Checks for external variable ospeed in the termcap library.
 have_ospeed=no
 AC_MSG_CHECKING(termcap for ospeed)
@@ -682,7 +682,7 @@ lesskey(filename, sysvar)
 		close(f);
 		return (-1);
 	}
-	if (lseek(f, (off_t)0, 0) == BAD_LSEEK)
+	if (lseek(f, (off_t)0, SEEK_SET) == BAD_LSEEK)
 	{
 		free(buf);
 		close(f);
@@ -313,6 +313,9 @@
 /* Define if you have the <ctype.h> header file.  */
 #define HAVE_CTYPE_H 1

+/* Define if you have the <wctype.h> header file.  */
+#define HAVE_WCTYPE_H 0
+
 /* Define if you have the <errno.h> header file.  */
 #define HAVE_ERRNO_H 1

@@ -282,6 +282,9 @@
 /* Define to 1 if you have the `stat' function. */
 #undef HAVE_STAT

+/* Define HAVE_STAT_INO if your struct stat has st_ino and st_dev. */
+#undef HAVE_STAT_INO
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H

@@ -351,6 +354,12 @@
 /* Define HAVE_VOID if your compiler supports the "void" type. */
 #undef HAVE_VOID

+/* Define HAVE_WCTYPE if you have iswupper, iswlower, towupper, towlower. */
+#undef HAVE_WCTYPE
+
+/* Define to 1 if you have the <wctype.h> header file. */
+#undef HAVE_WCTYPE_H
+
 /* Define to 1 if you have the `_setjmp' function. */
 #undef HAVE__SETJMP

@@ -279,6 +279,9 @@
 /* Define if you have the <ctype.h> header file.  */
 #define HAVE_CTYPE_H 1

+/* Define if you have the <wctype.h> header file.  */
+#define HAVE_WCTYPE_H 0
+
 /* Define if you have the <errno.h> header file.  */
 #define HAVE_ERRNO_H 1

@@ -287,6 +287,9 @@
 /* Define if you have the <ctype.h> header file.  */
 #define HAVE_CTYPE_H 1

+/* Define if you have the <wctype.h> header file.  */
+#define HAVE_WCTYPE_H 0
+
 /* Define if you have the <errno.h> header file.  */
 #define HAVE_ERRNO_H 1

@@ -277,6 +277,9 @@
 /* Define if you have the <ctype.h> header file.  */
 #define HAVE_CTYPE_H 1

+/* Define if you have the <wctype.h> header file.  */
+#define HAVE_WCTYPE_H 1
+
 /* Define if you have the <errno.h> header file.  */
 #define HAVE_ERRNO_H 1

@@ -10,6 +10,9 @@


 #include "less.h"
+#if HAVE_STAT
+#include <sys/stat.h>
+#endif

 public int fd0 = 0;

@@ -36,6 +39,11 @@ extern int force_logfile;
 extern char *namelogfile;
 #endif

+#if HAVE_STAT_INO
+public dev_t curr_dev;
+public ino_t curr_ino;
+#endif
+
 char *curr_altfilename = NULL;
 static void *curr_altpipe;

@@ -178,6 +186,9 @@ close_file()
 		curr_altfilename = NULL;
 	}
 	curr_ifile = NULL_IFILE;
+#if HAVE_STAT_INO
+	curr_ino = curr_dev = 0;
+#endif
 }

 /*
@@ -360,7 +371,6 @@ edit_ifile(ifile)
 			}
 		}
 	}
-	free(qopen_filename);

 	/*
 	 * Get the new ifile.
@@ -384,11 +394,24 @@ edit_ifile(ifile)
 #if LOGFILE
 		if (namelogfile != NULL && is_tty)
 			use_logfile(namelogfile);
+#endif
+#if HAVE_STAT_INO
+		/* Remember the i-number and device of the opened file. */
+		{
+			struct stat statbuf;
+			int r = stat(qopen_filename, &statbuf);
+			if (r == 0)
+			{
+				curr_ino = statbuf.st_ino;
+				curr_dev = statbuf.st_dev;
+			}
+		}
 #endif
 		if (every_first_cmd != NULL)
 			ungetsc(every_first_cmd);
 	}

+	free(qopen_filename);
 	no_display = !any_display;
 	flush();
 	any_display = TRUE;
@@ -657,6 +680,14 @@ reedit_ifile(save_ifile)
 	quit(QUIT_ERROR);
 }

+	public void
+reopen_curr_ifile()
+{
+	IFILE save_ifile = save_curr_ifile();
+	close_file();
+	reedit_ifile(save_ifile);
+}
+
 /*
 * Edit standard input.
 */
@@ -747,7 +778,7 @@ loop:
 		 * Append: open the file and seek to the end.
 		 */
 		logfile = open(filename, OPEN_APPEND);
-		if (lseek(logfile, (off_t)0, 2) == BAD_LSEEK)
+		if (lseek(logfile, (off_t)0, SEEK_END) == BAD_LSEEK)
 		{
 			close(logfile);
 			logfile = -1;
@@ -476,7 +476,7 @@ bin_file(f)

 	if (!seekable(f))
 		return (0);
-	if (lseek(f, (off_t)0, 0) == BAD_LSEEK)
+	if (lseek(f, (off_t)0, SEEK_SET) == BAD_LSEEK)
 		return (0);
 	n = read(f, data, sizeof(data));
 	for (i = 0;  i < n;  i++)
@@ -505,7 +505,7 @@ seek_filesize(f)
 {
 	off_t spos;

-	spos = lseek(f, (off_t)0, 2);
+	spos = lseek(f, (off_t)0, SEEK_END);
 	if (spos == BAD_LSEEK)
 		return (NULL_POSITION);
 	return ((POSITION) spos);
@@ -104,6 +104,7 @@
 	public IFILE save_curr_ifile ();
 	public void unsave_ifile ();
 	public void reedit_ifile ();
+	public void reopen_curr_ifile ();
 	public int edit_stdin ();
 	public void cat_file ();
 	public void use_logfile ();
@@ -72,6 +72,9 @@
 #if HAVE_CTYPE_H
 #include <ctype.h>
 #endif
+#if HAVE_WCTYPE_H
+#include <wctype.h>
+#endif
 #if HAVE_LIMITS_H
 #include <limits.h>
 #endif
@@ -126,16 +129,23 @@ void free();
 #undef IS_SPACE
 #undef IS_DIGIT

-#if !HAVE_UPPER_LOWER
-#define	IS_UPPER(c)	ASCII_IS_UPPER(c)
-#define	IS_LOWER(c)	ASCII_IS_LOWER(c)
-#define	TO_UPPER(c)	ASCII_TO_UPPER(c)
-#define	TO_LOWER(c)	ASCII_TO_LOWER(c)
+#if HAVE_WCTYPE
+#define	IS_UPPER(c)	iswupper(c)
+#define	IS_LOWER(c)	iswlower(c)
+#define	TO_UPPER(c)	towupper(c)
+#define	TO_LOWER(c)	towlower(c)
 #else
+#if HAVE_UPPER_LOWER
 #define	IS_UPPER(c)	isupper((unsigned char) (c))
 #define	IS_LOWER(c)	islower((unsigned char) (c))
 #define	TO_UPPER(c)	toupper((unsigned char) (c))
 #define	TO_LOWER(c)	tolower((unsigned char) (c))
+#else
+#define	IS_UPPER(c)	ASCII_IS_UPPER(c)
+#define	IS_LOWER(c)	ASCII_IS_LOWER(c)
+#define	TO_UPPER(c)	ASCII_TO_UPPER(c)
+#define	TO_LOWER(c)	ASCII_TO_LOWER(c)
+#endif
 #endif

 #ifdef isspace
@@ -188,6 +198,13 @@ void free();

 #define	BAD_LSEEK	((off_t)-1)

+#ifndef SEEK_SET
+#define SEEK_SET 0
+#endif
+#ifndef SEEK_END
+#define SEEK_END 2
+#endif
+
 #ifndef CHAR_BIT
 #define CHAR_BIT 8
 #endif
@@ -458,6 +475,9 @@ struct textlist
 #define	QUIT_ERROR	1
 #define	QUIT_SAVED_STATUS (-1)

+#define FOLLOW_DESC     0
+#define FOLLOW_NAME     1
+
 /* filestate flags */
 #define	CH_CANSEEK	001
 #define	CH_KEEPOPEN	002
@@ -445,8 +445,8 @@ LESS(1)                                                                LESS(1)
              buffer space is used for each file (unless the file is  a  pipe;
              see  the  -B  option).   The  -b option specifies instead that [4mn[0m
              kilobytes of buffer space should be used for each file.  If [4mn[24m is
-              -1,  buffer space is unlimited; that is, the entire file is read
-              into memory.
+              -1,  buffer  space is unlimited; that is, the entire file can be
+              read into memory.

       -B or --auto-buffers
              By default, when data is read from a pipe, buffers are allocated
@@ -456,8 +456,8 @@ LESS(1)                                                                LESS(1)
              buffers for pipes, so that only 64K  (or  the  amount  of  space
              specified  by the -b option) is used for the pipe.  Warning: use
              of -B can result in  erroneous  display,  since  only  the  most
-              recently  viewed part of the file is kept in memory; any earlier
-              data is lost.
+              recently  viewed  part  of the piped data is kept in memory; any
+              earlier data is lost.

       -c or --clear-screen
              Causes full screen repaints to be  painted  from  the  top  line
@@ -533,42 +533,44 @@ LESS(1)                                                                LESS(1)

       -j[4mn[24m or --jump-target=[4mn[0m
              Specifies  a line on the screen where the "target" line is to be
-              positioned.  A target line is the object of a text  search,  tag
-              search,  jump  to  a  line number, jump to a file percentage, or
-              jump to a marked position.  The screen line may be specified  by
-              a number: the top line on the screen is 1, the next is 2, and so
-              on.  The number may be negative to specify a  line  relative  to
-              the  bottom  of the screen: the bottom line on the screen is -1,
-              the second to the bottom is -2, and  so  on.   Alternately,  the
-              screen  line may be specified as a fraction of the height of the
-              screen, starting with a decimal point: .5 is in  the  middle  of
-              the  screen, .3 is three tenths down from the first line, and so
-              on.  If the line is specified as a  fraction,  the  actual  line
+              positioned.  The target line is the line specified by  any  com-
+              mand  to  search for a pattern, jump to a line number, jump to a
+              file percentage or jump to a tag.  The screen line may be speci-
+              fied  by  a number: the top line on the screen is 1, the next is
+              2, and so on.  The number may be negative to specify a line rel-
+              ative to the bottom of the screen: the bottom line on the screen
+              is -1, the second to the bottom is -2, and so on.   Alternately,
+              the  screen line may be specified as a fraction of the height of
+              the screen, starting with a decimal point: .5 is in  the  middle
+              of  the screen, .3 is three tenths down from the first line, and
+              so on.  If the line is specified as a fraction, the actual  line
              number  is  recalculated  if  the terminal window is resized, so
              that the target line remains at the specified  fraction  of  the
-              screen  height.  If the -j option is used, searches begin at the
-              line immediately after the target line.  For example,  if  "-j4"
-              is  used,  the  target line is the fourth line on the screen, so
-              searches begin at the fifth line on the screen.
+              screen  height.   If  any form of the -j option is used, forward
+              searches begin at the line immediately after  the  target  line,
+              and backward searches begin at the target line.  For example, if
+              "-j4" is used, the target line is the fourth line on the screen,
+              so forward searches begin at the fifth line on the screen.

       -J or --status-column
-              Displays a status column at the left edge of  the  screen.   The
-              status  column  shows the lines that matched the current search.
-              The status column is also used if the -w  or  -W  option  is  in
+              Displays  a  status  column at the left edge of the screen.  The
+              status column shows the lines that matched the  current  search.
+              The  status  column  is  also  used if the -w or -W option is in
              effect.

       -k[4mfilename[24m or --lesskey-file=[4mfilename[0m
-              Causes  [4mless[24m  to  open and interpret the named file as a [4mlesskey[0m
+              Causes [4mless[24m to open and interpret the named file  as  a  [4mlesskey[0m
              (1) file.  Multiple -k options may be specified.  If the LESSKEY
-              or  LESSKEY_SYSTEM  environment variable is set, or if a lesskey
+              or LESSKEY_SYSTEM environment variable is set, or if  a  lesskey
              file is found in a standard place (see KEY BINDINGS), it is also
              used as a [4mlesskey[24m file.

       -K or --quit-on-intr
-              Causes  [4mless[24m  to  exit  immediately  when an interrupt character
-              (usually ^C) is typed.  Normally, an interrupt character  causes
-              [4mless[24m  to  stop  whatever  it  is doing and return to its command
-              prompt.
+              Causes [4mless[24m to exit  immediately  when  an  interrupt  character
+              (usually  ^C) is typed.  Normally, an interrupt character causes
+              [4mless[24m to stop whatever it is doing  and  return  to  its  command
+              prompt.   Note  that  use  of this option makes it impossible to
+              return to the command prompt from the "F" command.

       -L or --no-lessopen
              Ignore the LESSOPEN environment variable (see the INPUT  PREPRO-
@@ -739,8 +741,8 @@ LESS(1)                                                                LESS(1)
       -x[4mn[24m,... or --tabs=[4mn[24m,...
              Sets tab stops.  If only one [4mn[24m is specified, tab stops  are  set
              at  multiples  of [4mn[24m.  If multiple values separated by commas are
-              specified, tab stops  are  set  at  those  positions,  and  then
-              continue  with  the  same spacing as the last two.  For example,
+              specified, tab stops are set at those positions, and  then  con-
+              tinue  with  the  same  spacing  as  the last two.  For example,
              [4m-x9,17[24m will set tabs at positions  9,  17,  25,  33,  etc.   The
              default for [4mn[24m is 8.

@@ -750,40 +752,35 @@ LESS(1)                                                                LESS(1)
              deinitialization  string does something unnecessary, like clear-
              ing the screen.

-       --no-keypad
-              Disables sending the keypad initialization and  deinitialization
-              strings to the terminal.  This is sometimes useful if the keypad
-              strings make the numeric keypad behave in an undesirable manner.
-
       -y[4mn[24m or --max-forw-scroll=[4mn[0m
              Specifies a maximum number of lines to scroll forward.  If it is
-              necessary to scroll forward more than [4mn[24m  lines,  the  screen  is
-              repainted  instead.   The -c or -C option may be used to repaint
-              from the top of the screen if desired.  By default, any  forward
+              necessary  to  scroll  forward  more than [4mn[24m lines, the screen is
+              repainted instead.  The -c or -C option may be used  to  repaint
+              from  the top of the screen if desired.  By default, any forward
              movement causes scrolling.

       -[z][4mn[24m or --window=[4mn[0m
-              Changes  the  default  scrolling  window  size  to [4mn[24m lines.  The
+              Changes the default scrolling  window  size  to  [4mn[24m  lines.   The
              default is one screenful.  The z and w commands can also be used
-              to  change the window size.  The "z" may be omitted for compati-
+              to change the window size.  The "z" may be omitted for  compati-
              bility with some versions of [4mmore.[24m  If the number [4mn[24m is negative,
-              it  indicates  [4mn[24m  lines  less than the current screen size.  For
+              it indicates [4mn[24m lines less than the  current  screen  size.   For
              example, if the screen is 24 lines, [4m-z-4[24m sets the scrolling win-
-              dow  to  20  lines.   If  the screen is resized to 40 lines, the
+              dow to 20 lines.  If the screen is  resized  to  40  lines,  the
              scrolling window automatically changes to 36 lines.

       -[4m"cc[24m or --quotes=[4mcc[0m
-              Changes the filename quoting character.  This may  be  necessary
-              if  you are trying to name a file which contains both spaces and
-              quote characters.  Followed by a single character, this  changes
-              the  quote  character to that character.  Filenames containing a
+              Changes  the  filename quoting character.  This may be necessary
+              if you are trying to name a file which contains both spaces  and
+              quote  characters.  Followed by a single character, this changes
+              the quote character to that character.  Filenames  containing  a
              space should then be surrounded by that character rather than by
-              double  quotes.   Followed  by  two characters, changes the open
-              quote to the first character, and the close quote to the  second
+              double quotes.  Followed by two  characters,  changes  the  open
+              quote  to the first character, and the close quote to the second
              character.  Filenames containing a space should then be preceded
-              by the open quote character and  followed  by  the  close  quote
-              character.   Note  that  even  after  the  quote  characters are
-              changed, this option remains -" (a dash  followed  by  a  double
+              by  the  open  quote  character  and followed by the close quote
+              character.  Note  that  even  after  the  quote  characters  are
+              changed,  this  option  remains  -" (a dash followed by a double
              quote).

       -~ or --tilde
@@ -793,10 +790,25 @@ LESS(1)                                                                LESS(1)

       -# or --shift
              Specifies the default number of positions to scroll horizontally
-              in the RIGHTARROW and LEFTARROW commands.  If the number  speci-
-              fied  is  zero,  it  sets the default number of positions to one
+              in  the RIGHTARROW and LEFTARROW commands.  If the number speci-
+              fied is zero, it sets the default number  of  positions  to  one
              half of the screen width.

+       --no-keypad
+              Disables  sending the keypad initialization and deinitialization
+              strings to the terminal.  This is sometimes useful if the keypad
+              strings make the numeric keypad behave in an undesirable manner.
+
+       --follow-name
+              Normally, if the input file is renamed while  an  F  command  is
+              executing,  [4mless[24m  will  continue  to display the contents of the
+              original file despite its  name  change.   If  --follow-name  is
+              specified, during an F command [4mless[24m will periodically attempt to
+              reopen the file by name.  If the reopen succeeds and the file is
+              a  different file from the original (which means that a new file
+              has been created  with  the  same  name  as  the  original  (now
+              renamed) file), [4mless[24m will display the contents of that new file.
+
       --     A command line argument of "--" marks the end  of  option  argu-
              ments.   Any  arguments  following this are interpreted as file-
              names.  This can be useful when viewing a file whose name begins
@@ -1544,4 +1556,4 @@ LESS(1)                                                                LESS(1)



-                           Version 409: 12 Oct 2007                    LESS(1)
+                           Version 416: 22 Nov 2007                    LESS(1)
@@ -1,4 +1,4 @@
-.TH LESS 1 "Version 409: 12 Oct 2007"
+.TH LESS 1 "Version 416: 22 Nov 2007"
 .SH NAME
 less \- opposite of more
 .SH SYNOPSIS
@@ -462,7 +462,7 @@ By default 64K of buffer space is used for each file
 The \-b option specifies instead that \fIn\fP kilobytes of 
 buffer space should be used for each file.
 If \fIn\fP is \-1, buffer space is unlimited; that is,
-the entire file is read into memory.
+the entire file can be read into memory.
 .IP "\-B or \-\-auto-buffers"
 By default, when data is read from a pipe,
 buffers are allocated automatically as needed.
@@ -473,7 +473,7 @@ so that only 64K
 (or the amount of space specified by the \-b option)
 is used for the pipe.
 Warning: use of \-B can result in erroneous display, since only the
-most recently viewed part of the file is kept in memory; 
+most recently viewed part of the piped data is kept in memory; 
 any earlier data is lost.
 .IP "\-c or \-\-clear-screen"
 Causes full screen repaints to be painted from the top line down.
@@ -555,9 +555,9 @@ the pattern contains uppercase letters.
 .IP "\-j\fIn\fP or \-\-jump-target=\fIn\fP"
 Specifies a line on the screen where the "target" line
 is to be positioned.
-A target line is the object of a text search, 
-tag search, jump to a line number,
-jump to a file percentage, or jump to a marked position.
+The target line is the line specified by any command to
+search for a pattern, jump to a line number,
+jump to a file percentage or jump to a tag.
 The screen line may be specified by a number: the top line on the screen
 is 1, the next is 2, and so on.
 The number may be negative to specify a line relative to the bottom
@@ -569,10 +569,11 @@ screen, .3 is three tenths down from the first line, and so on.
 If the line is specified as a fraction, the actual line number
 is recalculated if the terminal window is resized, so that the
 target line remains at the specified fraction of the screen height.
-If the \-j option is used, searches begin at the line immediately
-after the target line.
+If any form of the \-j option is used, 
+forward searches begin at the line immediately after the target line,
+and backward searches begin at the target line.
 For example, if "\-j4" is used, the target line is the
-fourth line on the screen, so searches begin at the fifth line
+fourth line on the screen, so forward searches begin at the fifth line
 on the screen.
 .IP "\-J or \-\-status-column"
 Displays a status column at the left edge of the screen.
@@ -597,6 +598,8 @@ to exit immediately when an interrupt character (usually ^C) is typed.
 Normally, an interrupt character causes
 .I less
 to stop whatever it is doing and return to its command prompt.
+Note that use of this option makes it impossible to return to the 
+command prompt from the "F" command.
 .IP "\-L or \-\-no-lessopen"
 Ignore the LESSOPEN environment variable
 (see the INPUT PREPROCESSOR section below).
@@ -799,11 +802,6 @@ Disables sending the termcap initialization and deinitialization strings
 to the terminal.
 This is sometimes desirable if the deinitialization string does
 something unnecessary, like clearing the screen.
-.IP "\-\-no-keypad"
-Disables sending the keypad initialization and deinitialization strings
-to the terminal.
-This is sometimes useful if the keypad strings make the numeric
-keypad behave in an undesirable manner.
 .IP "\-y\fIn\fP or \-\-max-forw-scroll=\fIn\fP"
 Specifies a maximum number of lines to scroll forward.
 If it is necessary to scroll forward more than \fIn\fP lines,
@@ -847,6 +845,24 @@ Specifies the default number of positions to scroll horizontally
 in the RIGHTARROW and LEFTARROW commands.
 If the number specified is zero, it sets the default number of
 positions to one half of the screen width.
+.IP "\-\-no-keypad"
+Disables sending the keypad initialization and deinitialization strings
+to the terminal.
+This is sometimes useful if the keypad strings make the numeric
+keypad behave in an undesirable manner.
+.IP "\-\-follow-name"
+Normally, if the input file is renamed while an F command is executing, 
+.I less
+will continue to display the contents of the original file despite
+its name change.
+If \-\-follow-name is specified, during an F command
+.I less
+will periodically attempt to reopen the file by name.
+If the reopen succeeds and the file is a different file from the original
+(which means that a new file has been created 
+with the same name as the original (now renamed) file),
+.I less
+will display the contents of that new file.
 .IP \-\-
 A command line argument of "\-\-" marks the end of option arguments.
 Any arguments following this are interpreted as filenames.
@@ -46,4 +46,4 @@ LESSECHO(1)                                                        LESSECHO(1)



-                           Version 409: 12 Oct 2007                LESSECHO(1)
+                           Version 416: 22 Nov 2007                LESSECHO(1)
@@ -1,4 +1,4 @@
-.TH LESSECHO 1 "Version 409: 12 Oct 2007"
+.TH LESSECHO 1 "Version 416: 22 Nov 2007"
 .SH NAME
 lessecho \- expand metacharacters
 .SH SYNOPSIS
@@ -357,4 +357,4 @@ LESSKEY(1)                                                          LESSKEY(1)



-                           Version 409: 12 Oct 2007                 LESSKEY(1)
+                           Version 416: 22 Nov 2007                 LESSKEY(1)
@@ -1,4 +1,4 @@
-.TH LESSKEY 1 "Version 409: 12 Oct 2007"
+.TH LESSKEY 1 "Version 416: 22 Nov 2007"
 .SH NAME
 lesskey \- specify key bindings for less
 .SH SYNOPSIS
@@ -1047,6 +1047,23 @@ pdone(endline)
 		linebuf[curr] = '\n';
 		attr[curr] = AT_NORMAL;
 		curr++;
+	} 
+	else if (ignaw && !auto_wrap && column >= sc_width)
+	{
+		/*
+		 * Big horrible kludge.
+		 * No-wrap terminals are too hard to deal with when they get in
+		 * the state where a full screen width of characters have been 
+		 * output but the cursor is sitting on the right edge instead
+		 * of at the start of the next line.  
+		 * So after we output a full line, we output an extra 
+		 * space and backspace to force the cursor to the 
+		 * beginning of the next line, like a sane terminal.
+		 */
+		linebuf[curr] = ' '; 
+		attr[curr++] = AT_NORMAL;
+		linebuf[curr] = '\b'; 
+		attr[curr++] = AT_NORMAL;
 	}
 	linebuf[curr] = '\0';
 	attr[curr] = AT_NORMAL;
@@ -442,7 +442,7 @@ opt__V(type, s)
 		any_display = 1;
 		putstr("less ");
 		putstr(version);
-		putstr("\nCopyright (C) 1984-2005 Mark Nudelman\n\n");
+		putstr("\nCopyright (C) 1984-2007 Mark Nudelman\n\n");
 		putstr("less comes with NO WARRANTY, to the extent permitted by law.\n");
 		putstr("For information about the terms of redistribution,\n");
 		putstr("see the file named README in the less distribution.\n");
@@ -50,7 +50,8 @@ public int shift_count;		/* Number of positions to shift horizontally */
 public int status_col;		/* Display a status column */
 public int use_lessopen;	/* Use the LESSOPEN filter */
 public int quit_on_intr;	/* Quit on interrupt */
-public int oldbot;		/* Old bottom of screen behavior */
+public int follow_mode;		/* F cmd Follows file desc or file name? */
+public int oldbot;		/* Old bottom of screen behavior {{REMOVE}} */
 #if HILITE_SEARCH
 public int hilite_search;	/* Highlight matched search patterns? */
 #endif
@@ -113,6 +114,7 @@ static struct optname query_optname  = { "help",                 NULL };
 static struct optname pound_optname  = { "shift",                NULL };
 static struct optname keypad_optname = { "no-keypad",            NULL };
 static struct optname oldbot_optname = { "old-bot",              NULL };
+static struct optname follow_optname = { "follow-name",          NULL };


 /*
@@ -440,6 +442,14 @@ static struct loption option[] =
 			NULL
 		}
 	},
+	{ '.', &follow_optname,
+		BOOL, FOLLOW_DESC, &follow_mode, NULL,
+		{
+			"F command Follows file descriptor",
+			"F command Follows file name",
+			NULL
+		}
+	},
 	{ '\0', NULL, NOVAR, 0, NULL, NULL, { NULL, NULL, NULL } }
 };

@@ -1845,11 +1845,15 @@ line_left()
 		GetConsoleScreenBufferInfo(con_out, &scr);
 		row = scr.dwCursorPosition.Y - scr.srWindow.Top + 1;
 	}
+#else
+#if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC
+		row = wherey();
 #else
 	{
 		struct rccoord tpos = _gettextposition();
 		row = tpos.row;
 	}
+#endif
 #endif
 	_settextposition(row, 1);
 #endif
@@ -66,6 +66,7 @@ extern int screen_trashed;
 extern int size_linebuf;
 extern int squished;
 extern int can_goto_line;
+extern int utf_mode;
 static int hide_hilite;
 static int oldbot;
 static POSITION prep_startpos;
@@ -106,14 +107,34 @@ static int is_ucase_pattern;
 static int last_search_type;
 static char *last_pattern = NULL;

-/*
- * Convert text.  Perform one or more of these transformations:
- */
 #define	CVT_TO_LC	01	/* Convert upper-case to lower-case */
 #define	CVT_BS		02	/* Do backspace processing */
 #define	CVT_CRLF	04	/* Remove CR after LF */
 #define	CVT_ANSI	010	/* Remove ANSI escape sequences */

+/*
+ * Get the length of a buffer needed to convert a string.
+ */
+	static int
+cvt_length(len, ops)
+	int len;
+	int ops;
+{
+	if (utf_mode)
+		/*
+		 * Just copying a string in UTF-8 mode can cause it to grow 
+		 * in length.
+		 * Six output bytes for one input byte is the worst case
+		 * (and unfortunately is far more than is needed in any 
+		 * non-pathological situation, so this is very wasteful).
+		 */
+		len *= 6;
+	return len + 1;
+}
+
+/*
+ * Convert text.  Perform one or more of these transformations:
+ */
 	static void
 cvt_text(odst, osrc, lenp, ops)
 	char *odst;
@@ -140,7 +161,7 @@ cvt_text(odst, osrc, lenp, ops)
 			put_wchar(&dst, TO_LOWER(ch));
 		} else if ((ops & CVT_BS) && ch == '\b' && dst > odst)
 		{
-			/* Delete BS and preceding char. */
+			/* Delete backspace and preceding char. */
 			do {
 				dst--;
 			} while (dst > odst &&
@@ -363,7 +384,7 @@ undo_search()
 * Compile a search pattern, for future use by match_pattern.
 */
 	static int
-compile_pattern(pattern, search_type)
+compile_pattern2(pattern, search_type)
 	char *pattern;
 	int search_type;
 {
@@ -442,6 +463,30 @@ compile_pattern(pattern, search_type)
 	return (0);
 }

+/*
+ * Like compile_pattern, but convert the pattern to lowercase if necessary.
+ */
+	static int
+compile_pattern(pattern, search_type)
+	char *pattern;
+	int search_type;
+{
+	char *cvt_pattern;
+	int result;
+
+	if (caseless != OPT_ONPLUS)
+		cvt_pattern = pattern;
+	else
+	{
+		cvt_pattern = (char*) ecalloc(1, cvt_length(strlen(pattern), CVT_TO_LC));
+		cvt_text(cvt_pattern, pattern, (int *)NULL, CVT_TO_LC);
+	}
+	result = compile_pattern2(cvt_pattern, search_type);
+	if (cvt_pattern != pattern)
+		free(cvt_pattern);
+	return (result);
+}
+
 /*
 * Forget that we have a compiled pattern.
 */
@@ -681,35 +726,8 @@ add_hilite(anchor, hl)
 	ihl->hl_next = hl;
 }

-	static void
-adj_hilite_ansi(cvt_ops, line, line_len, npos)
-	int cvt_ops;
-	char **line;
-	int line_len;
-	POSITION *npos;
-{
-	char *line_end = *line + line_len;
-
-	if (cvt_ops & CVT_ANSI)
-		while (IS_CSI_START(**line))
-		{
-			/*
-			 * Found an ESC.  The file position moves
-			 * forward past the entire ANSI escape sequence.
-			 */
-			(*line)++;
-			(*npos)++;
-			while (*line < line_end)
-			{
-				(*npos)++;
-				if (!is_ansi_middle(*(*line)++))
-					break;
-			}
-		}
-}
-
 /*
- * Adjust hl_startpos & hl_endpos to account for backspace processing.
+ * Adjust hl_startpos & hl_endpos to account for processing by cvt_text.
 */
 	static void
 adj_hilite(anchor, linepos, cvt_ops)
@@ -718,18 +736,21 @@ adj_hilite(anchor, linepos, cvt_ops)
 	int cvt_ops;
 {
 	char *line;
+	char *oline;
 	int line_len;
 	char *line_end;
 	struct hilite *hl;
 	int checkstart;
 	POSITION opos;
 	POSITION npos;
+	LWCHAR ch;
+	int ncwidth;

 	/*
 	 * The line was already scanned and hilites were added (in hilite_line).
 	 * But it was assumed that each char position in the line 
 	 * correponds to one char position in the file.
-	 * This may not be true if there are backspaces in the line.
+	 * This may not be true if cvt_text modified the line.
 	 * Get the raw line again.  Look at each character.
 	 */
 	(void) forw_raw_line(linepos, &line, &line_len);
@@ -760,31 +781,43 @@ adj_hilite(anchor, linepos, cvt_ops)
 		}
 		if (line == line_end)
 			break;
-		adj_hilite_ansi(cvt_ops, &line, line_end - line, &npos);
-		opos++;
-		npos++;
-		line++;
-		if (cvt_ops & CVT_BS)
+
+		/* Get the next char from the line. */
+		oline = line;
+		ch = step_char(&line, +1, line_end);
+		ncwidth = line - oline;
+		npos += ncwidth;
+
+		/* Figure out how this char was processed by cvt_text. */
+		if ((cvt_ops & CVT_BS) && ch == '\b')
 		{
-			while (*line == '\b')
+			/* Skip the backspace and the following char. */
+			oline = line;
+			ch = step_char(&line, +1, line_end);
+			ncwidth = line - oline;
+			npos += ncwidth;
+		} else if ((cvt_ops & CVT_TO_LC) && IS_UPPER(ch))
+		{
+			/* Converted uppercase to lower.
+			 * Note that this may have changed the number of bytes 
+			 * that the character occupies. */
+			char dbuf[6];
+			char *dst = dbuf;
+			put_wchar(&dst, TO_LOWER(ch));
+			opos += dst - dbuf;
+		} else if ((cvt_ops & CVT_ANSI) && IS_CSI_START(ch))
+		{
+			/* Skip to end of ANSI escape sequence. */
+			while (line < line_end)
 			{
 				npos++;
-				line++;
-				adj_hilite_ansi(cvt_ops, &line, line_end - line, &npos);
-				if (line == line_end)
-				{
-					--npos;
-					--line;
+				if (!is_ansi_middle(*++line))
 					break;
-				}
-				/*
-				 * Found a backspace.  The file position moves
-				 * forward by 2 relative to the processed line
-				 * which was searched in hilite_line.
-				 */
-				npos++;
-				line++;
 			}
+		} else 
+		{
+			/* Ordinary unprocessed character. */
+			opos += ncwidth;
 		}
 	}
 }
@@ -1014,6 +1047,7 @@ search_range(pos, endpos, search_type, matches, maxlines, plinepos, pendpos)
 	POSITION *pendpos;
 {
 	char *line;
+	char *cline;
 	int line_len;
 	LINENUM linenum;
 	char *sp, *ep;
@@ -1099,18 +1133,22 @@ search_range(pos, endpos, search_type, matches, maxlines, plinepos, pendpos)
 		 * If we're doing backspace processing, delete backspaces.
 		 */
 		cvt_ops = get_cvt_ops();
-		cvt_text(line, line, &line_len, cvt_ops);
+		cline = calloc(1, cvt_length(line_len, cvt_ops));
+		cvt_text(cline, line, &line_len, cvt_ops);

 		/*
 		 * Test the next line to see if we have a match.
 		 * We are successful if we either want a match and got one,
 		 * or if we want a non-match and got one.
 		 */
-		line_match = match_pattern(line, line_len, &sp, &ep, 0);
+		line_match = match_pattern(cline, line_len, &sp, &ep, 0);
 		line_match = (!(search_type & SRCH_NO_MATCH) && line_match) ||
 				((search_type & SRCH_NO_MATCH) && !line_match);
 		if (!line_match)
+		{
+			free(cline);
 			continue;
+		}
 		/*
 		 * Got a match.
 		 */
@@ -1123,8 +1161,9 @@ search_range(pos, endpos, search_type, matches, maxlines, plinepos, pendpos)
 			 * hilite list and keep searching.
 			 */
 			if (line_match)
-				hilite_line(linepos, line, line_len, sp, ep, cvt_ops);
+				hilite_line(linepos, cline, line_len, sp, ep, cvt_ops);
 #endif
+			free(cline);
 		} else if (--matches <= 0)
 		{
 			/*
@@ -1140,9 +1179,10 @@ search_range(pos, endpos, search_type, matches, maxlines, plinepos, pendpos)
 				 */
 				clr_hilite();
 				if (line_match)
-					hilite_line(linepos, line, line_len, sp, ep, cvt_ops);
+					hilite_line(linepos, cline, line_len, sp, ep, cvt_ops);
 			}
 #endif
+			free(cline);
 			if (plinepos != NULL)
 				*plinepos = linepos;
 			return (0);
@@ -1165,9 +1205,6 @@ hist_pattern(search_type)
 	if (pattern == NULL)
 		return (0);

-	if (caseless == OPT_ONPLUS)
-		cvt_text(pattern, pattern, (int *)NULL, CVT_TO_LC);
-
 	if (compile_pattern(pattern, search_type) < 0)
 		return (0);

@@ -1204,7 +1241,7 @@ search(search_type, pattern, n)
 	int n;
 {
 	POSITION pos;
-	int ucase;
+	int result;

 	if (pattern == NULL || *pattern == '\0')
 	{
@@ -1247,16 +1284,13 @@ search(search_type, pattern, n)
 		/*
 		 * Compile the pattern.
 		 */
-		ucase = is_ucase(pattern);
-		if (caseless == OPT_ONPLUS)
-			cvt_text(pattern, pattern, (int *)NULL, CVT_TO_LC);
 		if (compile_pattern(pattern, search_type) < 0)
 			return (-1);
 		/*
 		 * Ignore case if -I is set OR
 		 * -i is set AND the pattern is all lowercase.
 		 */
-		is_ucase_pattern = ucase;
+		is_ucase_pattern = is_ucase(pattern);
 		if (is_ucase_pattern && caseless != OPT_ONPLUS)
 			is_caseless = 0;
 		else
@@ -662,7 +662,7 @@ prevgtag()
 /*
 * Position the current file at at what is hopefully the tag that was chosen
 * using either findtag() or one of nextgtag() and prevgtag().  Returns -1
- * if it was unable to position at the tag, 0 if succesful.
+ * if it was unable to position at the tag, 0 if successful.
 */
 	static POSITION
 gtagsearch()
@@ -696,6 +696,12 @@ v406  6/17/07	Fix secure build.
 v407  8/16/07	Fix bugs; support CSI chars.
 v408  10/1/07	Fix bug in -i with non-ASCII chars.
 v409  10/12/07	Fix crash when viewing text with invalid UTF-8 sequences.
+v411  11/6/07	Fix case-insensitive searching with non-ASCII text.
+v412  11/6/07	Use symbolic SEEK constants.
+v413  11/6/07	Fix search highlight bug with non-ASCII text.
+v414  11/6/07	Fix display bug with no-wrap terminals.
+v415  11/14/07	Add --follow-name option.
+v416  11/22/07	Fix crash when searching text with invalid UTF-8 sequences.
 */

-char version[] = "409";
+char version[] = "416";
@@ -45,7 +45,9 @@ daily_clean_disks_verbose="YES"				# Mention files deleted
 daily_clean_tmps_enable="NO"				# Delete stuff daily
 daily_clean_tmps_dirs="/tmp"				# Delete under here
 daily_clean_tmps_days="3"				# If not accessed for
-daily_clean_tmps_ignore=".X*-lock quota.user quota.group" # Don't delete these
+daily_clean_tmps_ignore=".X*-lock .X11-unix .ICE-unix .font-unix .XIM-unix"
+daily_clean_tmps_ignore="$daily_clean_tmps_ignore quota.user quota.group"
+							# Don't delete these
 daily_clean_tmps_verbose="YES"				# Mention files deleted

 # 120.clean-preserve
@@ -309,3 +309,259 @@ ttySs	none			network
 ttySt	none			network
 ttySu	none			network
 ttySv	none			network
+ttyl0	none			network
+ttyl1	none			network
+ttyl2	none			network
+ttyl3	none			network
+ttyl4	none			network
+ttyl5	none			network
+ttyl6	none			network
+ttyl7	none			network
+ttyl8	none			network
+ttyl9	none			network
+ttyla	none			network
+ttylb	none			network
+ttylc	none			network
+ttyld	none			network
+ttyle	none			network
+ttylf	none			network
+ttylg	none			network
+ttylh	none			network
+ttyli	none			network
+ttylj	none			network
+ttylk	none			network
+ttyll	none			network
+ttylm	none			network
+ttyln	none			network
+ttylo	none			network
+ttylp	none			network
+ttylq	none			network
+ttylr	none			network
+ttyls	none			network
+ttylt	none			network
+ttylu	none			network
+ttylv	none			network
+ttym0	none			network
+ttym1	none			network
+ttym2	none			network
+ttym3	none			network
+ttym4	none			network
+ttym5	none			network
+ttym6	none			network
+ttym7	none			network
+ttym8	none			network
+ttym9	none			network
+ttyma	none			network
+ttymb	none			network
+ttymc	none			network
+ttymd	none			network
+ttyme	none			network
+ttymf	none			network
+ttymg	none			network
+ttymh	none			network
+ttymi	none			network
+ttymj	none			network
+ttymk	none			network
+ttyml	none			network
+ttymm	none			network
+ttymn	none			network
+ttymo	none			network
+ttymp	none			network
+ttymq	none			network
+ttymr	none			network
+ttyms	none			network
+ttymt	none			network
+ttymu	none			network
+ttymv	none			network
+ttyn0	none			network
+ttyn1	none			network
+ttyn2	none			network
+ttyn3	none			network
+ttyn4	none			network
+ttyn5	none			network
+ttyn6	none			network
+ttyn7	none			network
+ttyn8	none			network
+ttyn9	none			network
+ttyna	none			network
+ttynb	none			network
+ttync	none			network
+ttynd	none			network
+ttyne	none			network
+ttynf	none			network
+ttyng	none			network
+ttynh	none			network
+ttyni	none			network
+ttynj	none			network
+ttynk	none			network
+ttynl	none			network
+ttynm	none			network
+ttynn	none			network
+ttyno	none			network
+ttynp	none			network
+ttynq	none			network
+ttynr	none			network
+ttyns	none			network
+ttynt	none			network
+ttynu	none			network
+ttynv	none			network
+ttyo0	none			network
+ttyo1	none			network
+ttyo2	none			network
+ttyo3	none			network
+ttyo4	none			network
+ttyo5	none			network
+ttyo6	none			network
+ttyo7	none			network
+ttyo8	none			network
+ttyo9	none			network
+ttyoa	none			network
+ttyob	none			network
+ttyoc	none			network
+ttyod	none			network
+ttyoe	none			network
+ttyof	none			network
+ttyog	none			network
+ttyoh	none			network
+ttyoi	none			network
+ttyoj	none			network
+ttyok	none			network
+ttyol	none			network
+ttyom	none			network
+ttyon	none			network
+ttyoo	none			network
+ttyop	none			network
+ttyoq	none			network
+ttyor	none			network
+ttyos	none			network
+ttyot	none			network
+ttyou	none			network
+ttyov	none			network
+ttyL0	none			network
+ttyL1	none			network
+ttyL2	none			network
+ttyL3	none			network
+ttyL4	none			network
+ttyL5	none			network
+ttyL6	none			network
+ttyL7	none			network
+ttyL8	none			network
+ttyL9	none			network
+ttyLa	none			network
+ttyLb	none			network
+ttyLc	none			network
+ttyLd	none			network
+ttyLe	none			network
+ttyLf	none			network
+ttyLg	none			network
+ttyLh	none			network
+ttyLi	none			network
+ttyLj	none			network
+ttyLk	none			network
+ttyLl	none			network
+ttyLm	none			network
+ttyLn	none			network
+ttyLo	none			network
+ttyLp	none			network
+ttyLq	none			network
+ttyLr	none			network
+ttyLs	none			network
+ttyLt	none			network
+ttyLu	none			network
+ttyLv	none			network
+ttyM0	none			network
+ttyM1	none			network
+ttyM2	none			network
+ttyM3	none			network
+ttyM4	none			network
+ttyM5	none			network
+ttyM6	none			network
+ttyM7	none			network
+ttyM8	none			network
+ttyM9	none			network
+ttyMa	none			network
+ttyMb	none			network
+ttyMc	none			network
+ttyMd	none			network
+ttyMe	none			network
+ttyMf	none			network
+ttyMg	none			network
+ttyMh	none			network
+ttyMi	none			network
+ttyMj	none			network
+ttyMk	none			network
+ttyMl	none			network
+ttyMm	none			network
+ttyMn	none			network
+ttyMo	none			network
+ttyMp	none			network
+ttyMq	none			network
+ttyMr	none			network
+ttyMs	none			network
+ttyMt	none			network
+ttyMu	none			network
+ttyMv	none			network
+ttyN0	none			network
+ttyN1	none			network
+ttyN2	none			network
+ttyN3	none			network
+ttyN4	none			network
+ttyN5	none			network
+ttyN6	none			network
+ttyN7	none			network
+ttyN8	none			network
+ttyN9	none			network
+ttyNa	none			network
+ttyNb	none			network
+ttyNc	none			network
+ttyNd	none			network
+ttyNe	none			network
+ttyNf	none			network
+ttyNg	none			network
+ttyNh	none			network
+ttyNi	none			network
+ttyNj	none			network
+ttyNk	none			network
+ttyNl	none			network
+ttyNm	none			network
+ttyNn	none			network
+ttyNo	none			network
+ttyNp	none			network
+ttyNq	none			network
+ttyNr	none			network
+ttyNs	none			network
+ttyNt	none			network
+ttyNu	none			network
+ttyNv	none			network
+ttyO0	none			network
+ttyO1	none			network
+ttyO2	none			network
+ttyO3	none			network
+ttyO4	none			network
+ttyO5	none			network
+ttyO6	none			network
+ttyO7	none			network
+ttyO8	none			network
+ttyO9	none			network
+ttyOa	none			network
+ttyOb	none			network
+ttyOc	none			network
+ttyOd	none			network
+ttyOe	none			network
+ttyOf	none			network
+ttyOg	none			network
+ttyOh	none			network
+ttyOi	none			network
+ttyOj	none			network
+ttyOk	none			network
+ttyOl	none			network
+ttyOm	none			network
+ttyOn	none			network
+ttyOo	none			network
+ttyOp	none			network
+ttyOq	none			network
+ttyOr	none			network
+ttyOs	none			network
+ttyOt	none			network
+ttyOu	none			network
+ttyOv	none			network
@@ -307,3 +307,259 @@ ttySs	none			network
 ttySt	none			network
 ttySu	none			network
 ttySv	none			network
+ttyl0	none			network
+ttyl1	none			network
+ttyl2	none			network
+ttyl3	none			network
+ttyl4	none			network
+ttyl5	none			network
+ttyl6	none			network
+ttyl7	none			network
+ttyl8	none			network
+ttyl9	none			network
+ttyla	none			network
+ttylb	none			network
+ttylc	none			network
+ttyld	none			network
+ttyle	none			network
+ttylf	none			network
+ttylg	none			network
+ttylh	none			network
+ttyli	none			network
+ttylj	none			network
+ttylk	none			network
+ttyll	none			network
+ttylm	none			network
+ttyln	none			network
+ttylo	none			network
+ttylp	none			network
+ttylq	none			network
+ttylr	none			network
+ttyls	none			network
+ttylt	none			network
+ttylu	none			network
+ttylv	none			network
+ttym0	none			network
+ttym1	none			network
+ttym2	none			network
+ttym3	none			network
+ttym4	none			network
+ttym5	none			network
+ttym6	none			network
+ttym7	none			network
+ttym8	none			network
+ttym9	none			network
+ttyma	none			network
+ttymb	none			network
+ttymc	none			network
+ttymd	none			network
+ttyme	none			network
+ttymf	none			network
+ttymg	none			network
+ttymh	none			network
+ttymi	none			network
+ttymj	none			network
+ttymk	none			network
+ttyml	none			network
+ttymm	none			network
+ttymn	none			network
+ttymo	none			network
+ttymp	none			network
+ttymq	none			network
+ttymr	none			network
+ttyms	none			network
+ttymt	none			network
+ttymu	none			network
+ttymv	none			network
+ttyn0	none			network
+ttyn1	none			network
+ttyn2	none			network
+ttyn3	none			network
+ttyn4	none			network
+ttyn5	none			network
+ttyn6	none			network
+ttyn7	none			network
+ttyn8	none			network
+ttyn9	none			network
+ttyna	none			network
+ttynb	none			network
+ttync	none			network
+ttynd	none			network
+ttyne	none			network
+ttynf	none			network
+ttyng	none			network
+ttynh	none			network
+ttyni	none			network
+ttynj	none			network
+ttynk	none			network
+ttynl	none			network
+ttynm	none			network
+ttynn	none			network
+ttyno	none			network
+ttynp	none			network
+ttynq	none			network
+ttynr	none			network
+ttyns	none			network
+ttynt	none			network
+ttynu	none			network
+ttynv	none			network
+ttyo0	none			network
+ttyo1	none			network
+ttyo2	none			network
+ttyo3	none			network
+ttyo4	none			network
+ttyo5	none			network
+ttyo6	none			network
+ttyo7	none			network
+ttyo8	none			network
+ttyo9	none			network
+ttyoa	none			network
+ttyob	none			network
+ttyoc	none			network
+ttyod	none			network
+ttyoe	none			network
+ttyof	none			network
+ttyog	none			network
+ttyoh	none			network
+ttyoi	none			network
+ttyoj	none			network
+ttyok	none			network
+ttyol	none			network
+ttyom	none			network
+ttyon	none			network
+ttyoo	none			network
+ttyop	none			network
+ttyoq	none			network
+ttyor	none			network
+ttyos	none			network
+ttyot	none			network
+ttyou	none			network
+ttyov	none			network
+ttyL0	none			network
+ttyL1	none			network
+ttyL2	none			network
+ttyL3	none			network
+ttyL4	none			network
+ttyL5	none			network
+ttyL6	none			network
+ttyL7	none			network
+ttyL8	none			network
+ttyL9	none			network
+ttyLa	none			network
+ttyLb	none			network
+ttyLc	none			network
+ttyLd	none			network
+ttyLe	none			network
+ttyLf	none			network
+ttyLg	none			network
+ttyLh	none			network
+ttyLi	none			network
+ttyLj	none			network
+ttyLk	none			network
+ttyLl	none			network
+ttyLm	none			network
+ttyLn	none			network
+ttyLo	none			network
+ttyLp	none			network
+ttyLq	none			network
+ttyLr	none			network
+ttyLs	none			network
+ttyLt	none			network
+ttyLu	none			network
+ttyLv	none			network
+ttyM0	none			network
+ttyM1	none			network
+ttyM2	none			network
+ttyM3	none			network
+ttyM4	none			network
+ttyM5	none			network
+ttyM6	none			network
+ttyM7	none			network
+ttyM8	none			network
+ttyM9	none			network
+ttyMa	none			network
+ttyMb	none			network
+ttyMc	none			network
+ttyMd	none			network
+ttyMe	none			network
+ttyMf	none			network
+ttyMg	none			network
+ttyMh	none			network
+ttyMi	none			network
+ttyMj	none			network
+ttyMk	none			network
+ttyMl	none			network
+ttyMm	none			network
+ttyMn	none			network
+ttyMo	none			network
+ttyMp	none			network
+ttyMq	none			network
+ttyMr	none			network
+ttyMs	none			network
+ttyMt	none			network
+ttyMu	none			network
+ttyMv	none			network
+ttyN0	none			network
+ttyN1	none			network
+ttyN2	none			network
+ttyN3	none			network
+ttyN4	none			network
+ttyN5	none			network
+ttyN6	none			network
+ttyN7	none			network
+ttyN8	none			network
+ttyN9	none			network
+ttyNa	none			network
+ttyNb	none			network
+ttyNc	none			network
+ttyNd	none			network
+ttyNe	none			network
+ttyNf	none			network
+ttyNg	none			network
+ttyNh	none			network
+ttyNi	none			network
+ttyNj	none			network
+ttyNk	none			network
+ttyNl	none			network
+ttyNm	none			network
+ttyNn	none			network
+ttyNo	none			network
+ttyNp	none			network
+ttyNq	none			network
+ttyNr	none			network
+ttyNs	none			network
+ttyNt	none			network
+ttyNu	none			network
+ttyNv	none			network
+ttyO0	none			network
+ttyO1	none			network
+ttyO2	none			network
+ttyO3	none			network
+ttyO4	none			network
+ttyO5	none			network
+ttyO6	none			network
+ttyO7	none			network
+ttyO8	none			network
+ttyO9	none			network
+ttyOa	none			network
+ttyOb	none			network
+ttyOc	none			network
+ttyOd	none			network
+ttyOe	none			network
+ttyOf	none			network
+ttyOg	none			network
+ttyOh	none			network
+ttyOi	none			network
+ttyOj	none			network
+ttyOk	none			network
+ttyOl	none			network
+ttyOm	none			network
+ttyOn	none			network
+ttyOo	none			network
+ttyOp	none			network
+ttyOq	none			network
+ttyOr	none			network
+ttyOs	none			network
+ttyOt	none			network
+ttyOu	none			network
+ttyOv	none			network
@@ -308,3 +308,259 @@ ttySs	none			network
 ttySt	none			network
 ttySu	none			network
 ttySv	none			network
+ttyl0	none			network
+ttyl1	none			network
+ttyl2	none			network
+ttyl3	none			network
+ttyl4	none			network
+ttyl5	none			network
+ttyl6	none			network
+ttyl7	none			network
+ttyl8	none			network
+ttyl9	none			network
+ttyla	none			network
+ttylb	none			network
+ttylc	none			network
+ttyld	none			network
+ttyle	none			network
+ttylf	none			network
+ttylg	none			network
+ttylh	none			network
+ttyli	none			network
+ttylj	none			network
+ttylk	none			network
+ttyll	none			network
+ttylm	none			network
+ttyln	none			network
+ttylo	none			network
+ttylp	none			network
+ttylq	none			network
+ttylr	none			network
+ttyls	none			network
+ttylt	none			network
+ttylu	none			network
+ttylv	none			network
+ttym0	none			network
+ttym1	none			network
+ttym2	none			network
+ttym3	none			network
+ttym4	none			network
+ttym5	none			network
+ttym6	none			network
+ttym7	none			network
+ttym8	none			network
+ttym9	none			network
+ttyma	none			network
+ttymb	none			network
+ttymc	none			network
+ttymd	none			network
+ttyme	none			network
+ttymf	none			network
+ttymg	none			network
+ttymh	none			network
+ttymi	none			network
+ttymj	none			network
+ttymk	none			network
+ttyml	none			network
+ttymm	none			network
+ttymn	none			network
+ttymo	none			network
+ttymp	none			network
+ttymq	none			network
+ttymr	none			network
+ttyms	none			network
+ttymt	none			network
+ttymu	none			network
+ttymv	none			network
+ttyn0	none			network
+ttyn1	none			network
+ttyn2	none			network
+ttyn3	none			network
+ttyn4	none			network
+ttyn5	none			network
+ttyn6	none			network
+ttyn7	none			network
+ttyn8	none			network
+ttyn9	none			network
+ttyna	none			network
+ttynb	none			network
+ttync	none			network
+ttynd	none			network
+ttyne	none			network
+ttynf	none			network
+ttyng	none			network
+ttynh	none			network
+ttyni	none			network
+ttynj	none			network
+ttynk	none			network
+ttynl	none			network
+ttynm	none			network
+ttynn	none			network
+ttyno	none			network
+ttynp	none			network
+ttynq	none			network
+ttynr	none			network
+ttyns	none			network
+ttynt	none			network
+ttynu	none			network
+ttynv	none			network
+ttyo0	none			network
+ttyo1	none			network
+ttyo2	none			network
+ttyo3	none			network
+ttyo4	none			network
+ttyo5	none			network
+ttyo6	none			network
+ttyo7	none			network
+ttyo8	none			network
+ttyo9	none			network
+ttyoa	none			network
+ttyob	none			network
+ttyoc	none			network
+ttyod	none			network
+ttyoe	none			network
+ttyof	none			network
+ttyog	none			network
+ttyoh	none			network
+ttyoi	none			network
+ttyoj	none			network
+ttyok	none			network
+ttyol	none			network
+ttyom	none			network
+ttyon	none			network
+ttyoo	none			network
+ttyop	none			network
+ttyoq	none			network
+ttyor	none			network
+ttyos	none			network
+ttyot	none			network
+ttyou	none			network
+ttyov	none			network
+ttyL0	none			network
+ttyL1	none			network
+ttyL2	none			network
+ttyL3	none			network
+ttyL4	none			network
+ttyL5	none			network
+ttyL6	none			network
+ttyL7	none			network
+ttyL8	none			network
+ttyL9	none			network
+ttyLa	none			network
+ttyLb	none			network
+ttyLc	none			network
+ttyLd	none			network
+ttyLe	none			network
+ttyLf	none			network
+ttyLg	none			network
+ttyLh	none			network
+ttyLi	none			network
+ttyLj	none			network
+ttyLk	none			network
+ttyLl	none			network
+ttyLm	none			network
+ttyLn	none			network
+ttyLo	none			network
+ttyLp	none			network
+ttyLq	none			network
+ttyLr	none			network
+ttyLs	none			network
+ttyLt	none			network
+ttyLu	none			network
+ttyLv	none			network
+ttyM0	none			network
+ttyM1	none			network
+ttyM2	none			network
+ttyM3	none			network
+ttyM4	none			network
+ttyM5	none			network
+ttyM6	none			network
+ttyM7	none			network
+ttyM8	none			network
+ttyM9	none			network
+ttyMa	none			network
+ttyMb	none			network
+ttyMc	none			network
+ttyMd	none			network
+ttyMe	none			network
+ttyMf	none			network
+ttyMg	none			network
+ttyMh	none			network
+ttyMi	none			network
+ttyMj	none			network
+ttyMk	none			network
+ttyMl	none			network
+ttyMm	none			network
+ttyMn	none			network
+ttyMo	none			network
+ttyMp	none			network
+ttyMq	none			network
+ttyMr	none			network
+ttyMs	none			network
+ttyMt	none			network
+ttyMu	none			network
+ttyMv	none			network
+ttyN0	none			network
+ttyN1	none			network
+ttyN2	none			network
+ttyN3	none			network
+ttyN4	none			network
+ttyN5	none			network
+ttyN6	none			network
+ttyN7	none			network
+ttyN8	none			network
+ttyN9	none			network
+ttyNa	none			network
+ttyNb	none			network
+ttyNc	none			network
+ttyNd	none			network
+ttyNe	none			network
+ttyNf	none			network
+ttyNg	none			network
+ttyNh	none			network
+ttyNi	none			network
+ttyNj	none			network
+ttyNk	none			network
+ttyNl	none			network
+ttyNm	none			network
+ttyNn	none			network
+ttyNo	none			network
+ttyNp	none			network
+ttyNq	none			network
+ttyNr	none			network
+ttyNs	none			network
+ttyNt	none			network
+ttyNu	none			network
+ttyNv	none			network
+ttyO0	none			network
+ttyO1	none			network
+ttyO2	none			network
+ttyO3	none			network
+ttyO4	none			network
+ttyO5	none			network
+ttyO6	none			network
+ttyO7	none			network
+ttyO8	none			network
+ttyO9	none			network
+ttyOa	none			network
+ttyOb	none			network
+ttyOc	none			network
+ttyOd	none			network
+ttyOe	none			network
+ttyOf	none			network
+ttyOg	none			network
+ttyOh	none			network
+ttyOi	none			network
+ttyOj	none			network
+ttyOk	none			network
+ttyOl	none			network
+ttyOm	none			network
+ttyOn	none			network
+ttyOo	none			network
+ttyOp	none			network
+ttyOq	none			network
+ttyOr	none			network
+ttyOs	none			network
+ttyOt	none			network
+ttyOu	none			network
+ttyOv	none			network
@@ -307,3 +307,259 @@ ttySs	none			network
 ttySt	none			network
 ttySu	none			network
 ttySv	none			network
+ttyl0	none			network
+ttyl1	none			network
+ttyl2	none			network
+ttyl3	none			network
+ttyl4	none			network
+ttyl5	none			network
+ttyl6	none			network
+ttyl7	none			network
+ttyl8	none			network
+ttyl9	none			network
+ttyla	none			network
+ttylb	none			network
+ttylc	none			network
+ttyld	none			network
+ttyle	none			network
+ttylf	none			network
+ttylg	none			network
+ttylh	none			network
+ttyli	none			network
+ttylj	none			network
+ttylk	none			network
+ttyll	none			network
+ttylm	none			network
+ttyln	none			network
+ttylo	none			network
+ttylp	none			network
+ttylq	none			network
+ttylr	none			network
+ttyls	none			network
+ttylt	none			network
+ttylu	none			network
+ttylv	none			network
+ttym0	none			network
+ttym1	none			network
+ttym2	none			network
+ttym3	none			network
+ttym4	none			network
+ttym5	none			network
+ttym6	none			network
+ttym7	none			network
+ttym8	none			network
+ttym9	none			network
+ttyma	none			network
+ttymb	none			network
+ttymc	none			network
+ttymd	none			network
+ttyme	none			network
+ttymf	none			network
+ttymg	none			network
+ttymh	none			network
+ttymi	none			network
+ttymj	none			network
+ttymk	none			network
+ttyml	none			network
+ttymm	none			network
+ttymn	none			network
+ttymo	none			network
+ttymp	none			network
+ttymq	none			network
+ttymr	none			network
+ttyms	none			network
+ttymt	none			network
+ttymu	none			network
+ttymv	none			network
+ttyn0	none			network
+ttyn1	none			network
+ttyn2	none			network
+ttyn3	none			network
+ttyn4	none			network
+ttyn5	none			network
+ttyn6	none			network
+ttyn7	none			network
+ttyn8	none			network
+ttyn9	none			network
+ttyna	none			network
+ttynb	none			network
+ttync	none			network
+ttynd	none			network
+ttyne	none			network
+ttynf	none			network
+ttyng	none			network
+ttynh	none			network
+ttyni	none			network
+ttynj	none			network
+ttynk	none			network
+ttynl	none			network
+ttynm	none			network
+ttynn	none			network
+ttyno	none			network
+ttynp	none			network
+ttynq	none			network
+ttynr	none			network
+ttyns	none			network
+ttynt	none			network
+ttynu	none			network
+ttynv	none			network
+ttyo0	none			network
+ttyo1	none			network
+ttyo2	none			network
+ttyo3	none			network
+ttyo4	none			network
+ttyo5	none			network
+ttyo6	none			network
+ttyo7	none			network
+ttyo8	none			network
+ttyo9	none			network
+ttyoa	none			network
+ttyob	none			network
+ttyoc	none			network
+ttyod	none			network
+ttyoe	none			network
+ttyof	none			network
+ttyog	none			network
+ttyoh	none			network
+ttyoi	none			network
+ttyoj	none			network
+ttyok	none			network
+ttyol	none			network
+ttyom	none			network
+ttyon	none			network
+ttyoo	none			network
+ttyop	none			network
+ttyoq	none			network
+ttyor	none			network
+ttyos	none			network
+ttyot	none			network
+ttyou	none			network
+ttyov	none			network
+ttyL0	none			network
+ttyL1	none			network
+ttyL2	none			network
+ttyL3	none			network
+ttyL4	none			network
+ttyL5	none			network
+ttyL6	none			network
+ttyL7	none			network
+ttyL8	none			network
+ttyL9	none			network
+ttyLa	none			network
+ttyLb	none			network
+ttyLc	none			network
+ttyLd	none			network
+ttyLe	none			network
+ttyLf	none			network
+ttyLg	none			network
+ttyLh	none			network
+ttyLi	none			network
+ttyLj	none			network
+ttyLk	none			network
+ttyLl	none			network
+ttyLm	none			network
+ttyLn	none			network
+ttyLo	none			network
+ttyLp	none			network
+ttyLq	none			network
+ttyLr	none			network
+ttyLs	none			network
+ttyLt	none			network
+ttyLu	none			network
+ttyLv	none			network
+ttyM0	none			network
+ttyM1	none			network
+ttyM2	none			network
+ttyM3	none			network
+ttyM4	none			network
+ttyM5	none			network
+ttyM6	none			network
+ttyM7	none			network
+ttyM8	none			network
+ttyM9	none			network
+ttyMa	none			network
+ttyMb	none			network
+ttyMc	none			network
+ttyMd	none			network
+ttyMe	none			network
+ttyMf	none			network
+ttyMg	none			network
+ttyMh	none			network
+ttyMi	none			network
+ttyMj	none			network
+ttyMk	none			network
+ttyMl	none			network
+ttyMm	none			network
+ttyMn	none			network
+ttyMo	none			network
+ttyMp	none			network
+ttyMq	none			network
+ttyMr	none			network
+ttyMs	none			network
+ttyMt	none			network
+ttyMu	none			network
+ttyMv	none			network
+ttyN0	none			network
+ttyN1	none			network
+ttyN2	none			network
+ttyN3	none			network
+ttyN4	none			network
+ttyN5	none			network
+ttyN6	none			network
+ttyN7	none			network
+ttyN8	none			network
+ttyN9	none			network
+ttyNa	none			network
+ttyNb	none			network
+ttyNc	none			network
+ttyNd	none			network
+ttyNe	none			network
+ttyNf	none			network
+ttyNg	none			network
+ttyNh	none			network
+ttyNi	none			network
+ttyNj	none			network
+ttyNk	none			network
+ttyNl	none			network
+ttyNm	none			network
+ttyNn	none			network
+ttyNo	none			network
+ttyNp	none			network
+ttyNq	none			network
+ttyNr	none			network
+ttyNs	none			network
+ttyNt	none			network
+ttyNu	none			network
+ttyNv	none			network
+ttyO0	none			network
+ttyO1	none			network
+ttyO2	none			network
+ttyO3	none			network
+ttyO4	none			network
+ttyO5	none			network
+ttyO6	none			network
+ttyO7	none			network
+ttyO8	none			network
+ttyO9	none			network
+ttyOa	none			network
+ttyOb	none			network
+ttyOc	none			network
+ttyOd	none			network
+ttyOe	none			network
+ttyOf	none			network
+ttyOg	none			network
+ttyOh	none			network
+ttyOi	none			network
+ttyOj	none			network
+ttyOk	none			network
+ttyOl	none			network
+ttyOm	none			network
+ttyOn	none			network
+ttyOo	none			network
+ttyOp	none			network
+ttyOq	none			network
+ttyOr	none			network
+ttyOs	none			network
+ttyOt	none			network
+ttyOu	none			network
+ttyOv	none			network
@@ -307,3 +307,259 @@ ttySs	none			network
 ttySt	none			network
 ttySu	none			network
 ttySv	none			network
+ttyl0	none			network
+ttyl1	none			network
+ttyl2	none			network
+ttyl3	none			network
+ttyl4	none			network
+ttyl5	none			network
+ttyl6	none			network
+ttyl7	none			network
+ttyl8	none			network
+ttyl9	none			network
+ttyla	none			network
+ttylb	none			network
+ttylc	none			network
+ttyld	none			network
+ttyle	none			network
+ttylf	none			network
+ttylg	none			network
+ttylh	none			network
+ttyli	none			network
+ttylj	none			network
+ttylk	none			network
+ttyll	none			network
+ttylm	none			network
+ttyln	none			network
+ttylo	none			network
+ttylp	none			network
+ttylq	none			network
+ttylr	none			network
+ttyls	none			network
+ttylt	none			network
+ttylu	none			network
+ttylv	none			network
+ttym0	none			network
+ttym1	none			network
+ttym2	none			network
+ttym3	none			network
+ttym4	none			network
+ttym5	none			network
+ttym6	none			network
+ttym7	none			network
+ttym8	none			network
+ttym9	none			network
+ttyma	none			network
+ttymb	none			network
+ttymc	none			network
+ttymd	none			network
+ttyme	none			network
+ttymf	none			network
+ttymg	none			network
+ttymh	none			network
+ttymi	none			network
+ttymj	none			network
+ttymk	none			network
+ttyml	none			network
+ttymm	none			network
+ttymn	none			network
+ttymo	none			network
+ttymp	none			network
+ttymq	none			network
+ttymr	none			network
+ttyms	none			network
+ttymt	none			network
+ttymu	none			network
+ttymv	none			network
+ttyn0	none			network
+ttyn1	none			network
+ttyn2	none			network
+ttyn3	none			network
+ttyn4	none			network
+ttyn5	none			network
+ttyn6	none			network
+ttyn7	none			network
+ttyn8	none			network
+ttyn9	none			network
+ttyna	none			network
+ttynb	none			network
+ttync	none			network
+ttynd	none			network
+ttyne	none			network
+ttynf	none			network
+ttyng	none			network
+ttynh	none			network
+ttyni	none			network
+ttynj	none			network
+ttynk	none			network
+ttynl	none			network
+ttynm	none			network
+ttynn	none			network
+ttyno	none			network
+ttynp	none			network
+ttynq	none			network
+ttynr	none			network
+ttyns	none			network
+ttynt	none			network
+ttynu	none			network
+ttynv	none			network
+ttyo0	none			network
+ttyo1	none			network
+ttyo2	none			network
+ttyo3	none			network
+ttyo4	none			network
+ttyo5	none			network
+ttyo6	none			network
+ttyo7	none			network
+ttyo8	none			network
+ttyo9	none			network
+ttyoa	none			network
+ttyob	none			network
+ttyoc	none			network
+ttyod	none			network
+ttyoe	none			network
+ttyof	none			network
+ttyog	none			network
+ttyoh	none			network
+ttyoi	none			network
+ttyoj	none			network
+ttyok	none			network
+ttyol	none			network
+ttyom	none			network
+ttyon	none			network
+ttyoo	none			network
+ttyop	none			network
+ttyoq	none			network
+ttyor	none			network
+ttyos	none			network
+ttyot	none			network
+ttyou	none			network
+ttyov	none			network
+ttyL0	none			network
+ttyL1	none			network
+ttyL2	none			network
+ttyL3	none			network
+ttyL4	none			network
+ttyL5	none			network
+ttyL6	none			network
+ttyL7	none			network
+ttyL8	none			network
+ttyL9	none			network
+ttyLa	none			network
+ttyLb	none			network
+ttyLc	none			network
+ttyLd	none			network
+ttyLe	none			network
+ttyLf	none			network
+ttyLg	none			network
+ttyLh	none			network
+ttyLi	none			network
+ttyLj	none			network
+ttyLk	none			network
+ttyLl	none			network
+ttyLm	none			network
+ttyLn	none			network
+ttyLo	none			network
+ttyLp	none			network
+ttyLq	none			network
+ttyLr	none			network
+ttyLs	none			network
+ttyLt	none			network
+ttyLu	none			network
+ttyLv	none			network
+ttyM0	none			network
+ttyM1	none			network
+ttyM2	none			network
+ttyM3	none			network
+ttyM4	none			network
+ttyM5	none			network
+ttyM6	none			network
+ttyM7	none			network
+ttyM8	none			network
+ttyM9	none			network
+ttyMa	none			network
+ttyMb	none			network
+ttyMc	none			network
+ttyMd	none			network
+ttyMe	none			network
+ttyMf	none			network
+ttyMg	none			network
+ttyMh	none			network
+ttyMi	none			network
+ttyMj	none			network
+ttyMk	none			network
+ttyMl	none			network
+ttyMm	none			network
+ttyMn	none			network
+ttyMo	none			network
+ttyMp	none			network
+ttyMq	none			network
+ttyMr	none			network
+ttyMs	none			network
+ttyMt	none			network
+ttyMu	none			network
+ttyMv	none			network
+ttyN0	none			network
+ttyN1	none			network
+ttyN2	none			network
+ttyN3	none			network
+ttyN4	none			network
+ttyN5	none			network
+ttyN6	none			network
+ttyN7	none			network
+ttyN8	none			network
+ttyN9	none			network
+ttyNa	none			network
+ttyNb	none			network
+ttyNc	none			network
+ttyNd	none			network
+ttyNe	none			network
+ttyNf	none			network
+ttyNg	none			network
+ttyNh	none			network
+ttyNi	none			network
+ttyNj	none			network
+ttyNk	none			network
+ttyNl	none			network
+ttyNm	none			network
+ttyNn	none			network
+ttyNo	none			network
+ttyNp	none			network
+ttyNq	none			network
+ttyNr	none			network
+ttyNs	none			network
+ttyNt	none			network
+ttyNu	none			network
+ttyNv	none			network
+ttyO0	none			network
+ttyO1	none			network
+ttyO2	none			network
+ttyO3	none			network
+ttyO4	none			network
+ttyO5	none			network
+ttyO6	none			network
+ttyO7	none			network
+ttyO8	none			network
+ttyO9	none			network
+ttyOa	none			network
+ttyOb	none			network
+ttyOc	none			network
+ttyOd	none			network
+ttyOe	none			network
+ttyOf	none			network
+ttyOg	none			network
+ttyOh	none			network
+ttyOi	none			network
+ttyOj	none			network
+ttyOk	none			network
+ttyOl	none			network
+ttyOm	none			network
+ttyOn	none			network
+ttyOo	none			network
+ttyOp	none			network
+ttyOq	none			network
+ttyOr	none			network
+ttyOs	none			network
+ttyOt	none			network
+ttyOu	none			network
+ttyOv	none			network
@@ -307,3 +307,259 @@ ttySs	none			network
 ttySt	none			network
 ttySu	none			network
 ttySv	none			network
+ttyl0	none			network
+ttyl1	none			network
+ttyl2	none			network
+ttyl3	none			network
+ttyl4	none			network
+ttyl5	none			network
+ttyl6	none			network
+ttyl7	none			network
+ttyl8	none			network
+ttyl9	none			network
+ttyla	none			network
+ttylb	none			network
+ttylc	none			network
+ttyld	none			network
+ttyle	none			network
+ttylf	none			network
+ttylg	none			network
+ttylh	none			network
+ttyli	none			network
+ttylj	none			network
+ttylk	none			network
+ttyll	none			network
+ttylm	none			network
+ttyln	none			network
+ttylo	none			network
+ttylp	none			network
+ttylq	none			network
+ttylr	none			network
+ttyls	none			network
+ttylt	none			network
+ttylu	none			network
+ttylv	none			network
+ttym0	none			network
+ttym1	none			network
+ttym2	none			network
+ttym3	none			network
+ttym4	none			network
+ttym5	none			network
+ttym6	none			network
+ttym7	none			network
+ttym8	none			network
+ttym9	none			network
+ttyma	none			network
+ttymb	none			network
+ttymc	none			network
+ttymd	none			network
+ttyme	none			network
+ttymf	none			network
+ttymg	none			network
+ttymh	none			network
+ttymi	none			network
+ttymj	none			network
+ttymk	none			network
+ttyml	none			network
+ttymm	none			network
+ttymn	none			network
+ttymo	none			network
+ttymp	none			network
+ttymq	none			network
+ttymr	none			network
+ttyms	none			network
+ttymt	none			network
+ttymu	none			network
+ttymv	none			network
+ttyn0	none			network
+ttyn1	none			network
+ttyn2	none			network
+ttyn3	none			network
+ttyn4	none			network
+ttyn5	none			network
+ttyn6	none			network
+ttyn7	none			network
+ttyn8	none			network
+ttyn9	none			network
+ttyna	none			network
+ttynb	none			network
+ttync	none			network
+ttynd	none			network
+ttyne	none			network
+ttynf	none			network
+ttyng	none			network
+ttynh	none			network
+ttyni	none			network
+ttynj	none			network
+ttynk	none			network
+ttynl	none			network
+ttynm	none			network
+ttynn	none			network
+ttyno	none			network
+ttynp	none			network
+ttynq	none			network
+ttynr	none			network
+ttyns	none			network
+ttynt	none			network
+ttynu	none			network
+ttynv	none			network
+ttyo0	none			network
+ttyo1	none			network
+ttyo2	none			network
+ttyo3	none			network
+ttyo4	none			network
+ttyo5	none			network
+ttyo6	none			network
+ttyo7	none			network
+ttyo8	none			network
+ttyo9	none			network
+ttyoa	none			network
+ttyob	none			network
+ttyoc	none			network
+ttyod	none			network
+ttyoe	none			network
+ttyof	none			network
+ttyog	none			network
+ttyoh	none			network
+ttyoi	none			network
+ttyoj	none			network
+ttyok	none			network
+ttyol	none			network
+ttyom	none			network
+ttyon	none			network
+ttyoo	none			network
+ttyop	none			network
+ttyoq	none			network
+ttyor	none			network
+ttyos	none			network
+ttyot	none			network
+ttyou	none			network
+ttyov	none			network
+ttyL0	none			network
+ttyL1	none			network
+ttyL2	none			network
+ttyL3	none			network
+ttyL4	none			network
+ttyL5	none			network
+ttyL6	none			network
+ttyL7	none			network
+ttyL8	none			network
+ttyL9	none			network
+ttyLa	none			network
+ttyLb	none			network
+ttyLc	none			network
+ttyLd	none			network
+ttyLe	none			network
+ttyLf	none			network
+ttyLg	none			network
+ttyLh	none			network
+ttyLi	none			network
+ttyLj	none			network
+ttyLk	none			network
+ttyLl	none			network
+ttyLm	none			network
+ttyLn	none			network
+ttyLo	none			network
+ttyLp	none			network
+ttyLq	none			network
+ttyLr	none			network
+ttyLs	none			network
+ttyLt	none			network
+ttyLu	none			network
+ttyLv	none			network
+ttyM0	none			network
+ttyM1	none			network
+ttyM2	none			network
+ttyM3	none			network
+ttyM4	none			network
+ttyM5	none			network
+ttyM6	none			network
+ttyM7	none			network
+ttyM8	none			network
+ttyM9	none			network
+ttyMa	none			network
+ttyMb	none			network
+ttyMc	none			network
+ttyMd	none			network
+ttyMe	none			network
+ttyMf	none			network
+ttyMg	none			network
+ttyMh	none			network
+ttyMi	none			network
+ttyMj	none			network
+ttyMk	none			network
+ttyMl	none			network
+ttyMm	none			network
+ttyMn	none			network
+ttyMo	none			network
+ttyMp	none			network
+ttyMq	none			network
+ttyMr	none			network
+ttyMs	none			network
+ttyMt	none			network
+ttyMu	none			network
+ttyMv	none			network
+ttyN0	none			network
+ttyN1	none			network
+ttyN2	none			network
+ttyN3	none			network
+ttyN4	none			network
+ttyN5	none			network
+ttyN6	none			network
+ttyN7	none			network
+ttyN8	none			network
+ttyN9	none			network
+ttyNa	none			network
+ttyNb	none			network
+ttyNc	none			network
+ttyNd	none			network
+ttyNe	none			network
+ttyNf	none			network
+ttyNg	none			network
+ttyNh	none			network
+ttyNi	none			network
+ttyNj	none			network
+ttyNk	none			network
+ttyNl	none			network
+ttyNm	none			network
+ttyNn	none			network
+ttyNo	none			network
+ttyNp	none			network
+ttyNq	none			network
+ttyNr	none			network
+ttyNs	none			network
+ttyNt	none			network
+ttyNu	none			network
+ttyNv	none			network
+ttyO0	none			network
+ttyO1	none			network
+ttyO2	none			network
+ttyO3	none			network
+ttyO4	none			network
+ttyO5	none			network
+ttyO6	none			network
+ttyO7	none			network
+ttyO8	none			network
+ttyO9	none			network
+ttyOa	none			network
+ttyOb	none			network
+ttyOc	none			network
+ttyOd	none			network
+ttyOe	none			network
+ttyOf	none			network
+ttyOg	none			network
+ttyOh	none			network
+ttyOi	none			network
+ttyOj	none			network
+ttyOk	none			network
+ttyOl	none			network
+ttyOm	none			network
+ttyOn	none			network
+ttyOo	none			network
+ttyOp	none			network
+ttyOq	none			network
+ttyOr	none			network
+ttyOs	none			network
+ttyOt	none			network
+ttyOu	none			network
+ttyOv	none			network
@@ -315,3 +315,259 @@ ttySs	none			network
 ttySt	none			network
 ttySu	none			network
 ttySv	none			network
+ttyl0	none			network
+ttyl1	none			network
+ttyl2	none			network
+ttyl3	none			network
+ttyl4	none			network
+ttyl5	none			network
+ttyl6	none			network
+ttyl7	none			network
+ttyl8	none			network
+ttyl9	none			network
+ttyla	none			network
+ttylb	none			network
+ttylc	none			network
+ttyld	none			network
+ttyle	none			network
+ttylf	none			network
+ttylg	none			network
+ttylh	none			network
+ttyli	none			network
+ttylj	none			network
+ttylk	none			network
+ttyll	none			network
+ttylm	none			network
+ttyln	none			network
+ttylo	none			network
+ttylp	none			network
+ttylq	none			network
+ttylr	none			network
+ttyls	none			network
+ttylt	none			network
+ttylu	none			network
+ttylv	none			network
+ttym0	none			network
+ttym1	none			network
+ttym2	none			network
+ttym3	none			network
+ttym4	none			network
+ttym5	none			network
+ttym6	none			network
+ttym7	none			network
+ttym8	none			network
+ttym9	none			network
+ttyma	none			network
+ttymb	none			network
+ttymc	none			network
+ttymd	none			network
+ttyme	none			network
+ttymf	none			network
+ttymg	none			network
+ttymh	none			network
+ttymi	none			network
+ttymj	none			network
+ttymk	none			network
+ttyml	none			network
+ttymm	none			network
+ttymn	none			network
+ttymo	none			network
+ttymp	none			network
+ttymq	none			network
+ttymr	none			network
+ttyms	none			network
+ttymt	none			network
+ttymu	none			network
+ttymv	none			network
+ttyn0	none			network
+ttyn1	none			network
+ttyn2	none			network
+ttyn3	none			network
+ttyn4	none			network
+ttyn5	none			network
+ttyn6	none			network
+ttyn7	none			network
+ttyn8	none			network
+ttyn9	none			network
+ttyna	none			network
+ttynb	none			network
+ttync	none			network
+ttynd	none			network
+ttyne	none			network
+ttynf	none			network
+ttyng	none			network
+ttynh	none			network
+ttyni	none			network
+ttynj	none			network
+ttynk	none			network
+ttynl	none			network
+ttynm	none			network
+ttynn	none			network
+ttyno	none			network
+ttynp	none			network
+ttynq	none			network
+ttynr	none			network
+ttyns	none			network
+ttynt	none			network
+ttynu	none			network
+ttynv	none			network
+ttyo0	none			network
+ttyo1	none			network
+ttyo2	none			network
+ttyo3	none			network
+ttyo4	none			network
+ttyo5	none			network
+ttyo6	none			network
+ttyo7	none			network
+ttyo8	none			network
+ttyo9	none			network
+ttyoa	none			network
+ttyob	none			network
+ttyoc	none			network
+ttyod	none			network
+ttyoe	none			network
+ttyof	none			network
+ttyog	none			network
+ttyoh	none			network
+ttyoi	none			network
+ttyoj	none			network
+ttyok	none			network
+ttyol	none			network
+ttyom	none			network
+ttyon	none			network
+ttyoo	none			network
+ttyop	none			network
+ttyoq	none			network
+ttyor	none			network
+ttyos	none			network
+ttyot	none			network
+ttyou	none			network
+ttyov	none			network
+ttyL0	none			network
+ttyL1	none			network
+ttyL2	none			network
+ttyL3	none			network
+ttyL4	none			network
+ttyL5	none			network
+ttyL6	none			network
+ttyL7	none			network
+ttyL8	none			network
+ttyL9	none			network
+ttyLa	none			network
+ttyLb	none			network
+ttyLc	none			network
+ttyLd	none			network
+ttyLe	none			network
+ttyLf	none			network
+ttyLg	none			network
+ttyLh	none			network
+ttyLi	none			network
+ttyLj	none			network
+ttyLk	none			network
+ttyLl	none			network
+ttyLm	none			network
+ttyLn	none			network
+ttyLo	none			network
+ttyLp	none			network
+ttyLq	none			network
+ttyLr	none			network
+ttyLs	none			network
+ttyLt	none			network
+ttyLu	none			network
+ttyLv	none			network
+ttyM0	none			network
+ttyM1	none			network
+ttyM2	none			network
+ttyM3	none			network
+ttyM4	none			network
+ttyM5	none			network
+ttyM6	none			network
+ttyM7	none			network
+ttyM8	none			network
+ttyM9	none			network
+ttyMa	none			network
+ttyMb	none			network
+ttyMc	none			network
+ttyMd	none			network
+ttyMe	none			network
+ttyMf	none			network
+ttyMg	none			network
+ttyMh	none			network
+ttyMi	none			network
+ttyMj	none			network
+ttyMk	none			network
+ttyMl	none			network
+ttyMm	none			network
+ttyMn	none			network
+ttyMo	none			network
+ttyMp	none			network
+ttyMq	none			network
+ttyMr	none			network
+ttyMs	none			network
+ttyMt	none			network
+ttyMu	none			network
+ttyMv	none			network
+ttyN0	none			network
+ttyN1	none			network
+ttyN2	none			network
+ttyN3	none			network
+ttyN4	none			network
+ttyN5	none			network
+ttyN6	none			network
+ttyN7	none			network
+ttyN8	none			network
+ttyN9	none			network
+ttyNa	none			network
+ttyNb	none			network
+ttyNc	none			network
+ttyNd	none			network
+ttyNe	none			network
+ttyNf	none			network
+ttyNg	none			network
+ttyNh	none			network
+ttyNi	none			network
+ttyNj	none			network
+ttyNk	none			network
+ttyNl	none			network
+ttyNm	none			network
+ttyNn	none			network
+ttyNo	none			network
+ttyNp	none			network
+ttyNq	none			network
+ttyNr	none			network
+ttyNs	none			network
+ttyNt	none			network
+ttyNu	none			network
+ttyNv	none			network
+ttyO0	none			network
+ttyO1	none			network
+ttyO2	none			network
+ttyO3	none			network
+ttyO4	none			network
+ttyO5	none			network
+ttyO6	none			network
+ttyO7	none			network
+ttyO8	none			network
+ttyO9	none			network
+ttyOa	none			network
+ttyOb	none			network
+ttyOc	none			network
+ttyOd	none			network
+ttyOe	none			network
+ttyOf	none			network
+ttyOg	none			network
+ttyOh	none			network
+ttyOi	none			network
+ttyOj	none			network
+ttyOk	none			network
+ttyOl	none			network
+ttyOm	none			network
+ttyOn	none			network
+ttyOo	none			network
+ttyOp	none			network
+ttyOq	none			network
+ttyOr	none			network
+ttyOs	none			network
+ttyOt	none			network
+ttyOu	none			network
+ttyOv	none			network
@@ -24,7 +24,7 @@ IgnorePaths
 # Paths which start with anything matching an entry in an UpdateIfUnmodified
 # statement will only be updated if the contents of the file have not been
 # modified by the user (unless changes are merged; see below).
-UpdateIfUnmodified /etc/ /var/
+UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile

 # When upgrading to a new FreeBSD release, files which match MergeChanges
 # will have any local changes merged into the version from the new release.
@@ -123,14 +123,6 @@ zone "0.ip6.arpa"	{ type master; file "master/localhost-reverse.db"; };
 // "This" Network (RFCs 1912 and 3330)
 zone "0.in-addr.arpa"		{ type master; file "master/empty.db"; };

-// IANA Reserved - Unlikely to ever be assigned
-zone "1.in-addr.arpa"		{ type master; file "master/empty.db"; };
-zone "2.in-addr.arpa"		{ type master; file "master/empty.db"; };
-zone "223.in-addr.arpa"		{ type master; file "master/empty.db"; };
-
-// Public Data Networks (RFC 3330)
-zone "14.in-addr.arpa"		{ type master; file "master/empty.db"; };
-
 // Private Use Networks (RFC 1918)
 zone "10.in-addr.arpa"		{ type master; file "master/empty.db"; };
 zone "16.172.in-addr.arpa"	{ type master; file "master/empty.db"; };
@@ -50,8 +50,14 @@ ldconfig_start()
 					fi
 				fi
 			done
-			echo '32-bit compatibility ldconfig path:' ${ldconfig32_paths}
-			${ldconfig} -32 -m ${_ins} ${ldconfig32_paths}
+			_LDC=""
+			for i in ${ldconfig32_paths}; do
+				if [ -r "${i}" ]; then
+					_LDC="${_LDC} ${i}"
+				fi
+			done
+			echo '32-bit compatibility ldconfig path:' ${_LDC}
+			${ldconfig} -32 -m ${_ins} ${_LDC}
 			;;
 		esac

@@ -1,111 +1,54 @@
 This fortune brought to you by:
 $FreeBSD$
 %
-Having trouble using fetch through a firewall? Try setting the environment
-variable FTP_PASSIVE_MODE to yes, and see fetch(3) for more details.
+Any user that is a member of the wheel group can use "su -" to simulate
+a root login. You can add a user to the wheel group by editing /etc/group.
+		-- Konstantinos Konstantinidis <[email protected]>
 %
 By pressing "Scroll Lock" you can use the arrow keys to scroll backward
 through the console output.  Press "Scroll Lock" again to turn it off.
 %
-Want colour in your directory listings?  Use "ls -G".  "ls -F" is also useful,
-and they can be combined as "ls -FG".
+Can't remember if you've installed a certain port or not? Try "pkg_info
+-Ix port_name".
 %
-If you need to ask a question on the FreeBSD-questions mailing list then
+Ever wonder what those numbers after command names were, as in cat(1)?  It's
+the section of the manual the man page is in.  "man man" will tell you more.
+		-- David Scheidt <[email protected]>
+%
+Forget how to spell a word or a variation of a word? Use

-	http://www.freebsd.org/doc/en_US.ISO8859-1/articles/\
-		freebsd-questions/index.html
-
-contains lots of useful advice to help you get the best results.
+	look portion_of_word_you_know
+		-- Dru <[email protected]>
 %
-If you'd like to keep track of applications in the FreeBSD ports tree, take a
-look at FreshPorts;
-
-	http://www.freshports.org/
+Forget what directory you are in? Type "pwd".
+		-- Dru <[email protected]>
 %
-To search for files that match a particular name, use find(1); for example
-
-	find / -name "*GENERIC*" -ls
-
-will search '/', and all subdirectories, for files with 'GENERIC' in the name.
-      	--  Stephen Hilton <[email protected]>
+Forget when Easter is? Try "ncal -e". If you need the date for Orthodox
+Easter, use "ncal -o" instead.
+		-- Dru <[email protected]>
 %
-In tcsh, you can `set autolist' to have the shell automatically show
-all the possible matches when doing filename/directory expansion.
+FreeBSD is started up by the program 'init'.  The first thing init does when
+starting multiuser mode (ie, starting the computer up for normal use) is to
+run the shell script /etc/rc.  By reading /etc/rc and the /etc/rc.d/ scripts,
+you can learn a lot about how the system is put together, which again will
+make you more confident about what happens when you do something with it.
 %
-You can `set autologout = 30' to have tcsh log you off automatically
-if you leave the shell idle for more than 30 minutes.
+Handy bash(1) prompt:  PS1="\u@\h \w \!$ "
+		-- David Scheidt <[email protected]>
 %
-If you `set filec' (file completion) in tcsh and write a part of the
-filename, pressing TAB will show you the available choices when there
-is more than one, or complete the filename if there's only one match.
+Having trouble using fetch through a firewall? Try setting the environment
+variable FTP_PASSIVE_MODE to yes, and see fetch(3) for more details.
 %
-You can press up-arrow or down-arrow to walk through a list of
-previous commands in tcsh.
+If other operating systems have damaged your Master Boot Record, you can
+reinstall it either with /usr/sbin/sysinstall or with boot0cfg(8). See
+"man boot0cfg" for details.
 %
-You can disable tcsh's terminal beep if you `set nobeep'.
+If you accidentally end up inside vi, you can quit it by pressing Escape, colon
+(:), q (q), bang (!) and pressing return.
 %
-If you `set watch = (0 any any)' in tcsh, you will be notified when
-someone logs in or out of your system.
-%
-Nice tcsh prompt: set prompt = '%m %# '
-%
-Nice tcsh prompt: set prompt = '%n@%m%# '
-%
-Nice tcsh prompt: set prompt = '%n@%m:%~%# '
-%
-Nice tcsh prompt: set prompt = '%n@%m:%/%# '
-%
-Nice tcsh prompt: set prompt = '[%B%m%b] %B%~%b%# '
-%
-Simple tcsh prompt: set prompt = '%# '
-%
-If you want df(1) and other commands to display disk sizes in
-kilobytes instead of 512-byte blocks, set BLOCKSIZE in your
-environment to 'K'.  You can also use 'M' for Megabytes or 'G' for
-Gigabytes.  If you want df(1) to automatically select the best size
-then use 'df -h'.
-%
-To change an environment variable in tcsh you use: setenv NAME "value"
-where NAME is the name of the variable and "value" its new value.
-%
-To change an environment variable in /bin/sh use:
-
-	$ VARIABLE="value"
-	$ export VARIABLE
-%
-You can use /etc/make.conf to control the options used to compile software
-on this system.  Example entries are in
-/usr/share/examples/etc/make.conf.
-%
-To do a fast search for a file, try
-
-	 locate filename
-
-locate uses a database that is updated every Saturday (assuming your computer
-is running FreeBSD at the time) to quickly find files based on name only.
-%
-In order to search for a string in some files, use 'grep' like this:
-
-	 grep "string" filename1 [filename2 filename3 ...]
-
-This will print out the lines in the files that contain the string.  grep can
-also do a lot more advanced searches - type 'man grep' for details.
-%
-You can use the 'fetch' command to retrieve files over ftp or http.
-
-	 fetch http://www.freebsd.org/index.html
-
-will download the front page of the FreeBSD web site.
-%
-In order to make fetch (the FreeBSD downloading tool) ask for
-username/password when it encounters a password-protected web page, you can set
-the environment variable HTTP_AUTH to 'basic:*'.
-%
-You can permanently set environment variables for your shell by putting them
-in a startup file for the shell.  The name of the startup file varies
-depending on the shell - csh and tcsh uses .login, bash, sh, ksh and zsh use
-.profile.  When using bash, sh, ksh or zsh, don't forget to export the
-variable.
+If you are in the C shell and have just installed a new program, you won't
+be able to run it unless you first type "rehash".
+		-- Dru <[email protected]>
 %
 If you are running xterm, the default TERM variable will be 'xterm'.  If you
 set this environment variable to 'xterm-color' instead, a lot of programs will
@@ -123,16 +66,403 @@ If you do not want to get beeps in X11 (X Windows), you can turn them off with

 	xset b off
 %
-You can look through a file in a nice text-based interface by typing
+If you have a CD-ROM drive in your machine, you can make the CD-ROM that is
+presently inserted available by typing 'mount /cdrom' as root.  The CD-ROM
+will be available under /cdrom/.  Remember to do 'umount /cdrom' before
+removing the CD-ROM (it will usually not be possible to remove the CD-ROM
+without doing this.)

-	less filename
+Note: This tip may not work in all configurations.
+%
+If you need a reminder to leave your terminal, type "leave +hhmm" where
+"hhmm" represents in how many hours and minutes you need to leave.
+		-- Dru <[email protected]>
+%
+If you need to ask a question on the FreeBSD-questions mailing list then
+
+	http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/\
+		freebsd-questions/index.html
+
+contains lots of useful advice to help you get the best results.
+%
+If you `set filec' (file completion) in tcsh and write a part of the
+filename, pressing TAB will show you the available choices when there
+is more than one, or complete the filename if there's only one match.
+%
+If you `set watch = (0 any any)' in tcsh, you will be notified when
+someone logs in or out of your system.
+%
+If you use the C shell, add the following line to the .cshrc file in your
+home directory to prevent core files from being written to disk:
+
+	limit coredumpsize 0
+		-- Dru <[email protected]>
+%
+If you want df(1) and other commands to display disk sizes in
+kilobytes instead of 512-byte blocks, set BLOCKSIZE in your
+environment to 'K'.  You can also use 'M' for Megabytes or 'G' for
+Gigabytes.  If you want df(1) to automatically select the best size
+then use 'df -h'.
+%
+If you want to play CDs with FreeBSD, a utility for this is already included.
+Type 'cdcontrol' then 'help' to learn more.  (You may need to set the CDROM
+environment variable in order to make cdcontrol want to start.)
+%
+If you want to quickly check for duplicate package/port installations,
+try the following pkg_info command.
+
+	pkg_info | sort | sed -e 's/-[0-9].*$//' | \
+	uniq -c | grep -v '^[[:space:]]*1'
+%
+If you'd like to keep track of applications in the FreeBSD ports tree, take a
+look at FreshPorts;
+
+	http://www.freshports.org/
+%
+In order to make fetch (the FreeBSD downloading tool) ask for
+username/password when it encounters a password-protected web page, you can set
+the environment variable HTTP_AUTH to 'basic:*'.
+%
+In order to search for a string in some files, use 'grep' like this:
+
+	 grep "string" filename1 [filename2 filename3 ...]
+
+This will print out the lines in the files that contain the string.  grep can
+also do a lot more advanced searches - type 'man grep' for details.
+%
+In order to support national characters for European languages in tools like
+less without creating other nationalisation aspects, set the environment
+variable LC_ALL to 'en_US.ISO8859-1'.
+%
+In tcsh, you can `set autolist' to have the shell automatically show
+all the possible matches when doing filename/directory expansion.
+%
+"man firewall" will give advice for building a FreeBSD firewall
+		-- David Scheidt <[email protected]>
+%
+"man hier" will explain the way FreeBSD filesystems are normally laid out.
+		-- David Scheidt <[email protected]>
+%
+Man pages are divided into section depending on topic.  There are 9 different
+sections numbered from 1 (General Commands) to 9 (Kernel Developer's Manual).
+You can get an introduction to each topic by typing
+
+	man <number> intro
+
+In other words, to get the intro to general commands, type
+
+	man 1 intro
+%
+"man ports" gives many useful hints about installing FreeBSD ports.
+%
+"man security" gives very good advice on how to tune the security of your
+FreeBSD system.
+%
+"man tuning" gives some tips how to tune performance of your FreeBSD system.
+		-- David Scheidt <[email protected]>
+%
+Need to do a search in a manpage or in a file you've sent to a pager? Use
+"/search_word". To repeat the same search, type "n" for next.
+		-- Dru <[email protected]>
+%
+Need to find the location of a program? Use "locate program_name".
+		-- Dru <[email protected]>
+%
+Need to leave your terminal for a few minutes and don't want to logout?
+Use "lock -p". When you return, use your password as the key to unlock the
+terminal.
+		-- Dru <[email protected]>
+%
+Need to print a manpage? Use
+
+	man name_of_manpage | col -bx | lpr
+		-- Dru <[email protected]>
+%
+Need to quickly empty a file? Use ": > filename".
+		-- Dru <[email protected]>
+%
+Need to quickly return to your home directory? Type "cd".
+		-- Dru <[email protected]>
+%
+Need to remove all those ^M characters from a DOS file? Try
+
+	tr -d \\r < dosfile > newfile
+		-- Originally by Dru <[email protected]>
+%
+Need to see the calendar for this month? Simply type "cal".  To see the
+whole year, type "cal -y".
+		-- Dru <[email protected]>
+%
+Need to see which daemons are listening for connection requests? Use
+"sockstat -4l" for IPv4, and "sockstat -l" for IPv4 and IPv6.
+		-- Dru <[email protected]>
+%
+Need to see your routing table? Type "netstat -rn". The entry with the G
+flag is your gateway.
+		-- Dru <[email protected]>
+%
+Nice bash prompt: PS1='(\[$(tput md)\]\t <\w>\[$(tput me)\]) $(echo $?) \$ '
+		-- Mathieu <[email protected]>
+%
+Nice tcsh prompts:
+	set prompt = '[%B%m%b] %B%~%b%# '
+	set prompt = '%m %# '
+	set prompt = '%n@%m%# '
+	set prompt = '%n@%m:%/%# '
+	set prompt = '%n@%m:%~%# '
+%
+Over quota?  "du -s * | sort -n " will give you a sorted list of your
+directory sizes.
+		-- David Scheidt <[email protected]>
+%
+ports/net/netcat port is useful not only for redirecting input/output
+to TCP or UDP connections, but also for proxying them with inetd(8).
+%
+sh (the default Bourne shell in FreeBSD) supports command-line editing.  Just
+``set -o emacs'' or ``set -o vi'' to enable it.
+%
+Simple tcsh prompt: set prompt = '%# '
 %
 The default editor in FreeBSD is vi, which is efficient to use when you have
 learned it, but somewhat user-unfriendly.  To use ee (an easier but less
 powerful editor) instead, set the environment variable EDITOR to /usr/bin/ee
 %
-If you accidentally end up inside vi, you can quit it by pressing Escape, colon 
-(:), q (q), bang (!) and pressing return.
+Time to change your password? Type "passwd" and follow the prompts.
+		-- Dru <[email protected]>
+%
+To change an environment variable in /bin/sh use:
+
+	$ VARIABLE="value"
+	$ export VARIABLE
+%
+To change an environment variable in tcsh you use: setenv NAME "value"
+where NAME is the name of the variable and "value" its new value.
+%
+To clear the screen, use "clear". To re-display your screen buffer, press
+the scroll lock key and use your page up button. When you're finished,
+press the scroll lock key again to get your prompt back.
+		-- Dru <[email protected]>
+%
+To determine whether a file is a text file, executable, or some other type
+of file, use
+
+	file filename
+		-- Dru <[email protected]>
+%
+To do a fast search for a file, try
+
+	 locate filename
+
+locate uses a database that is updated every Saturday (assuming your computer
+is running FreeBSD at the time) to quickly find files based on name only.
+%
+To erase a line you've written at the command prompt, use "Ctrl-U".
+		-- Dru <[email protected]>
+%
+To find out the hostname associated with an IP address, use
+
+	dig -x IP_address
+		-- Dru <[email protected]>
+%
+To obtain a neat PostScript rendering of a manual page, use ``-t'' switch
+of the man(1) utility: ``man -t <topic>''.  For example:
+
+	man -t grep > grep.ps	# Save the PostScript version to a file
+or
+	man -t printf | lp	# Send the PostScript directly to printer
+%
+To quickly create an empty file, use "touch filename".
+		-- Dru <[email protected]>
+%
+To read a compressed file without having to first uncompress it, use
+"zcat" or "zmore" to view it.
+		-- Dru <[email protected]>
+%
+To repeat the last command in the C shell, type "!!".
+		-- Dru <[email protected]>
+%
+To save disk space in your home directory, compress files you rarely
+use with "gzip filename".
+		-- Dru <[email protected]>
+%
+To search for files that match a particular name, use find(1); for example
+
+	find / -name "*GENERIC*" -ls
+
+will search '/', and all subdirectories, for files with 'GENERIC' in the name.
+      	--  Stephen Hilton <[email protected]>
+%
+To see all of the directories on your FreeBSD system, type
+
+	ls -R / | more
+		-- Dru <[email protected]>
+%
+To see how long it takes a command to run, type the word "time" before the
+command name.
+		-- Dru <[email protected]>
+%
+To see how much disk space is left on your partitions, use
+
+	df -h
+		-- Dru <[email protected]>
+%
+To see the 10 largest files on a directory or partition, use
+
+	du /partition_or_directory_name | sort -rn | head
+		-- Dru <[email protected]>
+%
+To see the IP addresses currently set on your active interfaces, type
+"ifconfig -u".
+		-- Dru <[email protected]>
+%
+To see the last 10 lines of a long file, use "tail filename". To see the
+first 10 lines, use "head filename".
+		-- Dru <[email protected]>
+%
+To see the last time that you logged in, use lastlogin(8).
+		-- Dru <[email protected]>
+%
+To see the MAC addresses of the NICs on your system, type
+
+	ifconfig -a
+		-- Dru <[email protected]>
+%
+To see the output from when your computer started, run dmesg(8).  If it has
+been replaced with other messages, look at /var/run/dmesg.boot.
+		-- Francisco Reyes <[email protected]>
+%
+Want colour in your directory listings?  Use "ls -G".  "ls -F" is also useful,
+and they can be combined as "ls -FG".
+%
+Want to find a specific port, just type the following under /usr/ports,
+or one its subdirectories:
+
+	"make search name=<port-name>"
+    or
+	"make search key=<keyword>"
+%
+Want to know how many words, lines, or bytes are contained in a file? Type
+"wc filename".
+		-- Dru <[email protected]>
+%
+Want to see how much virtual memory you're using? Just type "swapinfo" to
+be shown information about the usage of your swap partitions.
+%
+Want to strip UTF-8 BOM(Byte Order Mark) from given files?
+
+	sed -e '1s/^\xef\xbb\xbf//' < bomfile > newfile
+%
+Want to use sed(1) to edit a file in place?  Well, to replace every 'e' with
+an 'o', in a file named 'foo', you can do:
+
+	sed -i.bak s/e/o/g foo
+
+And you'll get a backup of the original in a file named 'foo.bak', but if you
+want no backup:
+
+	sed -i '' s/e/o/g foo
+%
+When you've made modifications to a file in vi(1) and then find that
+you can't write it, type ``<ESC>!rm -f %'' then ``:w!'' to force the
+write
+
+This won't work if you don't have write permissions to the directory
+and probably won't be suitable if you're editing through a symbolic link.
+%
+You can adjust the volume of various parts of the sound system in your
+computer by typing 'mixer <type> <volume>'.  To get a list of what you can
+adjust, just type 'mixer'.
+%
+You can automatically download and install binary packages by doing
+
+	pkg_add -r <URL>
+
+where you replace <URL> with the URL to the package.  This will also
+automatically install the packages the package you download is dependent on
+(ie, the packages it needs in order to work.)
+%
+You can change the video mode on all consoles by adding something like
+the following to /etc/rc.conf:
+
+	allscreens="80x30"
+
+You can use "vidcontrol -i mode | grep T" for a list of supported text
+modes.
+		-- Konstantinos Konstantinidis <[email protected]>
+%
+You can disable tcsh's terminal beep if you `set nobeep'.
+%
+You can get a good generic server install by using the
+instant-server port/package.  If you have ports installed, you can
+install it by doing
+
+	# cd /usr/ports/misc/instant-server
+	# make install && make clean
+
+as root.  This will install a collection of packages that is appropriate for
+running a "generic" server.
+%
+You can get a good standard workstation install by using the
+instant-workstation port/package.  If you have ports installed, you can
+install it by doing
+
+	# cd /usr/ports/misc/instant-workstation
+	# make install && make clean
+
+as root.  This will install a collection of packages that is convenient to
+have on a workstation.
+%
+You can install extra packages for FreeBSD by using the ports system.
+If you have installed it, you can download, compile, and install software by
+just typing
+
+	# cd /usr/ports/<category>/<portname>
+	# make install && make clean
+
+as root.  The ports infrastructure will download the software, change it so
+it works on FreeBSD, compile it, install it, register the installation so it
+will be possible to automatically uninstall it, and clean out the temporary
+working space it used.  You can remove an installed port you decide you do not
+want after all by typing
+
+	# cd /usr/ports/<category>/<portname>
+	# make deinstall
+
+as root.
+%
+You can look through a file in a nice text-based interface by typing
+
+	less filename
+%
+You can make a log of your terminal session with script(1).
+%
+You can often get answers to your questions about FreeBSD by searching in the
+FreeBSD mailing list archives at
+
+	http://www.FreeBSD.org/search/search.html
+%
+You can open up a new split-screen window in (n)vi with :N or :E and then
+use ^w to switch between the two.
+%
+You can permanently set environment variables for your shell by putting them
+in a startup file for the shell.  The name of the startup file varies
+depending on the shell - csh and tcsh uses .login, bash, sh, ksh and zsh use
+.profile.  When using bash, sh, ksh or zsh, don't forget to export the
+variable.
+%
+You can press Ctrl-D to quickly exit from a shell, or logout from a
+login shell.
+		-- Konstantinos Konstantinidis <[email protected]>
+%
+You can press up-arrow or down-arrow to walk through a list of
+previous commands in tcsh.
+%
+You can search for documentation on a keyword by typing
+
+	apropos keyword
+%
+You can `set autologout = 30' to have tcsh log you off automatically
+if you leave the shell idle for more than 30 minutes.
 %
 You can use aliases to decrease the amount of typing you need to do to get
 commands you commonly use.  Examples of fairly popular aliases include (in
@@ -151,66 +481,18 @@ In csh or tcsh, these would be
 To remove an alias, you can usually use 'unalias aliasname'.  To list all
 aliases, you can usually type just 'alias'.
 %
-In order to support national characters for European languages in tools like
-less without creating other nationalisation aspects, set the environment
-variable LC_ALL to 'en_US.ISO8859-1'.
+You can use /etc/make.conf to control the options used to compile software
+on this system.  Example entries are in
+/usr/share/examples/etc/make.conf.
 %
-You can search for documentation on a keyword by typing
-
-	apropos keyword
+You can use "pkg_info" to see a list of packages you have installed.
+		-- Konstantinos Konstantinidis <[email protected]>
 %
-Man pages are divided into section depending on topic.  There are 9 different
-sections numbered from 1 (General Commands) to 9 (Kernel Developer's Manual).
-You can get an introduction to each topic by typing
+You can use the 'fetch' command to retrieve files over ftp or http.

-	man <number> intro
+	 fetch http://www.FreeBSD.org/index.html

-In other words, to get the intro to general commands, type
-
-	man 1 intro
-%
-FreeBSD is started up by the program 'init'.  The first thing init does when
-starting multiuser mode (ie, starting the computer up for normal use) is to
-run the shell script /etc/rc.  By reading /etc/rc and the /etc/rc.d/ scripts,
-you can learn a lot about how the system is put together, which again will
-make you more confident about what happens when you do something with it.
-%
-If you want to play CDs with FreeBSD, a utility for this is already included.
-Type 'cdcontrol' then 'help' to learn more.  (You may need to set the CDROM
-environment variable in order to make cdcontrol want to start.)
-%
-If you have a CD-ROM drive in your machine, you can make the CD-ROM that is
-presently inserted available by typing 'mount /cdrom' as root.   The CD-ROM
-will be available under /cdrom/.  Remember to do 'umount /cdrom' before
-removing the CD-ROM (it will usually not be possible to remove the CD-ROM
-without doing this.)
-
-Note: This tip may not work in all configurations.
-%
-You can install extra packages for FreeBSD by using the ports system.
-If you have installed it, you can download, compile, and install software by
-just typing
-
-	# cd /usr/ports/<category>/<portname>
-	# make install && make clean
-
-as root.   The ports infrastructure will download the software, change it so
-it works on FreeBSD, compile it, install it, register the installation so it
-will be possible to automatically uninstall it, and clean out the temporary
-working space it used.  You can remove an installed port you decide you do not
-want after all by typing
-
-	# cd /usr/ports/<category>/<portname>
-	# make deinstall
-
-as root.
-%
-Nice bash prompt: PS1='(\[$(tput md)\]\t <\w>\[$(tput me)\]) $(echo $?) \$ '
-		-- Mathieu <[email protected]>
-%
-To see the output from when your computer started, run dmesg(8).  If it has
-been replaced with other messages, look at /var/run/dmesg.boot.
-		-- Francisco Reyes <[email protected]>
+will download the front page of the FreeBSD web site.
 %
 You can use "whereis" to search standard binary, manual page and source
 directories for the specified programs. This can be particularly handy
@@ -219,287 +501,3 @@ when you are trying to find where in the ports tree an application is.
 Try "whereis netscape" and "whereis whereis".
 		-- Konstantinos Konstantinidis <[email protected]>
 %
-You can press Ctrl-D to quickly exit from a shell, or logout from a
-login shell.
-		-- Konstantinos Konstantinidis <[email protected]>
-%
-You can use "pkg_info" to see a list of packages you have installed.
-		-- Konstantinos Konstantinidis <[email protected]>
-%
-You can change the video mode on all consoles by adding something like
-the following to /etc/rc.conf:
-
-	allscreens="80x30"
-
-You can use "vidcontrol -i mode | grep T" for a list of supported text
-modes.
-		-- Konstantinos Konstantinidis <[email protected]>
-%
-Any user that is a member of the wheel group can use "su -" to simulate
-a root login. You can add a user to the wheel group by editing /etc/group.
-		-- Konstantinos Konstantinidis <[email protected]>
-%
-Over quota?  "du -s * | sort -n " will give you a sorted list of your
-directory sizes.
-		-- David Scheidt <[email protected]>
-%
-Handy bash(1) prompt:   PS1="\u@\h \w \!$ "
-		-- David Scheidt <[email protected]>
-%
-Ever wonder what those numbers after command names were, as in cat(1)?  It's
-the section of the manual the man page is in.  "man man" will tell you more.
-		-- David Scheidt <[email protected]>
-%
-"man hier" will explain the way FreeBSD filesystems are normally laid out.
-		-- David Scheidt <[email protected]>
-%
-"man tuning" gives some tips how to tune performance of your FreeBSD system.
-		-- David Scheidt <[email protected]>
-%
-"man firewall" will give advice for building a FreeBSD firewall
-		-- David Scheidt <[email protected]>
-%
-You can often get answers to your questions about FreeBSD by searching in the
-FreeBSD mailing list archives at
-
-	http://www.freebsd.org/search/search.html
-%
-You can adjust the volume of various parts of the sound system in your
-computer by typing 'mixer <type> <volume>'.  To get a list of what you can
-adjust, just type 'mixer'.
-%
-You can automatically download and install binary packages by doing
-
-	pkg_add -r <URL>
-
-where you replace <URL> with the URL to the package.  This will also
-automatically install the packages the package you download is dependent on
-(ie, the packages it needs in order to work.)
-%
-You can get a good standard workstation install by using the
-instant-workstation port/package.  If you have ports installed, you can
-install it by doing
-
-	# cd /usr/ports/misc/instant-workstation
-	# make install && make clean
-
-as root.  This will install a collection of packages that is convenient to
-have on a workstation.
-%
-You can get a good generic server install by using the
-instant-server port/package.  If you have ports installed, you can
-install it by doing
-
-	# cd /usr/ports/misc/instant-server
-	# make install && make clean
-
-as root.  This will install a collection of packages that is appropriate for
-running a "generic" server.
-%
-You can make a log of your terminal session with script(1).
-%
-"man ports" gives many useful hints about installing FreeBSD ports.
-%
-"man security" gives very good advice on how to tune the security of your
-FreeBSD system.
-%
-Want to find a specific port, just type the following under /usr/ports,
-or one its subdirectories:
-
-	"make search name=<port-name>"
-    or
-	"make search key=<keyword>"
-%
-Want to see how much virtual memory you're using? Just type "swapinfo" to
-be shown information about the usage of your swap partitions.
-%
-ports/net/netcat port is useful not only for redirecting input/output
-to TCP or UDP connections, but also for proxying them with inetd(8).
-%
-If other operating systems have damaged your Master Boot Record, you can
-reinstall it either with /usr/sbin/sysinstall or with boot0cfg(8). See
-"man boot0cfg" for details.
-%
-Need to see the calendar for this month? Simply type "cal".  To see the
-whole year, type "cal -y".
-		-- Dru <[email protected]>
-%
-Need to quickly return to your home directory? Type "cd".
-		-- Dru <[email protected]>
-%
-To see the last time that you logged in, use lastlogin(8).
-		-- Dru <[email protected]>
-%
-To clear the screen, use "clear". To re-display your screen buffer, press
-the scroll lock key and use your page up button. When you're finished,
-press the scroll lock key again to get your prompt back.
-		-- Dru <[email protected]>
-%
-To save disk space in your home directory, compress files you rarely
-use with "gzip filename".
-		-- Dru <[email protected]>
-%
-To read a compressed file without having to first uncompress it, use
-"zcat" or "zmore" to view it.
-		-- Dru <[email protected]>
-%
-To see how much disk space is left on your partitions, use
-
-	df -h
-		-- Dru <[email protected]>
-%
-To see the 10 largest files on a directory or partition, use
-
-	du /partition_or_directory_name | sort -rn | head
-		-- Dru <[email protected]>
-%
-To determine whether a file is a text file, executable, or some other type
-of file, use
-
-	file filename
-		-- Dru <[email protected]>
-%
-Time to change your password? Type "passwd" and follow the prompts.
-		-- Dru <[email protected]>
-%
-Want to know how many words, lines, or bytes are contained in a file? Type
-"wc filename".
-		-- Dru <[email protected]>
-%
-Need to print a manpage? Use
-
-	man name_of_manpage | col -bx | lpr
-		-- Dru <[email protected]>
-%
-Need to remove all those ^M characters from a DOS file? Try
-
-	tr -d \\r < dosfile > newfile
-		-- Originally by Dru <[email protected]>
-%
-Forget what directory you are in? Type "pwd".
-		-- Dru <[email protected]>
-%
-If you are in the C shell and have just installed a new program, you won't
-be able to run it unless you first type "rehash".
-		-- Dru <[email protected]>
-%
-Need to leave your terminal for a few minutes and don't want to logout?
-Use "lock -p". When you return, use your password as the key to unlock the
-terminal.
-		-- Dru <[email protected]>
-%
-Need to find the location of a program? Use "locate program_name".
-		-- Dru <[email protected]>
-%
-Forget how to spell a word or a variation of a word? Use
-
-	look portion_of_word_you_know
-		-- Dru <[email protected]>
-%
-To see the last 10 lines of a long file, use "tail filename". To see the
-first 10 lines, use "head filename".
-		-- Dru <[email protected]>
-%
-To see how long it takes a command to run, type the word "time" before the
-command name.
-		-- Dru <[email protected]>
-%
-To quickly create an empty file, use "touch filename".
-		-- Dru <[email protected]>
-%
-To find out the hostname associated with an IP address, use
-
-	dig -x IP_address
-		-- Dru <[email protected]>
-%
-If you use the C shell, add the following line to the .cshrc file in your
-home directory to prevent core files from being written to disk:
-
-	limit coredumpsize 0
-		-- Dru <[email protected]>
-%
-If you need a reminder to leave your terminal, type "leave +hhmm" where
-"hhmm" represents in how many hours and minutes you need to leave.
-		-- Dru <[email protected]>
-%
-Need to do a search in a manpage or in a file you've sent to a pager? Use
-"/search_word". To repeat the same search, type "n" for next.
-		-- Dru <[email protected]>
-%
-Forget when Easter is? Try "ncal -e". If you need the date for Orthodox
-Easter, use "ncal -o" instead.
-		-- Dru <[email protected]>
-%
-Need to see your routing table? Type "netstat -rn". The entry with the G
-flag is your gateway.
-		-- Dru <[email protected]>
-%
-Need to see which daemons are listening for connection requests? Use
-"sockstat -4l" for IPv4, and "sockstat -l" for IPv4 and IPv6.
-		-- Dru <[email protected]>
-%
-Can't remember if you've installed a certain port or not? Try "pkg_info 
-Ix port_name".
-%
-To erase a line you've written at the command prompt, use "Ctrl-U".
-		-- Dru <[email protected]>
-%
-To repeat the last command in the C shell, type "!!".
-		-- Dru <[email protected]>
-%
-Need to quickly empty a file? Use ": > filename".
-		-- Dru <[email protected]>
-%
-To see all of the directories on your FreeBSD system, type
-
-	ls -R / | more
-		-- Dru <[email protected]>
-%
-To see the IP addresses currently set on your active interfaces, type
-"ifconfig -u".
-		-- Dru <[email protected]>
-%
-To see the MAC addresses of the NICs on your system, type
-
-	ifconfig -a
-		-- Dru <[email protected]>
-%
-You can open up a new split-screen window in (n)vi with :N or :E and then
-use ^w to switch between the two.
-%
-sh (the default Bourne shell in FreeBSD) supports command-line editing.  Just
-``set -o emacs'' or ``set -o vi'' to enable it.
-%
-When you've made modifications to a file in vi(1) and then find that
-you can't write it, type ``<ESC>!rm -f %'' then ``:w!'' to force the
-write
-
-This won't work if you don't have write permissions to the directory
-and probably won't be suitable if you're editing through a symbolic link.
-%
-If you want to quickly check for duplicate package/port installations,
-try the following pkg_info command.
-
-	pkg_info | sort | sed -e 's/-[0-9].*$//' | \
-	uniq -c | grep -v '^[[:space:]]*1'
-%
-Want to use sed(1) to edit a file in place?  Well, to replace every 'e' with
-an 'o', in a file named 'foo', you can do:
-
-	sed -i.bak s/e/o/g foo
-
-And you'll get a backup of the original in a file named 'foo.bak', but if you
-want no backup:
-
-	sed -i '' s/e/o/g foo
-%
-To obtain a neat PostScript rendering of a manual page, use ``-t'' switch
-of the man(1) utility: ``man -t <topic>''.  For example:
-
-	man -t grep > grep.ps	# Save the PostScript version to a file
-or
-	man -t printf | lp	# Send the PostScript directly to printer
-%
-Want to strip UTF-8 BOM(Byte Order Mark) from given files?
-
-	sed -e '1s/^\xef\xbb\xbf//' < bomfile > newfile
@@ -0,0 +1,88 @@
+# $FreeBSD$
+aliasname
+allscreens
+AUTH
+autolist
+autologout
+BLOCKSIZE
+bomfile
+cdcontrol
+cdrom
+CDs
+cfg
+conf
+coredumpsize
+csh
+cshrc
+Ctrl
+deinstall
+dmesg
+dosfile
+dscheidt
+duth
+ESC
+filec
+FreeBSD
+grep
+gzip
+hiltonbsd
+html
+http
+ifconfig
+inetd
+init
+interactionvirtuelle
+IPv
+istar
+kkonstan
+Konstantinidis
+ksh
+lastlogin
+lpr
+manpage
+mathieu
+misc
+natserv
+ncal
+netcat
+netscape
+netstat
+newfile
+NICs
+nobeep
+nospam
+org
+passwd
+pkg
+portname
+PostScript
+printf
+proxying
+PS
+pwd
+Reyes
+sbin
+Scheidt
+setenv
+sockstat
+swapinfo
+sysinstall
+tcsh
+tcsh's
+tput
+tumbolia
+UDP
+umount
+unalias
+uninstall
+uniq
+username
+usr
+UTF
+vidcontrol
+whereis
+www
+xset
+zcat
+zmore
+zsh
@@ -1,4 +1,5 @@
 %% $FreeBSD$
+%
 A bad little girl in Madrid,
 A most reprehensible kid,
 	Told her Tante Louise
@@ -148,13 +149,6 @@ Had a rather tough bug in its core.
 	And spewed yards and yards
 Of illegible tape on the floor.
 %
-A computer, to print out a fact,
-Will divide, multiply, and subtract.
-	But this output can be
-	No more than debris,
-If the input was short of exact.
-		-- Gigo
-%
 A contortionist hailing from Lynch
 Used to rent out his tool by the inch.
 	A foot cost a quid --
@@ -315,13 +309,13 @@ By bleeding all over his face.
 A gay young prince from Morocco
 Made love in a manner rococco.
 	He painted his penis
-	To resemble a venus
+	To resemble a Venus
 And flavored his semen with cocoa.
 %
 A geneticist living in Delft
 Scientifically played with himself,
 	And when he was done
-	He labled it: son,
+	He labeled it: son,
 And filed him away on a shelf.
 %
 A gentleman, otherwise meek,
@@ -420,7 +414,7 @@ He couldn't get out with ESC.
 A hacker-turned-pervert named Fisk
 Made love to the drive of his disk.
 	The thing circumsized him,
-	Which rather suprised him.
+	Which rather surprised him.
 He wasn't aware of *that* risk.
 %
 A handsome young rodent named Gratian
@@ -602,12 +596,6 @@ Used to catch all the harlots and jail 'em.
 	He would stand them in line,
 With his common-law tool to impale 'em.
 %
-A limerick packs laughs anatomical
-Into space that is quite economical.
-	But the good ones I've seen
-	So seldom are clean,
-And the clean ones so seldom are comical.
-%
 A linguist thought it a farce
 That memory space was so sparse.
 	One day they increased it.
@@ -687,7 +675,7 @@ Got a doctor to alter his dong.
 When he got there he found he was wrong.
 %
 A mathematician named Hall
-Had a hexhedronical ball,
+Had a hexahedronical ball,
 	And the square of its weight
 	Times his pecker's, plus eight,
 Was four-fifths of five-eighths of fuck-all.
@@ -699,7 +687,7 @@ Has a hexahedronical ball,
 Is his phone number -- give him a call...
 %
 A mathematician named Klein
-Thought the Mobius band was divine.
+Thought the Moebius band was divine.
 	Said he, "If you glue
 	The edges of two,
 You'll get a weird bottle like mine!
@@ -777,12 +765,6 @@ Tied her infantine charge to a kite;
 And watched till it flew out of sight.
 		-- Edward Gorey
 %
-A pansy who lived in Khartoum
-Took a lesbian up to his room.
-	They argued all night
-	Over who had the right
-To do what, with which, and to whom.
-%
 A passionate red-haired girl
 When you kissed her, her senses would whirl,
 	And her twat would get wet,
@@ -995,10 +977,10 @@ But I hope -- yes I do -- that I marry
 As the kind that you zoo-keepers carry."
 %
 A spunky young schoolboy named Fred
-Used totoss off each night while in bed.
+Used to toss off each night while in bed.
 	Said his mother, "Dear lad,
 	That's exceedingly bad--
-Jump in here with your mamma instead."
+Jump in here with your mama instead."
 %
 A starship commander named Kirk
 Emerged from his cabin berserk.
@@ -1049,7 +1031,7 @@ Called the umpire blind out of malice.
 And a girl in the bleachers named Alice.
 %
 A teenage protester named Lil
-Cried, "Those watergate spies make me ill
+Cried, "Those Watergate spies make me ill
 	First they bugged our martinis,
 	Our bras and bikinis,
 And now they are bugging the pill."
@@ -1229,7 +1211,7 @@ A young maiden from France was no prude,
 She decided to dive in the nude,
 	But her buddy, behind,
 	Went out of his mind,
-When he noticed where she was tatooed.
+When he noticed where she was tattooed.
 %
 A young man by a girl was desired
 To give her the thrills she required,
@@ -1276,17 +1258,11 @@ Tore a hole in his sister's best lingerie.
 To add incest to insult and injury.
 %
 A young polo-player of Berkeley
-Made love to his sweetheart beserkly.
+Made love to his sweetheart berserkly.
 	In the midst of each chukker
 	He would break off and fuck her
 Horizontally, laterally and verkeley.
 %
-A young violinist from Rio
-Was seducing a woman named Cleo.
-	As she took down her panties
-	She said, "No andantes;
-I want this allegro con brio!"
-%
 A young wife in the outskirts of Reims
 Preferred frigging to going to mass.
 	Said her husband, "Take Jacques,
@@ -1363,7 +1339,7 @@ An ardent young man named Magruder
 Once wooed a girl nude in Bermuda.
 	She thought it quite lewd
 	To be wooed in the nude,
-But magruder was shrewder, he screwed her.
+But Magruder was shrewder, he screwed her.
 %
 An Argentine gaucho named Bruno
 Who said, "Fucking is one thing I do know.
@@ -1395,6 +1371,12 @@ Once buggered a VAX Unibus.
 	But not the young lad
 (Except for the toupee and truss).
 %
+An earnest young woman in Thrace
+Said, "Darling, that's not the right place!"
+	So he gave her a thwack,
+	And did on her back,
+What he couldn't have done face to face.
+%
 An Edwardian father named Udgeon,
 Whose offspring provoked him to dudgeon,
 	Used on Saturday nights
@@ -1447,7 +1429,7 @@ Made a synthetic ass for a friend,
 It was simply a bother -- no end.
 %
 An innocent maiden named Herridge
-Was cruelly tricked ito marriage;
+Was cruelly tricked into marriage;
 	When she later found out
 	What her spouse was about,
 She threw herself under a carriage.
@@ -1520,12 +1502,6 @@ Who valued her morals too dearly
 	Only once every year,
 And she strained her vagina severely.
 %
-An earnest young woman in Thrace
-Said, "Darling, that's not the right place!"
-	So he gave her a thwack,
-	And did on her back,
-What he couldn't have done face to face.
-%
 And then there's the story that's fraught
 With disaster -- of balls that got caught,
 	When a chap took a crap
@@ -1715,12 +1691,6 @@ Discovered a marvelous fossil.
 	And the knot on the end,
 T'was the penis of Paul the Apostle.
 %
-There was a young man from the Coast
-Who had an affair with a ghost.
-	At the height of orgasm
-	Said the pallid phantasm,
-"I think I can feel it -- almost!"
-%
 There once was a bishop from Birmingham
 Who deflowered young girls while confirming 'em.
 	As they knelt on the hassock
@@ -1775,8 +1745,8 @@ Whose cunt was incredibly huge.
 	As he thunderously came:
 "Mon Dieu!  Apres moi, le deluge!"
 %
-There once was a fag of Khartoom
-Who spent the night in a Lesbians room.
+There once was a fag of Khartoum
+Who spent the night in a Lesbian's room.
 	They argued all night,
 	Over who had the right,
 To do what, and with which, and to whom.
@@ -1785,7 +1755,7 @@ There once was a fairy named Avers
 Who encircled his cock with lifesavers.
 	Though buggers all claimed
 	That their asses were maimed,
-Sixy-niners all cheered the new flavors.
+Sixty-niners all cheered the new flavors.
 %
 There once was a fellow named Bob
 Who in sexual ways was a snob.
@@ -1821,7 +1791,7 @@ There once was a fencer named Fisk,
 Whose speed was incredibly brisk.
 	So fast was his action,
 	The Fitzgerald contraction,
-Foreshortended his foil to a disk.
+Foreshortened his foil to a disk.
 %
 There once was a fiesty young terrier
 Who liked to bite girls on the derriere.
@@ -1986,7 +1956,7 @@ Fell in love with a virile young Tartar.
 And cried: "For that I'll be a martyr!"
 %
 There once was a lady named Clair,
-Who posessed a magnificent pair.
+Who possessed a magnificent pair.
 	Or that's what I thought,
 	Till I saw one get caught,
 On a thorn and begin losing air.
@@ -2035,12 +2005,6 @@ Who always ate soup with a fork.
 	Either fish, foul or flesh,
 I otherwise finish too quick."
 %
-There once was a man from Exameter
-Who had a prodigious diameter
-	But it wasn't the size
-	That brought forth the cries
-'Twas his rythm, iambic pentameter.
-%
 There once was a man from Nantucket
 Who kept all his cash in a bucket.
 	His daughter, named Nan,
@@ -2077,12 +2041,6 @@ Who could put it up to her kidney.
 	Put it up to her neck;
 He had a big one, now didn't he?
 %
-There once was a man named Lodge,
-who had seatbelts installed in his Dodge.
-	When his date was strapped in,
-	He committed a sin,
-without ever leaving the garage.
-%
 There once was a man named McGruder,
 Who canoed with a girl in Bermuder.
 	But the girl thought it crude,
@@ -2169,8 +2127,8 @@ Or a breeches-buoy swung from the masthead.
 %
 There once was a Scot named McAmeter
 With a tool of prodigious diameter.
-	It was not the size
-	That cause such surprise;
+	But it wasn't the size
+	That caused such surprise;
 'Twas his rhythm -- iambic pentameter.
 %
 There once was a son-of-a-bitch,
@@ -2292,7 +2250,7 @@ Who'd a really enormous vagina,
 And used it for docking a liner.
 %
 There was a fat man from Rangoon
-Whose prick was much like a ballon.
+Whose prick was much like a balloon.
 	He tried hard to ride her
 	And when finally inside her
 She thought she was pregnant too soon.
@@ -2706,12 +2664,6 @@ Was prodigiously massive and long.
 	Two testes did hang
 That attracted a curious throng.
 %
-There was a young gaucho named Bruno
-Who said, "Screwing is one thing I do know.
-	A woman is fine,
-	And a sheep is divine,
-But a llama is Numero Uno."
-%
 There was a young German named Ringer
 Who was screwing an opera singer.
 	Said he with a grin,
@@ -3075,7 +3027,7 @@ Whose screams could be heard for a block away.
 Cried, "God! I have cut his whole cock away!"
 %
 There was a young lad from Siam,
-Whose sexlife was caught in a jam.
+Whose sex life was caught in a jam.
 	He loved them real small,
 	'Cause they're funner to ball,
 So he went out and bought him a lamb!
@@ -3183,8 +3135,8 @@ Lodged tight in her hole so it seems.
 There was a young lady from Rio
 Who slept with the Fornier trio.
 	As she dropped her panties
-	She said, "No andanties
-I want this allegro con brio."
+	She said, "No andantes,
+I want this allegro con brio!"
 %
 There was a young lady from Siam
 Who said to her lover, one Kiam,
@@ -3300,12 +3252,6 @@ Who said, "I think skating's a bliss"
 	For a wheel off her skate
 .siht ekil gnihtemos pu hsinif reh edaM
 %
-There was a young lady named Clair
-Who possessed a magnificent pair;
-	At least so I thought
-	Till I saw one get caught
-On a thorn, and begin losing air.
-%
 There was a young lady named Dot
 Whose cunt was so terribly hot
 	That ten bishops of Rome
@@ -3393,7 +3339,7 @@ But if you got her alone, Oh God!
 %
 There was a young lady named May
 Who strolled in a park by the way,
-	And she met a youg man
+	And she met a young man
 	Who fucked her and ran --
 Now she goes to the park every day.
 %
@@ -3521,7 +3467,7 @@ I much prefer fucking to feeling."
 There was a young lady of fashion
 Who had oodles and oodles of passion.
 	To her lover she said,
-	As  they climbed into bed,
+	As they climbed into bed,
 "Here's one thing the bastards can't ration!"
 %
 There was a young lady of Fez
@@ -3627,7 +3573,7 @@ As her bridegroom got into the bed,
 You can get up my bottom instead."
 %
 There was a young lady whose cunt
-Could accomodate a small punt.
+Could accommodate a small punt.
 	Her mother said, "Annie,
 	It matches your fanny,
 Which never was that of a runt."
@@ -3818,6 +3764,12 @@ Who boasted so torrid a tool
 	Explored by this satyr
 Seemed almost unpleasantly cool.
 %
+There was a young man from the Coast
+Who had an affair with a ghost.
+	At the height of orgasm
+	Said the pallid phantasm,
+"I think I can feel it -- almost!"
+%
 There was a young man from Tibet-
 And this is the strangest one yet-
 	Whose tool was so long,
@@ -4206,7 +4158,7 @@ But alas! he was only a eunuch.
 %
 There was a young sportsman named Peel
 Who went for a trip on his wheel;
-	He pedalled for days
+	He pedaled for days
 	Through crepuscular haze,
 And returned feeling somewhat unreal.
 		-- Edward Gorey
@@ -4335,7 +4287,7 @@ Who would not pay a whore what he owed her.
 And pissed in his whiskey-and-soda.
 %
 There was an old curate of Hestion
-Who'd errect at the slightest suggestion.
+Who'd erect at the slightest suggestion.
 	But so small was his tool
 	He could scarce screw a spool,
 And a cunt was quite out of the question.
@@ -4522,7 +4474,7 @@ Who attempted an anthropoid ravish.
 And the anthropoid ravished McTavish.
 %
 There was an old whore from Silesia
-Who'd croke: "If my box doesn't please ya,
+Who'd croak: "If my box doesn't please ya,
 	For a slight extra sum
 	You can go up my bum
 But watchout or my tapeworm'll seize ya."
@@ -4737,7 +4689,7 @@ Fished, hidden in deep shore-grass,
 Your sinkers -- they're banging my ass."
 %
 Two eager young men from Cawnpore
-Once buggared and fucked the same whore.
+Once buggered and fucked the same whore.
 	But her partition split
 	And the blood and the shit
 Rolled out in a mess on the floor.
@@ -4785,7 +4737,7 @@ Who'd been bedded and banged in the palace,
 She replied, "He's a jolly good phallus!"
 %
 When you fuck little Annie in Anza
-You get a great bossom bonanza:
+You get a great bosom bonanza:
 	Sucking Annie's soft tits
 	Makes her throw fifty fits,
 And the fuck is a sextravaganza!
@@ -4821,7 +4773,7 @@ His model reclined on a ladder.
 	Suggested coition,
 So he leapt up the ladder and had 'er.
 %
-While travelling in farthest Tibet,
+While traveling in farthest Tibet,
 Lord Irongate found cause to regret
 	The buttered-up tea,
 	A pain in his knee,
@@ -0,0 +1,463 @@
+# $FreeBSD$
+abbess's
+Abercrombie
+Aberystwyth
+acrost
+Aden
+Ades
+Alsace
+altera
+Amphigorey
+anatomies
+andantes
+Annie's
+Annista
+Antigua
+Anza
+Apres
+archeologist
+Arden
+ARPAnaut
+arsehole
+astonishment's
+Asturias
+Attila
+ausgefuckt
+Azores
+backsides
+ballocks
+Baroda
+Bartholin
+Batonger
+Baugh
+Bavel
+beabrve
+Beaconsfield
+beastial
+Beaulieu
+Beever
+belican
+Benares
+Bergere
+Bermuder
+berserkly
+bettera
+Bicester
+Bingly
+Bloch
+Blott
+Blount
+Bluth
+boffed
+bologna
+Bonaire
+boney
+Breerley
+bridegroom's
+Brienz
+Brighton
+Brillo
+brio
+Bronix
+Bruckner
+Bruges
+Buckingham
+Bude
+bull's
+busiasm
+bustles
+Byrd
+Cah'lina
+Cajon
+callgirl
+Camyre
+cannie
+Carmia
+Carranza's
+Carruthers
+Castellamare
+Cawnpore
+cervixes
+chanties
+Charteris
+Cheadle
+Cheddar
+Chichester
+Chichester's
+circumsized
+Ciss
+clarum
+clergyman's
+Clews
+Clombe
+Coblenz
+cocksucking
+coish
+Condover
+coxing
+Coxsaxie
+creame
+Crewe
+crewmates
+Cribbs
+crusader's
+curat
+d'hotel
+d'Isere
+d'oeuvres
+Daguerrodargue
+Decatur
+deflowered
+deflowers
+Detroit
+detumesced
+Devizes
+Dieu
+dillie
+disait
+Dispar
+dooflicker
+doric
+Drambuie
+draymen
+dribblings
+Drumrig
+duck's
+Duddee
+Dumfries
+Dundee
+Dunoon
+duply
+Durand
+Durcan
+Ealing
+eastertide
+edaM
+eighths
+ekil
+elihW
+Ells
+epousetta
+erat
+Ermintrude's
+Eroticon
+ESC
+Esser
+Eton
+exige
+eyesight's
+Fabia
+faggot
+faire
+fanny
+fart
+farta
+farted
+farter
+farting
+farts
+fecerat
+Feeney
+fellatrix
+fellatrix's
+Fenner
+Fennis
+festooned
+festoons
+fidgital
+fiesty
+Fleager
+floozie
+Folies
+foreskins
+Forgeteth
+Fornier
+frigged
+frigger
+frigging
+fritz
+fuckener
+fucking'em
+Fuckoscope
+fuckstress
+fuddled
+Fyfe
+Gamahuchee
+Gasted
+gaucho
+gawked
+Gaza
+geminarum
+Glengozzle
+gnihtemos
+gniyl
+Gomorrah
+goosey
+gooster
+Gorey
+Gratian
+Gression
+guerre
+Hank's
+Harper's
+Harwich
+helican
+Herridge
+Herts
+Hestion
+hetera
+Heuser
+hexahedronical
+hexed
+hsinif
+huic
+Huxham
+Hyde
+hymen's
+Ickes
+Ignatious
+iguanas
+IIE
+Illiac
+intacto
+interflex
+Irongate
+itchez
+jello
+Jodhpur
+Johore
+joile
+Kew
+Kewry
+Khartoum
+Kiam
+Kilkenny
+Kimble
+Kissen
+Kornbluth
+Kotex
+Kroll
+Kutki
+lacklustre
+Lahore
+Lancelot
+laundress
+Leeds
+Lefebrve
+Lesbian's
+lifesavers
+lilly
+Lizes
+llamas
+Llanfairpwllgwyngyll
+LLewellyn
+Longet
+looky
+Lorentz
+lovemaking
+Lowe
+LSD
+Luntz
+lusus
+Mable
+MacDougall
+Magnifique
+Mais
+Maitre
+Mam'selle
+Manchukuo
+Mandel
+Manhasset
+mari
+Maurier
+maxi
+Mayence
+McAmeter
+McFee
+Mcgoffin
+McGru
+McGruder
+McMeanus
+McSweeny
+McTavish
+meanie
+meanies
+meany
+mentis
+midgets
+minimis
+missin
+misspent
+Moebius
+moi
+moister
+mole's
+Mons
+Moxie
+muckener
+n'est
+Natches
+naturae
+navel's
+Nemetia
+nighty
+nihili
+niners
+Noah's
+Norte
+nuki
+nutless
+O'Clare
+O'Doole
+O'Malley
+obbligatos
+octagenerian
+organed
+orter
+Ostend
+oversexed
+Paloma
+papooses
+paree
+Parridge
+patchez
+pecker's
+peckers
+peedle
+peeholes
+peenies
+pees
+Penzance
+pink'un
+pissin
+Pitlochry
+Pitts
+plaudits
+pleasure's
+ploughman
+Plunnery
+port's
+Pourtant
+Priam
+Pridgets
+prodigical
+pruntz
+Pryne
+Prynne
+Quaffed
+Quelle
+question's
+quibblings
+quim
+quimmy
+quints
+ravished
+Reims
+reknown
+Resounded
+retriebrve
+Rhyll
+rococco
+rogered
+Salinas
+Sandem
+savoir
+Schmitz
+scratchez
+seatbelts
+secours
+secret's
+sextravaganza
+Shedd
+shins
+Shittlecock
+shitty
+shootin
+shrewder
+Siegel
+siht
+skating's
+Slatey
+Smokey
+sneaux
+sniffin
+sophomore'd
+spaceman
+spikey
+Spitzbergen
+Sprotic
+Spyder
+Stamboul
+Stillson
+Streator
+Strensall
+strewed
+stroda
+Suki
+Susiasm
+Sweenies
+Swoboda
+T'was
+Tagore
+Tante
+tapeworm'll
+Terminus's
+testicularum
+thing's
+Thrace
+Thrums
+Tiffan
+tis
+titted
+titties
+Tobruk
+tooty
+topsheet
+tous
+Trans
+Trasket
+trifurcated
+triplici
+trop
+truckloads
+trysts
+Tunney
+Tupper
+Tupps
+Twickenham
+Twiss
+Twould
+Udgeon
+Uhura
+urgin's
+Usenetter
+vaginae
+vaginoid
+Vassar
+Venerio
+Ventry
+verkeley
+Vesuvial
+Virginny
+virgo
+Vitalis
+vobiscum
+Vogel's
+Voulait
+wanna
+Weaveth
+weeney
+Whatam
+Whyte
+Wimley
+Wohunt
+Wubley
+Wylde
+ylbatrofmoc
+yontiff
+Yoric
+Yost
+yourselfer
+Zerubbabel
+Zerubbabub
+Zug
@@ -1,16 +1,4 @@
 %%$FreeBSD$
-You can lead a horticulture, but you can't make her think.
-%
-When you're up to your nose in shit,
-be sure to keep your mouth shut.
-%
-One's life tends to be like a beaver's,
-one dam thing after another.
-%
-Never sleep with anyone crazier than yourself.
-%
-Old Scottish prayer:  O Lord, grant that we may always be
-right, for thou knowest we will never change our minds.
 %
 All probabilities are 50%: either a thing will
 happen or it won't.
@@ -19,13 +7,24 @@ This is especially true when dealing with women.

 Likelihoods, however, are 90% against you.
 %
-Sow your wild oats on Saturday night - then on
-Sunday pray for crop failure.
-%
 Early to rise and early to bed makes a male
 healthy and wealthy and dead.
 %
+It's always the wrong time of the month.
+%
+Never sleep with anyone crazier than yourself.
+%
+One's life tends to be like a beaver's,
+one dam thing after another.
+%
 Pity the poor egg;
 It only gets laid once in its life.
 %
-It's always the wrong time of the month.
+Sow your wild oats on Saturday night - then on
+Sunday pray for crop failure.
+%
+When you're up to your nose in shit,
+be sure to keep your mouth shut.
+%
+You can lead a horticulture, but you can't make her think.
+%
@@ -0,0 +1,36 @@
+# $FreeBSD$
+abend
+ACF
+barbeque
+Carroll
+Chevrolets
+countercan't
+crabgrass
+DP
+feebs
+Freud's
+fruitcakes
+gotta
+headlamp
+IQ
+IRS
+l'orange
+MCP
+Murphy's
+paranoids
+plumber's
+postmortems
+Poul
+profanities
+RACF
+radiologists
+roccoco
+saad
+Siezbo
+simps
+Souffles
+subordinate's
+superstar
+szechuan
+Twinkies
+walkthroughs
@@ -1,4 +1,108 @@
 %% $FreeBSD$
+%
+	"... freedom ... is a worship word..."
+	"It is our worship word too."
+		-- Cloud William and Kirk, "The Omega Glory", stardate unknown
+%
+	"Beauty is transitory."
+	"Beauty survives."
+		-- Spock and Kirk, "That Which Survives", stardate unknown
+%
+	"Can you imagine how life could be improved if we could do away
+with jealousy, greed, hate ..."
+	"It can also be improved by eliminating love, tenderness,
+sentiment -- the other side of the coin"
+		-- Dr. Roger Corby and Kirk,
+		   "What are Little Girls Made Of?", stardate 2712.4
+%
+	"Evil does seek to maintain power by suppressing the truth."
+	"Or by misleading the innocent."
+		-- Spock and McCoy, "And The Children Shall Lead",
+		   stardate 5029.5.
+%
+	"Get back to your stations!"
+	"We're beaming down to the planet, sir."
+		-- Kirk and Mr. Leslie, "This Side of Paradise",
+		   stardate 3417.3
+%
+	"I think they're going to take all this money that we spend now
+on war and death --"
+	"And make them spend it on life."
+		-- Edith Keeler and Kirk, "The City on the Edge of Forever",
+		   stardate unknown.
+%
+	"It's hard to believe that something which is neither seen nor
+felt can do so much harm."
+	"That's true.  But an idea can't be seen or felt.  And that's
+what kept the Troglytes in the mines all these centuries.  A mistaken idea."
+		-- Vanna and Kirk, "The Cloud Minders", stardate 5819.0
+%
+	"Life and death are seldom logical."
+	"But attaining a desired goal always is."
+		-- McCoy and Spock, "The Galileo Seven", stardate 2821.7
+%
+	"Logic and practical information do not seem to apply here."
+	"You admit that?"
+	"To deny the facts would be illogical, Doctor"
+		-- Spock and McCoy, "A Piece of the Action", stardate unknown
+%
+	"No one talks peace unless he's ready to back it up with war."
+	"He talks of peace if it is the only way to live."
+		-- Colonel Green and Surak of Vulcan, "The Savage Curtain",
+		   stardate 5906.5.
+%
+	"That unit is a woman."
+	"A mass of conflicting impulses."
+		-- Spock and Nomad, "The Changeling", stardate 3541.9
+%
+	"The combination of a number of things to make existence worthwhile."
+	"Yes, the philosophy of 'none,' meaning 'all.'"
+		-- Spock and Lincoln, "The Savage Curtain", stardate 5906.4
+%
+	"The glory of creation is in its infinite diversity."
+	"And in the way our differences combine to create meaning and
+beauty."
+		-- Dr. Miranda Jones and Spock,
+		   "Is There in Truth No Beauty?", stardate 5630.8
+%
+	"The release of emotion is what keeps us healthy.  Emotionally
+healthy."
+	"That may be, Doctor.  However, I have noted that the healthy
+release of emotion is frequently unhealthy for those closest to you."
+		-- McCoy and Spock, "Plato's Stepchildren", stardate 5784.3
+%
+	"There's only one kind of woman ..."
+	"Or man, for that matter.  You either believe in yourself or
+you don't."
+		-- Kirk and Harry Mudd, "Mudd's Women", stardate 1330.1
+%
+	"We have the right to survive!"
+	"Not by killing others."
+		-- Deela and Kirk, "Wink of An Eye", stardate 5710.5
+%
+	"What a terrible way to die."
+	"There are no good ways."
+		-- Sulu and Kirk, "That Which Survives", stardate unknown
+%
+	"What happened to the crewman?"
+	"The M-5 computer needed a new power source, the crewman merely
+got in the way."
+		-- Kirk and Dr. Richard Daystrom, "The Ultimate Computer",
+		   stardate 4731.3.
+%
+... bacteriological warfare ... hard to believe we were once foolish
+enough to play around with that.
+		-- McCoy, "The Omega Glory", stardate unknown
+%
+... The prejudices people feel about each other disappear when they get
+to know each other.
+		-- Kirk, "Elaan of Troyius", stardate 4372.5
+%
+... The things love can drive a man to -- the ecstasies, the
+miseries, the broken rules, the desperate chances, the glorious
+failures and the glorious victories.
+		-- McCoy, "Requiem for Methuselah", stardate 5843.7
+%
 A father doesn't destroy his children.
 		-- Lt. Carolyn Palamas, "Who Mourns for Adonais?",
 		   stardate 3468.1.
@@ -46,14 +150,6 @@ Another war ... must it always be so?  How many comrades have we lost
 in this way? ...  Obedience.  Duty.  Death, and more death ...
 		-- Romulan Commander, "Balance of Terror", stardate 1709.2
 %
-... bacteriological warfare ... hard to believe we were once foolish
-enough to play around with that.
-		-- McCoy, "The Omega Glory", stardate unknown
-%
-"Beauty is transitory."
-"Beauty survives."
-		-- Spock and Kirk, "That Which Survives", stardate unknown
-%
 Behind every great man, there is a woman -- urging him on.
 		-- Harry Mudd, "I, Mudd", stardate 4513.3
 %
@@ -66,14 +162,6 @@ able to break it, but, I'll bet you credits to Navy Beans we can put a
 dent in it.
 		-- deSalle, "Catspaw", stardate 3018.2
 %
-"Can you imagine how life could be improved if we could do away with
-jealousy, greed, hate ..."
-
-"It can also be improved by eliminating love, tenderness, sentiment --
-the other side of the coin"
-		-- Dr. Roger Corby and Kirk, "What are Little Girls Made Of?",
-		   stardate 2712.4
-%
 Change is the essential process of all existence.
 		-- Spock, "Let That Be Your Last Battlefield", stardate 5730.2
 %
@@ -89,13 +177,13 @@ man.  And nothing can replace it or him.
 Conquest is easy. Control is not.
 		-- Kirk, "Mirror, Mirror", stardate unknown
 %
-Death, when unnecessary, is a tragic thing.
-		-- Flint, "Requiem for Methuselah", stardate 5843.7
-%
 Death.  Destruction.  Disease.  Horror.  That's what war is all about.
 That's what makes it a thing to be avoided.
 		-- Kirk, "A Taste of Armageddon", stardate 3193.0
 %
+Death, when unnecessary, is a tragic thing.
+		-- Flint, "Requiem for Methuselah", stardate 5843.7
+%
 Do you know about being with somebody?  Wanting to be?  If I had the
 whole universe, I'd give it to you, Janice.  When I see you, I feel
 like I'm hungry all over.  Do you know how that feels?
@@ -132,39 +220,25 @@ mistakes.
 Every living thing wants to survive.
 		-- Spock, "The Ultimate Computer", stardate 4731.3
 %
-"Evil does seek to maintain power by suppressing the truth."
-"Or by misleading the innocent."
-		-- Spock and McCoy, "And The Children Shall Lead",
-		   stardate 5029.5.
-%
 Extreme feminine beauty is always disturbing.
 		-- Spock, "The Cloud Minders", stardate 5818.4
 %
-Fascinating is a word I use for the unexpected.
-		-- Spock, "The Squire of Gothos", stardate 2124.5
-%
 Fascinating, a totally parochial attitude.
 		-- Spock, "Metamorphosis", stardate 3219.8
 %
+Fascinating is a word I use for the unexpected.
+		-- Spock, "The Squire of Gothos", stardate 2124.5
+%
 First study the enemy.  Seek weakness.
 		-- Romulan Commander, "Balance of Terror", stardate 1709.2
 %
 Four thousand throats may be cut in one night by a running man.
 		-- Klingon Soldier, "Day of the Dove", stardate unknown
 %
-"... freedom ... is a worship word..."
-"It is our worship word too."
-		-- Cloud William and Kirk, "The Omega Glory", stardate unknown
-%
 Genius doesn't work on an assembly line basis.  You can't simply say,
 "Today I will be brilliant."
 		-- Kirk, "The Ultimate Computer", stardate 4731.3
 %
-"Get back to your stations!"
-"We're beaming down to the planet, sir."
-		-- Kirk and Mr. Leslie, "This Side of Paradise",
-		   stardate 3417.3
-%
 He's dead, Jim
 		-- McCoy, "The Devil in the Dark", stardate 3196.1
 %
@@ -192,26 +266,11 @@ nor am I frightened of it.  It simply exists, and I will do whatever
 logically needs to be done.
 		-- Spock, "The Galileo Seven", stardate 2812.7
 %
-"I think they're going to take all this money that we spend now on war
-and death --"
-"And make them spend it on life."
-		-- Edith Keeler and Kirk, "The City on the Edge of Forever",
-		   stardate unknown.
-%
 I thought my people would grow tired of killing.  But you were right,
 they see it is easier than trading.  And it has its pleasures.  I feel
 it myself.  Like the hunt, but with richer rewards.
 		-- Apella, "A Private Little War", stardate 4211.8
 %
-I'm a soldier, not a diplomat.  I can only tell the truth.
-		-- Kirk, "Errand of Mercy", stardate 3198.9
-%
-I'm frequently appalled by the low regard you Earthmen have for life.
-		-- Spock, "The Galileo Seven", stardate 2822.3
-%
-I've already got a female to worry about.  Her name is the Enterprise.
-		-- Kirk, "The Corbomite Maneuver", stardate 1514.0
-%
 If a man had a child who'd gone anti-social, killed perhaps, he'd still
 tend to protect that child.
 		-- McCoy, "The Ultimate Computer", stardate 4731.3
@@ -225,6 +284,12 @@ If some day we are defeated, well, war has its fortunes, good and bad.
 If there are self-made purgatories, then we all have to live in them.
 		-- Spock, "This Side of Paradise", stardate 3417.7
 %
+I'm a soldier, not a diplomat.  I can only tell the truth.
+		-- Kirk, "Errand of Mercy", stardate 3198.9
+%
+I'm frequently appalled by the low regard you Earthmen have for life.
+		-- Spock, "The Galileo Seven", stardate 2822.3
+%
 Immortality consists largely of boredom.
 		-- Zefrem Cochrane, "Metamorphosis", stardate 3219.8
 %
@@ -278,12 +343,8 @@ It would be illogical to kill without reason
 It would seem that evil retreats when forcibly confronted
 		-- Yarnek of Excalbia, "The Savage Curtain", stardate 5906.5
 %
-"It's hard to believe that something which is neither seen nor felt can
-do so much harm."
-
-"That's true.  But an idea can't be seen or felt.  And that's what kept
-the Troglytes in the mines all these centuries.  A mistaken idea."
-		-- Vanna and Kirk, "The Cloud Minders", stardate 5819.0
+I've already got a female to worry about.  Her name is the Enterprise.
+		-- Kirk, "The Corbomite Maneuver", stardate 1514.0
 %
 Killing is stupid; useless!
 		-- McCoy, "A Private Little War", stardate 4211.8
@@ -300,18 +361,9 @@ Landru! Guide us!
 Leave bigotry in your quarters; there's no room for it on the bridge.
 		-- Kirk, "Balance of Terror", stardate 1709.2
 %
-"Life and death are seldom logical."
-"But attaining a desired goal always is."
-		-- McCoy and Spock, "The Galileo Seven", stardate 2821.7
-%
 Live long and prosper.
 		-- Spock, "Amok Time", stardate 3372.7
 %
-"Logic and practical information do not seem to apply here."
-"You admit that?"
-"To deny the facts would be illogical, Doctor"
-		-- Spock and McCoy, "A Piece of the Action", stardate unknown
-%
 Lots of people drink from the wrong bottle sometimes.
 		-- Edith Keeler, "The City on the Edge of Forever",
 		   stardate unknown
@@ -323,7 +375,7 @@ Madness has no purpose.  Or reason.  But it may have a goal.
 		-- Spock, "The Alternative Factor", stardate 3088.7
 %
 Many Myths are based on truth
-		-- Spock, "The Way to Eden",  stardate 5832.3
+		-- Spock, "The Way to Eden", stardate 5832.3
 %
 Men don't talk peace unless they're ready to back it up with war.
 		-- Col. Green, "The Savage Curtain", stardate 5906.4
@@ -352,11 +404,6 @@ No one can guarantee the actions of another.
 No one may kill a man.  Not for any purpose.  It cannot be condoned.
 		-- Kirk, "Spock's Brain", stardate 5431.6
 %
-"No one talks peace unless he's ready to back it up with war."
-"He talks of peace if it is the only way to live."
-		-- Colonel Green and Surak of Vulcan, "The Savage Curtain",
-		   stardate 5906.5.
-%
 No one wants war.
 		-- Kirk, "Errand of Mercy", stardate 3201.7
 %
@@ -440,14 +487,6 @@ Suffocating together ... would create heroic camaraderie.
 Superior ability breeds superior ambition.
 		-- Spock, "Space Seed", stardate 3141.9
 %
-"That unit is a woman."
-"A mass of conflicting impulses."
-		-- Spock and Nomad, "The Changeling", stardate 3541.9
-%
-"The combination of a number of things to make existence worthwhile."
-"Yes, the philosophy of 'none,' meaning 'all.'"
-		-- Spock and Lincoln, "The Savage Curtain", stardate 5906.4
-%
 The face of war has never changed.  Surely it is more logical to heal
 than to kill.
 		-- Surak of Vulcan, "The Savage Curtain", stardate 5906.5
@@ -457,11 +496,6 @@ pattern.  We don't fear it as you do.
 		-- Proconsul Marcus Claudius, "Bread and Circuses",
 		   stardate 4041.2
 %
-"The glory of creation is in its infinite diversity."
-"And in the way our differences combine to create meaning and beauty."
-		-- Dr. Miranda Jones and Spock, "Is There in Truth No Beauty?",
-		   stardate 5630.8
-%
 The heart is not a logical organ.
 		-- Dr. Janet Wallace, "The Deadly Years", stardate 3479.4
 %
@@ -490,27 +524,12 @@ destroying or interfering with the creation of that which we love so
 deeply -- life in every form from fetus to developed being.
 		-- Hodin of Gideon, "The Mark of Gideon", stardate 5423.4
 %
-... The prejudices people feel about each other disappear when they get
-to know each other.
-		-- Kirk, "Elaan of Troyius", stardate 4372.5
-%
-"The release of emotion is what keeps us healthy.  Emotionally healthy."
-
-"That may be, Doctor.  However, I have noted that the healthy release
-of emotion is frequently unhealthy for those closest to you."
-		-- McCoy and Spock, "Plato's Stepchildren", stardate 5784.3
-%
 The sight of death frightens them [Earthers].
 		-- Kras the Klingon, "Friday's Child", stardate 3497.2
 %
 The sooner our happiness together begins, the longer it will last.
 		-- Miramanee, "The Paradise Syndrome", stardate 4842.6
 %
-... The things love can drive a man to -- the ecstasies, the
-miseries, the broken rules, the desperate chances, the glorious
-failures and the glorious victories.
-		-- McCoy, "Requiem for Methuselah", stardate 5843.7
-%
 There are always alternatives.
 		-- Spock, "The Galileo Seven", stardate 2822.3
 %
@@ -551,10 +570,6 @@ There's nothing disgusting about it [the Companion].  It's just another
 life form, that's all.  You get used to those things.
 		-- McCoy, "Metamorphosis", stardate 3219.8
 %
-"There's only one kind of woman ..."
-"Or man, for that matter.  You either believe in yourself or you don't."
-		-- Kirk and Harry Mudd, "Mudd's Women", stardate 1330.1
-%
 This cultural mystique surrounding the biological function -- you
 realize humans are overly preoccupied with the subject.
 		-- Kelinda the Kelvan, "By Any Other Name", stardate 4658.9
@@ -600,12 +615,6 @@ Vulcans worship peace above all.
 Wait!  You have not been prepared!
 		-- Mr. Atoz, "Tomorrow is Yesterday", stardate 3113.2
 %
-War is never imperative.
-		-- McCoy, "Balance of Terror", stardate 1709.2
-%
-War isn't a good life, but it's life.
-		-- Kirk, "A Private Little War", stardate 4211.8
-%
 [War] is instinctive.  But the instinct can be fought.  We're human
 beings with the blood of a million savage years on our hands!  But we
 can stop it.  We can admit that we're killers ... but we're not going
@@ -613,6 +622,12 @@ to kill today.  That's all it takes!  Knowing that we're not going to
 kill today!
 		-- Kirk, "A Taste of Armageddon", stardate 3193.0
 %
+War is never imperative.
+		-- McCoy, "Balance of Terror", stardate 1709.2
+%
+War isn't a good life, but it's life.
+		-- Kirk, "A Private Little War", stardate 4211.8
+%
 We do not colonize.  We conquer.  We rule.  There is no other way for
 us.
 		-- Rojan, "By Any Other Name", stardate 4657.5
@@ -628,10 +643,6 @@ development.
 We have phasers, I vote we blast 'em!
 		-- Bailey, "The Corbomite Maneuver", stardate 1514.2
 %
-"We have the right to survive!"
-"Not by killing others."
-		-- Deela and Kirk, "Wink of An Eye", stardate 5710.5
-%
 We Klingons believe as you do -- the sick should die.  Only the strong
 should live.
 		-- Kras, "Friday's Child", stardate 3497.2
@@ -641,21 +652,10 @@ But when it comes to your job -- that's different.  And it always will
 be different.
 		-- McCoy, "The Ultimate Computer", stardate 4729.4
 %
-"What happened to the crewman?"
-
-"The M-5 computer needed a new power source, the crewman merely got in
-the way."
-		-- Kirk and Dr. Richard Daystrom, "The Ultimate Computer",
-		   stardate 4731.3.
-%
 What kind of love is that?  Not to be loved; never to have shown love.
 		-- Commissioner Nancy Hedford, "Metamorphosis",
 		   stardate 3219.8
 %
-"What terrible way to die."
-"There are no good ways."
-		-- Sulu and Kirk, "That Which Survives", stardate unknown
-%
 When a child is taught ... its programmed with simple instructions --
 and at some point, if its mind develops properly, it exceeds the sum of
 what it was taught, thinks independently.
@@ -703,6 +703,9 @@ woman.
 Yes, it is written.  Good shall always destroy evil.
 		-- Sirah the Yang, "The Omega Glory", stardate unknown
 %
+You!  What PLANET is this?!
+		-- McCoy, "The City on the Edge of Forever", stardate 3134.0
+%
 You are an excellent tactician, Captain.  You let your second in
 command attack while you sit and watch for weakness.
 		-- Khan Noonian Singh, "Space Seed", stardate 3141.9
@@ -735,9 +738,6 @@ soldiers.
 		-- Kor, the Klingon Commander, "Errand of Mercy",
 		   stardate 3201.7
 %
-You!  What PLANET is this?!
-		-- McCoy, "The City on the Edge of Forever", stardate 3134.0
-%
 You'll learn something about men and women -- the way they're supposed
 to be.  Caring for each other, being happy with each other, being good
 to each other.  That's what we call love.  You'll like that a lot.
@@ -755,3 +755,4 @@ You're too beautiful to ignore.  Too much woman.
 Youth doesn't excuse everything.
 		-- Dr. Janice Lester (in Kirk's body), "Turnabout Intruder",
 		   stardate 5928.5.
+%
@@ -1,4 +1,69 @@
 %% $FreeBSD$
+%
+	Talking Pinhead Blues:
+Oh, I LOST my ``HELLO KITTY'' DOLL and I get BAD reception on channel
+    TWENTY-SIX!!
+
+Th'HOSTESS FACTORY is closin' down and I just heard ZASU PITTS has been
+    DEAD for YEARS..  (sniff)
+
+My PLATFORM SHOE collection was CHEWED up by th' dog, ALEXANDER HAIG
+    won't let me take a SHOWER 'til Easter ... (snurf)
+
+So I went to the kitchen, but WALNUT PANELING whup me upside mah HAID!!
+    (on no, no, no..  Heh, heh)
+%
+... bleakness ... desolation ... plastic forks ...
+%
+... he dominates the DECADENT SUBWAY SCENE.
+%
+... I don't know why but, suddenly, I want to discuss declining I.Q.
+LEVELS with a blue ribbon SENATE SUB-COMMITTEE!
+%
+... I don't like FRANK SINATRA or his CHILDREN.
+%
+... I have read the INSTRUCTIONS ...
+%
+-- I have seen the FUN --
+%
+-- I love KATRINKA because she drives a PONTIAC.  We're going away
+now.  I fed the cat.
+%
+... I see TOILET SEATS ...
+%
+... I think I'd better go back to my DESK and toy with a few common
+MISAPPREHENSIONS ...
+%
+... I want a COLOR T.V. and a VIBRATING BED!!!
+%
+... I want FORTY-TWO TRYNEL FLOATATION SYSTEMS installed within
+SIX AND A HALF HOURS!!!
+%
+... ich bin in einem dusenjet ins jahr 53 vor chr ... ich lande im
+antiken Rom ...  einige gladiatoren spielen scrabble ... ich rieche
+PIZZA ...
+%
+... If I had heart failure right now, I couldn't be a more fortunate
+man!!
+%
+... I'm IMAGINING a sensuous GIRAFFE, CAVORTING in the BACK ROOM
+of a KOSHER DELI --
+%
+... My pants just went on a wild rampage through a Long Island Bowling
+Alley!!
+%
+... Now, it's time to "HAVE A NAGEELA"!!
+%
+... or were you driving the PONTIAC that HONKED at me in MIAMI last
+Tuesday?
+%
+... the HIGHWAY is made out of LIME JELLO and my HONDA is a barbequeued
+OYSTER!  Yum!
+%
+... the MYSTERIANS are in here with my CORDUROY SOAP DISH!!
+%
+... this must be what it's like to be a COLLEGE GRADUATE!!
+%
 A can of ASPARAGUS, 73 pigeons, some LIVE ammo, and a FROZEN DAQUIRI!!
 %
 A dwarf is passing out somewhere in Detroit!
@@ -81,8 +146,6 @@ BELA LUGOSI is my co-pilot ...
 %
 BI-BI-BI-BI-BI-BI-BI-BI-BI-BI-BI-BI-BI-BI-BI-BI-BI-BI-BI-BI-BI-BI-BI-BI-
 %
-... bleakness ... desolation ... plastic forks ...
-%
 Bo Derek ruined my life!
 %
 Boy, am I glad it's only 1971...
@@ -93,6 +156,9 @@ But they went to MARS around 1953!!
 %
 But was he mature enough last night at the lesbian masquerade?
 %
+Calling J-Man Kink.  Calling J-Man Kink.  Hash missile sighted, target
+Los Angeles.  Disregard personal feelings about city and intercept.
+%
 Can I have an IMPULSE ITEM instead?
 %
 Can you MAIL a BEAN CAKE?
@@ -220,8 +286,6 @@ today!
 Has everybody got HALVAH spread all over their ANKLES?? ...  Now, it's
 time to "HAVE A NAGEELA"!!
 %
-... he dominates the DECADENT SUBWAY SCENE.
-%
 He is the MELBA-BEING ... the ANGEL CAKE ... XEROX him ... XEROX him --
 %
 He probably just wants to take over my CELLS and then EXPLODE inside me
@@ -229,23 +293,23 @@ like a BARREL of runny CHOPPED LIVER!  Or maybe he'd like to
 PSYCHOLIGICALLY TERRORISE ME until I have no objection to a RIGHT-WING
 MILITARY TAKEOVER of my apartment!!  I guess I should call AL PACINO!
 %
-HELLO KITTY gang terrorizes town, family STICKERED to death!
+Hello?  Enema Bondage?  I'm calling because I want to be happy, I
+guess ...
+%
+Hello.  I know the divorce rate among unmarried Catholic Alaskan
+females!!
+%
+Hello...  IRON CURTAIN?  Send over a SAUSAGE PIZZA!  World War III?  No
+thanks!
+%
+Hello.  Just walk along and try NOT to think about your INTESTINES
+being almost FORTY YARDS LONG!!
 %
 HELLO, everybody, I'm a HUMAN!!
 %
 Hello, GORRY-O!!  I'm a GENIUS from HARVARD!!
 %
-Hello.  I know the divorce rate among unmarried Catholic Alaskan
-females!!
-%
-Hello.  Just walk along and try NOT to think about your INTESTINES
-being almost FORTY YARDS LONG!!
-%
-Hello...  IRON CURTAIN?  Send over a SAUSAGE PIZZA!  World War III?  No
-thanks!
-%
-Hello?  Enema Bondage?  I'm calling because I want to be happy, I
-guess ...
+HELLO KITTY gang terrorizes town, family STICKERED to death!
 %
 Here I am at the flea market but nobody is buying my urine sample
 bottles ...
@@ -334,14 +398,9 @@ I don't believe there really IS a GAS SHORTAGE ... I think it's all
 just a BIG HOAX on the part of the plastic sign salesmen -- to sell
 more numbers!!
 %
-... I don't know why but, suddenly, I want to discuss declining I.Q.
-LEVELS with a blue ribbon SENATE SUB-COMMITTEE!
-%
 I don't know WHY I said that ... I think it came from the FILLINGS in
 my read molars ...
 %
-... I don't like FRANK SINATRA or his CHILDREN.
-%
 I don't understand the HUMOUR of the THREE STOOGES!!
 %
 I feel ... JUGULAR ...
@@ -378,10 +437,6 @@ I have accepted Provolone into my life!
 %
 I have many CHARTS and DIAGRAMS..
 %
-... I have read the INSTRUCTIONS ...
-%
-- I have seen the FUN --
-%
 I have seen these EGG EXTENDERS in my Supermarket ...
 %
 I have seen these EGG EXTENDERS in my Supermarket ... I have read the
@@ -430,19 +485,16 @@ I Know A Joke
 %
 I know how to do SPECIAL EFFECTS!!
 %
-I know th'MAMBO!!  I have a TWO-TONE CHEMISTRY SET!!
-%
 I know things about TROY DONAHUE that can't even be PRINTED!!
 %
+I know th'MAMBO!!  I have a TWO-TONE CHEMISTRY SET!!
+%
 I left my WALLET in the BATHROOM!!
 %
 I like the way ONLY their mouths move ...  They look like DYING OYSTERS
 %
 I like your SNOOPY POSTER!!
 %
-- I love KATRINKA because she drives a PONTIAC.  We're going away
-now.  I fed the cat.
-%
 I love ROCK 'N ROLL!  I memorized the all WORDS to "WIPE-OUT" in
 1965!!
 %
@@ -460,8 +512,6 @@ I represent a sardine!!
 %
 I request a weekend in Havana with Phil Silvers!
 %
-... I see TOILET SEATS ...
-%
 I selected E5 ... but I didn't hear "Sam the Sham and the Pharoahs"!
 %
 I smell a RANCID CORN DOG!
@@ -470,9 +520,6 @@ I smell like a wet reducing clinic on Columbus Day!
 %
 I think I am an overnight sensation right now!!
 %
-... I think I'd better go back to my DESK and toy with a few common
-MISAPPREHENSIONS ...
-%
 I think I'll KILL myself by leaping out of this 14th STORY WINDOW while
 reading ERICA JONG'S poetry!!
 %
@@ -481,8 +528,6 @@ I think my career is ruined!
 I used to be a FUNDAMENTALIST, but then I heard about the HIGH
 RADIATION LEVELS and bought an ENCYCLOPEDIA!!
 %
-... I want a COLOR T.V. and a VIBRATING BED!!!
-%
 I want a VEGETARIAN BURRITO to go ... with EXTRA MSG!!
 %
 I want a WESSON OIL lease!!
@@ -492,9 +537,6 @@ I want another RE-WRITE on my CAESAR SALAD!!
 I want EARS!  I want two ROUND BLACK EARS to make me feel warm 'n
 secure!!
 %
-... I want FORTY-TWO TRYNEL FLOATATION SYSTEMS installed within
-SIX AND A HALF HOURS!!!
-%
 I want the presidency so bad I can already taste the hors d'oeuvres.
 %
 I want to dress you up as TALLULAH BANKHEAD and cover you with VASELINE
@@ -540,6 +582,31 @@ I'd like MY data-base JULIENNED and stir-fried!
 %
 I'd like some JUNK FOOD ... and then I want to be ALONE --
 %
+If a person is FAMOUS in this country, they have to go on the ROAD for
+MONTHS at a time and have their name misspelled on the SIDE of a
+GREYHOUND SCENICRUISER!!
+%
+If elected, Zippy pledges to each and every American a 55-year-old
+houseboy ...
+%
+If I am elected no one will ever have to do their laundry again!
+%
+If I am elected, the concrete barriers around the WHITE HOUSE will be
+replaced by tasteful foam replicas of ANN MARGARET!
+%
+If I felt any more SOPHISTICATED I would DIE of EMBARRASSMENT!
+%
+If I had a Q-TIP, I could prevent th' collapse of NEGOTIATIONS!!
+%
+If I pull this SWITCH I'll be RITA HAYWORTH!!  Or a SCIENTOLOGIST!
+%
+if it GLISTENS, gobble it!!
+%
+If our behavior is strict, we do not need fun!
+%
+If Robert Di Niro assassinates Walter Slezak, will Jodie Foster marry
+Bonzo??
+%
 I'll eat ANYTHING that's BRIGHT BLUE!!
 %
 I'll show you MY telex number if you show me YOURS ...
@@ -595,9 +662,6 @@ wealthy CORPORATE LAWYERS ...
 %
 I'm having fun HITCHHIKING to CINCINNATI or FAR ROCKAWAY!!
 %
-... I'm IMAGINING a sensuous GIRAFFE, CAVORTING in the BACK ROOM
-of a KOSHER DELI --
-%
 I'm in direct contact with many advanced fun CONCEPTS.
 %
 I'm into SOFTWARE!
@@ -653,45 +717,6 @@ REGIONS!
 %
 I'm ZIPPY the PINHEAD and I'm totally committed to the festive mode.
 %
-I've got a COUSIN who works in the GARMENT DISTRICT ...
-%
-I've got an IDEA!!  Why don't I STARE at you so HARD, you forget your
-SOCIAL SECURITY NUMBER!!
-%
-I've read SEVEN MILLION books!!
-%
-... ich bin in einem dusenjet ins jahr 53 vor chr ... ich lande im
-antiken Rom ...  einige gladiatoren spielen scrabble ... ich rieche
-PIZZA ...
-%
-If a person is FAMOUS in this country, they have to go on the ROAD for
-MONTHS at a time and have their name misspelled on the SIDE of a
-GREYHOUND SCENICRUISER!!
-%
-If elected, Zippy pledges to each and every American a 55-year-old
-houseboy ...
-%
-If I am elected no one will ever have to do their laundry again!
-%
-If I am elected, the concrete barriers around the WHITE HOUSE will be
-replaced by tasteful foam replicas of ANN MARGARET!
-%
-If I felt any more SOPHISTICATED I would DIE of EMBARRASSMENT!
-%
-If I had a Q-TIP, I could prevent th' collapse of NEGOTIATIONS!!
-%
-... If I had heart failure right now, I couldn't be a more fortunate
-man!!
-%
-If I pull this SWITCH I'll be RITA HAYWORTH!!  Or a SCIENTOLOGIST!
-%
-if it GLISTENS, gobble it!!
-%
-If our behavior is strict, we do not need fun!
-%
-If Robert Di Niro assassinates Walter Slezak, will Jodie Foster marry
-Bonzo??
-%
 In 1962, you could buy a pair of SHARKSKIN SLACKS, with a "Continental
 Belt," for $10.99!!
 %
@@ -746,6 +771,13 @@ It's OKAY -- I'm an INTELLECTUAL, too.
 %
 It's the RINSE CYCLE!!  They've ALL IGNORED the RINSE CYCLE!!
 %
+I've got a COUSIN who works in the GARMENT DISTRICT ...
+%
+I've got an IDEA!!  Why don't I STARE at you so HARD, you forget your
+SOCIAL SECURITY NUMBER!!
+%
+I've read SEVEN MILLION books!!
+%
 JAPAN is a WONDERFUL planet -- I wonder if we'll ever reach their level
 of COMPARATIVE SHOPPING ...
 %
@@ -780,17 +812,17 @@ Like I always say -- nothing can beat the BRATWURST here in DUSSELDORF!!
 %
 Loni Anderson's hair should be LEGALIZED!!
 %
+Look!  A ladder!  Maybe it leads to heaven, or a sandwich!
+%
+LOOK!!  Sullen American teens wearing MADRAS shorts and "Flock of
+Seagulls" HAIRCUTS!
+%
 Look DEEP into the OPENINGS!!  Do you see any ELVES or EDSELS ... or a
 HIGHBALL?? ...
 %
 Look into my eyes and try to forget that you have a Macy's charge
 card!
 %
-Look!  A ladder!  Maybe it leads to heaven, or a sandwich!
-%
-LOOK!!  Sullen American teens wearing MADRAS shorts and "Flock of
-Seagulls" HAIRCUTS!
-%
 Make me look like LINDA RONSTADT again!!
 %
 Mary Tyler Moore's SEVENTH HUSBAND is wearing my DACRON TANK TOP in a
@@ -843,9 +875,6 @@ My nose feels like a bad Ronald Reagan movie ...
 %
 my NOSE is NUMB!
 %
-... My pants just went on a wild rampage through a Long Island Bowling
-Alley!!
-%
 My pants just went to high school in the Carlsbad Caverns!!!
 %
 My polyvinyl cowboy wallet was made in Hong Kong by Montgomery Clift!
@@ -887,21 +916,19 @@ by SMALL BOYS selling FRUIT ...
 %
 Now KEN and BARBIE are PERMANENTLY ADDICTED to MIND-ALTERING DRUGS ...
 %
+Now, let's SEND OUT for QUICHE!!
+%
 Now my EMOTIONAL RESOURCES are heavily committed to 23% of the SMELTING
 and REFINING industry of the state of NEVADA!!
 %
 Now that I have my "APPLE", I comprehend COST ACCOUNTING!!
 %
-... Now, it's time to "HAVE A NAGEELA"!!
-%
-Now, let's SEND OUT for QUICHE!!
-%
 Of course, you UNDERSTAND about the PLAIDS in the SPIN CYCLE --
 %
-Oh my GOD -- the SUN just fell into YANKEE STADIUM!!
-%
 Oh, I get it!!  "The BEACH goes on", huh, SONNY??
 %
+Oh my GOD -- the SUN just fell into YANKEE STADIUM!!
+%
 Okay ... I'm going home to write the "I HATE RUBIK's CUBE HANDBOOK FOR
 DEAD CAT LOVERS" ...
 %
@@ -922,10 +949,6 @@ QUILTING BEES aboard a cruise ship to DISNEYWORLD if only we let it!!
 On the road, ZIPPY is a pinhead without a purpose, but never without a
 POINT.
 %
-Once upon a time, four AMPHIBIOUS HOG CALLERS attacked a family of
-DEFENSELESS, SENSITIVE COIN COLLECTORS and brought DOWN their PROPERTY
-VALUES!!
-%
 Once, there was NO fun ... This was before MENU planning, FASHION
 statements or NAUTILUS equipment ... Then, in 1985 ... FUN was
 completely encoded in this tiny MICROCHIP ... It contain 14,768 vaguely
@@ -933,15 +956,16 @@ amusing SIT-COM pilots!!  We had to wait FOUR BILLION years but we
 finally got JERRY LEWIS, MTV and a large selection of creme-filled
 snack cakes!
 %
-One FISHWICH coming up!!
+Once upon a time, four AMPHIBIOUS HOG CALLERS attacked a family of
+DEFENSELESS, SENSITIVE COIN COLLECTORS and brought DOWN their PROPERTY
+VALUES!!
 %
 ONE:    I will donate my entire "BABY HUEY" comic book collection to
 	the downtown PLASMA CENTER ...
 TWO:	I won't START a BAND called "KHADAFY & THE HIT SQUAD" ...
 THREE:	I won't ever TUMBLE DRY my FOX TERRIER again!!
 %
-... or were you driving the PONTIAC that HONKED at me in MIAMI last
-Tuesday?
+One FISHWICH coming up!!
 %
 Our father who art in heaven ... I sincerely pray that SOMEBODY at this
 table will PAY for my SHREDDED WHAT and ENGLISH MUFFIN ... and also
@@ -999,12 +1023,12 @@ hair stylist or my failure to refer five TEENAGERS to a good OCULIST?
 %
 Sign my PETITION.
 %
-So this is what it feels like to be potato salad
-%
 So, if we convert SUPPLY-SIDE SOYABEAN FUTURES into HIGH-YIELD T-BILL
 INDICATORS, the PRE-INFLATIONARY risks will DWINDLE to a rate of 2
 SHOPPING SPREES per EGGPLANT!!
 %
+So this is what it feels like to be potato salad
+%
 someone in DAYTON, Ohio is selling USED CARPETS to a SERBO-CROATIAN
 %
 Sometime in 1993 NANCY SINATRA will lead a BLOODLESS COUP on GUAM!!
@@ -1021,19 +1045,6 @@ to Beaver"!
 Spreading peanut butter reminds me of opera!!  I wonder why?
 %
 TAILFINS!! ... click ...
-%
-	Talking Pinhead Blues:
-Oh, I LOST my ``HELLO KITTY'' DOLL and I get BAD reception on channel
-    TWENTY-SIX!!
-
-Th'HOSTESS FACTORY is closin' down and I just heard ZASU PITTS has been
-    DEAD for YEARS..  (sniff)
-
-My PLATFORM SHOE collection was CHEWED up by th' dog, ALEXANDER HAIG
-    won't let me take a SHOWER 'til Easter ... (snurf)
-
-So I went to the kitchen, but WALNUT PANELING whup me upside mah HAID!!
-    (on no, no, no..  Heh, heh)
 %
 TAPPING?  You POLITICIANS!  Don't you realize that the END of the "Wash
 Cycle" is a TREASURED MOMENT for most people?!
@@ -1056,13 +1067,8 @@ SPINAL COLUMN is fairly enjoyable!!
 %
 The FALAFEL SANDWICH lands on my HEAD and I become a VEGETARIAN ...
 %
-... the HIGHWAY is made out of LIME JELLO and my HONDA is a barbequeued
-OYSTER!  Yum!
-%
 The Korean War must have been fun.
 %
-... the MYSTERIANS are in here with my CORDUROY SOAP DISH!!
-%
 The Osmonds!  You are all Osmonds!!  Throwing up on a freeway at
 dawn!!!
 %
@@ -1090,8 +1096,6 @@ This is a NO-FRILLS flight -- hold th' CANADIAN BACON!!
 This MUST be a good party -- My RIB CAGE is being painfully pressed up
 against someone's MARTINI!!
 %
-... this must be what it's like to be a COLLEGE GRADUATE!!
-%
 This PIZZA symbolizes my COMPLETE EMOTIONAL RECOVERY!!
 %
 This PORCUPINE knows his ZIPCODE ... And he has "VISA"!!
@@ -1113,9 +1117,6 @@ Nipples, dimples, knuckles, NICKLES, wrinkles, pimples!!
 %
 TONY RANDALL!  Is YOUR life a PATIO of FUN??
 %
-Uh-oh -- WHY am I suddenly thinking of a VENERABLE religious leader
-frolicking on a FORT LAUDERDALE weekend?
-%
 Uh-oh!!  I forgot to submit to COMPULSORY URINALYSIS!
 %
 UH-OH!!  I put on "GREAT HEAD-ON TRAIN COLLISIONS of the 50's" by
@@ -1128,6 +1129,9 @@ Uh-oh!!  I'm having TOO MUCH FUN!!
 %
 UH-OH!!  We're out of AUTOMOBILE PARTS and RUBBER GOODS!
 %
+Uh-oh -- WHY am I suddenly thinking of a VENERABLE religious leader
+frolicking on a FORT LAUDERDALE weekend?
+%
 Used staples are good with SOY SAUCE!
 %
 VICARIOUSLY experience some reason to LIVE!!
@@ -1241,6 +1245,9 @@ Xerox your lunch and file it under "sex offenders"!
 Yes, but will I see the EASTER BUNNY in skintight leather at an IRON
 MAIDEN concert?
 %
+YOU!!  Give me the CUTEST, PINKEST, most charming little VICTORIAN
+DOLLHOUSE you can find!!  An make it SNAPPY!!
+%
 You can't hurt me!!  I have an ASSUMABLE MORTGAGE!!
 %
 You mean now I can SHOOT YOU in the back and further BLUR th'
@@ -1255,9 +1262,6 @@ CAREER!!
 %
 You were s'posed to laugh!
 %
-YOU!!  Give me the CUTEST, PINKEST, most charming little VICTORIAN
-DOLLHOUSE you can find!!  An make it SNAPPY!!
-%
 Your CHEEKS sit like twin NECTARINES above a MOUTH that knows no BOUNDS --
 %
 Youth of today!  Join me in a mass rally for traditional mental
@@ -1279,6 +1283,10 @@ Yow!  Are you the self-frying president?
 %
 Yow!  Did something bad happen or am I in a drive-in movie??
 %
+YOW!!  Everybody out of the GENETIC POOL!
+%
+YOW!!!  I am having fun!!!
+%
 Yow!  I just went below the poverty line!
 %
 Yow!  I threw up on my window!
@@ -1292,6 +1300,8 @@ mill!
 %
 Yow!  I'm imagining a surfer van filled with soy sauce!
 %
+YOW!!  I'm in a very clever and adorable INSANE ASYLUM!!
+%
 Yow!  Is my fallout shelter termite proof?
 %
 Yow!  Is this sexual intercourse yet??  Is it, huh, is it??
@@ -1305,26 +1315,21 @@ Yow!  Maybe I should have asked for my Neutron Bomb in PAISLEY --
 Yow!  Now I get to think about all the BAD THINGS I did to a BOWLING
 BALL when I was in JUNIOR HIGH SCHOOL!
 %
-Yow!  Now we can become alcoholics!
-%
-Yow!  Those people look exactly like Donnie and Marie Osmond!!
-%
-Yow!  We're going to a new disco!
-%
-YOW!!  Everybody out of the GENETIC POOL!
-%
-YOW!!  I'm in a very clever and adorable INSANE ASYLUM!!
-%
 YOW!!  Now I understand advanced MICROBIOLOGY and th' new TAX REFORM
 laws!!
 %
+Yow!  Now we can become alcoholics!
+%
 YOW!!  The land of the rising SONY!!
 %
+Yow!  Those people look exactly like Donnie and Marie Osmond!!
+%
 YOW!!  Up ahead!  It's a DONUT HUT!!
 %
+Yow!  We're going to a new disco!
+%
 YOW!!  What should the entire human race DO??  Consume a fifth of
 CHIVAS REGAL, ski NUDE down MT. EVEREST, and have a wild SEX WEEKEND!
 %
-YOW!!!  I am having fun!!!
-%
 Zippy's brain cells are straining to bridge synapses ...
+%
@@ -1,3 +1,4 @@
+# $FreeBSD$
 ANAL
 ASEXUAL
 Astro
@@ -2,4 +2,8 @@

 SUBDIR=	doc libgdb gdb gdbtui kgdb

+.if ${MACHINE_ARCH} == "i386"
+SUBDIR+=gdbserver
+.endif
+
 .include <bsd.subdir.mk>
@@ -7,7 +7,7 @@ LIBSRCS+= amd64-nat.c amd64bsd-nat.c amd64fbsd-nat.c
 .endif
 LIBSRCS+= solib.c solib-svr4.c
 LIBSRCS+= amd64-tdep.c amd64fbsd-tdep.c i386-tdep.c i386bsd-tdep.c \
-	i386fbsd-tdep.c	i387-tdep.c
+	i386fbsd-tdep-fixed.c	i387-tdep.c

 nm.h:
 	echo '#include "i386/nm-fbsd64.h"' > ${.TARGET}
@@ -17,3 +17,8 @@ tm.h:

 xm.h:
 	echo '#include "i386/xm-i386.h"' > ${.TARGET}
+
+i386fbsd-tdep-fixed.c: i386fbsd-tdep.c
+	sed -e '48s/^static //' ${.ALLSRC} > ${.TARGET}
+
+CLEANFILES+= i386fbsd-tdep-fixed.c
@@ -2,7 +2,7 @@

 GENSRCS+= xm.h
 LIBSRCS+= armfbsd-nat.c
-LIBSRCS+= arm-tdep.c armfbsd-tdep.c solib.c solib-svr4.c
+LIBSRCS+= arm-tdep.c armfbsd-tdep.c solib.c solib-svr4.c fbsd-threads.c

 nm.h:
 #XXX this should be arm/nm-fbsd.h but won't until it's merged into the gdb repo
@@ -78,9 +78,7 @@ supply_gregset (struct reg *gregset)

  supply_register (ARM_SP_REGNUM, (char *) &gregset->r_sp);
  supply_register (ARM_LR_REGNUM, (char *) &gregset->r_lr);
-  /* This is ok: we're running native...  */
-  r_pc = ADDR_BITS_REMOVE (gregset->r_pc);
-  supply_register (ARM_PC_REGNUM, (char *) &r_pc);
+  supply_register (ARM_PC_REGNUM, (char *) &gregset->r_pc);

  if (arm_apcs_32)
    supply_register (ARM_PS_REGNUM, (char *) &gregset->r_cpsr);
@@ -88,6 +86,28 @@ supply_gregset (struct reg *gregset)
    supply_register (ARM_PS_REGNUM, (char *) &gregset->r_pc);
 }

+/* Fill register REGNO (if it is a general-purpose register) in
+   *GREGSETPS with the value in GDB's register array.  If REGNO is -1,
+   do this for all registers.  */
+
+void
+fill_gregset (struct reg *gregset, int regno)
+{
+  int i;
+
+  for (i = ARM_A1_REGNUM; i < ARM_SP_REGNUM; i++)
+    if ((regno == -1 || regno == i))
+      regcache_collect (i, &gregset->r[i]);
+  if (regno == -1 || regno == ARM_SP_REGNUM)
+      regcache_collect (ARM_SP_REGNUM, &gregset->r_sp);
+  if (regno == -1 || regno == ARM_LR_REGNUM)
+      regcache_collect (ARM_LR_REGNUM, &gregset->r_lr);
+  if (regno == -1 || regno == ARM_PC_REGNUM)
+      regcache_collect (ARM_PC_REGNUM, &gregset->r_pc);
+  if (regno == -1 || regno == ARM_PS_REGNUM)
+      regcache_collect (ARM_PS_REGNUM, &gregset->r_cpsr);
+}
+
 void
 supply_fpregset (struct fpreg *fparegset)
 {
@@ -100,6 +120,20 @@ supply_fpregset (struct fpreg *fparegset)
  supply_register (ARM_FPS_REGNUM, (char *) &fparegset->fpr_fpsr);
 }

+void
+fill_fpregset (struct fpreg *fparegset, int regno)
+{
+  int i;
+
+  for (i = ARM_F0_REGNUM; i <= ARM_F7_REGNUM; i++)
+    if (regno == -1 || regno == i)
+      regcache_raw_supply(current_regcache, i,
+	  &fparegset->fpr[i - ARM_F0_REGNUM]);
+  if (regno == -1 || regno == ARM_FPS_REGNUM)
+    regcache_raw_supply(current_regcache, ARM_FPS_REGNUM, 
+	&fparegset->fpr_fpsr);
+}
+
 static void
 fetch_register (int regno)
 {
@@ -60,7 +60,6 @@ arm_freebsd_elf_init_abi (struct gdbarch_info info,
  tdep->fp_model = ARM_FLOAT_SOFT_VFP;
 }

-
 void
 _initialize_armfbsd_tdep (void)
 {
@@ -105,6 +105,7 @@ extern initialize_file_ftype _initialize_mi_cmds;
 extern initialize_file_ftype _initialize_mi_cmd_env;
 extern initialize_file_ftype _initialize_mi_interp;
 extern initialize_file_ftype _initialize_mi_main;
+extern initialize_file_ftype _initialize_thread_db;
 extern initialize_file_ftype _initialize_tui_hooks;
 extern initialize_file_ftype _initialize_tui_interp;
 extern initialize_file_ftype _initialize_tui_layout;
@@ -128,6 +129,7 @@ initialize_all_files (void)
  _initialize_kernel_u_addr ();
  _initialize_infptrace ();
  _initialize_inftarg ();
+  _initialize_thread_db ();
 #endif
  _initialize_arm_fbsdnat ();
  _initialize_remote ();
@@ -29,4 +29,7 @@
 /* Override copies of {fetch,store}_inferior_registers in `infptrace.c'.  */
 #define FETCH_INFERIOR_REGISTERS

+/* We can attach and detach.  */
+#define ATTACH_DETACH
+
 #endif /* NM_NBSD_H */
@@ -6,7 +6,7 @@ LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c
 LIBSRCS+= i386-nat.c i386bsd-nat.c i386fbsd-nat.c
 .endif
 LIBSRCS+= solib.c solib-svr4.c
-LIBSRCS+= i386-tdep.c i386bsd-tdep.c i386fbsd-tdep.c i387-tdep.c
+LIBSRCS+= i386-tdep.c i386bsd-tdep.c i386fbsd-tdep-fixed.c i387-tdep.c

 nm.h:
 	echo '#include "i386/nm-fbsd.h"' > ${.TARGET}
@@ -16,3 +16,7 @@ tm.h:

 xm.h:
 	echo '#include "i386/xm-i386.h"' > ${.TARGET}
+
+i386fbsd-tdep-fixed.c: i386fbsd-tdep.c
+	sed -e '48s/^static\ //' ${.ALLSRC} > ${.TARGET}
+CLEANFILES += i386fbsd-tdep-fixed.c
@@ -32,7 +32,6 @@
 struct thread_info;

 extern kvm_t *kvm;
-extern int verbose;

 struct kthr {
 	struct kthr	*next;
@@ -43,7 +43,7 @@ static const struct {
    int32_t	type;
    char	name[sizeof ABI_VENDOR];
    int32_t	desc;
-} abitag __attribute__ ((section (ABI_SECTION), aligned(4))) __unused = {
+} abitag __attribute__ ((section (ABI_SECTION), aligned(4))) __used = {
    sizeof ABI_VENDOR,
    sizeof(int32_t),
    ABI_NOTETYPE,
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 2007 Peter Wemm
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-/*
- * This is private to libc.  It is intended for wrapping syscall stubs in order
- * to avoid having to put SIGSYS signal handlers in place to test for presence
- * of new syscalls.  This caches the result in order to be as quick as possible.
- *
- * Use getosreldate(3) for public use as it respects the $OSVERSION environment
- * variable.
- */
-
-int
-__getosreldate(void)
-{
-	static int osreldate;
-	size_t len;
-	int oid[2];
-	int error, osrel;
-
-	if (osreldate != 0)
-		return (osreldate);
-	
-	oid[0] = CTL_KERN;
-	oid[1] = KERN_OSRELDATE;
-	osrel = 0;
-	len = sizeof(osrel);
-	error = sysctl(oid, 2, &osrel, &len, NULL, 0);
-	if (error == 0 && osrel > 0 && len == sizeof(osrel))
-		osreldate = osrel;
-	return (osreldate);
-}
@@ -86,9 +86,9 @@ again:
 	}
 	if (!digit)
 		return (INADDR_NONE);
+	if (pp >= parts + 4 || val > 0xffU)
+		return (INADDR_NONE);
 	if (*cp == '.') {
-		if (pp >= parts + 4 || val > 0xffU)
-			return (INADDR_NONE);
 		*pp++ = val, cp++;
 		goto again;
 	}
@@ -181,6 +181,7 @@ _none_wcsnrtombs(char * __restrict dst, const wchar_t ** __restrict src,
 /* setup defaults */

 int __mb_cur_max = 1;
+int __mb_sb_limit = 256;
 size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict, size_t,
    mbstate_t * __restrict) = _none_mbrtowc;
 int (*__mbsinit)(const mbstate_t *) = _none_mbsinit;
@@ -59,10 +59,10 @@ __FBSDID("$FreeBSD$");

 /*
 * The following are range values for pseudo TTY devices.  Pseudo TTYs have a
- * name of /dev/[pt]ty[p-sP-S][0-9a-v], yielding 256 combinations per major.
+ * name of /dev/[pt]ty[l-sL-S][0-9a-v], yielding 256 combinations per major.
 */
 #define PT_MAX		256
-#define	PT_DEV1		"pqrsPQRS"
+#define	PT_DEV1		"pqrsPQRSlmnoLMNO"
 #define PT_DEV2		"0123456789abcdefghijklmnopqrstuv"

 /*
@@ -214,24 +214,30 @@ char *
 ptsname(int fildes)
 {
 	static char slave[] = _PATH_DEV PTS_PREFIX "XY";
-	char *retval;
+	const char *master;
 	struct stat sbuf;

-	retval = NULL;
+	/* All master pty's must be char devices. */
+	if (_fstat(fildes, &sbuf) == -1)
+		goto invalid;
+	if (!S_ISCHR(sbuf.st_mode))
+		goto invalid;

-	if (_fstat(fildes, &sbuf) == 0) {
-		if (!ISPTM(sbuf))
-			errno = EINVAL;
-		else {
-			(void)snprintf(slave, sizeof(slave),
-				       _PATH_DEV PTS_PREFIX "%s",
-				       devname(sbuf.st_rdev, S_IFCHR) +
-				       strlen(PTM_PREFIX));
-			retval = slave;
-		}
-	}
+	/* Check to see if this device is a pty(4) master. */
+	master = devname(sbuf.st_rdev, S_IFCHR);
+	if (strlen(master) != strlen(PTM_PREFIX "XY"))
+		goto invalid;
+	if (strncmp(master, PTM_PREFIX, strlen(PTM_PREFIX)) != 0)
+		goto invalid;

-	return (retval);
+	/* It is, so generate the corresponding pty(4) slave name. */
+	(void)snprintf(slave, sizeof(slave), _PATH_DEV PTS_PREFIX "%s",
+	    master + strlen(PTM_PREFIX));
+	return (slave);
+
+invalid:
+	errno = EINVAL;
+	return (NULL);
 }

 /*
@@ -240,18 +246,14 @@ ptsname(int fildes)
 int
 unlockpt(int fildes)
 {
-	int retval;
-	struct stat sbuf;

 	/*
 	 * Unlocking a master/slave pseudo-terminal pair has no meaning in a
 	 * non-streams PTY environment.  However, we do ensure fildes is a
 	 * valid master pseudo-terminal device.
 	 */
-	if ((retval = _fstat(fildes, &sbuf)) == 0 && !ISPTM(sbuf)) {
-		errno = EINVAL;
-		retval = -1;
-	}
+	if (ptsname(fildes) == NULL)
+		return (-1);

-	return (retval);
+	return (0);
 }
@@ -78,7 +78,7 @@

 /* Output debug messages like this: */
 #define stdout_debug(args...)	_thread_printf(STDOUT_FILENO, ##args)
-#define stderr_debug(args...)	_thread_printf(STDOUT_FILENO, ##args)
+#define stderr_debug(args...)	_thread_printf(STDERR_FILENO, ##args)

 #define	DBG_MUTEX	0x0001
 #define	DBG_SIG		0x0002
@@ -50,9 +50,13 @@ __weak_reference(_pthread_setspecific, pthread_setspecific);
 int
 _pthread_key_create(pthread_key_t *key, void (*destructor) (void *))
 {
-	struct pthread *curthread = _get_curthread();
+	struct pthread *curthread;
 	int i;

+	if (_thr_initial == NULL)
+		_libpthread_init(NULL);
+	curthread = _get_curthread();
+
 	/* Lock the key table: */
 	THR_LOCK_ACQUIRE(curthread, &_keytable_lock);
 	for (i = 0; i < PTHREAD_KEYS_MAX; i++) {
@@ -66,7 +66,7 @@ openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct win
 	else
 		ttygid = -1;

-	for (cp1 = "pqrsPQRS"; *cp1; cp1++) {
+	for (cp1 = "pqrsPQRSlmnoLMNO"; *cp1; cp1++) {
 		line[8] = *cp1;
 		for (cp2 = "0123456789abcdefghijklmnopqrstuv"; *cp2; cp2++) {
 			line[5] = 'p';
@@ -76,8 +76,7 @@ openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct win
 					break; /* try the next pty group */
 			} else {
 				line[5] = 't';
-				(void) chown(line, getuid(), ttygid);
-				(void) chmod(line, S_IRUSR|S_IWUSR|S_IWGRP);
+				(void) grantpt(master);
 				(void) revoke(line);
 				if ((slave = open(line, O_RDWR, 0)) != -1) {
 					*amaster = master;
@@ -18,7 +18,7 @@
 # Set these, release builder!
 #
 # Fixed version:
-#BUILDNAME=6.3-STABLE
+#BUILDNAME=6.3-RELEASE
 #
 # Automatic SNAP versioning:
 DATE != date +%Y%m%d
@@ -268,6 +268,7 @@ CD=			${_R}/cdrom
 CD_BOOT=		${CD}/bootonly
 CD_DISC1=		${CD}/disc1
 CD_DISC2=		${CD}/disc2
+CD_DISC3=		${CD}/disc3
 .if !defined(NODOC)
 CD_DOCS=		${CD}/docs
 .endif
@@ -959,7 +960,7 @@ cdrom.1:
 	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_LIVEFS}/cdrom.inf
 	touch ${.TARGET}

-# Build disc1 and disc2 cdrom images
+# Build disc1, disc2 and disc3 cdrom images
 cdrom.2:
 	@echo "Building CDROM disc1 filesystem image"
 	@mkdir -p ${CD_DISC1}/${BUILDNAME}
@@ -993,6 +994,10 @@ cdrom.2:
 	@mkdir -p ${CD_DISC2}
 	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf
 	@echo "CD_VOLUME = 2" >> ${CD_DISC2}/cdrom.inf
+	@echo "Building CDROM disc3 filesystem image"
+	@mkdir -p ${CD_DISC3}
+	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC3}/cdrom.inf
+	@echo "CD_VOLUME = 3" >> ${CD_DISC3}/cdrom.inf
 .if !defined(NODOC)
 	@echo "Building CDROM docs filesystem image"
 	@mkdir -p ${CD_DOCS}
@@ -1035,6 +1040,9 @@ CD_DISC1_PKGS=	${CD_PACKAGE_TREE}/disc1
 .if exists(${CD_PACKAGE_TREE}/disc2)
 CD_DISC2_PKGS=	${CD_PACKAGE_TREE}/disc2
 .endif
+.if exists(${CD_PACKAGE_TREE}/disc3)
+CD_DISC3_PKGS=	${CD_PACKAGE_TREE}/disc3
+.endif
 .endif
 .endif

@@ -1054,6 +1062,10 @@ iso.1:
 	    FreeBSD_Packages \
 	    ${CD}/${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2} \
 	    ${CD_DISC2_PKGS}
+	@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \
+	    FreeBSD_Packages_2 \
+	    ${CD}/${BUILDNAME}-${TARGET}-disc3.iso ${CD_DISC3} \
+	    ${CD_DISC3_PKGS}
 .if !defined(NODOC)
 	@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \
 	    FreeBSD_Documentation \
@@ -16,7 +16,7 @@

 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY release.bugfix "6.2-RELEASE">
+<!ENTITY release.bugfix "6.3-RELEASE">
 ]>

 <article>
@@ -95,133 +95,19 @@
  <sect1 id="late-news">
    <title>Late-Breaking News and Corrections</title>

-    <para>[20070116] The release notes should have mentioned that a
-      separate ISO image has been created with readable documentation
-      files.  It contains renderings of the documention for all
-      supported languages; the last several &os; releases only
-      contained English documents due to space limitations.</para>
-
-    <para>[20070116] Some versions of the release announcement
-      contained an incorrect manual page reference for the GELI disk
-      encryption subsystem.  The correct manual page is
-      &man.geli.8;.</para>
-
+    <para></para>
  </sect1>

  <sect1 id="security">
    <title>Security Advisories</title>

-    <para>The following security advisories pertain to &os; &release.bugfix;.
-      For more information, consult the individual advisories available from
-      <ulink url="http://security.FreeBSD.org/"></ulink>.</para>
-
-
-    <informaltable frame="none" pgwide="0">
-      <tgroup cols="3">
-	<colspec colwidth="1*">
-	<colspec colwidth="1*">
-	<colspec colwidth="3*">
-	<thead>
-	  <row>
-	    <entry>Advisory</entry>
-	    <entry>Date</entry>
-	    <entry>Topic</entry>
-	  </row>
-	</thead>
-
-	<tbody>
-	  <row>
-	    <entry><ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-07:02.bind.asc">SA-07:02.bind</ulink></entry>
-	    <entry>9&nbsp;February&nbsp;2007</entry>
-	    <entry><para>Multiple Denial of Service vulnerabilities in &man.named.8;</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-07:03.ipv6.asc">SA-07:03.ipv6</ulink></entry>
-	    <entry>26&nbsp;April&nbsp;2007</entry>
-	    <entry><para>IPv6 Routing Header 0 is dangerous</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-07:05.libarchive.asc">SA-07:05.libarchive</ulink></entry>
-	    <entry>12&nbsp;July&nbsp;2007</entry>
-	    <entry><para>Errors handling corrupt tar files in &man.libarchive.3;</para></entry>
-	  </row>
-	</tbody>
-      </tgroup>
-    </informaltable>
-
+    <para></para>
  </sect1>

  <sect1 id="known-problems">
    <title>Known Problems and Solutions</title>

-    <para>[20070116] As mentioned in the release notes, the
-      &man.arcmsr.4; driver was updated for &os; &release.bugfix;.
-      Some isolated crash problems were noted after this update,
-      although the driver in general tends to work quite well for
-      many testers, and it seems to be <quote>better</quote> in
-      general in terms of functionality and supported hardware.
-      Users having problems may wish to consider backing out the
-      driver update or installing a version of this driver 
-      <ulink url="ftp://ftp.areca.com.tw/RaidCards/AP_Drivers/FreeBSD/DRIVER/SourceCode/">directly
-      from Areca</ulink>.  Further investigation is continuing into
-      these issues.</para>
-
-    <para>[20070116] &os; &release.bugfix; has been diagnosed with
-      kernel bug related to UNIX-domain sockets.
-      A <ulink url="http://people.FreeBSD.org/~jhb/patches/unp_gc.patch">patch</ulink>
-      for this problem has been committed to HEAD and RELENG_6, and is
-      a candidate for an errata patch to RELENG_6_2 after further
-      testing.</para>
-
-    <para>[20070116, update 20070212] Systems with very heavy network activity have
-      been observed to have some problems with the kernel memory
-      allocator.  Symptoms are processes that get stuck in zonelimit
-      state, or system livelocks.  One partial workaround for this
-      problem is to add the following line
-      to <filename>/boot/loader.conf</filename> and reboot:</para>
-
-    <screen>kern.ipc.nmbclusters="0"</screen>
-
-    <para>Other workarounds have been discussed on the
-      <literal>freebsd-current@</literal>
-      and <literal>freebsd-stable@</literal> mailing lists.</para>
-
-    <para>A bugfix has been committed to HEAD and has been merged to RELENG_6.</para>
-
-    <para>[20070123, updated 20070307 &os; &release.bugfix; does not properly add a
-      host route to the destination of a &man.gif.4; interface
-      configured as an IPv6 point-to-point interface.  This makes it
-      impossible to send traffic across the tunnel.  A workaround is
-      to add the required route manually.  If the &man.gif.4;
-      interface was configured as:</para>
-
-    <screen>&prompt.root; ifconfig gif0 <replaceable>ADDRESS</replaceable>/128 <replaceable>DESTINATION</replaceable></screen>
-
-    <para>then the correct route can be added with this command:</para>
-
-    <screen>&prompt.root; route add -host -inet6 <replaceable>DESTINATION</replaceable> -iface gif0 -llinfo -nostatic</screen>
-
-    <para>A fix for this problem has been committed to HEAD,
-      RELENG_6, and RELENG_6_2.  Further details are given in
-      FreeBSD Errata Notice
-      <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-EN-07:02.net.asc">EN-07:02.net</ulink>.</para>
-
-    <para>[20070307] Under certain circumstances, a failed &man.jail.8;
-      startup may cause some undesired changes to a host's network
-      interface configuration, due to a bug in the
-      <filename>rc.d/jail</filename> startup script.  This problem has
-      been corrected on HEAD, RELENG_6, and RELENG_6_2, and is
-      documented in FreeBSD Errata Notice
-      <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-EN-07:03.rc.d_jail.asc">EN-07:03.rc.d_jail</ulink>.</para>
-
-    <para>[20070318] The &man.freebsd-update.8; client included in &os;
-      &release.bugfix; does not properly update SMP kernels.  This
-      bug has been fixed on HEAD, RELENG_6, and RELENG_6_2, as
-      described in FreeBSD Errata Notice
-      <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-EN-07:05.freebsd-update.asc">EN-07:05.freebsd-update</ulink>.</para>
-
+    <para></para>
  </sect1>

 </article>
@@ -14,6 +14,7 @@
    <year>2005</year>
    <year>2006</year>
    <year>2007</year>
+    <year>2008</year>
    <holder role="mailto:[email protected]">The &os; Documentation Project</holder>
  </copyright>

@@ -133,6 +134,26 @@
      previously security patch) has been corrected.  More details
      can be found in security advisory
      <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-07:08.openssl.asc">FreeBSD-SA-07:08.openssl</ulink>.</para>
+
+    <para>An flaw that could lead to the disclosure of
+      previously-generated &man.random.4; data has been corrected.
+      Information regarding this issue can be found in security
+      advisory
+      <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-07:09.random.asc">FreeBSD-SA-07:09.random</ulink>.</para>
+
+    <para>Information disclosure issues found in &man.openpty.3; and
+      &man.ptsname.3; have been corrected.
+      Information regarding this issue can be found in security
+      advisory
+      <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-08:01.pty.asc">FreeBSD-SA-08:01.pty</ulink>.</para>
+
+    <para>A programming error in &man.inet.network.3; Internet
+      address manipulation function that could lead to
+      overwriting a region of memory with user defined data
+      has been corrected.
+      Information regarding this issue can be found in security
+      advisory
+      <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-08:02.libc.asc">FreeBSD-SA-08:02.libc</ulink>.</para>
  </sect2>

  <sect2 id="kernel">
@@ -199,7 +220,7 @@
 	  interfaces, has been added.</para>

 	<para>The &man.em.4; driver has been updated to
-	  version 6.6.6 from Intel.</para>
+	  version 6.7.2 from Intel.</para>

 	<para>The &man.msk.4; driver has been added.  It supports
 	  network interfaces using the Marvell/SysKonnect Yukon II
@@ -305,12 +326,21 @@
    <para>The &man.fdisk.8; program now supports a <option>-p</option>
      flag to print the slice table in fdisk configuration format.</para>

+    <para>The &man.freebsd-update.8; utility now supports
+      an <command>upgrade</command> command to perform binary upgrades between
+      different versions of &os;.</para>
+
    <para>The &man.ftpd.8; utility now has support for RFC2389 (FEAT)
      and rudimentary support for RFC2640 (UTF8).  The RFC2640 support
      is optional and can be enabled using the new <option>-8</option>
      flag.  More information can be found in the &man.ftpd.8; manual
      page.</para>

+    <para>The &man.ipfwpcap.8; utility has been added; it captures
+      packets on a &man.divert.4; socket and writes them as
+      &man.pcap.3; (also known as &man.tcpdump.1;) format data to a
+      file or pipe.</para>
+
    <para>The &man.rpc.lockd.8; and &man.rpc.statd.8; programs now
      accept <option>-p</option> options to indicate which port they
      should bind to.</para>
@@ -366,8 +396,11 @@
    <para>The GNU version of <application>gzip</application> has been
      replaced with a modified version of gzip ported from NetBSD.</para>

+    <para><application>IPFilter</application> has been updated from
+      4.1.13 to 4.1.28.</para>
+
    <para><application>less</application> has been updated from v381
-      to v409.</para>
+      to v416.</para>

    <para><application>ncurses</application> has been updated from
      5.2-20020615 to 5.6-20061217.  ncurses now also has wide
@@ -385,8 +418,10 @@

    <para>The timezone database has been updated from the
      <application>tzdata2006g</application> release to the
-      <application>tzdata2007h</application> release.</para>
+      <application>tzdata2007k</application> release.</para>

+    <para>TrustedBSD <application>OpenBSM</application> has been
+      updated from 1.0 alpha 12 to 1.0.</para>
  </sect2>

  <sect2 id="ports">
@@ -35,17 +35,6 @@
 		  (list (list "HREF" "mailto:[email protected]"))
                  (literal "[email protected]"))
                (literal ">.")))
-            (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"  
-                (literal "All users of FreeBSD ")
-		(literal (entity-text "release.branch"))
-		(literal " should subscribe to the ")
-                (literal "<")
-		(create-link (list (list "HREF" "mailto:[email protected]"))
-                  (literal "[email protected]"))
-                (literal "> mailing list.")))
-
            (make element gi: "p"
                  attributes: (list (list "align" "center"))
              (make element gi: "small"  
@@ -12,7 +12,7 @@ UNITEXTS=	readme errata

 IMAGEDIR=	.imagedir
 RHOST=		freefall.freebsd.org
-RDIR=		public_html/relnotes/6-STABLE
+RDIR=		public_html/relnotes/6.3-RELEASE
 DOCDIR=		./release/doc
 LANG=		en_US.ISO8859-1

@@ -6,7 +6,7 @@

 <!-- Version of the OS we're describing.  This needs to be updated
     with each new release. -->
-<!ENTITY release.current "6.2-STABLE">
+<!ENTITY release.current "6.3-RELEASE">

 <!-- The previous version used for comparison in the "What's New"
     section.  For -CURRENT, we might point back to the last
@@ -19,28 +19,28 @@
 <!ENTITY release.prev.stable "6.2-RELEASE">

 <!-- The next version to be released, usually used for snapshots. -->
-<!ENTITY release.next "6.3-RELEASE">
+<!ENTITY release.next "6.4-RELEASE">

 <!-- The name of this branch. -->
-<!ENTITY release.branch "6-STABLE">
+<!ENTITY release.branch "6.3-STABLE">

 <!-- The URL for obtaining this version of FreeBSD. -->
-<!ENTITY release.url "http://www.FreeBSD.org/snapshots/">
+<!ENTITY release.url "ftp://ftp.FreeBSD.org/">

 <!-- The type of release (usually this will be either "snapshot"
     or "release" -->
-<!ENTITY release.type "snapshot">
-<!ENTITY % release.type.current  "INCLUDE">
+<!ENTITY release.type "release">
+<!ENTITY % release.type.current  "IGNORE">
 <!ENTITY % release.type.snapshot "IGNORE">
-<!ENTITY % release.type.release "IGNORE">
+<!ENTITY % release.type.release "INCLUDE">

 <!-- The manpaths for man page references -->
 <!ENTITY release.man.url "http://www.FreeBSD.org/cgi/man.cgi">
-<!ENTITY release.manpath.xfree86       "4.5.0">
-<!ENTITY release.manpath.xorg          "6.9.0">
-<!ENTITY release.manpath.netbsd        "3.0">
+<!ENTITY release.manpath.xfree86       "4.6.0">
+<!ENTITY release.manpath.xorg          "7.3">
+<!ENTITY release.manpath.netbsd        "4.0">
 <!ENTITY release.manpath.freebsd-ports "Ports">
-<!ENTITY release.manpath.freebsd       "6.0-stable">
+<!ENTITY release.manpath.freebsd       "6.3-RELEASE">

 <!-- Text constants which probably don't need to be changed.-->

@@ -10,7 +10,7 @@

 	The FreeBSD Simplified Chinese Project

-	Original Revision: 1.73.2.37
+	Original Revision: 1.73.2.50.2.1
 -->

 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -19,7 +19,7 @@

 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY release.bugfix "6.1-RELEASE">
+<!ENTITY release.bugfix "6.3-RELEASE">
 ]>

 <article>
@@ -85,204 +85,27 @@
      也会包含本文档 (在制作快照时) 的最新版本。</para>

    <para>全部 &os; CERT 安全公告的列表， 可以在 <ulink
-      url="http://www.FreeBSD.org/security/"></ulink> 或 <ulink
+      url="http://security.FreeBSD.org/"></ulink> 或 <ulink
      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/"></ulink> 找到。</para>

  </sect1>

  <sect1 id="late-news">
-    <title>更新信息</title>
+    <title>最新新闻及修正信息</title>

-    <para>无新闻。</para>
+    <para></para>
  </sect1>

  <sect1 id="security">
    <title>安全公告</title>

-    <para>下列安全公告与 &os; &release.bugfix; 有关。
-      要了解进一步的信息， 请从
-      <ulink url="http://security.FreeBSD.org/"></ulink>
-      下载并阅读安全公告。</para>
-
-    <informaltable frame="none" pgwide="0">
-      <tgroup cols="3">
-	<colspec colwidth="1*">
-	<colspec colwidth="1*">
-	<colspec colwidth="3*">
-	<thead>
-	  <row>
-	    <entry>安全公告</entry>
-	    <entry>日期</entry>
-	    <entry>主题</entry>
-	  </row>
-	</thead>
-
-	<tbody>
-	  <row>
-	    <entry><ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:15.ypserv.asc"
-		>SA-06:15.ypserv</ulink></entry>
-	    <entry>2006&nbsp;年&nbsp;5&nbsp;月&nbsp;31&nbsp;日</entry>
-	    <entry><para>&man.ypserv.8; 中的访问控制功能工作不正确</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:16.smbfs.asc"
-		>SA-06:16.smbfs</ulink></entry>
-	    <entry>2006&nbsp;年&nbsp;5&nbsp;月&nbsp;31&nbsp;日</entry>
-	    <entry><para>在 smbfs 中可能绕过 chroot</para></entry>
-
-	  <row>
-	    <entry><ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:17.sendmail.asc"
-		>SA-06:17.sendmail</ulink></entry>
-	    <entry>2006&nbsp;年&nbsp;6&nbsp;月&nbsp;14日</entry>
-	    <entry><para>在 Sendmail 中对 multipart 信件的处理不正确</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:18.ppp.asc"
-		>SA-06:18.ppp</ulink></entry>
-	    <entry>2006&nbsp;年&nbsp;8&nbsp;月&nbsp;23&nbsp;日</entry>
-	    <entry><para>在 &man.sppp.4; 中存在缓冲区溢出问题</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:19.openssl.asc"
-		>SA-06:19.openssl</ulink></entry>
-	    <entry>2006&nbsp;年&nbsp;9&nbsp;月&nbsp;06日</entry>
-	    <entry><para>&man.crypto.3; 中对 PKCS#1 v1.5 补位验证不正确的问题</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:20.bind.asc"
-		>SA-06:20.bind</ulink></entry>
-	    <entry>2006&nbsp;年&nbsp;9&nbsp;月&nbsp;06&nbsp;日</entry>
-	    <entry><para>&man.named.8;中的拒绝服务问题</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:21.gzip.asc"
-		>SA-06:21.gzip</ulink></entry>
-	    <entry>2006&nbsp;年&nbsp;9&nbsp;月&nbsp;19&nbsp;日</entry>
-	    <entry><para>&man.gzip.1; 中的多处漏洞</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:22.openssh.asc"
-		>SA-06:22.openssh</ulink></entry>
-	    <entry>2006&nbsp;年&nbsp;9&nbsp;月&nbsp;30&nbsp;日</entry>
-	    <entry><para>OpenSSH 中的多处漏洞</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:23.openssl.asc"
-		>SA-06:23.openssl</ulink></entry>
-	    <entry>2006&nbsp;年&nbsp;9&nbsp;月&nbsp;28&nbsp;日</entry>
-	    <entry><para>&man.crypto.3; 中的多处问题</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:25.kmem.asc"
-		>SA-06:25.kmem</ulink></entry>
-	    <entry>2006&nbsp;年&nbsp;12&nbsp;月&nbsp;6&nbsp;日</entry>
-	    <entry><para>在 &man.firewire.4; 中的内核内存内容不当泄露问题</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-07:01.jail.asc"
-		>SA-07:01.jail</ulink></entry>
-	    <entry>2007&nbsp;年&nbsp;1&nbsp;月&nbsp;11&nbsp;日</entry>
-	    <entry><para>Jail rc.d 脚本特权提升问题</para></entry>
-	  </row>
-	</tbody>
-      </tgroup>
-    </informaltable>
+    <para></para>
  </sect1>

  <sect1 id="known-problems">
    <title>已知问题和解决方法</title>

-    <para>(2006/05/10) 随 &os;
-      &release.bugfix; 发布的勘误说明文件中错误地包含了仅适用于
-      &os; 6.0-RELEASE 的信息。</para>
-
-    <para>(2006/05/10) &os; &release.bugfix;
-      中的发行版说明文件中关于 KDE 升级的部分中，
-      KDE port 的名字是错的。 正确的名字应该是
-      <filename role="package">x11/kde3</filename>。</para>
-
-    <para>(2006/05/10) 针对 &os; &release.bugfix; 的发行版说明中，
-      未能提及在使用 SMP 内核时会默认启用双核的 i386 和 amd64 CPU 中的第二个核。</para>
-
-    <para>(2006/05/13) 在 &os;
-      &release.bugfix; 中 &man.ata.4; 驱动的变动，
-      导致了用户态程序可见的一个软件接口变化。 所有使用
-      <literal>IOCATAREQUEST</literal> &man.ioctl.2; 接口的程序，
-      都必须重新编译才能继续使用。 通常这种程序是直接与 ATA 和 ATAPI 驱动器通讯的，
-      这其中包括 CDROM 刻录和音轨抓取， 以及监控程序等等。
-      目前已知会受到影响的程序是
-      <filename role="package">sysutils/smartmontools</filename>
-      port 所安装的 <filename>smartd</filename>。</para>
-
-    <para>(2006/05/27， 于 2006/06/01 更新) 在 &os;/alpha 上， 有时 &man.sysinstall.8;
-      会不允许对磁盘做 label 操作。 磁盘在 &man.sysinstall.8; 中能够看到，
-      但类似 <guimenuitem>Auto</guimenuitem> 这样的操作不会产生 disklabel。
-      绕过这个问题的方法是使用安装 CD 启动， 选择 <guimenuitem>Fixit</guimenuitem>。
-      接着在 <prompt>Fixit#</prompt> 提示符下手工执行 &man.disklabel.8;。 例如：
-      <command>disklabel -rw da1 auto</command> 会在
-      <devicename>da1</devicename> 中写入可用的 disklabel。 再用安装光盘重新启动系统，
-      则 &man.sysinstall.8; 就能检测到有效的 disklabel，
-      并正确地进行分区操作了。</para>
-
-    <para>(2006/05/27) &os; &release.bugfix; 中包含了一些对 <filename>src/sys/net/if_media.h</filename>
-      中某些定义 (版本为 1.30.2.1) 的变动。 这会破坏与为 &os; 6.0-RELEASE
-      所撰写的 10Gb 以太网设备驱动的源代码级别兼容性。 这一变动未能在发行版说明中体现。</para>
-
-    <para>(2006/06/01， 于 2006/07/07 更新) 在 <filename>rc.d/jail</filename>
-      启动脚本中存在一系列问题， 这些问题可能会给使用它来配置系统引导时的 &man.jail.2;
-      环境的用户带来麻烦。 对于这些问题的修正， 目前已经汇入了 HEAD、 RELENG_6 和 RELENG_6_1。
-      关于这一问题的更多细节， 请参见勘误公告
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ERRATA/notices/FreeBSD-EN-06:01.jail.asc">FreeBSD-EN-06:01.jail</ulink>。</para>
-
-    <para>(2006/06/01， 于 2006/08/30 更新) 发现在某些情况下 (可重现) 文件系统同时使用快照和容量配额的机器上会发生死锁。
-      对于此问题的修正， 已经汇入
-      HEAD 和 RELENG_6 分支。</para>
-
-    <para>(2006/06/01， 于 2006/08/28 更新) 在 Neighbor Discovery Protocol (NDP)
-      实现中的一处问题会导致 &os; &release.bugfix; 通过点对点
-      IPv6 链路发送无效消息。 这是 &os; 6.0-RELEASE 上的一个回归问题。
-      对此问题的修正， 已经汇入 HEAD、 RELENG_6 和 RELENG_6_1。
-      关于此问题的进一步详情， 请参见勘误公告
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ERRATA/notices/FreeBSD-EN-06:02.net.asc">FreeBSD-EN-06:02.net</ulink>。</para>
-
-    <para>(2006/06/01， 于 2006/11/22 更新) 发现在 &man.sysinstall.8; 环境中从多个 CDROM
-      上加载包时存在一些问题。 具体说来，
-      &man.sysinstall.8; 的换盘功能对磁盘内容的识别有些问题。
-      这一状况主要见于在安装不带 &xorg; 的基本系统
-      (通常是第一张 CDROM)， 之后又使用 &man.sysinstall.8; 从后续的 CDROM 来安装需要
-      &xorg; 的包 (例如 GNOME 或 KDE 桌面环境) 时可能会触发问题。
-      绕过这一问题的方法是随基本系统安装 &xorg;， 或在安装依赖它的其它包之前单独安装它。
-      此问题已在 HEAD 和 RELENG_6 上修正。</para>
-
-    <para>(2006/06/01， 于 2006/08/28 更新) 在 UMA 内核内存分配器中负责统计数据的逻辑存在问题，
-      这会导致 <literal>requests for mbufs denied(拒绝的 mbufs 请求)</literal> 数量 (使用
-      <command>netstat -m</command> 查看) 错误地增多。 对于此问题的修正，
-      目前已经汇入了 HEAD、 RELENG_6 和
-      RELENG_6_1。 关于此问题的进一步详情， 请参见勘误公告
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ERRATA/notices/FreeBSD-EN-06:02.net.asc">FreeBSD-EN-06:02.net</ulink>。</para>
-
-    <para>(2006/06/01， 于 2006/10/07 更新) 修正了长期以来 i386 引导加载器在使用 &man.nextboot.8;
-      工具， 且 <filename>/boot/nextboot.conf</filename>
-      配置文件位于引导盘第 1023 柱面之后时可能导致根文件系统损坏的问题。
-      此问题的修正已经汇入了 HEAD， 并合并到了 RELENG_6。</para>
-
-    <para>(2006/06/16， 于 2006/10/07 更新) 发现了一处与锁有关的， 可导致 NFS 服务器性能明显下降的问题。
-      对于此问题的修正已经汇入了 HEAD 和 RELENG_6。</para>
-
-    <para>(2006/08/28) 由于在使用指针时未进行有效性验证，
-      网络协议栈可以从本地触发 panic。 这一问题已经在 HEAD、 RELENG_6 以及 RELENG_6_1
-      中修正。 关于此问题的进一步详情， 请参见勘误公告
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ERRATA/notices/FreeBSD-EN-06:02.net.asc">FreeBSD-EN-06:02.net</ulink>。</para>
-
+    <para></para>
  </sect1>

 </article>
@@ -1,6 +1,6 @@
 # The FreeBSD Simplified Chinese Project
 #
-# Original Revision: 1.6
+# Original Revision: 1.6.10.1
 # $FreeBSD$

 RELN_ROOT?= ${.CURDIR}/../..
@@ -1,7 +1,7 @@
 <!--
 	The FreeBSD Simplified Chinese Project

-	Original Revision: 1.282.2.12
+	Original Revision: 1.282.2.17
 -->

 <!--
@@ -214,6 +214,8 @@
    (&man.cs.4; 驱动程序)
    </para>

+    &hwlist.cxgb;
+
    &hwlist.dc;

    &hwlist.de;
@@ -246,6 +248,10 @@

    &hwlist.lnc;

+    &hwlist.msk;
+
+    &hwlist.mxge;
+
    &hwlist.my;

    &hwlist.nge;
@@ -334,26 +340,30 @@
  <sect2 id="wlan">
    <title>无线网络接口</title>

-    <para arch="i386">NCR / AT&amp;T / Lucent Technologies WaveLan T1-speed
-    ISA/radio LAN 卡 (&man.wl.4; 驱动程序)</para>
-
-    <para arch="i386,pc98,amd64">Lucent Technologies WaveLAN/IEEE 802.11b
-      无线网络适配器以及软件通用型的采用 Lucent Hermes, Intersil
-      PRISM-II, Intersil PRISM-2.5, Intersil Prism-3, 和 Symbol
-      Spectrum24 芯片组的网卡 (&man.wi.4; 驱动程序)
+    <para arch="i386,pc98,amd64">Cisco/Aironet 802.11b 无线适配器 (&man.an.4; 驱动程序)
    </para>

-    <para arch="i386,pc98,amd64">Cisco/Aironet 802.11b 无线网络适配器 (&man.an.4; 驱动程序)
-    </para>
-
-    <para arch="i386,pc98">Raytheon Raylink 2.4GHz 无线网络适配器 (&man.ray.4; 驱动程序)
-    </para>
+    &hwlist.ath;

    &hwlist.awi;

    &hwlist.cnw;

-    &hwlist.ath;
+    <para>[&arch.i386;, &arch.amd64;] Intel PRO/Wireless 2100 MiniPCI 网络适配器
+      (&man.ipw.4; 驱动程序)</para>
+
+    <para>[&arch.i386;, &arch.amd64;] Intel PRO/Wireless 2200BG/2915ABG MiniPCI
+      和 2225BG PCI 网络适配器 (&man.iwi.4; 驱动程序)</para>
+
+    &hwlist.ral;
+
+    <para arch="i386,pc98">Raytheon Raylink 2.4GHz 无线适配器 (&man.ray.4; 驱动程序)
+    </para>
+
+    &hwlist.ural;
+
+    <para arch="i386">NCR / AT&amp;T / 郎讯科技 WaveLan T1-speed
+    ISA/无线 LAN 卡 (&man.wl.4; 驱动程序)</para>
  </sect2>

  <sect2 id="misc-network">
@@ -1,5 +1,5 @@
 <!-- -*- sgml -*- -->
-<!-- Original Revision: 1.5 -->
+<!-- Original Revision: 1.5.10.1 -->
 <!-- $FreeBSD$ -->

 <!-- Text constants which probably don't need to be changed.-->
@@ -13,6 +13,7 @@
 <!ENTITY sect.proc.i386 SYSTEM "../i386/proc-i386.sgml">
 <!ENTITY sect.proc.ia64 SYSTEM "../ia64/proc-ia64.sgml">
 <!ENTITY sect.proc.pc98 SYSTEM "../pc98/proc-pc98.sgml">
+<!ENTITY sect.proc.powerpc SYSTEM "../powerpc/proc-powerpc.sgml">
 <!ENTITY sect.proc.sparc64 SYSTEM "../sparc64/proc-sparc64.sgml">
 <!ENTITY sect.dev SYSTEM "../common/dev.sgml">

@@ -1,4 +1,4 @@
-# Original Revision: 1.6
+# Original Revision: 1.6.10.1
 # $FreeBSD$

 RELN_ROOT?= ${.CURDIR}/../..
@@ -8,6 +8,7 @@ SUBDIR+= amd64
 SUBDIR+= ia64
 SUBDIR+= i386
 SUBDIR+= pc98
+SUBDIR+= powerpc
 SUBDIR+= sparc64

 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"