summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2012-04-13 22:33:36 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2012-04-13 22:33:36 +0000
commitb8a8a8dd5916965143c3cd3778768cf6385a4cb8 (patch)
treea98cb8c85e73f24e9971ad88a0461261917f21d6
parent41a086533751bfd51ca1454424deda925dd91291 (diff)
downloadzsh-b8a8a8dd5916965143c3cd3778768cf6385a4cb8.tar.gz
zsh-b8a8a8dd5916965143c3cd3778768cf6385a4cb8.tar.xz
zsh-b8a8a8dd5916965143c3cd3778768cf6385a4cb8.zip
Christian Neukirchen: 30398, 30399: TIMEFMT documentation
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/params.yo10
2 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 7dbc2e72a..e21d1eba8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-04-13  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
+	* Christian Neukirchen: 30398, 30399: Doc/params.yo: TIMEFMT
+	documentation.
+
 	* 30400 (plus a few extra tweaks): NEWS, Etc/NEWS-4.3: update
 	NEWS for forthcoming 5.0 release.
 
@@ -16180,5 +16183,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5625 $
+* $Revision: 1.5626 $
 *****************************************************
diff --git a/Doc/Zsh/params.yo b/Doc/Zsh/params.yo
index 82768983d..61df66779 100644
--- a/Doc/Zsh/params.yo
+++ b/Doc/Zsh/params.yo
@@ -1287,7 +1287,7 @@ the workaround `tt(TERM=$TERM)' unnecessary.
 vindex(TIMEFMT)
 item(tt(TIMEFMT))(
 The format of process time reports with the tt(time) keyword.
-The default is `tt(%E real  %U user  %S system  %P %J)'.
+The default is `tt(%J  %U user %S system %P cpu %*E total)'.
 Recognizes the following escape sequences, although not all
 may be available on all systems, and some that are available
 may not be useful:
@@ -1300,12 +1300,12 @@ sitem(tt(%E))(Elapsed time in seconds.)
 sitem(tt(%P))(The CPU percentage, computed as
 (100*tt(%U)PLUS()tt(%S))/tt(%E).)
 sitem(tt(%W))(Number of times the process was swapped.)
-sitem(tt(%X))(The average amount in (shared) text space used in Kbytes.)
+sitem(tt(%X))(The average amount in (shared) text space used in kilobytes.)
 sitem(tt(%D))(The average amount in (unshared) data/stack space used in
-Kbytes.)
-sitem(tt(%K))(The total space used (%X+%D) in Kbytes.)
+kilobytes.)
+sitem(tt(%K))(The total space used (%X+%D) in kilobytes.)
 sitem(tt(%M))(The  maximum memory the process had in use at any time in
-Kbytes.)
+megabytes.)
 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.)