Imported from rancid-2.3.rc1.tar.gz.rancid-2.3.rc1

29 files changed, 706 insertions, 313 deletions

diff --git a/man/Makefile.am b/man/Makefile.am
index d499951..4be3c26 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,24 +1,73 @@
 ## Process this file with automake to produce Makefile.in
 ## A Makefile.in is supplied, in case you do not have automake.
 
+## $Id: Makefile.am,v 1.44 2004/01/11 06:12:35 hank Exp $
+##
+## Copyright (C) 1997-2004 by Terrapin Communications, Inc.
+## All rights reserved.
+##
+## This software may be freely copied, modified and redistributed
+## without fee for non-commerical purposes provided that this license
+## remains intact and unmodified with any RANCID distribution.
+##
+## There is no warranty or other guarantee of fitness of this software.
+## It is provided solely "as is".  The author(s) disclaim(s) all
+## responsibility and liability with respect to this software's usage
+## or its effect upon hardware, computer systems, other software, or
+## anything else.
+##
+## Except where noted otherwise, rancid was written by and is maintained by
+## Henry Kilmer, John Heasley, Andrew Partan, Pete Whiting, and Austin Schutz.
+##
+
 AUTOMAKE_OPTIONS=foreign no-dependencies
 
 @SET_MAKE@
 
-man_gen_MANS = env.5 lg.conf.5 lg_intro.1
-man_nogen_MANS = do-diffs.1 alogin.1 blogin.1 clogin.1 control_rancid.1 \
-		create_cvs.1 rancid.1 \
+man_gen_MANS = lg.conf.5 rancid.conf.5 lg_intro.1
+man_nogen_MANS = alogin.1 blogin.1 clogin.1 control_rancid.1 \
+		cssrancid.1 rancid.1 \
 		rancid_intro.1 cloginrc.5 router.db.5 \
-		elogin.1 f10rancid.1 flogin.1 hlogin.1 hrancid.1 jlogin.1 \
-		jrancid.1 f10rancid.1 francid.1 cat5rancid.1 erancid.1 \
-		mrancid.1 par.1 xrancid.1
+		elogin.1 f10rancid.1 flogin.1 fnrancid.1 \
+		hlogin.1 hrancid.1 htlogin.1 htrancid.1 jlogin.1 \
+		jrancid.1 jerancid.1 f10rancid.1 francid.1 cat5rancid.1 \
+		erancid.1 mrancid.1 nlogin.1 nrancid.1 nslogin.1 nsrancid.1 \
+		par.1 prancid.1 \
+		rancid-cvs.1 rancid-run.1 rivlogin.1 rivrancid.1 \
+		tntlogin.1 tntrancid.1 xrancid.1 zrancid.1
+
+man_MANS = $(man_nogen_MANS) $(man_gen_MANS)
+
+EXTRA_DIST = $(man_nogen_MANS) $(man_gen_MANS:%=%.in)
 
-man_MANS = $(man_gen_MANS) $(man_nogen_MANS)
+CLEANFILES = $(man_gen_MANS)
 
-EXTRA_DIST = $(man_nogen_MANS)
+# auto_edit does the autoconf variable substitution.  This allows the
+# substitution to have the full expansion of the variables, e.g.: $sysconfdir
+# will be /prefix/etc instead of ${prefix}/etc.
+#
+# This is a bit of a PITA, but is the method recommended by the autoconf
+# documentation.
+auto_edit = sed \
+	-e 's,@prefix\@,$(prefix),g' \
+	-e 's,@bindir\@,$(bindir),g' \
+	-e 's,@localstatedir\@,$(localstatedir),g' \
+	-e 's,@sysconfdir\@,$(sysconfdir),g' \
+	-e 's,@pkgdatadir\@,$(sysconfdir),g' \
+	-e 's,@ADMINMAILPLUS\@,$(ADMINMAILPLUS),g' \
+	-e 's,@MAILPLUS\@,$(MAILPLUS),g'
 
-#CLEANFILES = Makefile env.5 lg.conf.5 lg_intro.1
+lg.conf.5: Makefile $(srcdir)/lg.conf.5.in
+	rm -f lg.conf.5 lg.conf.5.tmp; \
+	$(auto_edit) $(srcdir)/lg.conf.5.in >lg.conf.5.tmp; \
+	mv lg.conf.5.tmp lg.conf.5
 
-all:
+lg_intro.1: Makefile $(srcdir)/lg_intro.1.in
+	rm -f lg_intro.1 lg_intro.1.tmp; \
+	$(auto_edit) $(srcdir)/lg_intro.1.in >lg_intro.1.tmp; \
+	mv lg_intro.1.tmp lg_intro.1
 
