about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2007-03-23 17:14:05 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2007-03-23 17:14:05 +0000
commitf69f1ded8ca5d21e47fd719463dba8319bf4f633 (patch)
treef907e57fa8bb403767c312b5e387f01a5804fb46
parent11bbce3a66aeb8c2b8832a8ee1657e3fa2e8dc4b (diff)
downloadzsh-f69f1ded8ca5d21e47fd719463dba8319bf4f633.tar.gz
zsh-f69f1ded8ca5d21e47fd719463dba8319bf4f633.tar.xz
zsh-f69f1ded8ca5d21e47fd719463dba8319bf4f633.zip
unposted: nitpicked version of zmodload doc tweak
-rw-r--r--ChangeLog3
-rw-r--r--Doc/Zsh/builtins.yo8
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ff17bc897..79d11434d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-03-23  Peter Stephenson  <pws@csr.com>
 
+	* unposted, see followups to 23232: Doc/Zsh/builtins.yo:
+	superduper nitpicked version.
+
 	* 23232: Src/module.c, Doc/Zsh/builtins.yo: improve
 	warning interface; record that zmodload doesn't flag an error
 	on failed loading.
diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo
index aca1cceca..dde13b47a 100644
--- a/Doc/Zsh/builtins.yo
+++ b/Doc/Zsh/builtins.yo
@@ -1865,10 +1865,10 @@ a standard suffix, usually `tt(.so)' (`tt(.sl)' on HPUX).
 If the module to be loaded is
 already loaded and the tt(-i) option is given, the duplicate module is
 ignored.  Otherwise tt(zmodload) prints an error message and returns
-a non-zero status.  The current code block is not aborted unless
-tt(zmodload) detects an inconsistency, such as an invalid module name
-or circular dependency list.  Hence `tt(zmodload -i) var(module)
-tt(2>/dev/null)' is sufficient to test whether a module is available.
+a non-zero status.  If tt(zmodload) detects an inconsistency, such as an
+invalid module name or circular dependency list, the current code block is 
+aborted.  Hence `tt(zmodload -i) var(module) tt(2>/dev/null)' is sufficient
+to test whether a module is available.
 If it is available, the module is loaded if necessary, while if it
 is not available, non-zero status is silently returned.