2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 439893da6..03b16cc2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,10 @@
      [clientloop.c log.c ssh.1 log.h]
      Add ~v and ~V escape sequences to raise and lower the logging level
      respectively. Man page help from jmc, ok deraadt jmc
+   - dtucker@cvs.openbsd.org 2012/09/06 09:50:13
+     [clientloop.c]
+     Make the escape command help (~?) context sensitive so that only commands
+     that will work in the current session are shown.  ok markus@
 
 20120830
  - (dtucker) [moduli] Import new moduli file.
diff --git a/clientloop.c b/clientloop.c
index 0e5c45a9d..72b1d40f0 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.242 2012/09/06 04:37:38 dtucker Exp $ */
+/* $OpenBSD: clientloop.c,v 1.243 2012/09/06 06:25:41 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1200,8 +1200,8 @@ Supported escape sequences:\r\n\
   %cB  - send a BREAK to the remote system\r\n\
   %cC  - open a command line\r\n\
   %cR  - Request rekey (SSH protocol 2 only)\r\n\
-  %cV  - Increase verbosity (LogLevel)\r\n\
-  %cv  - Decrease verbosity (LogLevel)\r\n\
+  %cV  - Decrease verbosity (LogLevel)\r\n\
+  %cv  - Increase verbosity (LogLevel)\r\n\
   %c^Z - suspend ssh\r\n\
   %c#  - list forwarded connections\r\n\
   %c&  - background ssh (when waiting for connections to terminate)\r\n\