-distclean: clean
+rancid.conf.5: Makefile $(srcdir)/rancid.conf.5.in
+	rm -f rancid.conf.5 rancid.conf.5.tmp; \
+	$(auto_edit) $(srcdir)/rancid.conf.5.in >rancid.conf.5.tmp; \
+	mv rancid.conf.5.tmp rancid.conf.5
diff --git a/man/Makefile.in b/man/Makefile.in
index 0c9bc06..135c237 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.8 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -10,135 +12,213 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
-SHELL = @SHELL@
-
+@SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+subdir = man
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h
+CONFIG_CLEAN_FILES =
+depcomp =
+am__depfiles_maybe =
+SOURCES =
+DIST_SOURCES =
+man1dir = $(mandir)/man1
+am__installdirs = $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir)
+man5dir = $(mandir)/man5
+NROFF = nroff
+MANS = $(man_MANS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADMINMAILPLUS = @ADMINMAILPLUS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
 COMM = @COMM@
 CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
 CVS = @CVS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIFF = @DIFF@
 DIFF_CMD = @DIFF_CMD@
 DIRNAME = @DIRNAME@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 ENV_PATH = @ENV_PATH@
+EXEEXT = @EXEEXT@
 EXPECT_PATH = @EXPECT_PATH@
 FIND = @FIND@
 GREP = @GREP@
 ID = @ID@
-INST_PROGS = @INST_PROGS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
 LG_PING_CMD = @LG_PING_CMD@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
 MAILPLUS = @MAILPLUS@
-MAINT = @MAINT@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MKDIR = @MKDIR@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERLV = @PERLV@
 PERLV_PATH = @PERLV_PATH@
 PING_PATH = @PING_PATH@
-RD_BIN_DATAS = @RD_BIN_DATAS@
-RD_BIN_PROGS = @RD_BIN_PROGS@
-RD_UTIL_LG_PROGS = @RD_UTIL_LG_PROGS@
-RD_UTIL_PROGS = @RD_UTIL_PROGS@
 RSH = @RSH@
 SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 SORT = @SORT@
 SSH = @SSH@
+STRIP = @STRIP@
 TAR = @TAR@
 TELNET = @TELNET@
 TOUCH = @TOUCH@
 U = @U@
 VERSION = @VERSION@
-
+ac_ct_CC = @ac_ct_CC@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
+man_gen_MANS = lg.conf.5 rancid.conf.5 lg_intro.1
+man_nogen_MANS = alogin.1 blogin.1 clogin.1 control_rancid.1 \
+		cssrancid.1 rancid.1 \
+		rancid_intro.1 cloginrc.5 router.db.5 \
+		elogin.1 f10rancid.1 flogin.1 fnrancid.1 \
+		hlogin.1 hrancid.1 htlogin.1 htrancid.1 jlogin.1 \
+		jrancid.1 jerancid.1 f10rancid.1 francid.1 cat5rancid.1 \
+		erancid.1 mrancid.1 nlogin.1 nrancid.1 nslogin.1 nsrancid.1 \
+		par.1 prancid.1 \
+		rancid-cvs.1 rancid-run.1 rivlogin.1 rivrancid.1 \
+		tntlogin.1 tntrancid.1 xrancid.1 zrancid.1
+
+man_MANS = $(man_nogen_MANS) $(man_gen_MANS)
+EXTRA_DIST = $(man_nogen_MANS) $(man_gen_MANS:%=%.in)
+CLEANFILES = $(man_gen_MANS)
+
+# auto_edit does the autoconf variable substitution.  This allows the
+# substitution to have the full expansion of the variables, e.g.: $sysconfdir
+# will be /prefix/etc instead of ${prefix}/etc.
+#
+# This is a bit of a PITA, but is the method recommended by the autoconf
+# documentation.
+auto_edit = sed \
+	-e 's,@prefix\@,$(prefix),g' \
+	-e 's,@bindir\@,$(bindir),g' \
+	-e 's,@localstatedir\@,$(localstatedir),g' \
+	-e 's,@sysconfdir\@,$(sysconfdir),g' \
+	-e 's,@pkgdatadir\@,$(sysconfdir),g' \
+	-e 's,@ADMINMAILPLUS\@,$(ADMINMAILPLUS),g' \
+	-e 's,@MAILPLUS\@,$(MAILPLUS),g'
+
+all: all-am
 
-man_gen_MANS = env.5 lg.conf.5 lg_intro.1
-man_nogen_MANS = do-diffs.1 alogin.1 blogin.1 clogin.1 control_rancid.1 		create_cvs.1 rancid.1 		rancid_intro.1 cloginrc.5 router.db.5 		elogin.1 f10rancid.1 flogin.1 hlogin.1 hrancid.1 jlogin.1 		jrancid.1 f10rancid.1 francid.1 cat5rancid.1 erancid.1 		mrancid.1 par.1 xrancid.1
-
-
-man_MANS = $(man_gen_MANS) $(man_nogen_MANS)
-
-EXTRA_DIST = $(man_nogen_MANS)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../include/config.h
-CONFIG_CLEAN_FILES =  env.5 lg.conf.5 lg_intro.1
-man1dir = $(mandir)/man1
-man5dir = $(mandir)/man5
-MANS = $(man_MANS)
-
-NROFF = nroff
-DIST_COMMON =  Makefile.am Makefile.in env.5.in lg.conf.5.in \
-lg_intro.1.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-env.5: $(top_builddir)/config.status env.5.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-lg.conf.5: $(top_builddir)/config.status lg.conf.5.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-lg_intro.1: $(top_builddir)/config.status lg_intro.1.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-install-man1:
-	$(mkinstalldirs) $(DESTDIR)$(man1dir)
-	@list='$(man1_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  man/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  man/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-man1: $(man1_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	$(mkdir_p) $(DESTDIR)$(man1dir)
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
 	  esac; \
@@ -147,31 +227,43 @@ install-man1:
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
 	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
 	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
 	done
-
 uninstall-man1:
-	@list='$(man1_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
+	@$(NORMAL_UNINSTALL)
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
 	  esac; \
 	done; \
 	for i in $$list; do \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
 	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
 	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
 	done
-
-install-man5:
-	$(mkinstalldirs) $(DESTDIR)$(man5dir)
-	@list='$(man5_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
+install-man5: $(man5_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	$(mkdir_p) $(DESTDIR)$(man5dir)
+	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
 	  case "$$i" in \
 	    *.5*) list="$$list $$i" ;; \
 	  esac; \
@@ -180,122 +272,176 @@ install-man5:
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    5*) ;; \
+	    *) ext='5' ;; \
+	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
 	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst"; \
 	  $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst; \
 	done
-
 uninstall-man5:
-	@list='$(man5_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
+	@$(NORMAL_UNINSTALL)
+	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
 	  case "$$i" in \
 	    *.5*) list="$$list $$i" ;; \
 	  esac; \
 	done; \
 	for i in $$list; do \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    5*) ;; \
+	    *) ext='5' ;; \
+	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
 	  echo " rm -f $(DESTDIR)$(man5dir)/$$inst"; \
 	  rm -f $(DESTDIR)$(man5dir)/$$inst; \
 	done
-install-man: $(MANS)
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-man1 install-man5
-uninstall-man:
-	@$(NORMAL_UNINSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1 uninstall-man5
 tags: TAGS
 TAGS:
 
+ctags: CTAGS
+CTAGS:
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = man
 
 distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
+all-am: Makefile $(MANS)
+installdirs:
+	$(mkdir_p) $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir)
+install: install-am
 install-exec: install-exec-am
-
-install-data-am: install-man
 install-data: install-data-am
+uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-man
-uninstall: uninstall-am
-all-am: Makefile $(MANS)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5
-
 
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
 
-clean: clean-am
+dvi: dvi-am
 
-distclean-am:  distclean-generic clean-am
+dvi-am:
 
-distclean: distclean-am
+html: html-am
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+info: info-am
+
+info-am:
+
+install-data-am: install-man
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man: install-man1 install-man5
+
+installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
 
-.PHONY: install-man1 uninstall-man1 install-man5 uninstall-man5 \
-install-man uninstall-man tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+mostlyclean: mostlyclean-am
 
+mostlyclean-am: mostlyclean-generic
 
-@SET_MAKE@
+pdf: pdf-am
 
-#CLEANFILES = Makefile env.5 lg.conf.5 lg_intro.1
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-man
+
+uninstall-man: uninstall-man1 uninstall-man5
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-man1 install-man5 install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
+	uninstall-man uninstall-man1 uninstall-man5
+
+
+@SET_MAKE@
 
-all:
+lg.conf.5: Makefile $(srcdir)/lg.conf.5.in
+	rm -f lg.conf.5 lg.conf.5.tmp; \
+	$(auto_edit) $(srcdir)/lg.conf.5.in >lg.conf.5.tmp; \
+	mv lg.conf.5.tmp lg.conf.5
 
