manpage: various fixes

7 files changed, 41 insertions, 81 deletions

diff --git a/DOCS/man/en/af.rst b/DOCS/man/en/af.rst
index 1fe480dcdc..a53e6afd42 100644
--- a/DOCS/man/en/af.rst
+++ b/DOCS/man/en/af.rst
@@ -534,9 +534,3 @@ scaletempo[=option1:option2:...]
         Would playback audio file at 1.2x normal speed, with audio at normal
         pitch. Changing playback speed, would change pitch, leaving audio
         tempo at 1.2x.
-
-stats
-    Collects and prints statistics about the audio stream, especially the
-    volume. These statistics are especially intended to help adjusting the
-    volume while avoiding clipping. The volumes are printed in dB and
-    compatible with the volume audio filter.
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index 5febb3afd2..ac36feda21 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -57,11 +57,12 @@ General changes for mplayer2 to mpv
 * Removal of teletext support
 * Replace image VOs (``--vo=jpeg`` etc.) with ``--vo=image``
 * Do not lose settings when playing a new file in the same player instance
-* New location for config files, new name for the binary. (Planned change.)
+* New location for config files, new name for the binary.
 * Slave mode compatibility broken (see below)
-* Encoding functionality (replacement for mencoder)
-  (Remove ``--vo=gif89a``, ``--vo=md5sum``, ``--vo=yuv4mpeg``, as encoding can
-  handle these use cases.)
+* Encoding functionality (replacement for mencoder, see ``DOCS/encoding.rst``)
+* Remove ``--vo=gif89a``, ``--vo=md5sum``, ``--vo=yuv4mpeg``, as encoding can
+  handle these use cases. For yuv4mpeg, for example, use:
+  ``mpv input.mkv -o output.y4m --no-audio``.
 * Image subtitles (DVDs etc.) are rendered in color and use more correct
   positioning
 * General code cleanups
@@ -149,7 +150,8 @@ Other
 ~~~~~
 
 * The playtree has been removed. **mpv**'s internal playlist is a simple and
-  flat list now. This makes the code easier, and makes using it less confusing.
+  flat list now. This makes the code easier, and makes **mpv** usage less
+  confusing.
 * Slave mode is broken. This mode is entirely insane in the ``old`` versions of
   mplayer. A proper slave mode application needed tons of code and hacks to get
   it right. The main problem is that slave mode is a bad and incomplete
diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst
index 2f6e0b1e09..9a6b8e1adf 100644
--- a/DOCS/man/en/input.rst
+++ b/DOCS/man/en/input.rst
@@ -77,8 +77,7 @@ seek <seconds> [relative|absolute|absolute-percent|- [default-precise|exact|keyf
         Always restart playback at keyframe boundaries (fast).
 
 frame_step
-    Basically seek forward by one frame. Actually this plays one frame, then
-    pauses again.
+    Play one frame, then pause.
 
 set <property> "<value>"
     Set the given property to the given value.
@@ -154,7 +153,7 @@ playlist_clear
 
 run "<command>"
     Run the given command with ``/bin/sh -c``. The string is expanded like in
-    ``--playing-msg`` before
+    ``--playing-msg``.
 
 quit [<code>]
     Exit the player using the given exit code.
@@ -197,7 +196,7 @@ show_tracks
 
 
 
-Undocumented properties: tv_start_scan, tv_step_channel, tv_step_norm,
+Undocumented commands: tv_start_scan, tv_step_channel, tv_step_norm,
 tv_step_chanlist, tv_set_channel, tv_last_channel, tv_set_freq, tv_step_freq,
 tv_set_norm, dvb_set_channel, radio_step_channel, radio_set_channel,
 radio_set_freq, radio_step_freq (all of these should be replaced by properties),
@@ -266,7 +265,7 @@ chapters                      number of chapters
 editions                      number of MKV editions
 angle                       x current DVD angle
 metadata                      metadata key/value pairs
-metadata/<key>                value of metedata entry <key>
+metadata/<key>                value of metadata entry <key>
 pause                       x pause status (bool)
 pts-association-mode        x see ``--pts-association-mode``
 hr-seek                     x see ``--hr-seek``
diff --git a/DOCS/man/en/mpv.rst b/DOCS/man/en/mpv.rst
index 96ccb10691..8b6dc0acca 100644
--- a/DOCS/man/en/mpv.rst
+++ b/DOCS/man/en/mpv.rst
@@ -128,9 +128,6 @@ v
 j and J
     Cycle through the available subtitles.
 
-y and g
-    Adjust subtitle delay to immediately display previous/next subtitle.
-
 F
     Toggle displaying "forced subtitles".
 
@@ -603,9 +600,6 @@ Stream from HTTP:
 Stream using RTSP:
     ``mpv rtsp://server.example.com/streamName``
 
-input from standard V4L:
-    ``mpv tv:// --tv=driver=v4l:width=640:height=480:outfmt=i420 --vc=rawi420 --vo=xv``
-
 AUTHORS
 =======
 
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index e4fbca3af8..5796c7f6d7 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -361,7 +361,7 @@
     options --colormatrix-input-range and --colormatrix-output-range.
 
     These options are not always supported. Different video outputs provide
-    varying degrees of support. The gl and vdpau video output drivers usually
+    varying degrees of support. The opengl and vdpau video output drivers usually
     offer full support. The xv output can set the color space if the system
     video driver supports it, but not input and output levels. The scale video
     filter can configure color space and input levels, but only if the output
@@ -472,7 +472,7 @@
 
     ``--display=xtest.localdomain:0``
 
---doubleclick-time
+--doubleclick-time=<milliseconds>
     Time in milliseconds to recognize two consecutive button presses as a
     double-click (default: 300).
 
@@ -543,9 +543,8 @@
     ``--ss=10 --endpos=56``
         Stop at 1 minute 6 seconds.
 
---extbased, --no-extbased
-    Enabled by default.
-    Disables extension-based demuxer selection. By default, when the file type
+--no-extbased, --extbased
+    ``--no-extbased`` disables extension-based demuxer selection. By default, when the file type
     (demuxer) cannot be detected reliably (the file has no header or it is not
     reliable enough), the filename extension is used to select the demuxer.
     Always falls back on content-based demuxer selection.
@@ -560,12 +559,9 @@
     :0:  top field first
     :1:  bottom field first
 
---fixed-vo, --no-fixed-vo
-    ``--fixed-vo`` enforces a fixed video system for multiple files (one
-    (un)initialization for all files). Therefore only one window will be
-    opened for all files. Now enabled by default, use ``--no-fixed-vo`` to
-    disable and create a new window whenever the video stream changes. Some of
-    the older drivers may not be *fixed-vo* compliant.
+--no-fixed-vo, --fixed-vo
+    ``--no-fixed-vo`` enforces closing and reopening the video window for
+    multiple files (one (un)initialization for all files).
 
 --flip
     Flip image upside-down.
@@ -621,8 +617,7 @@
 --frames=<number>
     Play/convert only first <number> frames, then quit.
 
---fullscreen
---fs
+--fullscreen, --fs
     Fullscreen playback (centers movie, and paints black bands around it).
 
 --fsmode-dontuse=<0-31>
@@ -818,6 +813,7 @@
     size for VOBsub subtitles.
 
 --ignore-start
+    Matters with the builtin AVI demuxer only, which is not enabled by default.
     Ignore the specified starting time for streams in AVI files. This
     nullifies stream delays.
 
@@ -891,14 +887,10 @@
 --joystick, --no-joystick
     Enable/disable joystick support. Enabled by default.
 
---keepaspect, --no-keepaspect
-    Keep window aspect ratio when resizing windows. Enabled by default. By
-    default mpv tries to keep the correct video aspect ratio by
-    instructing the window manager to maintain window aspect when resizing,
-    and by adding black bars if the window manager nevertheless allows window
-    shape to change. --no-keepaspect disables window manager aspect hints and
-    scales the video to completely fill the window without regard for aspect
-    ratio.
+--no-keepaspect, --keepaspect
+    --no-keepaspect will always stretch the video to window size, and will
+    disable the window manager hints that force the window aspect ratio.
+    (Ignored in fullscreen mode.)
 
 --key-fifo-size=<2-65000>
     Specify the size of the FIFO that buffers key events (default: 7). If it
@@ -1146,8 +1138,8 @@
     Enabled by default. Disable mouse button press/release input
     (mozplayerxp's context menu relies on this option).
 
---msgcolor
-    Enable colorful console output on terminals that support ANSI color.
+--no-msgcolor
+    Disable colorful console output on terminals.
 
 --msglevel=<module1=level1:module2=level2:...>
     Control verbosity directly for each module. The *all* module changes the
@@ -1253,7 +1245,8 @@
 
 --overlapsub
     Allows the next subtitle to be displayed while the current one is still
-    visible (default is to enable the support only for specific formats).
+    visible (default is to enable the support only for specific formats). This
+    only matters for subtitles loaded with ``-sub``.
 
 --panscan=<0.0-1.0>
     Enables pan-and-scan functionality (cropping the sides of e.g. a 16:9
@@ -1828,7 +1821,6 @@
 --sub-pos=<0-100>
     Specify the position of subtitles on the screen. The value is the vertical
     position of the subtitle in % of the screen height.
-    Can be useful with ``--vf=expand``.
 
 --sws=<n>
     Specify the software scaler algorithm to be used with the ``--zoom``
@@ -2090,7 +2082,8 @@
     Use <string> as user agent for HTTP streaming.
 
 --utf8
-    Tells mpv to handle the subtitle file as UTF-8.
+    Tells mpv to handle the subtitle file as UTF-8. By default, the subtitle
+    file encoding is guessed, and all text converted to UTF-8 internally.
 
 -v
     Increment verbosity level, one level for each ``-v`` found on the command
@@ -2172,28 +2165,6 @@
     Supported by at least the direct3d, gl, x11, xv and corevideo video output
     drivers.
 
---xvidopts=<option1:option2:...>
-    Specify additional parameters when decoding with Xvid.
-
-    *NOTE*: Since libavcodec is faster than Xvid you might want to use the
-    libavcodec postprocessing filter (``--vf=pp``) and decoder
-    (``--vfm=ffmpeg``) instead.
-
-    Xvid's internal postprocessing filters:
-
-    :deblock-chroma (see also ``--vf=pp``):    chroma deblock filter
-    :deblock-luma   (see also ``--vf=pp``):    luma deblock filter
-    :dering-luma    (see also ``--vf=pp``):    luma deringing filter
-    :dering-chroma  (see also ``--vf=pp``):    chroma deringing filter
-    :filmeffect     (see also ``--vf=noise``):
-        Adds artificial film grain to the video. May increase perceived
-        quality, while lowering true quality.
-
-    rendering methods:
-
-    :dr2:   Activate direct rendering method 2.
-    :nodr2: Deactivate direct rendering method 2.
-
 --xy=<value>
 
     :value<=8: Scale image by factor <value>.
diff --git a/DOCS/man/en/vf.rst b/DOCS/man/en/vf.rst
index 31947e82b6..f96fb20ac9 100644
--- a/DOCS/man/en/vf.rst
+++ b/DOCS/man/en/vf.rst
@@ -515,9 +515,7 @@ divtc[=options]
     and can resync at the exact spot. These passes do *not* correspond to pass
     one and two of the encoding process. You must run an extra pass using
     divtc pass one before the actual encoding throwing the resulting video
-    away. Use ``--nosound --ovc=raw -o /dev/null`` to avoid wasting CPU power
-    for this pass. You may add something like ``crop=2:2:0:0`` after divtc to
-    speed things up even more. Then use divtc pass two for the actual
+    away. Then use divtc pass two for the actual
     encoding. If you use multiple encoder passes, use divtc pass two for all
     of them. The options are:
 
@@ -663,6 +661,9 @@ screenshot
     not always safe to insert this filter by default. See the
     ``Taking screenshots`` section for details.
 
+screenshot_force
+    Same as ``screenshot``, but prefer it over VO based screenshot code.
+
 sub
     Moves subtitle rendering to an arbitrary point in the filter
     chain, or force subtitle rendering in the video filter as opposed to using
diff --git a/DOCS/man/en/vo.rst b/DOCS/man/en/vo.rst
index d3dcf7f388..57d8fa7119 100644
--- a/DOCS/man/en/vo.rst
+++ b/DOCS/man/en/vo.rst
@@ -236,7 +236,7 @@ opengl
     and color management.
 
     By default, it tries to use fast and fail-safe settings. Use the alias
-    ``opengl-hq`` to use this driver with defaults set for high quality
+    ``opengl-hq`` to use this driver with defaults set to high quality
     rendering.
 
     Requires at least OpenGL 2.1 and the GL_ARB_texture_rg extension. For older
@@ -410,8 +410,8 @@ opengl
         first render the video into a video-sized RGB texture, and
         draw the result on screen. The luma scaler is used to scale
         the RGB image when rendering to screen. The chroma scaler
-        is used only on YUV conversion, and only if the video uses
-        chroma-subsampling.
+        is used only on YUV conversion, and only if the video is
+        chroma-subsampled (usually the case).
         This mechanism is disabled on RGB input.
         Specifying this option directly is generally useful for debugging only.
 
@@ -472,8 +472,7 @@ opengl-old
     OpenGL video output driver, old version. Video size must be smaller
     than the maximum texture size of your OpenGL implementation. Intended to
     work even with the most basic OpenGL implementations, but also makes use
-    of newer extensions, which allow support for more colorspaces and direct
-    rendering.
+    of newer extensions, which allow support for more colorspaces.
 
     The code performs very few checks, so if a feature does not work, this
     might be because it is not supported by your card/OpenGL implementation
@@ -680,7 +679,7 @@ image
         Select the image file format.
 
         jpg
-            JPEG files, extension .jpg.
+            JPEG files, extension .jpg. (Default.)
         jpeg
             JPEG files, extension .jpeg.
         png
@@ -699,9 +698,9 @@ image
     jpeg-quality=<0-100>
         JPEG quality factor (default: 90)
     [no-]jpeg-progressive
-        Specify standard or progressive JPEG (default: noprogressive).
+        Specify standard or progressive JPEG (default: no).
     [no-]jpeg-baseline
-        Specify use of JPEG baseline or not (default: baseline).
+        Specify use of JPEG baseline or not (default: yes).
     jpeg-optimize=<0-100>
         JPEG optimization factor (default: 100)
     jpeg-smooth=<0-100>