diff options
author | Damien Miller <djm@cvs.openbsd.org> | 2004-05-22 06:32:13 +0000 |
---|---|---|
committer | Damien Miller <djm@cvs.openbsd.org> | 2004-05-22 06:32:13 +0000 |
commit | 99b3fde6241b77d30d522c5386d7b52251708ab3 (patch) | |
tree | 82a73a539c665f557bceca34c1a26ee7fef98fac /usr.bin/ssh | |
parent | 39bf0fa8b62f09327394be022b355659ffb8ae3a (diff) |
use '-h' for help in ~C commandline instead of '-?'; inspired by jmc@
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r-- | usr.bin/ssh/clientloop.c | 4 | ||||
-rw-r--r-- | usr.bin/ssh/ssh.1 | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c index ce627e8b824..31e604180a6 100644 --- a/usr.bin/ssh/clientloop.c +++ b/usr.bin/ssh/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/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1 index 7da143b198d..008fdde34bf 100644 --- a/usr.bin/ssh/ssh.1 +++ b/usr.bin/ssh/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 |