- deraadt@cvs.openbsd.org 2013/11/25 18:04:21
[ssh.1 ssh.c]
improve -Q usage and such. One usage change is that the option is now
case-sensitive
ok dtucker markus djm
diff --git a/ssh.1 b/ssh.1
index 73e2086..842affb 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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.340 2013/11/21 00:45:44 djm Exp $
-.Dd $Mdocdate: November 21 2013 $
+.\" $OpenBSD: ssh.1,v 1.341 2013/11/25 18:04:21 deraadt Exp $
+.Dd $Mdocdate: November 25 2013 $
.Dt SSH 1
.Os
.Sh NAME
@@ -60,13 +60,13 @@
.Op Fl p Ar port
.Op Fl R Oo Ar bind_address : Oc Ns Ar port : Ns Ar host : Ns Ar hostport
.Op Fl S Ar ctl_path
+.Op Fl Q Ar cipher | Ar cipher-auth | Ar mac | Ar kex | Ar key
.Op Fl W Ar host : Ns Ar port
.Op Fl w Ar local_tun Ns Op : Ns Ar remote_tun
.Oo Ar user Ns @ Oc Ns Ar hostname
.Op Ar command
.Ek
.Nm
-.Fl Q Ar protocol_feature
.Sh DESCRIPTION
.Nm
(SSH client) is a program for logging into a remote machine and for
@@ -496,23 +496,21 @@
Port to connect to on the remote host.
This can be specified on a
per-host basis in the configuration file.
-.It Fl Q Ar protocol_feature
+.It Fl Q Ar cipher | Ar cipher-auth | Ar mac | Ar kex | Ar key
Queries
.Nm
-for the algorithms supported for the specified version 2
-.Ar protocol_feature .
-The queriable features are:
-.Dq cipher
+for the algorithms supported for the specified version 2.
+The available features are:
+.Ar cipher
(supported symmetric ciphers),
-.Dq cipher-auth
+.Ar cipher-auth
(supported symmetric ciphers that support authenticated encryption),
-.Dq MAC
+.Ar mac
(supported message integrity codes),
-.Dq KEX
+.Ar kex
(key exchange algorithms),
-.Dq key
+.Ar key
(key types).
-Protocol features are treated case-insensitively.
.It Fl q
Quiet mode.
Causes most warning and diagnostic messages to be suppressed.