summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-05-15 08:47:18 +1000
committerDamien Miller <djm@mindrot.org>2011-05-15 08:47:18 +1000
commit486dd2eadbbb4d51d0062789fdb8d8f7a3fe51fd (patch)
treee1d567b06114a7a807359feb2124986c6527579c
parentc067f6256048f01e646cc3db71ad3d836a742ac1 (diff)
- jmc@cvs.openbsd.org 2011/05/07 23:19:39
[ssh_config.5] - tweak previous - come consistency fixes ok djm
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.511
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 0a3b93580..51de4ee26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,6 +42,11 @@
42 - djm@cvs.openbsd.org 2011/05/06 22:20:10 42 - djm@cvs.openbsd.org 2011/05/06 22:20:10
43 [PROTOCOL.mux] 43 [PROTOCOL.mux]
44 fix numbering; from bert.wesarg AT googlemail.com 44 fix numbering; from bert.wesarg AT googlemail.com
45 - jmc@cvs.openbsd.org 2011/05/07 23:19:39
46 [ssh_config.5]
47 - tweak previous
48 - come consistency fixes
49 ok djm
45 50
4620110510 5120110510
47 - (dtucker) [openbsd-compat/openssl-compat.{c,h}] Bug #1882: fix 52 - (dtucker) [openbsd-compat/openssl-compat.{c,h}] Bug #1882: fix
diff --git a/ssh_config.5 b/ssh_config.5
index 83baa82b1..7a3b641ff 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
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.149 2011/05/06 21:34:32 djm Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.150 2011/05/07 23:19:39 jmc Exp $
37.Dd $Mdocdate: May 6 2011 $ 37.Dd $Mdocdate: May 7 2011 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -320,8 +320,9 @@ will be substituted by the first component of the local host name,
320will be substituted by the local host name (including any domain name), 320will be substituted by the local host name (including any domain name),
321.Ql %h 321.Ql %h
322will be substituted by the target host name, 322will be substituted by the target host name,
323.Ql %h 323.Ql %n
324will be substituted by original target host name specified on the commandline, 324will be substituted by the original target host name
325specified on the command line,
325.Ql %p 326.Ql %p
326the port, 327the port,
327.Ql %r 328.Ql %r
@@ -585,7 +586,7 @@ Specifies the real host name to log into.
585This can be used to specify nicknames or abbreviations for hosts. 586This can be used to specify nicknames or abbreviations for hosts.
586If the hostname contains the character sequence 587If the hostname contains the character sequence
587.Ql %h , 588.Ql %h ,
588then this will be replaced with the host name specified on the commandline 589then this will be replaced with the host name specified on the command line
589(this is useful for manipulating unqualified names). 590(this is useful for manipulating unqualified names).
590The default is the name given on the command line. 591The default is the name given on the command line.
591Numeric IP addresses are also permitted (both on the command line and in 592Numeric IP addresses are also permitted (both on the command line and in