about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2002-05-10 09:52:39 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2002-05-10 09:52:39 +0000
commitd7eee8a62bf12a7736d9a927e6ca6246398418fd (patch)
tree598ad4472fa6d6edcc76432efb4aff18780c84fe
parentae5ac5edea6f4c49e89291e4e973283c252fa59c (diff)
downloadzsh-d7eee8a62bf12a7736d9a927e6ca6246398418fd.tar.gz
zsh-d7eee8a62bf12a7736d9a927e6ca6246398418fd.tar.xz
zsh-d7eee8a62bf12a7736d9a927e6ca6246398418fd.zip
users/4951: make ulimit documentation clearer
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/builtins.yo3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 182661c3f..943ca03a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-10  Peter Stephenson  <pws@csr.com>
+
+	* users/4951: Doc/Zsh/builtins.yo: make it clearer that ulimit
+	defaults to soft limits.
+
 2002-05-08  Andrej Borsenkow  <bor@zsh.org>
 
         * 17080: Doc/Zsh/compsys.yo: clarify tag-order style usage
diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo
index 88dd45594..d1021371d 100644
--- a/Doc/Zsh/builtins.yo
+++ b/Doc/Zsh/builtins.yo
@@ -1223,7 +1223,8 @@ cindex(limits, resource)
 item(tt(ulimit) [ tt(-SHacdflmnpstv) [ var(limit) ] ... ])(
 Set or display resource limits of the shell and the processes started by
 the shell.  The value of var(limit) can be a number in the unit specified
-below or the value `tt(unlimited)'.  If the tt(-H) flag is given use
+below or the value `tt(unlimited)'.  By default, only soft limits are
+manipulated. If the tt(-H) flag is given use
 hard limits instead of soft limits.  If the tt(-S) flag is given
 together with the tt(-H) flag set both hard and soft limits.  If no
 options are used, the file size limit (tt(-f)) is assumed.  If