4 files changed, 24 insertions, 1 deletions
diff --git a/.hgsigs b/.hgsigs
index 92f6ce36d..b6c252df8 100644
--- a/.hgsigs
+++ b/.hgsigs
@@ -4,3 +4,4 @@
 b591d00fcd386cdd3779378c34b2d42b7504afc4 0 iD8DBQBHh5UfsBKtjPGfWZ8RAgvMAJ9xwnDNifmaobFYe2nR7+rJlLTkEQCgguGMqwqRZY68HWQXhEx918hp4Yg=
 ae1e23df14223cdacf83df75b28b223895d658c2 0 iD8DBQBHm6SjsBKtjPGfWZ8RAi8HAKDAHmmLu8rwN5XJJPhfEofE7BTpsgCfTyNzku+v/PhqXgl4kQnRiB6nUSE=
 d912bda42df43a6ec24a4d479e202c327a733a42 0 iD8DBQBH4R2HsBKtjPGfWZ8RAr/IAJ46ypOhqO0EiSDrZYhumvpFYtrPQwCbBz/SXSDNuJNaKlR70Ep+THmhFIk=
+92dad3eca733ff0daecd6b1a539f8b077ea071cb 0 iD8DBQBH76CDsBKtjPGfWZ8RAnQUAJ9ARudZye68h9JIKe10wIsWm6OQEwCgvjS+c6o48SjNrb5l7i8KisKG89o=
diff --git a/.hgtags b/.hgtags
index ab55cbd20..a70a10e01 100644
--- a/.hgtags
+++ b/.hgtags
@@ -71,3 +71,4 @@ af8d20ae15d8c619ce0e215817d4b8fdba814407 vdr-xine-version-801
 c3a5e9ba6dfc694408275a54114d571d68acbd25 vdr-xine-version-712
 ffe7962edb79c2ed967b82a82ccfb2ac7eb148a2 vdr-xine-version-802
 10a6bc10e58f45f6cb79f634bdb6b7daa3167742 xine-lib-1_1_11-release
+2a2cc543b27b64a6587dfaef4f1d986eb2f2710a xine-lib-1_1_11_1-release
diff --git a/ChangeLog b/ChangeLog
index cbbc8d8ec..4c85154cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,7 +64,7 @@ xine-lib (1.1.90) (Unreleased)
   * Report more video output capabilities via (port)->get_capabilities():
     colour controls, zooming, colour keying.
 
-xine-lib (1.1.11.1) 2008-??-??
+xine-lib (1.1.11.1) 2008-03-30
   * Security fixes:
     - Integer overflows in FLV, Qt, Real, WC3Movie, Matroska and FILM
       demuxers, allowing remote attackers to trigger heap overflows and
diff --git a/doc/man/en/xine.5 b/doc/man/en/xine.5
index c5c6600de..3d3975ec4 100644
--- a/doc/man/en/xine.5
+++ b/doc/man/en/xine.5
@@ -257,6 +257,23 @@ audio program ID
 .TP 20
 .B service-id
 service ID (needed for now/next information etc.)
+.PP
+The following keyboard & mouse inputs may be accepted:
+.TP 24
+.B Menu 2
+Start/stop recording
+.TP 24
+.B Menu 3
+Toggle zoom
+.TP 24
+.B Menu 7
+Toggle now/next display
+.TP 24
+.B Previous/Next Chapter
+Previous/next channel
+.TP 24
+.B Mouse wheel & button 1
+Scroll through channel list & select the highlighted channel
 .SH SUBTITLE
 .B external subtitle files (any mrl)
 .br
@@ -296,6 +313,10 @@ Set audio dynamic range compression.
 .BI <config\ entry> : <config\ value>
 Assign a new value to any config entry.
 .TP
+.BI save: <file>
+Save the stream (if allowed) to the named file, relative to the directory
+given by the option "media.capture.save_dir".
+.TP
 .B change configuration option 'on the fly':
 .br
 You can change a configuration option at any time, using the special