-distclean: clean
+lg_intro.1: Makefile $(srcdir)/lg_intro.1.in
+	rm -f lg_intro.1 lg_intro.1.tmp; \
+	$(auto_edit) $(srcdir)/lg_intro.1.in >lg_intro.1.tmp; \
+	mv lg_intro.1.tmp lg_intro.1
 
+rancid.conf.5: Makefile $(srcdir)/rancid.conf.5.in
+	rm -f rancid.conf.5 rancid.conf.5.tmp; \
+	$(auto_edit) $(srcdir)/rancid.conf.5.in >rancid.conf.5.tmp; \
+	mv rancid.conf.5.tmp rancid.conf.5
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/man/clogin.1 b/man/clogin.1
index a888d99..48e53ea 100644
--- a/man/clogin.1
+++ b/man/clogin.1
@@ -1,6 +1,6 @@
 .\"
 .hys 50
-.TH "clogin" "1" "13 Jan 2001"
+.TH "clogin" "1" "6 Jan 2004"
 .SH NAME
 clogin \- Cisco/Foundry login script
 .SH SYNOPSIS
@@ -50,22 +50,33 @@ router
 is an
 .BR expect (1)
 script to automate the process of logging into a Cisco router,
-catalyst switch, Extreme switch, or Redback router.  There are
-complementary scripts for
+catalyst switch, Extreme switch, Juniper ERX/E-series, Procket Networks,
+or Redback router.
+There are complementary scripts for
 Alteon,
 Bay Networks (nortel),
 ADC-kentrox EZ-T3 mux,
 Foundry,
 HP Procurve Switches,
-and Juniper,
+Hitachi Routers,
+Juniper Networks,
+Netscreen firewalls,
+Netscaler,
+Riverstone,
+and Lucent TNT,
 named
 .B alogin,
 .B blogin,
 .B elogin,
 .B flogin,
 .B hlogin,
-and
+.B htlogin,
 .B jlogin,
+.B nlogin,
+.B nslogin,
+.B rivlogin,
+and
+.B tntlogin,
 respectively.
 .PP
 .B clogin
@@ -89,7 +100,7 @@ should be quoted to avoid shell expansion.
 .B \-E
 Specifies a variable to pass through to scripts (\-s).  For example, the
 command-line option \-Efoo=bar will produce a global variable by the name
-Efoo with the initial value "foo".
+Efoo with the initial value "bar".
 .\"
 .TP
 .B \-e
@@ -118,8 +129,13 @@ The filename of an
 script which will be sourced after the login is successful and is expected
 to return control to
 .B clogin,
