summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2007-12-02 23:09:30 +1100
committerDarren Tucker <dtucker@zip.com.au>2007-12-02 23:09:30 +1100
commit63b31cb9437185dff9574f0245e6953bb7651759 (patch)
treef86a9939caab8812cc0315ae54d51a19d0d4a2be
parentb776c856aa086b0e136b858d9484c155cb00a99b (diff)
- jmc@cvs.openbsd.org 2007/10/29 07:48:19
[ssh_config.5] clean up after previous macro removal;
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.58
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 818d71834..57590bddc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@
23 - dtucker@cvs.openbsd.org 2007/10/29 06:54:50 23 - dtucker@cvs.openbsd.org 2007/10/29 06:54:50
24 [ssh.c] 24 [ssh.c]
25 Make LocalCommand work for Protocol 1 too; ok djm@ 25 Make LocalCommand work for Protocol 1 too; ok djm@
26 - jmc@cvs.openbsd.org 2007/10/29 07:48:19
27 [ssh_config.5]
28 clean up after previous macro removal;
26 29
2720071030 3020071030
28 - (djm) OpenBSD CVS Sync 31 - (djm) OpenBSD CVS Sync
@@ -3440,4 +3443,4 @@
3440 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3443 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3441 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3444 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3442 3445
3443$Id: ChangeLog,v 1.4801 2007/12/02 12:06:35 dtucker Exp $ 3446$Id: ChangeLog,v 1.4802 2007/12/02 12:09:30 dtucker Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 3535d9f97..17fc0ec66 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,8 +34,8 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh_config.5,v 1.104 2007/10/29 06:51:59 dtucker Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.105 2007/10/29 07:48:19 jmc Exp $
38.Dd $Mdocdate: October 29 2007 $ 38.Dd $Mdocdate: December 2 2007 $
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -599,7 +599,7 @@ and
599Specifies a command to execute on the local machine after successfully 599Specifies a command to execute on the local machine after successfully
600connecting to the server. 600connecting to the server.
601The command string extends to the end of the line, and is executed with 601The command string extends to the end of the line, and is executed with
602the user's shell . 602the user's shell.
603This directive is ignored unless 603This directive is ignored unless
604.Cm PermitLocalCommand 604.Cm PermitLocalCommand
605has been enabled. 605has been enabled.
@@ -723,7 +723,7 @@ if version 2 is not available.
723Specifies the command to use to connect to the server. 723Specifies the command to use to connect to the server.
724The command 724The command
725string extends to the end of the line, and is executed with 725string extends to the end of the line, and is executed with
726the user's shell . 726the user's shell.
727In the command string, 727In the command string,
728.Ql %h 728.Ql %h
729will be substituted by the host name to 729will be substituted by the host name to