diff --git a/README b/README
line changes: +8/-9
index 516f9cf..fd2b794
--- a/README
+++ b/README

@@ -3,7 +3,7 @@ Hello prints a friendly greeting.  It also serves as a sample GNU
 package, showing practices that may be useful for GNU projects.
 
   Copyright (C) 1992, 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2004, 2005 Free Software Foundation, Inc.
+  2002, 2004, 2005, 2006 Free Software Foundation, Inc.
 
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright

@@ -20,14 +20,15 @@ Home page: http://www.gnu.org/software/hello/
 Mailing list: bug-hello@gnu.org
 - please use this list for all discussion: bug reports, enhancements, etc.
 - archived at: http://lists.gnu.org/pipermail/bug-hello
-- anyone is welcome to join the list; to do so, visit:
+- anyone is welcome to join the list; to do so, visit
   http://lists.gnu.org/mailman/listinfo/bug-hello
 - there is no corresponding newsgroup.
 
 Bug reports:
  Please include enough information for the maintainers to reproduce the
  problem.  Generally speaking, that means:
-- the contents of any input files necessary to reproduce the bug (crucial!).
+- the contents of any input files necessary to reproduce the bug
+  and command line invocations of the program(s) involved (crucial!).
 - a description of the problem and any samples of the erroneous output.
 - the version number of the program(s) involved (use --version).
 - hardware, operating system, and compiler versions (uname -a).

@@ -44,11 +45,9 @@ you can still make significant contributions by writing test cases,
 checking the documentation against the implementation, translating the
 program strings to other languages, etc.
 
-The basic algorithm is described in: "The C Programming Language", by
-B.W. Kernighan and D.M. Ritchie, Prentice-Hall, New Jersey, 1978;
-the program is an enhancement of the one published in that book.
-
-The GNU implementation of this classic program is brought to you by
-the efforts of several people.  Please see the ./AUTHORS file.
+The basic Hello algorithm was described by B.W. Kernighan and
+D.M. Ritchie.  The GNU implementation is an enhancement of the one
+published in that book, brought to you by the efforts of several people.
+Please see the ./AUTHORS file.
 
 GNU Hello is free software.  See the file COPYING for copying conditions.

diff --git a/README-alpha b/README-alpha
line changes: +3/-5
index b076909..86658cd
--- a/README-alpha
+++ b/README-alpha

@@ -1,6 +1,6 @@
 This is the README-alpha file for GNU Hello prereleases.
 
-  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+  Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
   Free Software Foundation, Inc.
 
   Copying and distribution of this file, with or without modification,

@@ -17,13 +17,11 @@ different list than for official releases.  In the case of GNU Hello,
 though, traffic is so low this is not necessary.  Therefore, please
 email bug reports, comments, etc. to bug-hello@gnu.org.
 
-You are welcome to join this list;
-to do so, visit http://lists.gnu.org/mailman/listinfo/bug-hello.
-It's archived at http://lists.gnu.org/pipermail/bug-hello.
+You are welcome to join this list; see the README for details.
 
 If you see a problem in this release that you've already reported, feel
 free to re-report it -- it's good to get a reminder.  If you sent a
 patch for a previous release, and you haven't received any feedback
 about it, please do re-send it, it likely got lost.
 
-For development environment information, see README.dev.
+For information on the development environment, see README.dev.

diff --git a/README.dev b/README.dev
line changes: +3/-4
index bc1f0ac..4d3624d
--- a/README.dev
+++ b/README.dev

@@ -1,14 +1,13 @@
 This README.dev file describes the development environment.
 
-  Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+  Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
   notice and this notice are preserved.
 
-The development sources for GNU Texinfo are available through anonymous
-CVS at Savannah:
-  http://savannah.gnu.org/cvs/?group=texinfo
+The development sources are available through anonymous CVS at Savannah:
+  http://savannah.gnu.org/cvs/?group=hello
 
 This distribution uses whatever versions of Automake, Autoconf, and
 Gettext are listed in NEWS; usually the latest ones released.  If you

diff --git a/bootstrap b/bootstrap
line changes: +3/-3
index 87b54d2..b575e25
--- a/bootstrap
+++ b/bootstrap

@@ -10,11 +10,11 @@ fi
 
 echo "Bootstrapping CVS Hello with:"
 
-# This overwrites lots of files with older versions.
+# This overwrites lots of files with older versions, so don't use it.
 # I keep the newest versions of files common between distributions up to
-# date in CVS (see util/srclist.txt), because it's not trivial for every
+# date in CVS, using gnulib-tool, because it's not trivial for every
 # developer to do this.
-#cmd="autoreconf --verbose --force --install --include=m4"
+#cmd="autoreconf --verbose --force --install --include=gnulib/m4"
 
 : ${ACLOCAL=aclocal}
 : ${AUTOHEADER=autoheader}

diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex
line changes: +12/-9
index 9b55ebe..be3e5f4
--- a/build-aux/texinfo.tex
+++ b/build-aux/texinfo.tex

@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2006-01-27.14}
+\def\texinfoversion{2006-02-11.16}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free

@@ -2977,12 +2977,10 @@ where each line of input produces a line of output.}
   \gdef\dodoignore#1{%
     % #1 contains the command name as a string, e.g., `ifinfo'.
     %
-    % Define a command to find the next `@end #1', which must be on a line
-    % by itself.  Ignore anything after the `#1'; this matters in
-    % verbatim environments, where otherwise the newline after an
-    % ignored conditional would result in a blank line in the output.
-    \long\def\doignoretext##1^^M@end #1##2^^M{%
+    % Define a command to find the next `@end #1'.
+    \long\def\doignoretext##1^^M@end #1{%
       \doignoretextyyy##1^^M@#1\_STOP_}%
+    %
     % And this command to find another #1 command, at the beginning of a
     % line.  (Otherwise, we would consider a line `@c @ifset', for
     % example, to count as an @ifset for nesting.)

@@ -3018,9 +3016,14 @@ where each line of input produces a line of output.}
   \next
 }
 
-% Finish off ignored text.
-\def\enddoignore{\endgroup\ignorespaces}
-
+% Finish off ignored text by looking for a following \lisppar and
+% ignoring it, if present.  This happens in
+% verbatim environments, where otherwise the newline after an
+% ignored conditional would result in a blank line in the output.
+% It would be better to ignore everything to the end of the line, but
+% I'm not sure how to do that if we are *not* in a verbatim env.
+\def\enddoignore{\futurelet\next\finishignore}%
+\def\finishignore{\ifx\next\lisppar\aftergroup\gobble\fi\endgroup}
 
 % @set VAR sets the variable VAR to an empty value.
 % @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE.