Fix description of limits on diversions.

* doc/m4.texinfo (Diversions): Fix grammar.  Be less pessimistic
about limitations.
* THANKS: Update.
Reported by Elias Benali.

Signed-off-by: Eric Blake <ebb9@byu.net>
(cherry picked from commit cd172d932ce467b2c592eb9a603962b280aa0570)

3 files changed, 15 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 4cc52e52..49b20f21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-06-26  Eric Blake  <ebb9@byu.net>
+
+	Fix description of limits on diversions.
+	* doc/m4.texinfo (Diversions): Fix grammar.  Be less pessimistic
+	about limitations.
+	* THANKS: Update.
+	Reported by Elias Benali.
+
 2009-06-17  Eric Blake  <ebb9@byu.net>
 
 	Stress test for hash resizing.
diff --git a/THANKS b/THANKS
index 4a2d06cd..0d5295ad 100644
--- a/THANKS
+++ b/THANKS
@@ -39,6 +39,7 @@ Daniel Richard G.	skunk@iskunk.org
 David J. MacKenzie	djm@uunet.uu.net
 David Perlin		davep@nanosoft.com
 Elbert Pol		elbert.pol@gmail.com
+Elias Benali		elptr@users.sourceforge.net
 Erez Zadok		ezk@cs.columbia.edu
 Eric Allman		eric@cs.berkeley.edu
 Eric Backus		ericb@lsid.hp.com
@@ -61,7 +62,9 @@ Ian Taylor		ian@cygnus.com
 Ilya N. Golubev		gin@mo.msk.ru
 Jan Djarv		Jan.Djarv@sa.erisoft.se
 Jason Merrill		jason@jarthur.claremont.edu
+Jay Krell		jay.krell@cornell.edu
 Jean-Charles Longuet	jclonguet@free.fr
+Jens Rehsack		rehsack@googlemail.com
 Jim Avera		jima@netcom.com
 Jim Kingdom		kingdon@cygnus.com
 Jim Meyering		meyering@acm.org
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index 6408881b..2a31238b 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -6110,17 +6110,16 @@ time.
 
 @cindex @env{TMPDIR}
 Numbered diversions are counted from 0 upwards, diversion number 0
-being the normal output stream.  The number of simultaneous diversions
-is limited mainly by the memory used to describe them, because @acronym{GNU}
+being the normal output stream.  @acronym{GNU}
 @code{m4} tries to keep diversions in memory.  However, there is a
-limit to the overall memory usable by all diversions taken altogether
+limit to the overall memory usable by all diversions taken together
 (512K, currently).  When this maximum is about to be exceeded,
 a temporary file is opened to receive the contents of the biggest
 diversion still in memory, freeing this memory for other diversions.
 When creating the temporary file, @code{m4} honors the value of the
 environment variable @env{TMPDIR}, and falls back to @file{/tmp}.
-So, it is theoretically possible that the number and aggregate size of
-diversions is limited only by available disk space.
+Thus, the amount of available disk space provides the only real limit on
+the number and aggregate size of diversions.
 
 Diversions make it possible to generate output in a different order than
 the input was read.  It is possible to implement topological sorting