-with the connection to the router intact, when it is done.  Example script(s)
-can be found in util/*.exp.
+with the connection to the router intact, when it is done.  Note that
+.B clogin
+disables
+.IR log_user
+of
+.BR expect (1).
+Example script(s) can be found in util/*.exp.
 .\"
 .TP
 .B \-t
@@ -209,16 +225,33 @@ configuration file.
 .SH "SEE ALSO"
 .BR cloginrc (5),
 .BR expect (1)
+.\"
 .SH CAVEATS
 The HP Procurve switches that are Foundry OEMs use flogin, not hlogin.
+.PP
+The Extreme is supported by
+.B clogin,
+but it has no concept of an "enabled" privilege level.  You must
+set autoenable for these devices in your
+.IR .cloginrc .
+.\"
 .SH BUGS
+Do not use greater than (>) or pound sign (#) in device banners.  These
+are the normal terminating characters of device prompts and the login
+scripts need to locate the initial prompt.  Afterward, the full prompt
+is collected and makes a more precise match so that the scripts know
+when the device is ready for the next command.
+.PP
 All these login scripts for separate devices should be rolled into one.
+This goal is exceedingly difficult.
 .PP
-The HP Procurve switch CLI relies heavily upon curses based cursor/screen
+The HP Procurve switch CLI relies heavily upon curses for cursor/screen
 manipulation and assumes a vt100 terminal type.  They do not provide a way
 to set a different terminal type or adjust this behavior.  The resulting
 escape codes make automating interaction with these devices very difficult
-or impossible.  Therefore, bin/hpfilter is used by hlogin to filter these.
-While this works for rancid's collection, there are side effects for
-interactive logins via hlogin; most of which are formatting annoyances that
-may be remedied by hitting CTRL-R to reprint the current line.
+or impossible.  Thus bin/hpuifilter, which must be found in the PATH, is used
+by hlogin to filter these.  While this works for rancid's collection,
+there are side effects for interactive logins via hlogin; most of which are
+formatting annoyances that may be remedied by typing CTRL-R to reprint the
+current line.
+.PP
diff --git a/man/cloginrc.5 b/man/cloginrc.5
index e91bfea..36709c2 100644
--- a/man/cloginrc.5
+++ b/man/cloginrc.5
@@ -1,6 +1,8 @@
 .\"
+.\" $Id: cloginrc.5,v 1.31 2004/01/11 01:53:10 heas Exp $
+.\"
 .hys 50
-.TH "cloginrc" "5" "22 Jan 2001"
+.TH "cloginrc" "5" "11 Jan 2004"
 .SH NAME
  \.cloginrc \- clogin configuration file
 .SH DESCRIPTION
@@ -12,8 +14,13 @@ contains configuration information for
 .BR elogin (1),
 .BR flogin (1),
 .BR hlogin (1),
-and
+.BR htlogin (1),
 .BR jlogin (1),
+.BR nlogin (1),
+.BR nslogin (1),
+.BR rivlogin (1),
+and
+.BR tntlogin (1),
 such as usernames, passwords, ssh encryption type, etc., and is read at
 run-time.
 .PP
@@ -33,11 +40,23 @@ include {<file>}
 .fi
 .in -1i
 .PP
+Note: the braces ({}) surrounding the values is significant when the values
+include TCL meta-characters.  Best common practice is to always enclose the
+values in braces.  If a value includes a (left or right) brace, it must
+be backslash-escaped, as in:
+.PP
+.in +1i
+.nf
+add user <hostname glob> {foo\\}bar}
+.fi
+.in -1i
+.PP
 As
 .B .cloginrc
-is searched for a directive for a hostname, it is always the first instance
-of a directive, whose hostname glob expression matches the hostname, that
-is used.  For example; looking up the password for hostname foo in a
+is searched for a directive matching a hostname, it is always the first
+matching instance of a directive, one whose hostname glob expression matches
+the hostname, which is used.  For example; looking up the "password"
+directive for hostname foo in a
 .B .cloginrc
 file containing
 .sp
@@ -61,12 +80,6 @@ of the same unix group.  See
 and
 .BR chmod (1)
 for more information on ownership and file modes.
-.PP
-A sample
-.B .cloginrc
-file can be found in the top-level directory of the rancid distribution by the
-name
-.IR "cloginrc.sample" .
 .SH DIRECTIVES
 The accepted directives are (alphabetically):
 .PP
@@ -148,6 +161,8 @@ to first attempt an ssh connection to the device and if that were
 to fail with connection refused, a telnet connection to port 3000
 would be tried, and then a rsh connection.
 .sp
+Note that not all platforms support all of these connection methods.
+.sp
 Default: {telnet} {ssh}
 .\"
 .TP
@@ -196,7 +211,7 @@ Specifies a username
 .IR clogin
 should use if or when prompted for one.
 .sp
-Default: $USER, ie: your Unix username.
+Default: $USER (or $LOGNAME), i.e.: your Unix username.
 .\"
 .TP
 .B add userpassword <router name glob> {<user password>}
@@ -231,17 +246,31 @@ file that is shared among a group of folks.
 If <file> is not a full pathname, $HOME/ will be prepended.
 .sp
 Example: include {.cloginrc.group}
+.\"
+.TP
+.B add sshcmd {<ssh>}
+<ssh> is the name of the ssh executable.  OpenSSH uses a command-line
+option to specify the protocol version, but other implementations use
+a separate binary such as "ssh1".
+.B sshcmd
+allows this to be adjusted as necessary for the local environment.
+.sp
+Default: ssh
 .El
 .SH FILES
 .br
 .nf
 .\" set tabstop to longest possible filename, plus a wee bit
 .ta \w'xHOME/xcloginrc  'u
-\fI$HOME/.cloginrc\fR Configuration file described here.
+\fI$HOME/.cloginrc\fR               Configuration file described here.
+.\"
+\fIshare/rancid/cloginrc.sample\fR  A sample \fB.cloginrc\fR.
+.\"
 .SH ERRORS
 .B .cloginrc
 is interpreted directly by Tcl, so its syntax follows that of Tcl.  Errors
 may produce quite unexpected results.
 .SH "SEE ALSO"
 .BR clogin (1),
-.BR glob (3)
+.BR glob (3),
+.BR tclsh (1)
diff --git a/man/control_rancid.1 b/man/control_rancid.1
index e6ca10e..f502fb0 100644
--- a/man/control_rancid.1
+++ b/man/control_rancid.1
@@ -1,10 +1,10 @@
 .\"
 .hys 50
-.TH "control_rancid" "1" "22 Jan 2001"
+.TH "control_rancid" "1" "7 Jan 2004"
 .SH NAME
 control_rancid \- run rancid for devices of a group
 .SH SYNOPSIS
-.B create_cvs
+.B control_rancid
 [\c
 .BI \-m\ \c
 mail_rcpt]\ \c
@@ -44,10 +44,10 @@ with <group name>/<device name> rather than just the group name alone.
 .PP
 .B control_rancid
 is normally (and best) run via
-.BR do-diffs (1)
+.BR rancid-run (1)
 which provides a locking mechanism on a group basis.
 .\"
-.SH SEE ALSO
-.BR do-diffs (1),
-.BR env (5),
+.SH "SEE ALSO"
+.BR rancid-run (1),
+.BR rancid.conf (5),
 .BR router.db (5)
diff --git a/man/cssrancid.1 b/man/cssrancid.1
new file mode 100644
index 0000000..b4633ee
--- /dev/null
+++ b/man/cssrancid.1
@@ -0,0 +1 @@
+.so man1/rancid.1
diff --git a/man/fnrancid.1 b/man/fnrancid.1
new file mode 100644
index 0000000..b4633ee
--- /dev/null
+++ b/man/fnrancid.1
@@ -0,0 +1 @@
+.so man1/rancid.1
diff --git a/man/htlogin.1 b/man/htlogin.1
new file mode 100644
index 0000000..4c83247
--- /dev/null
+++ b/man/htlogin.1
@@ -0,0 +1 @@
+.so man1/clogin.1
diff --git a/man/htrancid.1 b/man/htrancid.1
new file mode 100644
index 0000000..b4633ee
--- /dev/null
+++ b/man/htrancid.1
@@ -0,0 +1 @@
+.so man1/rancid.1
diff --git a/man/jerancid.1 b/man/jerancid.1
new file mode 100644
index 0000000..b4633ee
--- /dev/null
+++ b/man/jerancid.1
@@ -0,0 +1 @@
+.so man1/rancid.1
diff --git a/man/lg.conf.5.in b/man/lg.conf.5.in
index b5d5423..a2058d1 100644
--- a/man/lg.conf.5.in
+++ b/man/lg.conf.5.in
@@ -1,6 +1,6 @@
 .\"
 .hys 50
-.TH "lg.conf" "5" "22 Jan 2001"
+.TH "lg.conf" "5" "7 Jan 2004"
 .SH NAME
 lg.conf \- looking glass configuration file
 .SH DESCRIPTION
@@ -36,7 +36,7 @@ Default: ./tmp
 .sp
 Note that the default is relative to the directory where 
 .IR lg.cgi
-runs in the server's document root (eg: /usr/local/www/data/lg/tmp).
+runs in the server's document root (e.g.: /usr/local/www/data/lg/tmp).
 .\"
 .TP
 .B LG_CACHE_TIME
@@ -53,7 +53,7 @@ Defines the location of the
 that the looking glass should use.  The path may be relative to the directory
 where the CGI scripts run in the server's document root.
 .sp
-Default: @prefix@/.cloginrc
+Default: $HOME/.cloginrc
 .sp
 Note that the .cloginrc must be readable by the user or group that will be
 running the CGI and that
@@ -80,7 +80,7 @@ Example: $LG_INFO="For Support contact <a href=mailto:webmaster\@localhost>webma
 .\"
 .TP
 .B LG_LOG
-Defines the fully qualified path name (ie: begins with '/') for the log file
+Defines the fully qualified path name (i.e.: begins with '/') for the log file
 or the
 .BR syslog (3)
 facility to use for logging.  For syslog, the argument is the lowercase name
@@ -100,14 +100,14 @@ format.  It lists the devices that should be available to the looking glass
 users.  Only those devices of supported types and with state 'up' are made
 available.  If not defined and the default file does not exist, the looking
 glass will compile a list from the router.db files of all the groups present
-in rancid, that is, the list will be a concatenation of $BASEDIR/*/router.db.
-.sp
-Default: @prefix@/util/lg/router.db
+in rancid, that is, the list will be a concatenation of the available
+.IR router.db (5)
+files.
 .sp
 Note that if the concatenation method is used, it may be necessary to alter
 the mode of the router.db files in the rancid group directories, since rancid's
 default umask is 027 (see
-.BR env (5)).
+.BR rancid.conf (5)).
 .\"
 .TP
 .B LG_STRIP
@@ -117,17 +117,24 @@ this is a SECURITY CONCERN!  However, this output can be very useful for
 debugging clogin problems.
 .\"
 .TP
+.B LG_STYLE
+Defines the URL of a style sheet to be used for HTML formatting.
+.\"
+.TP
 .B PATH
 Is a colon separated list of directory pathnames in the file system
 where rancid's login scripts,
 .IR clogin (1)
