summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh_config.56
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1b920b197..eceb85b4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
12 - djm@cvs.openbsd.org 2013/10/20 09:51:26 12 - djm@cvs.openbsd.org 2013/10/20 09:51:26
13 [scp.1 sftp.1] 13 [scp.1 sftp.1]
14 add canonicalisation options to -o lists 14 add canonicalisation options to -o lists
15 - jmc@cvs.openbsd.org 2013/10/20 18:00:13
16 [ssh_config.5]
17 tweak the "exec" description, as worded by djm;
15 18
1620131018 1920131018
17 - (djm) OpenBSD CVS Sync 20 - (djm) OpenBSD CVS Sync
diff --git a/ssh_config.5 b/ssh_config.5
index b60dc1a51..4161a6624 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,7 +33,7 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh_config.5,v 1.176 2013/10/20 06:19:28 djm Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.177 2013/10/20 18:00:13 jmc Exp $
37.Dd $Mdocdate: October 20 2013 $ 37.Dd $Mdocdate: October 20 2013 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
@@ -143,9 +143,9 @@ The available keywords are:
143and 143and
144.Cm localuser . 144.Cm localuser .
145.Pp 145.Pp
146The criteria for the 146The
147.Cm exec 147.Cm exec
148keyword is command that is executed under the user's shell.. 148keyword executes the specified command under the user's shell.
149If the command returns a zero exit status then the condition is considered true. 149If the command returns a zero exit status then the condition is considered true.
150Commands containing whitespace characters must be quoted. 150Commands containing whitespace characters must be quoted.
151The following character sequences in the command will be expanded prior to 151The following character sequences in the command will be expanded prior to