summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blake <ebb9@byu.net>2009-06-25 11:04:48 -0600
committerEric Blake <ebb9@byu.net>2009-06-25 21:16:02 -0600
commitdae39a14fd724380af8d19a63703ab51db4d96d4 (patch)
tree97c0ec6ab6d49cfe4fb3a846ea7278807712bfc6
parent0b17f4d076af8ce7349b97f5a5e4c94dd27630db (diff)
downloadm4-dae39a14fd724380af8d19a63703ab51db4d96d4.tar.gz
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)
-rw-r--r--ChangeLog8
-rw-r--r--THANKS1
-rw-r--r--doc/m4.texinfo9
3 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index d35b823e..4dac1a00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-06-25 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-20 Eric Blake <ebb9@byu.net>
Update gnulib for hash fixes.
diff --git a/THANKS b/THANKS
index f7779abe..95e841fb 100644
--- a/THANKS
+++ b/THANKS
@@ -32,6 +32,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
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index ee907ddf..01829791 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -5636,17 +5636,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.
@ignore
@comment We need to test spilled diversions, but don't need to expose