[PATCH 1/2] [MAN] 0 and EXIT both work for exit traps.

[PATCH 1/2] [MAN] 0 and EXIT both work for exit traps.

[Adam Buchbinder]

I saw a discussion in which there was some confusion over whether or not
you can use a symbolic name, since the manpage doesn't specifically say so.

Signed-off-by: Adam Buchbinder <adam.buchbinder@gmail.com>
---
 ChangeLog  | 4 ++++
 src/dash.1 | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 2a39e34..81df8d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-11  Adam Buchbinder <adam.buchbinder@gmail.com>
+
+	* Clarify that 0 and EXIT are both acceptable for exit traps.	
+
 2013-08-23  Herbert Xu <herbert@gondor.apana.org.au>
 
 	* Propagate EXP_QPAT in subevalvar.
diff --git a/src/dash.1 b/src/dash.1
index 6241a61..a07a52d 100644
--- a/src/dash.1
+++ b/src/dash.1
@@ -2071,7 +2071,9 @@ The signals are specified by signal number or as the name of the signal.
 If
 .Ar signal
 is
-.Li 0 ,
+.Li 0
+or
+.Li EXIT ,
 the action is executed when the shell exits.
 .Ar action
 may be null, which cause the specified signals to be ignored.
-- 
2.0.0.526.g5318336

[PATCH 2/2] [MAN] Clarify "trap '' signals" syntax in man page

[Adam Buchbinder]

From: Jonathan Nieder <jrnieder@gmail.com>

When the manpage states

| <action> may be null, which cause the specified signals to be ignored.

it is not immediately obvious what it means for an action to be
null.  Clarify by explicitly referring to an empty string, as
opposed to a NULL pointer or the string "null".

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 ChangeLog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 81df8d1..5559a24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-11  Jonathan Nieder  <jrnieder@gmail.com>
+
+	* Clarify "trap '' signals" syntax in manual page.
+
 2014-06-11  Adam Buchbinder <adam.buchbinder@gmail.com>
 
 	* Clarify that 0 and EXIT are both acceptable for exit traps.	
-- 
2.0.0.526.g5318336

Re: [PATCH 1/2] [MAN] 0 and EXIT both work for exit traps.

[Jonathan Nieder]

Adam Buchbinder wrote:

> Signed-off-by: Adam Buchbinder <adam.buchbinder@gmail.com>
> ---
>  ChangeLog  | 4 ++++
>  src/dash.1 | 4 +++-
>  2 files changed, 7 insertions(+), 1 deletion(-)

Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>

Re: [PATCH 1/2] [MAN] 0 and EXIT both work for exit traps.

[Jonathan Nieder]

Jonathan Nieder wrote:
> Adam Buchbinder wrote:

>> Signed-off-by: Adam Buchbinder <adam.buchbinder@gmail.com>
>> ---
>>  ChangeLog  | 4 ++++
>>  src/dash.1 | 4 +++-
>>  2 files changed, 7 insertions(+), 1 deletion(-)
>
> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>

Mph, on second thought this still seems to have a trailing tab
for some reason.  Patch 2 seems to be missing the change to
src/dash.1.  Here are the same patches again with that fixed.

Thanks,

Adam Buchbinder (1):
  [MAN] 0 and EXIT both work for exit traps.

Jonathan Nieder (1):
  [MAN] Clarify "trap '' signals" syntax in manual page

 ChangeLog  | 4 ++++
 src/dash.1 | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

[PATCH 1/2] [MAN] 0 and EXIT both work for exit traps.

[Jonathan Nieder]

From: Adam Buchbinder <adam.buchbinder@gmail.com>

I saw a discussion in which there was some confusion over whether or not
you can use a symbolic name, since the manpage doesn't specifically say so.

Signed-off-by: Adam Buchbinder <adam.buchbinder@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 ChangeLog  | 4 ++++
 src/dash.1 | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 2a39e34..3f59ac2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-11  Adam Buchbinder <adam.buchbinder@gmail.com>
+
+	* Clarify that 0 and EXIT are both acceptable for exit traps.
+
 2013-08-23  Herbert Xu <herbert@gondor.apana.org.au>
 
 	* Propagate EXP_QPAT in subevalvar.
diff --git a/src/dash.1 b/src/dash.1
index 6241a61..a07a52d 100644
--- a/src/dash.1
+++ b/src/dash.1
@@ -2071,7 +2071,9 @@ The signals are specified by signal number or as the name of the signal.
 If
 .Ar signal
 is
-.Li 0 ,
+.Li 0
+or
+.Li EXIT ,
 the action is executed when the shell exits.
 .Ar action
 may be null, which cause the specified signals to be ignored.
-- 
2.0.0.526.g5318336

Re: [PATCH 1/2] [MAN] 0 and EXIT both work for exit traps.

[Herbert Xu]

On Wed, Jun 11, 2014 at 11:20:44PM +0000, Jonathan Nieder wrote:
> From: Adam Buchbinder <adam.buchbinder@gmail.com>
> 
> I saw a discussion in which there was some confusion over whether or not
> you can use a symbolic name, since the manpage doesn't specifically say so.
> 
> Signed-off-by: Adam Buchbinder <adam.buchbinder@gmail.com>
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>

Thanks.  Both patches applied.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

[PATCH 2/2] [MAN] Clarify "trap '' signals" syntax in manual page

[Jonathan Nieder]

When the manpage states

| <action> may be null, which cause the specified signals to be ignored.

it is not immediately obvious what it means for an action to be
null.  Clarify by explicitly referring to an empty string, as
opposed to a NULL pointer or the string "null".

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 ChangeLog  | 4 ++++
 src/dash.1 | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3f59ac2..765b9b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-11  Jonathan Nieder <jrnieder@gmail.com>
+
+	* Clarify "trap '' signals" syntax in manual page.
+
 2014-06-11  Adam Buchbinder <adam.buchbinder@gmail.com>
 
 	* Clarify that 0 and EXIT are both acceptable for exit traps.
diff --git a/src/dash.1 b/src/dash.1
index a07a52d..68bd5fe 100644
--- a/src/dash.1
+++ b/src/dash.1
@@ -2076,7 +2076,9 @@ or
 .Li EXIT ,
 the action is executed when the shell exits.
 .Ar action
-may be null, which cause the specified signals to be ignored.
+may be empty
+.Li ( "''" ) ,
+which causes the specified signals to be ignored.
 With
 .Ar action
 omitted or set to `-' the specified signals are set to their default action.
-- 
2.0.0.526.g5318336