-etc. )
+etc.)
 and programs needed within these, such as
 .IR telnet (1),
 are located.
 Its value is set by configure.  Should it be necessary to modify PATH,
 note that it must include $BASEDIR/bin (see above).
 .\"
+.TP
+Queries		...................................
+.\"
 .El
 .\"
 .SH ENVIRONMENT
@@ -148,19 +155,23 @@ is interpreted directly by
 so its syntax follows that of perl.  Syntax errors may produce quite unexpected
 results.
 .SH FILES
-.Bl -tag -width .BASEDIR/bin/ENV -compact
+.Bl -tag -width @sysconfdir@/rancid.conf -compact
 .TP
-.B $BASEDIR/util/lg/lg.conf
-Configuration file described here, where $BASEDIR is set at the time that
-the rancid package was configured.  In this installation, $BASEDIR is
-.IR @prefix@ .
+.B @sysconfdir@/lg.conf
+Configuration file described here.
 .sp
 .B lg.conf
 is located by the value of the environment variable LG_CONF, in the CWD
-(current working directory), or rancid install directory ($BASEDIR/util/lg),
-in that order.
+(current working directory), or the sysconfdir defined when rancid was
+installed, in that order.
 .El
-.SH SEE ALSO
+.SH "SEE ALSO"
 .BR cloginrc (5),
 .BR lg_intro (1),
 .BR router.db (5)
+.\"
+.SH HISTORY
+In RANCID releases prior to 2.3,
+.B lg.conf
+was located in the util/lg sub-directory of the install path.  This was
+changed to be more consistent with common file location practices.
diff --git a/man/lg_intro.1.in b/man/lg_intro.1.in
index b6ced11..a9a72c4 100644
--- a/man/lg_intro.1.in
+++ b/man/lg_intro.1.in
@@ -47,7 +47,7 @@ Besides
 .BR lg.conf (5),
 additional instructions for setting up the looking glass can be found
 in the README file under
-.IR @prefix@/util/lg .
+.IR @pkgdatadir@/README.lg .
 .PP
 Note that the looking glass scripts require a few perl modules not
 included with rancid.  Rancid's configure process does not check for
diff --git a/man/nlogin.1 b/man/nlogin.1
new file mode 100644
index 0000000..4c83247
--- /dev/null
+++ b/man/nlogin.1
@@ -0,0 +1 @@
+.so man1/clogin.1
diff --git a/man/nrancid.1 b/man/nrancid.1
new file mode 100644
index 0000000..b4633ee
--- /dev/null
+++ b/man/nrancid.1
@@ -0,0 +1 @@
+.so man1/rancid.1
diff --git a/man/nslogin.1 b/man/nslogin.1
new file mode 100644
index 0000000..4c83247
--- /dev/null
+++ b/man/nslogin.1
@@ -0,0 +1 @@
+.so man1/clogin.1
diff --git a/man/nsrancid.1 b/man/nsrancid.1
new file mode 100644
index 0000000..b4633ee
--- /dev/null
+++ b/man/nsrancid.1
@@ -0,0 +1 @@
+.so man1/rancid.1
diff --git a/man/par.1 b/man/par.1
index 535246a..7f4ebd4 100644
--- a/man/par.1
+++ b/man/par.1
@@ -1,6 +1,6 @@
 .\"
 .hys 50
-.TH "par" "1" "17 Nov 2001"
+.TH "par" "1" "9 Jan 2004"
 .SH NAME
 par \- parallel command processing
 .SH SYNOPSIS
@@ -22,14 +22,14 @@ file
 takes a list of files to run a command on.  The first line of each file begins
 with a colon (:) or a pound-sign (#).  If a colon, the remainder of the
 line is a command to run for each of the subsequent lines.  If a pound-sign,
-then each subsequent line is a command, unless the 
+then each subsequent line is a (self-contained) command, unless the 
 .B \-c
 option was specified, in which case it operates as if the argument to
 .B \-c
 had followed a colon on the first line.
 .PP
 In each of the cases where the lines of the file following the first are
-not commands (ie: colon or -c), instances of open-close braces ({}) in the
+not commands (i.e.: colon or -c), instances of open-close braces ({}) in the
 command will be replaced by these values.
 .PP
 For example, a inputfile whose contents is:
@@ -61,7 +61,7 @@ The command-line options are as follows:
 .TP
 .B \-c
 Command to be run on each of the arguments following the command-line
-options, when the first line of the input file(s) begin with a pound-sign
+options, where the first line of the input file(s) begins with a pound-sign
 (#).
 .\"
 .TP
@@ -70,7 +70,7 @@ Print debugging information on standard error (stderr).
 .\"
 .TP
 .B \-i
-Run commands interactively though (multiple) 
+Run commands interactively through (multiple) 
 .BR xterm (1)
 processes.
 .\"
diff --git a/man/prancid.1 b/man/prancid.1
new file mode 100644
index 0000000..b4633ee
--- /dev/null
+++ b/man/prancid.1
@@ -0,0 +1 @@
+.so man1/rancid.1
diff --git a/man/create_cvs.1 b/man/rancid-cvs.1
index 1e57459..2cb34bd 100644
--- a/man/create_cvs.1
+++ b/man/rancid-cvs.1
@@ -1,13 +1,13 @@
 .\"
 .hys 50
-.TH "create_cvs" "1" "13 Jan 2001"
+.TH "rancid-cvs" "1" "7 Jan 2004"
 .SH NAME
-create_cvs \- initialize CVS and rancid group files and directories
+rancid-cvs \- initialize CVS and rancid group files and directories
 .SH SYNOPSIS
-.B create_cvs
+.B rancid-cvs
 [group [group ...]]
 .SH DESCRIPTION
-.B create_cvs
+.B rancid-cvs
 is a
 .IR sh (1)
 script to create the directories,
@@ -17,21 +17,21 @@ and
 directories necessary for a rancid group.
 .\"
 .PP
-.B create_cvs
+.B rancid-cvs
 reads
-.BR env (5)
+.BR rancid.conf (5)
 to configure itself.  Then proceeds with the initialization first of the
 .BR cvs (1)
 repository, if necessary, and then for each of the rancid groups listed on
 the command-line or those in the variable
 .I LIST_OF_GROUPS
 from
-.BR env (5),
+.BR rancid.conf (5),
 if the argument is omitted.
 .\"
 .PP
 Running
-.B create_cvs
+.B rancid-cvs
 for groups which already exist will not cause problems.  If the group's
 directory already exists, the
 .BR cvs (1)
@@ -43,12 +43,12 @@ already exists, it will be left as-is.
 The best method for adding groups is add the group name to
 .I LIST_OF_GROUPS
 in
-.BR env (5),
+.BR rancid.conf (5),
 then run
-.B create_cvs.  Do not create the directories manually, allow create_cvs
+.B rancid-cvs.  Do not create the directories manually, allow rancid-cvs
 to do it.
 .\"
-.SH SEE ALSO
+.SH "SEE ALSO"
 .BR cvs (1),
-.BR env (5),
+.BR rancid.conf (5),
 .BR router.db (5)
diff --git a/man/do-diffs.1 b/man/rancid-run.1
index 97b9664..3e99b26 100644
--- a/man/do-diffs.1
+++ b/man/rancid-run.1
@@ -1,10 +1,10 @@
 .\"
 .hys 50
-.TH "do-diffs" "1" "13 Jan 2001"
+.TH "rancid-run" "1" "7 Jan 2004"
 .SH NAME
-do-diffs \- run rancid for each of the groups
+rancid-run \- run rancid for each of the groups
 .SH SYNOPSIS
-.B do-diffs
+.B rancid-run
 [\c
 .BI \-m\ \c
 mail_rcpt]\ \c
@@ -13,16 +13,16 @@ mail_rcpt]\ \c
 device_name]\ \c
 [group [group ...]]
 .SH DESCRIPTION
