about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@zsh.org>2018-02-13 09:39:20 +0000
committerPeter Stephenson <pws@zsh.org>2018-02-13 09:39:20 +0000
commitfa2879f50074c5189a7274b6ee7e738c25cbc94b (patch)
tree979c985fac74ef09f2f76918cc01e9f0c6ed8852
parent47aa60950c488a49dc245659c126e3078bf499d0 (diff)
downloadzsh-fa2879f50074c5189a7274b6ee7e738c25cbc94b.tar.gz
zsh-fa2879f50074c5189a7274b6ee7e738c25cbc94b.tar.xz
zsh-fa2879f50074c5189a7274b6ee7e738c25cbc94b.zip
Document REPORTMEMORY is in Kb, not Mb
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/params.yo4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 522830fb4..102af2909 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-13  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* Eitan Adler: Doc/Zsh/params.yo: REPORTMEMORY is in kilobytes,
+	not megabytes:
+
 2018-02-12  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* Marijn: 42355: Src/exec.c, Test/A04redirect.ztst:
diff --git a/Doc/Zsh/params.yo b/Doc/Zsh/params.yo
index 8a7fe5f5f..9ad228679 100644
--- a/Doc/Zsh/params.yo
+++ b/Doc/Zsh/params.yo
@@ -1469,7 +1469,7 @@ is specified with no command.  Defaults to tt(more).
 vindex(REPORTMEMORY)
 item(tt(REPORTMEMORY))(
 If nonnegative, commands whose maximum resident set size (roughly
-speaking, main memory usage) in megabytes is greater than this
+speaking, main memory usage) in kilobytes is greater than this
 value have timing statistics reported.  The format used to output
 statistics is the value of the tt(TIMEFMT) parameter, which is the same
 as for the tt(REPORTTIME) variable and the tt(time) builtin; note that
@@ -1604,7 +1604,7 @@ sitem(tt(%D))(The average amount in (unshared) data/stack space used in
 kilobytes.)
 sitem(tt(%K))(The total space used (tt(%X)PLUS()tt(%D)) in kilobytes.)
 sitem(tt(%M))(The  maximum memory the process had in use at any time in
-megabytes.)
+kilobytes.)
 sitem(tt(%F))(The number of major page faults (page needed to be brought
 from disk).)
 sitem(tt(%R))(The number of minor page faults.)