From 796e5638ac6bd5e13e0f69e2b9557ba0af1718cd Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 21 Oct 2012 12:33:18 +0200 Subject: manpage: optional input command args can't just be omitted Fix the "grammar" of such commands to be hopefully less confusing. Also, add the "-" for such arguments, which skips optional arguments without changing their default value. Also change some mentions of "mplayer" to "mpv". --- DOCS/man/en/input.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'DOCS') diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst index 18e5b824e1..08eaed9456 100644 --- a/DOCS/man/en/input.rst +++ b/DOCS/man/en/input.rst @@ -14,7 +14,7 @@ with shift. A list of special keys can be obtained with -| **mplayer** --input=keylist +| **mpv** --input=keylist In general, keys can be combined with ``Shift``, ``Ctrl`` and ``Alt``: @@ -45,7 +45,7 @@ ignore disabling default bindings, without disabling all bindings with ``--input=default-bindings=no``. -seek [relative|absolute|absolute-percent] [default-precise|exact|keyframes] +seek [relative|absolute|absolute-percent|- [default-precise|exact|keyframes]] Change the playback position. By default, seeks by a relative amount of seconds. @@ -87,7 +87,7 @@ cycle [up|down] speed_mult Multiply the ``speed`` property by the given value. -screenshot [subtitles|video|window] [single|each-frame] +screenshot [subtitles|video|window|- [single|each-frame]] Take a screenshot. First argument: @@ -100,7 +100,7 @@ screenshot [subtitles|video|window] [single|each-frame] Like ``subtitles``, but typically without OSD or subtitles. The exact behavior depends on the selected video output. - Save the contents of the mplayer window. Typically scaled, with OSD and + Save the contents of the mpv window. Typically scaled, with OSD and subtitles. The exact behavior depends on the selected video output, and if no support is available, this will act like ``video``. @@ -167,7 +167,7 @@ print_text "" Print text to stdout. The string can contain properties, which are expanded like in ``--playing-msg``. -show_text "" [] [] +show_text "" [|- []] Show text on the OSD. The string can contain properties, which are expanded like in ``--playing-msg``. This can be used to show playback time, filename, and so on. @@ -223,7 +223,7 @@ pausing_keep_force. (Should these be made official?) Properties ---------- -Properties are used to set mplayer options during runtime, or to query arbitrary +Properties are used to set mpv options during runtime, or to query arbitrary information. They can be manipulated with the ``set``/``add``/``cycle`` commands, and retrieved with ``show_text``, or anything else that uses property expansion. (See ``--playing-msg`` how properties are expanded.) -- cgit v1.2.3