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 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh.1,v 1.350 2014/10/08 22:20:25 djm Exp $ -.Dd $Mdocdate: October 8 2014 $ +.\" $OpenBSD: ssh.1,v 1.351 2014/10/09 06:21:31 jmc Exp $ +.Dd $Mdocdate: October 9 2014 $ .Dt SSH 1 .Os .Sh NAME @@ -43,7 +43,7 @@ .Sh SYNOPSIS .Nm ssh .Bk -words -.Op Fl 1246AaCfgGKkMNnqsTtVvXxYy +.Op Fl 1246AaCfGgKkMNnqsTtVvXxYy .Op Fl b Ar bind_address .Op Fl c Ar cipher_spec .Op Fl D Oo Ar bind_address : Oc Ns Ar port @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.408 2014/10/08 22:20:25 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.409 2014/10/09 06:21:31 jmc Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -199,7 +199,7 @@ static void usage(void) { fprintf(stderr, -"usage: ssh [-1246AaCfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n" +"usage: ssh [-1246AaCfGgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n" " [-D [bind_address:]port] [-E log_file] [-e escape_char]\n" " [-F configfile] [-I pkcs11] [-i identity_file]\n" " [-L [bind_address:]port:host:hostport] [-l login_name] [-m mac_spec]\n" diff --git a/ssh_config.5 b/ssh_config.5 index b702e323..9677ef07 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.193 2014/10/08 22:20:25 djm Exp $ -.Dd $Mdocdate: October 8 2014 $ +.\" $OpenBSD: ssh_config.5,v 1.194 2014/10/09 06:21:31 jmc Exp $ +.Dd $Mdocdate: October 9 2014 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -154,7 +154,7 @@ and The .Cm all criteria must appear alone or immediately after -.Cm canonical. +.Cm canonical . Other criteria may be combined arbitrarily. All criteria but .Cm all |