Merge branch 'gawk-4.1-stable'

3 files changed, 9 insertions, 0 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 269c8aa7..5cae20c6 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,6 +1,9 @@
 2015-02-27         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* gawktexi.in: Update UPDATE-MONTH and copyright year.
+	Note that "the guide is definitive" quote is really
+	from "The Restaurant at the End of the Universe". Thanks
+	to Antonio Colombo for pointing this out.
 
 2015-02-24         Arnold D. Robbins     <arnold@skeeve.com>
 
diff --git a/doc/gawk.texi b/doc/gawk.texi
index e4cb136b..9e208cce 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -12004,6 +12004,9 @@ the string constant @code{"0"} is actually true, because it is non-null.
 @i{The Guide is definitive. Reality is frequently inaccurate.}
 @author Douglas Adams, @cite{The Hitchhiker's Guide to the Galaxy}
 @end quotation
+@c 2/2015: Antonio Colombo points out that this is really from
+@c The Restaurant at the End of the Universe. But I'm going to
+@c leave it alone.
 
 @cindex comparison expressions
 @cindex expressions, comparison
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index c1654af5..4f2eea73 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -11332,6 +11332,9 @@ the string constant @code{"0"} is actually true, because it is non-null.
 @i{The Guide is definitive. Reality is frequently inaccurate.}
 @author Douglas Adams, @cite{The Hitchhiker's Guide to the Galaxy}
 @end quotation
+@c 2/2015: Antonio Colombo points out that this is really from
+@c The Restaurant at the End of the Universe. But I'm going to
+@c leave it alone.
 
 @cindex comparison expressions
 @cindex expressions, comparison