From 1973c8889875042977ded9774b4363509f4aa79a Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 24 May 2004 10:34:36 +1000
Subject:    - djm@cvs.openbsd.org 2004/05/22 06:32:12      [clientloop.c
 ssh.1]      use '-h' for help in ~C commandline instead of '-?'; inspired by
 jmc@

---
 ChangeLog    | 5 ++++-
 clientloop.c | 4 ++--
 ssh.1        | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0e8f4a556..486d4c2ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@
      bz #756: add support for the cancel-tcpip-forward request for the server and
      the client (through the ~C commandline). reported by z3p AT twistedmatrix.com;
      ok markus@
+   - djm@cvs.openbsd.org 2004/05/22 06:32:12
+     [clientloop.c ssh.1]
+     use '-h' for help in ~C commandline instead of '-?'; inspired by jmc@
 
 20040523
  - (djm) [sshd_config] Explain consequences of UsePAM=yes a little better in 
@@ -1144,4 +1147,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3362 2004/05/24 00:18:05 dtucker Exp $
+$Id: ChangeLog,v 1.3363 2004/05/24 00:34:36 dtucker Exp $
diff --git a/clientloop.c b/clientloop.c
index ce627e8b8..31e604180 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.121 2004/05/21 11:33:11 djm Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.122 2004/05/22 06:32:12 djm Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -521,7 +521,7 @@ process_cmdline(void)
 	if (*s == '\0')
 		goto out;
 
-	if (*s == '?') {
+	if (*s == 'h' || *s == 'H' || *s == '?') {
 		logit("Commands:");
 		logit("      -Lport:host:hostport    Request local forward");
 		logit("      -Rport:host:hostport    Request remote forward");
diff --git a/ssh.1 b/ssh.1
index 7da143b19..008fdde34 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
 .\" (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.186 2004/05/21 11:33:11 djm Exp $
+.\" $OpenBSD: ssh.1,v 1.187 2004/05/22 06:32:12 djm Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -311,8 +311,8 @@ options (see below).
 It also allows the cancellation of existing remote port-forwardings 
 using
 .Fl KR Ar hostport .
-Basic help is available, using the 
-.Fl ?
+Basic help is available, using the
+.Fl h
 option.
 .It Cm ~R
 Request rekeying of the connection
-- 
cgit v1.2.3