summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-04-18 08:07:43 +1000
committerDamien Miller <djm@mindrot.org>2010-04-18 08:07:43 +1000
commitc4eddee1b7281dc076f8539569ca78291dde8103 (patch)
treed3ddcb41c15ecf7998ce018a4eb0dc8174bc77bc
parent4e270b05dd9d850fb9e2e0ac43f33cb4090d3ebc (diff)
- OpenBSD CVS Sync
- jmc@cvs.openbsd.org 2010/04/16 06:45:01 [ssh_config.5] tweak previous; ok djm
-rw-r--r--ChangeLog6
-rw-r--r--ssh_config.510
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b058de0f8..765477302 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120100418
2 - OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2010/04/16 06:45:01
4 [ssh_config.5]
5 tweak previous; ok djm
6
120100416 720100416
2 - (djm) Release openssh-5.5p1 8 - (djm) Release openssh-5.5p1
3 - OpenBSD CVS Sync 9 - OpenBSD CVS Sync
diff --git a/ssh_config.5 b/ssh_config.5
index 3f0f537a9..2df948e62 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.132 2010/04/14 22:27:42 djm Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.133 2010/04/16 06:45:01 jmc Exp $
38.Dd $Mdocdate: April 14 2010 $ 38.Dd $Mdocdate: April 16 2010 $
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -759,13 +759,13 @@ Specifies the command to use to connect to the server.
759The command 759The command
760string extends to the end of the line, and is executed with 760string extends to the end of the line, and is executed with
761the user's shell. 761the user's shell.
762In the command string, any occurance of 762In the command string, any occurrence of
763.Ql %h 763.Ql %h
764will be substituted by the host name to 764will be substituted by the host name to
765connect, 765connect,
766.Ql %p 766.Ql %p
767by the port and 767by the port, and
768.Ql %u 768.Ql %r
769by the remote user name. 769by the remote user name.
770The command can be basically anything, 770The command can be basically anything,
771and should read from its standard input and write to its standard output. 771and should read from its standard input and write to its standard output.