* s/id-utils/idutils/g;

 * other small changes

4 files changed, 42 insertions, 38 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 32e099b..689a90e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
-info_TEXINFOS = id-utils.texi
+info_TEXINFOS = idutils.texi
 
 EXTRA_DIST = texinfo.tex
 
-DISTCLEANFILES = id-utils.fl
+DISTCLEANFILES = idutils.fl
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 4047e83..a229390 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -84,13 +84,13 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-INFO_DEPS = $(srcdir)/id-utils.info
+INFO_DEPS = $(srcdir)/idutils.info
 am__TEXINFO_TEX_DIR = $(srcdir)
-DVIS = id-utils.dvi
-PDFS = id-utils.pdf
-PSS = id-utils.ps
-HTMLS = id-utils.html
-TEXINFOS = id-utils.texi
+DVIS = idutils.dvi
+PDFS = idutils.pdf
+PSS = idutils.ps
+HTMLS = idutils.html
+TEXINFOS = idutils.texi
 TEXI2DVI = texi2dvi
 TEXI2PDF = $(TEXI2DVI) --pdf --batch
 MAKEINFOHTML = $(MAKEINFO) --html
@@ -131,6 +131,8 @@ GENCAT = @GENCAT@
 GETOPT_H = @GETOPT_H@
 GLIBC2 = @GLIBC2@
 GLIBC21 = @GLIBC21@
+GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@
+GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@
 GMSGFMT = @GMSGFMT@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
@@ -220,9 +222,9 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-info_TEXINFOS = id-utils.texi
+info_TEXINFOS = idutils.texi
 EXTRA_DIST = texinfo.tex
-DISTCLEANFILES = id-utils.fl
+DISTCLEANFILES = idutils.fl
 all: all-am
 
 .SUFFIXES:
@@ -300,14 +302,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	    rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
 	  exit 1; \
 	fi
-$(srcdir)/id-utils.info: id-utils.texi $(srcdir)/version.texi
-id-utils.dvi: id-utils.texi $(srcdir)/version.texi
-id-utils.pdf: id-utils.texi $(srcdir)/version.texi
-id-utils.html: id-utils.texi $(srcdir)/version.texi
+$(srcdir)/idutils.info: idutils.texi $(srcdir)/version.texi
+idutils.dvi: idutils.texi $(srcdir)/version.texi
+idutils.pdf: idutils.texi $(srcdir)/version.texi
+idutils.html: idutils.texi $(srcdir)/version.texi
 $(srcdir)/version.texi: @MAINTAINER_MODE_TRUE@ $(srcdir)/stamp-vti
