diff options
author | jmc@openbsd.org <jmc@openbsd.org> | 2014-10-09 06:21:31 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-10-20 14:40:05 +1100 |
commit | b1ba15f3885947c245c2dbfaad0a04ba050abea0 (patch) | |
tree | 86f24c8fe804f7a8785b5348c4191bd8841df371 | |
parent | 259a02ebdf74ad90b41d116ecf70aa823fa4c6e7 (diff) |
upstream commit
tweak previous;
-rw-r--r-- | ssh.1 | 6 | ||||
-rw-r--r-- | ssh.c | 4 | ||||
-rw-r--r-- | ssh_config.5 | 6 |
3 files changed, 8 insertions, 8 deletions
@@ -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.1,v 1.350 2014/10/08 22:20:25 djm Exp $ | 36 | .\" $OpenBSD: ssh.1,v 1.351 2014/10/09 06:21:31 jmc Exp $ |
37 | .Dd $Mdocdate: October 8 2014 $ | 37 | .Dd $Mdocdate: October 9 2014 $ |
38 | .Dt SSH 1 | 38 | .Dt SSH 1 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -43,7 +43,7 @@ | |||
43 | .Sh SYNOPSIS | 43 | .Sh SYNOPSIS |
44 | .Nm ssh | 44 | .Nm ssh |
45 | .Bk -words | 45 | .Bk -words |
46 | .Op Fl 1246AaCfgGKkMNnqsTtVvXxYy | 46 | .Op Fl 1246AaCfGgKkMNnqsTtVvXxYy |
47 | .Op Fl b Ar bind_address | 47 | .Op Fl b Ar bind_address |
48 | .Op Fl c Ar cipher_spec | 48 | .Op Fl c Ar cipher_spec |
49 | .Op Fl D Oo Ar bind_address : Oc Ns Ar port | 49 | .Op Fl D Oo Ar bind_address : Oc Ns Ar port |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.408 2014/10/08 22:20:25 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.409 2014/10/09 06:21:31 jmc Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -199,7 +199,7 @@ static void | |||
199 | usage(void) | 199 | usage(void) |
200 | { | 200 | { |
201 | fprintf(stderr, | 201 | fprintf(stderr, |
202 | "usage: ssh [-1246AaCfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n" | 202 | "usage: ssh [-1246AaCfGgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n" |
203 | " [-D [bind_address:]port] [-E log_file] [-e escape_char]\n" | 203 | " [-D [bind_address:]port] [-E log_file] [-e escape_char]\n" |
204 | " [-F configfile] [-I pkcs11] [-i identity_file]\n" | 204 | " [-F configfile] [-I pkcs11] [-i identity_file]\n" |
205 | " [-L [bind_address:]port:host:hostport] [-l login_name] [-m mac_spec]\n" | 205 | " [-L [bind_address:]port:host:hostport] [-l login_name] [-m mac_spec]\n" |
diff --git a/ssh_config.5 b/ssh_config.5 index b702e323f..9677ef079 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.193 2014/10/08 22:20:25 djm Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.194 2014/10/09 06:21:31 jmc Exp $ |
37 | .Dd $Mdocdate: October 8 2014 $ | 37 | .Dd $Mdocdate: October 9 2014 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -154,7 +154,7 @@ and | |||
154 | The | 154 | The |
155 | .Cm all | 155 | .Cm all |
156 | criteria must appear alone or immediately after | 156 | criteria must appear alone or immediately after |
157 | .Cm canonical. | 157 | .Cm canonical . |
158 | Other criteria may be combined arbitrarily. | 158 | Other criteria may be combined arbitrarily. |
159 | All criteria but | 159 | All criteria but |
160 | .Cm all | 160 | .Cm all |