From f842b3f2b2a0b7751d466a7b2ed096ae555dcaf2 Mon Sep 17 00:00:00 2001
From: Kevin Mitchell <kevmitch@gmail.com>
Date: Fri, 3 Oct 2014 02:18:48 -0700
Subject: manpage: improve consistency with new ~/.config/mpv default

Signed-off-by: wm4 <wm4@nowhere>
---
 DOCS/man/options.rst | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'DOCS/man/options.rst')

diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index e8e41331d6..64dc4bc2c8 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -255,9 +255,8 @@ Program Behavior
     Print version string and exit.
 
 ``--no-config``
-    Do not load default configuration files. This prevents loading of
-    ``~/.config/mpv/mpv.conf`` and ``~/.config/mpv/input.conf``, as well as
-    loading the same files from system wide configuration directories. Other
+    Do not load default configuration files. This prevents loading of both the
+    user-level and system-wide ``mpv.conf`` and ``input.conf`` files. Other
     configuration files are blocked as well, such as resume playback files.
 
     .. note::
@@ -313,7 +312,8 @@ Program Behavior
     Specify configuration file to be parsed after the default ones.
 
 ``--load-scripts=<yes|no>``
-    If set to ``no``, don't auto-load scripts from ``~/.mpv/lua/``.
+    If set to ``no``, don't auto-load scripts from the ``lua`` configuration
+    subdirectory (usually ``~/.config/mpv/lua/``).
     (Default: ``yes``)
 
 ``--lua=<filename>``
@@ -335,7 +335,8 @@ Program Behavior
     commands.
 
 ``--no-resume-playback``
-    Do not restore playback position from ``~/.mpv/watch_later/``.
+    Do not restore playback position from the ``watch_later`` configuration
+    subdirectory (usually ``~/.config/mpv/watch_later/``).
     See ``quit_watch_later`` input command.
 
 ``--profile=<profile1,profile2,...>``
@@ -1362,7 +1363,7 @@ Subtitles
         - ``/path/to/video/sub/``
         - ``/path/to/video/subtitles/``
         - ``/tmp/subs/``
-        - ``~/.mpv/sub/``
+        -  the ``sub`` configuration subdirectory (usually ``~/.config/mpv/sub/``)
 
 ``--sub-visibility``, ``--no-sub-visibility``
     Can be used to disable display of subtitles, but still select and decode
@@ -2081,8 +2082,8 @@ Input
     Number of key presses to generate per second on autorepeat.
 
 ``--input-conf=<filename>``
-    Specify input configuration file other than the default
-    ``~/.config/mpv/input.conf``.
+    Specify input configuration file other than the default location in the mpv
+    configuration directory (usually ``~/.config/mpv/input.conf``).
 
 ``--no-input-default-bindings``
     Disable mpv default (built-in) key bindings.
@@ -2963,9 +2964,10 @@ DVB
     Specifies using card number 1-4 (default: 1).
 
 ``--dvbin-file=<filename>``
-    Instructs mpv to read the channels list from ``<filename>``. Default is
-    ``~/.mpv/channels.conf.{sat,ter,cbl,atsc}`` (based on your card type) or
-    ``~/.mpv/channels.conf`` as a last resort.
+    Instructs mpv to read the channels list from ``<filename>``. The default is
+    in the mpv configuration directory (usually ``~/.config/mpv``) with the
+    filename ``channels.conf.{sat,ter,cbl,atsc}`` (based on your card type) or
+    ``channels.conf`` as a last resort.
 
 ``--dvbin-timeout=<1-30>``
     Maximum number of seconds to wait when trying to tune a frequency before
-- 
cgit v1.2.3