From 421fb02139eda7d4649d3dca2646039657795382 Mon Sep 17 00:00:00 2001
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 16 Jan 2011 14:11:50 +0000
Subject: [PATCH] sh(1): Document changes to 'exit' from traps.

---
 bin/sh/sh.1 | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bin/sh/sh.1 b/bin/sh/sh.1
index 275c5e23ca84..32b76c828611 100644
--- a/bin/sh/sh.1
+++ b/bin/sh/sh.1
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd December 21, 2010
+.Dd January 16, 2011
 .Dt SH 1
 .Os
 .Sh NAME
@@ -1848,7 +1848,12 @@ If
 .Ar exitstatus
 is given
 it is used as the exit status of the shell;
-otherwise the exit status of the preceding command is used.
+otherwise, if the shell is executing an
+.Cm EXIT
+trap, the exit status of the last command before the trap is used;
+if the shell is executing a trap for a signal,
+the shell exits by resending the signal to itself;
+otherwise, the exit status of the preceding command is used.
 The exit status should be an integer between 0 and 255.
 .It Ic export Ar name ...
 .It Ic export Op Fl p