From 12770d540706a864e6d6c47195dd03ed4d51f678 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 10 Sep 2013 15:09:24 +0200
Subject: manpage: various improvements

Took a superficial look at the manpage, and fixed whatever I spotted.
---
 DOCS/man/en/mpv.rst | 34 +++++++---------------------------
 1 file changed, 7 insertions(+), 27 deletions(-)

(limited to 'DOCS/man/en/mpv.rst')

diff --git a/DOCS/man/en/mpv.rst b/DOCS/man/en/mpv.rst
index 74cc70f1e5..a73be8bad5 100644
--- a/DOCS/man/en/mpv.rst
+++ b/DOCS/man/en/mpv.rst
@@ -203,8 +203,7 @@ corresponding adjustment, or the software equalizer (``--vf=eq``).)
 7 and 8
     Adjust saturation.
 
-(The following keys are valid only when using the corevideo video output
-driver.)
+(The following keys are valid only on OSX.)
 
 command + 0
     Resize movie window to half its original size.
@@ -233,7 +232,7 @@ PREVIOUS and NEXT
     Seek backward/forward 1 minute.
 
 (The following keys are only valid if you compiled with TV or DVB input
-support and will take precedence over the keys defined above.)
+support.)
 
 h and k
     Select previous/next channel.
@@ -253,24 +252,6 @@ button 3 and button 4
 button 5 and button 6
     Decrease/increase volume.
 
-Joystick Control
-----------------
-
-left and right
-    Seek backward/forward 10 seconds.
-
-up and down
-    Seek forward/backward 1 minute.
-
-button 1
-    Pause.
-
-button 2
-    Toggle OSD states: none / seek / seek + timer / seek + timer + total time.
-
-button 3 and button 4
-    Decrease/increase volume.
-
 
 USAGE
 =====
@@ -315,6 +296,8 @@ file1.mkv       ``--a --b --c``
 file2.mkv       ``--a --b --c``
 =============== ===========================
 
+(This is different from MPlayer and mplayer2.)
+
 Also, if any option is changed at runtime (via input commands), they are not
 reset when a new file is played.
 
@@ -499,7 +482,7 @@ behavior of mpv.
 
 FFmpeg/Libav:
     This library accesses various environment variables. However, they are not
-    centrally documented, and documenting them is not our job. Therefore, the
+    centrally documented, and documenting them is not our job. Therefore, this
     list is incomplete.
 
     Notable environment variables:
@@ -602,13 +585,10 @@ FILES
 EXAMPLES OF MPV USAGE
 =====================
 
-Quickstart Blu-ray playing:
+Blu-ray playback:
     - ``mpv bd:////path/to/disc``
     - ``mpv bd:// --bluray-device=/path/to/disc``
 
-Quickstart DVD playing:
-    ``mpv dvd://1``
-
 Play in Japanese with English subtitles:
     ``mpv dvd://1 --alang=ja --slang=en``
 
@@ -644,6 +624,6 @@ mpv is a MPlayer fork based on mplayer2, which in turn is a fork of MPlayer.
 MPlayer was initially written by Arpad Gereoffy. See the ``AUTHORS`` file for
 a list of some of the many other contributors.
 
-MPlayer is (C) 2000-2012 The MPlayer Team
+MPlayer is (C) 2000-2013 The MPlayer Team
 
 This man page was written mainly by Gabucino, Jonas Jermann and Diego Biurrun.
-- 
cgit v1.2.3