diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Doc/Zsh/options.yo | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index e4ffaa46a..504df73e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2015-04-13 Peter Stephenson <p.stephenson@samsung.com> + * Han Pingtian: 34880: Doc/Zsh/options.yo: POSIX_TRAPS doc. + * Han Pingtian: 34875: Doc/Zsh/options.yo: CSH_JUNKIE_HISTORY doc. * Han Pingtian: users/20078: Doc/Zsh/options.yo: HIST_BEEP doc. diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo index f0d6f1d3c..20d9fc2a8 100644 --- a/Doc/Zsh/options.yo +++ b/Doc/Zsh/options.yo @@ -2097,7 +2097,7 @@ pindex(NOPOSIXTRAPS) cindex(traps, on function exit) cindex(traps, POSIX compatibility) item(tt(POSIX_TRAPS) <K> <S>)( -When the is option is set, the usual zsh behaviour of executing +When this option is set, the usual zsh behaviour of executing traps for tt(EXIT) on exit from shell functions is suppressed. In that case, manipulating tt(EXIT) traps always alters the global trap for exiting the shell; the tt(LOCAL_TRAPS) option is |