11 files changed, 39 insertions, 25 deletions
diff --git a/doc/tools/.cvsignore b/doc/tools/.cvsignore
index 7663ba0604..525275c115 100644
--- a/doc/tools/.cvsignore
+++ b/doc/tools/.cvsignore
@@ -1,6 +1,13 @@
-aclocal.m4
-configure
+Makefile
 Makefile.in
+aclocal.m4
+config.cache
+config.guess
 config.log
 config.status
-Makefile
+config.sub
+configure
+depcomp
+install-sh
+missing
+mkinstalldirs
diff --git a/doc/tools/bmenu/.cvsignore b/doc/tools/bmenu/.cvsignore
index c61522900c..27f2171dc1 100644
--- a/doc/tools/bmenu/.cvsignore
+++ b/doc/tools/bmenu/.cvsignore
@@ -1,4 +1,5 @@
-Makefile.in
-Makefile
 .deps
+Makefile
+Makefile.in
 bmenu
+bmenu2
diff --git a/doc/tools/bmenu/Makefile.am b/doc/tools/bmenu/Makefile.am
index 122467187b..51dd466a4c 100644
--- a/doc/tools/bmenu/Makefile.am
+++ b/doc/tools/bmenu/Makefile.am
@@ -8,9 +8,15 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-noinst_PROGRAMS=bmenu
+noinst_PROGRAMS=bmenu bmenu2
 
 bmenu_SOURCES = \
 address.h     chain.c       isr.h \
 address.inl   chain.h       main.c \
 base.h        chain.inl     system.h
+
+bmenu2_SOURCES = \
+address.h     chain.c       isr.h \
+address.inl   chain.h       bmenu2.c \
+base.h        chain.inl     system.h
+
diff --git a/doc/tools/pdl2texi/.cvsignore b/doc/tools/pdl2texi/.cvsignore
index 2ef4dad165..409c01ea4f 100644
--- a/doc/tools/pdl2texi/.cvsignore
+++ b/doc/tools/pdl2texi/.cvsignore
@@ -1,4 +1,4 @@
-Makefile.in
-Makefile
 .deps
+Makefile
+Makefile.in
 pdl2texi
diff --git a/doc/tools/src2html/.cvsignore b/doc/tools/src2html/.cvsignore
index 3dda72986f..282522db03 100644
--- a/doc/tools/src2html/.cvsignore
+++ b/doc/tools/src2html/.cvsignore
@@ -1,2 +1,2 @@
-Makefile.in
 Makefile
+Makefile.in
diff --git a/doc/tools/src2html1.4a/.cvsignore b/doc/tools/src2html1.4a/.cvsignore
index 3dda72986f..282522db03 100644
--- a/doc/tools/src2html1.4a/.cvsignore
+++ b/doc/tools/src2html1.4a/.cvsignore
@@ -1,2 +1,2 @@
-Makefile.in
 Makefile
+Makefile.in
diff --git a/doc/tools/src2html1.4a/Ctags/.cvsignore b/doc/tools/src2html1.4a/Ctags/.cvsignore
index febb8e79bc..93a72f6c91 100644
--- a/doc/tools/src2html1.4a/Ctags/.cvsignore
+++ b/doc/tools/src2html1.4a/Ctags/.cvsignore
@@ -1,4 +1,4 @@
-Makefile.in
-Makefile
 .deps
+Makefile
+Makefile.in
 ctags-new
diff --git a/doc/tools/src2html1.4a/FreeBSD/.cvsignore b/doc/tools/src2html1.4a/FreeBSD/.cvsignore
index 3dda72986f..282522db03 100644
--- a/doc/tools/src2html1.4a/FreeBSD/.cvsignore
+++ b/doc/tools/src2html1.4a/FreeBSD/.cvsignore
@@ -1,2 +1,2 @@
-Makefile.in
 Makefile
+Makefile.in
diff --git a/doc/tools/src2html1.4a/ctags-emacs/.cvsignore b/doc/tools/src2html1.4a/ctags-emacs/.cvsignore
index 3dda72986f..282522db03 100644
--- a/doc/tools/src2html1.4a/ctags-emacs/.cvsignore
+++ b/doc/tools/src2html1.4a/ctags-emacs/.cvsignore
@@ -1,2 +1,2 @@
-Makefile.in
 Makefile
+Makefile.in
diff --git a/doc/tools/texi2www/.cvsignore b/doc/tools/texi2www/.cvsignore
index 3dda72986f..282522db03 100644
--- a/doc/tools/texi2www/.cvsignore
+++ b/doc/tools/texi2www/.cvsignore
@@ -1,2 +1,2 @@
-Makefile.in
 Makefile
+Makefile.in
diff --git a/doc/tools/word-replace2 b/doc/tools/word-replace2
index a56d88a688..55d24fcb9b 100644
--- a/doc/tools/word-replace2
+++ b/doc/tools/word-replace2
@@ -76,26 +76,26 @@ if ( $#ARGV > -1 )
   shift @ARGV ;
 }
 
-print STDERR "$outfile\t";
-
 open (INFILE, "<$infile") ||
         die "could not open input file $infile: $!";
+$line = join('',<INFILE>) ;
+close INFILE;
+
+
+print STDERR "$outfile\t";
 
 open (OUTFILE, ">$outfile") ||
         die "could not open output file $outfile: $!";
 
-$line = join('',<INFILE>) ;
-
-  foreach $key (keys %patterns)
+foreach $key (keys %patterns)
+{
+  if ( $line =~ s/\b$key\b/$patterns{$key}/ge )
   {
-    if ( $line =~ s/\b$key\b/$patterns{$key}/ge )
-    {
-      print STDERR "." ;
-    }
+    print STDERR "." ;
   }
+}
 
 print OUTFILE $line ;
 
 print STDERR "\n";
-close INFILE;
 close OUTFILE;