-.B do-diffs
+.B rancid-run
 is a
 .IR sh (1)
 script to run
 .IR rancid (1)
 for a set of rancid group(s).
 .PP
-.B do-diffs
+.B rancid-run
 reads
-.BR env (5)
+.BR rancid.conf (5)
 to configure itself, then uses
 .IR control_rancid (1)
 to run
@@ -31,12 +31,12 @@ for each rancid group.  The set of rancid groups can either be provided
 as command-line arguments or via the
 .I LIST_OF_GROUPS
 variable in
-.BR env (5),
+.BR rancid.conf (5),
 if the group argument is omitted.
 .PP
 A lock file is maintained per-group to prevent simultaneous runs for a given
 group by
-.IR do-diffs (1).
+.IR rancid-run (1).
 The lock file will be named
 .IR .<group>.run.lock
 and will be located in
@@ -44,18 +44,18 @@ and will be located in
 (see below).
 .PP
 A log file is produced under
-.IR $BASEDIR/logs
+.IR $LOGDIR/logs
 for each rancid group processed.  The file name will be <group>.YYYYMMDD.HHMMSS
 (year month day . hour minute second).
 .PP
-.B do-diffs
+.B rancid-run
 is normally used to run rancid from
 .BR cron (8).
 For example:
 .PP
 .in +1i
 .nf
-0 * * * *      /usr/local/rancid/bin/do-diffs
+0 * * * *      /usr/local/rancid/bin/rancid-run
 .fi
 .in -1i
 .\"
@@ -82,9 +82,9 @@ option alters the subject line of the diff mail.  It will begin
 with <group name>/<device name> rather than just the group name alone.
 .\"
 .SH ENVIRONMENT
-.B do-diffs
+.B rancid-run
 utilizes the following environment variables from
-.BR env (5).
+.BR rancid.conf (5).
 .\"
 .TP
 .B BASEDIR
@@ -114,11 +114,11 @@ device with 'clogin hostname', and so on.
 .BR 
 .SH FILES
 .TP
-.B $BASEDIR/bin/env
-.B do-diffs
+.B $BASEDIR/etc/rancid.conf
+.B rancid-run
 configuration file.
 .El
-.SH SEE ALSO
+.SH "SEE ALSO"
 .BR control_rancid (1),
-.BR router.db (5),
-.BR env (5)
+.BR rancid.conf (5),
+.BR router.db (5)
diff --git a/man/rancid.1 b/man/rancid.1
index fe8d618..15fca7d 100644
--- a/man/rancid.1
+++ b/man/rancid.1
@@ -1,6 +1,6 @@
 .\"
 .hys 50
-.TH "rancid" "1" "13 Jan 2001"
+.TH "rancid" "1" "6 Jan 2004"
 .SH NAME
 rancid \- Cisco configuration filter
 .SH SYNOPSIS
@@ -26,28 +26,48 @@ For example, hostname.new.
 There are complementary scripts for
 Alteon WebOS switches,
 Bay Networks (nortel),
-Cisco catalyst switch,
+Cisco catalyst switches,
+Cisco content services switches,
 ADC-kentrox EZ-T3 mux,
 Force10,
 Foundry,
 HP Procurve Switches,
-Juniper,
+Hitachi Routers,
+Juniper Networks E-series,
+Juniper Networks,
 MRTd,
+Procket Networks,
+Riverstone,
 Redback,
-and Extreme,
+Lucent TNT,
+Netscreen firewalls,
+Netscaler,
+Extreme,
+and Zebra routing software
 named 
 .B arancid,
 .B brancid,
 .B cat5rancid,
+.B cssrancid,
 .B erancid,
 .B f10rancid,
+.B fnrancid,
 .B francid,
 .B hrancid,
+.B htrancid,
+.B jerancid,
 .B jrancid,
 .B mrancid,
+.B nrancid,
+.B nsrancid,
+.B prancid,
+.B rivrancid,
 .B rrancid,
-and
+.B tntrancid,
+.B nrancid,
 .B xrancid,
+and
+.B zrancid,
 respectively.
 .PP
 The command-line options are as follows:
