simplify the description of what a restricted shell is:

sh.1 does not need to talk about rksh;
ksh.1 does not need to talk about rsh;
also references to rpdksh are not really helpful;

from tamas tevesz;
ok jaredy

2 files changed, 14 insertions, 18 deletions

diff --git a/bin/ksh/ksh.1 b/bin/ksh/ksh.1
index 513774ef1f6..661ca4c6efb 100644
--- a/bin/ksh/ksh.1
+++ b/bin/ksh/ksh.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ksh.1,v 1.109 2005/12/06 20:40:02 jmc Exp $
+.\"	$OpenBSD: ksh.1,v 1.110 2006/03/07 09:31:02 jmc Exp $
 .\"
 .\"	Public Domain
 .\"
@@ -91,15 +91,13 @@ Restricted shell.
 A shell is
 .Dq restricted
 if this
-option is used or if either the basename the shell was invoked
-with or the
+option is used;
+if the basename the shell was invoked with was
+.Dq rksh ;
+or if the
 .Ev SHELL
-parameter match the pattern
-.Dq *r*sh
-(e.g.\&
-.Nm rsh ,
-.Nm rksh ,
-.Nm rpdksh ) .
+parameter is set to
+.Dq rksh .
 The following restrictions come into effect after the shell processes any
 profile and
 .Ev ENV
diff --git a/bin/ksh/sh.1 b/bin/ksh/sh.1
index 84dd3a22262..1a564aef7bd 100644
--- a/bin/ksh/sh.1
+++ b/bin/ksh/sh.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sh.1,v 1.71 2005/10/07 09:17:38 jmc Exp $
+.\"	$OpenBSD: sh.1,v 1.72 2006/03/07 09:31:01 jmc Exp $
 .\"
 .\"	Public Domain
 .\"
@@ -88,15 +88,13 @@ Restricted shell.
 A shell is
 .Dq restricted
 if this
-option is used or if either the basename the shell was invoked
-with or the
+option is used;
+if the basename the shell was invoked with was
+.Dq rsh ;
+or if the
 .Ev SHELL
-parameter match the pattern
-.Dq *r*sh
-(e.g.\&
-.Nm rsh ,
-.Nm rksh ,
-.Nm rpdksh ) .
+parameter is set to
+.Dq rsh .
 The following restrictions come into effect after the shell processes any
 profile and
 .Ev ENV