-$(srcdir)/stamp-vti: id-utils.texi $(top_srcdir)/configure
-	@(dir=.; test -f ./id-utils.texi || dir=$(srcdir); \
-	set `$(SHELL) $(srcdir)/mdate-sh $$dir/id-utils.texi`; \
+$(srcdir)/stamp-vti: idutils.texi $(top_srcdir)/configure
+	@(dir=.; test -f ./idutils.texi || dir=$(srcdir); \
+	set `$(SHELL) $(srcdir)/mdate-sh $$dir/idutils.texi`; \
 	echo "@set UPDATED $$1 $$2 $$3"; \
 	echo "@set UPDATED-MONTH $$2 $$3"; \
 	echo "@set EDITION $(VERSION)"; \
@@ -364,11 +366,10 @@ dist-info: $(INFO_DEPS)
 	done
 
 mostlyclean-aminfo:
-	-rm -rf id-utils.aux id-utils.cp id-utils.cps id-utils.fl id-utils.fn \
-	  id-utils.ky id-utils.log id-utils.op id-utils.pg \
-	  id-utils.tmp id-utils.toc id-utils.tp id-utils.tps \
-	  id-utils.vr id-utils.dvi id-utils.pdf id-utils.ps \
-	  id-utils.html
+	-rm -rf idutils.aux idutils.cp idutils.cps idutils.fl idutils.fn idutils.ky \
+	  idutils.log idutils.op idutils.pg idutils.tmp idutils.toc \
+	  idutils.tp idutils.tps idutils.vr idutils.dvi idutils.pdf \
+	  idutils.ps idutils.html
 
 maintainer-clean-aminfo:
 	@list='$(INFO_DEPS)'; for i in $$list; do \
diff --git a/doc/id-utils.texi b/doc/idutils.texi
index 26a673a..7c5cd34 100644
--- a/doc/id-utils.texi
+++ b/doc/idutils.texi
@@ -1,6 +1,6 @@
 \input texinfo
 @comment %**start of header
-@setfilename id-utils.info
+@setfilename idutils.info
 @settitle ID database utilities
 @comment %**end of header
 
@@ -21,18 +21,18 @@
 @ifinfo
 @format
 START-INFO-DIR-ENTRY
-* ID database: (id-utils).              Identifier database utilities.
-* mkid: (id-utils)mkid invocation.      Creating an ID database.
-* lid: (id-utils)lid invocation.        Matching words and patterns.
-* fid: (id-utils)fid invocation.        Listing a file's tokens.
-* fnid: (id-utils)fnid invocation.      Looking up file names.
-* xtokid: (id-utils)xtokid invocation.  Testing mkid scanners.
+* ID database: (idutils).              Identifier database utilities.
+* mkid: (idutils)mkid invocation.      Creating an ID database.
+* lid: (idutils)lid invocation.        Matching words and patterns.
+* fid: (idutils)fid invocation.        Listing a file's tokens.
+* fnid: (idutils)fnid invocation.      Looking up file names.
+* xtokid: (idutils)xtokid invocation.  Testing mkid scanners.
 END-INFO-DIR-ENTRY
 @end format
 @end ifinfo
 
 @ifinfo
-This file documents the @file{id-utils} database utilities.
+This file documents the @file{idutils} database utilities.
 
 Copyright (C) 1996, 1999, 2000 Free Software Foundation, Inc.
 
@@ -1055,12 +1055,12 @@ as a case-insensitive literal substring.
 @section GNU Emacs query interface
 
 @cindex Emacs interface to @code{gid}
-@flindex id-utils.el @r{interface to Emacs}
+@flindex idutils.el @r{interface to Emacs}
 
 @vindex load-path
-The @code{id-utils} source distribution comes with a file @file{id-utils.el},
+The @code{idutils} source distribution comes with a file @file{idutils.el},
 which defines a GNU Emacs interface to @code{gid}.  To install it, put
-@file{id-utils.el} somewhere that Emacs will find it (i.e., in your
+@file{idutils.el} somewhere that Emacs will find it (i.e., in your
 @code{load-path}) and put
 
 @example
@@ -1089,7 +1089,7 @@ GNU Emacs Manual}).
 
 @samp{lid -R edit} is an editing interface for the ID utilities that is
 most commonly used with @file{vi}.  Emacs users should use the interface
-defined in @code{id-utils.el} (@pxref{Emacs gid interface}).  The ID
+defined in @code{idutils.el} (@pxref{Emacs gid interface}).  The ID
 utilities include an alias called @file{eid}, and for the sake of
 brevity, we'll use this alias for the remainder of this section.
 @file{eid} performs a @file{lid}-style, then asks if you wish to edit
@@ -1250,7 +1250,7 @@ utility''.
 Greg McGary conceived of the ideas behind the ID utilities when he
 began working on the Unix kernel in 1984.  He needed a navigation tool
 to help him find his way around the expansive, unfamiliar landscape.
-The first @code{id-utils}-like tools were shell scripts, and produced an
+The first @code{idutils}-like tools were shell scripts, and produced an
 ASCII database that looks much like the output of @samp{lid ".*"}.  It
 took over an hour on a @sc{vax 11/750} to build a database for a
 @sc{4.1bsd} derived kernel.  The first version of @file{lid} used the
@@ -1293,10 +1293,13 @@ file-tree walker, so that directory names can be passed on the command
 line instead of the names of every individual file.  Greg reorganized
 and rewrote most of the Texinfo manual to reflect these changes.
 
+In 2006, package name had a minor change from @code{id-utils} to
+@code{idutils}, to be more consistent with the other GNU package names.
+
 @pindex cscope
 @pindex grep
 @cindex future
-Future releases of @code{id-utils} might include:
+Future releases of @code{idutils} might include:
 
 @table @bullet
 
diff --git a/doc/version.texi b/doc/version.texi
index 4a0aac3..b46c1b3 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
 @set UPDATED 9 November 2005
 @set UPDATED-MONTH November 2005
-@set EDITION 4.1rc1
-@set VERSION 4.1rc1
+@set EDITION 4.1rc2
+@set VERSION 4.1rc2