@@ -70,4 +90,20 @@ output it would normally collect from the device (
 .SH "SEE ALSO"
 .BR control_rancid (1),
 .BR clogin (1),
-.BR env (5)
+.BR rancid.conf (5)
+.\"
+.SH "CAVEATS"
+For Catalyst switches running CatOS, type
+.B cat5,
+the prompt must end with '>'.
+.BR clogin (1)
+looks for '>' to determine when a login is successful.  For example:
+.sp
+.in +1i
+.nf
+cat5k>
+cat5k> enable
+Password: 
+cat5k> (enable) 
+.fi
+.in -1i
diff --git a/man/env.5.in b/man/rancid.conf.5.in
index 99366c4..75adc87 100644
--- a/man/env.5.in
+++ b/man/rancid.conf.5.in
@@ -1,46 +1,51 @@
 .\"
+.\" $Id: rancid.conf.5.in,v 1.9 2004/01/11 06:12:35 hank Exp $
+.\"
 .hys 50
-.TH "env" "5" "22 Jan 2001"
+.TH "rancid.conf" "5" "7 Jan 2004"
 .SH NAME
-env \- rancid environment configuration file
+rancid.conf \- rancid environment configuration file
 .SH DESCRIPTION
-.B env
+.B rancid.conf
 contains environment configuration information for
-.BR do-diffs (1)
+.BR rancid-run (1)
 and
 .BR rancid (1)
 including shell PATH, list of rancid groups, etc. and is read by
-.BR do-diffs (1)
+.BR rancid-run (1)
 at run-time.
 .PP
 The syntax of
-.B env
+.B rancid.conf
 is that of
 .IR sh (1).
-.B env
+.B rancid.conf
 is used to set environment variables used by other rancid scripts to
 effect their run-time behavior or to enable them to find their resources.
 .PP
 .SH VARIABLES
-The following variables are used (alphabetically):
+The following variables are used (listed alphabetically):
 .PP
 .Bl -tag -width flag
 .\"
 .TP
 .B BASEDIR
-BASEDIR is the top-level directory where rancid is installed.  Its value
-is set by configure and should be modified if rancid is moved to a new
-location in the file system without re-installing from the distribution.
+BASEDIR is the directory where
+.B rancid-run's
+log directory and where the CVS repository and rancid collection group
+directories will be placed.  Its value is configure's localstatedir and
+should be modified if rancid is moved to a new location in the file
+system without re-installing from the distribution.
 .sp
-Default: @prefix@
+Default: @localstatedir@
 .\"
 .TP
 .B CVSROOT
 .IR cvs (1)
 and
-.IR create_cvs (1)
+.IR rancid-cvs (1)
 use this environment variable to locate the CVS repository.  It should
-not be necessary to alter CVSROOT.
+not be necessary to alter it.
 .sp
 Default: $BASEDIR/CVS
 .\"
@@ -62,14 +67,14 @@ does not affect the handling of SNMP community strings.  see
 below.
 .sp
 Note: passwords whose value cycles and would produce erroneous diffs
-are always filtered (eg: Alteon passwords).
+are always filtered (e.g.: Alteon passwords).
 .\"
 .TP
 .B LIST_OF_GROUPS
 Defines a list of group names of routers separated by white-space.  These
 names become the directory names in $BASEDIR which contain the data
 for that set of devices.
-.BR do-diffs (1)
+.BR rancid-run (1)
 also uses this variable to determine which device groups it should collect.
 Choose these names to be descriptive of the set of devices and do not use
 spaces, unprintable characters, etc.
@@ -78,7 +83,7 @@ Example: LIST_OF_GROUPS="UofO USFS"
 .sp
 Two groups are defined; UofO (University of Oregon) and USFS (US Forest
 Service).  Each will have a directory created (see
-.IR create_cvs (1))
+.IR rancid-cvs (1))
 $BASEDIR/UofO and $BASEDIR/USFS respectively, which will contain their data.
 .sp
 Each group must also have aliases for the administrative and diff recipients
@@ -89,14 +94,27 @@ For example:
 .in +1i
 .nf
 @MAILPLUS@uofo:            frank
-@MAILPLUS@admin-uofo:      joe,bob
+@ADMINMAILPLUS@uofo:      joe,bob
 @MAILPLUS@usfs:            frank
-@MAILPLUS@admin-usfs:      joe,bob
+@ADMINMAILPLUS@usfs:      joe,bob
 .fi
 .sp
 .in -1i
 .\"
 .TP
+.B LOCKTIME
+Defines the number of hours a group's lock file may age before rancid
+starts to complain about a hung collection.  The default is 4 hours.
+.\"
+.TP
+.B LOGDIR
+Directory where
+.B rancid-run
+places log files.
+.sp
+Default: $BASEDIR/logs
+.\"
+.TP
 .B NOCOMMSTR
 If set,
 .IR rancid (1)
@@ -120,7 +138,9 @@ Specified as a number of hours, OLDTIME defines how many hours should pass
 since a successful collection of a device's configuration and when
 .IR control_rancid (1)
 should start complaining about failures.  The value should be greater than
-the number of hours between do-diffs cron runs.
+the number of hours between
+.B rancid-run
+cron runs.
 .sp
 Default: 4
 .\"
@@ -148,12 +168,18 @@ and
 scripts should look for the programs that it needs, such as
 .IR telnet (1).
 Its value is set by configure.  Should it be necessary to modify PATH,
-note that it must include $BASEDIR/bin (see above).
+note that it must include @bindir@.
 .\"
 .TP
 .B TERM
 Some Unix utilities require TERM, the terminal type, to be set to a sane
-value.  The default should suffice.
+value.  Some clients, such as
+.IR telnet (1)
+and
+.IR ssh (1) ,
+communicate this to the server (i.e.: the remote device), thus this can
+affect the behavior of login sessions on a device.  The default should
+suffice.
 .sp
 Default: network
 .\"
@@ -171,19 +197,28 @@ present in the environment of child processes, each must be exported.  See
 .IR sh (1)
 for more information on the built-in command export.
 .SH ERRORS
-.B env
+.B rancid.conf
 is interpreted directly by 
 .IR sh (1),
 so its syntax follows that of the bourne shell.  Errors
 may produce quite unexpected results.
 .SH FILES
-.Bl -tag -width .BASEDIR/bin/ENV -compact
+.Bl -tag -width @sysconfdir@/rancid.conf -compact
 .TP
-.B $BASEDIR/bin/env
+.B @sysconfdir@/rancid.conf
 Configuration file described here.
 .El
-.SH SEE ALSO
+.\"
+.SH "SEE ALSO"
 .BR control_rancid (1),
-.BR create_cvs (1),
-.BR do-diffs (1),
-.BR rancid (1)
+.BR rancid (1),
+.BR rancid-cvs (1),
+.BR rancid-run (1)
+.\"
+.SH HISTORY
+In RANCID releases prior to 2.3,
+.B rancid.conf
+was named
+.B env
+and located in the bin directory.  This was changed to be more consistent
+with common file location practices.
diff --git a/man/rancid_intro.1 b/man/rancid_intro.1
index d180019..cf4c571 100644
--- a/man/rancid_intro.1
+++ b/man/rancid_intro.1
@@ -1,14 +1,18 @@
 .\"
+.\" $Id: rancid_intro.1,v 1.27 2004/01/11 00:43:19 heas Exp $
+.\"
 .hys 50
-.TH "rancid_intro" "1" "22 Jan 2001"
+.TH "rancid_intro" "1" "7 Jan 2004"
 .SH NAME
 rancid_intro \- introduction to the Really Awesome New Cisco confIg Differ
 .SH INTRODUCTION
 .B rancid
 is really more than just a Cisco configuration differ.  It handles several
 different device's configurations; currently including Alteon, Bay Networks
-(Nortel), Cisco, Extreme, Force10, Foundry, HP Procurve switches,
-Juniper, Redback, MRTd daemon, and the ADC-Kentrox EZ-T3 mux.
+(Nortel), Cisco, Extreme, Force10, Foundry, HP Procurve switches, Juniper
+Routers and edge (ERX) routers, Redback, MRTd daemon, Lucent TNT, Netscalar
+load balancers, Netscreen firewalls, Zebra routing software, and the
+ADC-Kentrox EZ-T3 mux.
 .PP
 .B rancid
 uses an expect script to login to each of a list of devices and run a set of
