2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index d1c4b3e65..f4baa4ebe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,6 +60,9 @@
      [channels.c channels.h clientloop.c ssh.1]
      support cancellation of local/dynamic forwardings from ~C commandline;
      ok & feedback djm@
+   - okan@cvs.openbsd.org 2011/09/11 06:59:05
+     [ssh.1]
+     document new -O cancel command; ok djm@
 
 20110909
  - (dtucker) [entropy.h] Bug #1932: remove old definition of init_rng.  From
diff --git a/ssh.1 b/ssh.1
index 67a42cb5d..ac61326e8 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.322 2011/09/10 22:26:34 markus Exp $
-.Dd $Mdocdate: September 10 2011 $
+.\" $OpenBSD: ssh.1,v 1.323 2011/09/11 06:59:05 okan Exp $
+.Dd $Mdocdate: September 11 2011 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -393,6 +393,8 @@ Valid commands are:
 (check that the master process is running),
 .Dq forward
 (request forwardings without command execution),
+.Dq cancel
+(cancel forwardings),
 .Dq exit
 (request the master to exit), and
 .Dq stop