@@ -18,15 +22,17 @@ unwanted or security related data such as chassis temperature and easily
 reverse-able passwords.
 .PP
 Named after the device's name in the group's configuration file (\c
-.B router.db\c
-), the resulting files are saved in the directory <group>/configs.  Except for
+.IR router.db ),
+the resulting files are saved in the directory <group>/configs.  Except for
 the data filtered from the configuration file for security reasons, such as
 reversable passwords, these files are suitable for loading directly to restore
 a lost configuration.  See
-.BR env (5)
-for more information on <group>'s.
+.BR rancid.conf (5)
+for more information on <group>s.
 .PP
-After filtering, a uni-diff (see diff(1)) of the result is produced
+After filtering, a uni-diff (see 
+.BR diff (1))
+of the result is produced
 for each of the devices in a group against that of the previous run of
 .B rancid
 and is e-mailed to that group's mail list, "rancid-<group>".  This e-mail
@@ -75,14 +81,12 @@ the router, it could just as easily be that the card crashed so the RP
 can not communicate with it to collect information.
 .SH "GETTING STARTED"
 Installation instructions are included in the distribution's top-level
-directory in the README file.  Once the installation is complete, start
-by reading the man pages listed below or follow the basic instructions
-included in the README file.
+directory in the README file (which will be installed in share/rancid).
+Once the installation is complete, start by reading the man pages listed
+below or follow the basic instructions included in the README file.
 .PP
 See http://www.shrubbery.net/rancid for information on new versions,
 mail lists, etc.
-.B rancid
-can be retrieved from ftp://ftp.shrubbery.net/pub/rancid.
 .SH "ADDING NEW GROUPS"
 Follow this procdure for adding new groups:
 .TP
@@ -90,26 +94,26 @@ o
 Update the
 .IR LIST_OF_GROUPS
 variable in
-.IR bin/env
+.IR etc/rancid.conf
 (see
-.BR env (5)).
+.BR rancid.conf (5)).
 .TP
 o
 Run
-.BR create_cvs (1).
+.BR rancid-cvs (1).
 .TP
 o
 Update the system's mail aliases file
-.IR /etc/aliases (
-see 
-.BR env (5)).
+.IR /etc/aliases
+(see 
+.BR rancid.conf (5)).
 .\"
 .SH "SEE ALSO"
-.BR cloginrc (5),
 .BR clogin (1),
+.BR cloginrc (5),
 .BR control_rancid (1),
-.BR env (5),
-.BR do-diffs (1),
 .BR lg_intro (1),
-.BR router.db (5) ,
-.BR rancid (1)
+.BR rancid (1),
+.BR rancid-run (1),
+.BR rancid.conf (5),
+.BR router.db (5)
diff --git a/man/rivlogin.1 b/man/rivlogin.1
new file mode 100644
index 0000000..4c83247
--- /dev/null
+++ b/man/rivlogin.1
@@ -0,0 +1 @@
+.so man1/clogin.1
diff --git a/man/rivrancid.1 b/man/rivrancid.1
new file mode 100644
index 0000000..b4633ee
--- /dev/null
+++ b/man/rivrancid.1
@@ -0,0 +1 @@
+.so man1/rancid.1
diff --git a/man/router.db.5 b/man/router.db.5
index a568243..8261556 100644
--- a/man/router.db.5
+++ b/man/router.db.5
@@ -1,6 +1,6 @@
 .\"
 .hys 50
-.TH "router.db" "5" "22 Jan 2001"
+.TH "router.db" "5" "7 Jan 2004"
 .SH NAME
 router.db \- rancid group configuration file
 .SH DESCRIPTION
@@ -55,13 +55,25 @@ An Alteon WebOS switches.
 A Bay Networks router.
 .TP
 .B cat5
-A cisco catalyst series 5000 and 4000 switches (ie: running the catalyst OS,
+A Cisco catalyst series 5000 and 4000 switches (i.e.: running the catalyst OS,
 not IOS).
 .TP
 .B cisco
-A cisco router, PIX, or switch such as the 3500XL or 6000 running IOS (or
+A Cisco router, PIX, or switch such as the 3500XL or 6000 running IOS (or
 IOS-like) OS.
 .TP
+.B css
+A Cisco content services switch.
+.TP
+.ID 15n
+.B enterasys
+An enterasys NAS.  This is currently an alias for the
+.B riverstone
+device type.
+.TP
+.B erx
+A Juniper E-series edge router.
+.TP
 .B extreme
 An Extreme switch.
 .TP
@@ -76,6 +88,9 @@ A Foundry router, switch, or router-switch.  This includes HP
 Procurve switches that are OEMs of Foundry products, such as the
 HP9304M.
 .TP
+.B hitachi
+A Hitachi routers.
+.TP
 .B hp
 A HP Procurve switch such as the 2524 or 4108 procurve switches.  Also see the
 .B foundry
@@ -88,8 +103,28 @@ A Juniper router.
 A host running the (merit) MRTd daemon.
 .TP
 .ID 15n
+.B netscalar
+A Netscalar load balancer.
+.TP
+.ID 15n
+.B netscreen
+A Netscreen firewall.
+.TP
+.ID 15n
 .B redback
 A Redback router, NAS, etc.
+.TP
+.ID 15n
+.B riverstone
+A Riverstone NAS or Cabletron (starting with version ~9.0.3) router.
+.TP
+.ID 15n
+.B tnt
+A lucent TNT.
+.TP
+.ID 15n
+.B zebra
+Zebra routing software.
 .RE
 .\"
 .TP
@@ -119,7 +154,7 @@ Freeform string to describe the current state of the router.
 A ``#'' at the begining of a line is a comment; the entire line is
 ignored.
 .PP
-If you delete a device from the 
+If a device is deleted from the 
 .B router.db
 file, then
 .B rancid
@@ -139,9 +174,9 @@ Attic directory (using
 Configuration file described here, where <group> is a device group name
 defined in the variable
 .I LIST_OF_GROUPS
-within \fI$BASEDIR/bin/env\fR.
+within \fI$BASEDIR/etc/rancid.conf\fR.
 .El
-.SH SEE ALSO
+.SH "SEE ALSO"
 .BR control_rancid (1),
-.BR env (5),
-.BR rancid (1)
+.BR rancid (1),
+.BR rancid.conf (5)
diff --git a/man/tntlogin.1 b/man/tntlogin.1
new file mode 100644
index 0000000..4c83247
--- /dev/null
+++ b/man/tntlogin.1
@@ -0,0 +1 @@
+.so man1/clogin.1
diff --git a/man/tntrancid.1 b/man/tntrancid.1
new file mode 100644
index 0000000..b4633ee
--- /dev/null
+++ b/man/tntrancid.1
@@ -0,0 +1 @@
+.so man1/rancid.1
diff --git a/man/zrancid.1 b/man/zrancid.1
new file mode 100644
index 0000000..b4633ee
--- /dev/null
+++ b/man/zrancid.1
@@ -0,0 +1 @@
+.so man1/rancid.1