summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-04-28 22:15:39 +0200
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-04-29 18:40:42 +0900
commit39f6824b3051695c9c99cb0b396e17d1016c7288 (patch)
tree0ed4cea6fec215a3bda2d75ddbf4e5370f30bb70
parent477eefa63fb4f0858a858c4dd68f5f0ae1dfee34 (diff)
downloadmpv-39f6824b3051695c9c99cb0b396e17d1016c7288.tar.bz2
mpv-39f6824b3051695c9c99cb0b396e17d1016c7288.tar.xz
manpage: put explicit links to config file path details
It seems users still have trouble finding the exact paths, especially on Windows. Maybe this helps. (cherry picked from commit 0b72f5e5ad6f9fca8849fcfb5ced8c03e21ce82a)
-rw-r--r--DOCS/man/mpv.rst5
1 files changed, 4 insertions, 1 deletions
diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst
index 751b2b2b59..82deedf097 100644
--- a/DOCS/man/mpv.rst
+++ b/DOCS/man/mpv.rst
@@ -378,7 +378,8 @@ Location and Syntax
You can put all of the options in configuration files which will be read every
time mpv is run. The system-wide configuration file 'mpv.conf' is in your
configuration directory (e.g. ``/etc/mpv`` or ``/usr/local/etc/mpv``), the
-user-specific one is ``~/.config/mpv/mpv.conf``.
+user-specific one is ``~/.config/mpv/mpv.conf``. For details and platform
+specifics see the `FILES`_ section.
User-specific options override system-wide options and options given on the
command line override either. The syntax of the configuration files is
``option=<value>``; everything after a *#* is considered a comment. Options
@@ -796,6 +797,8 @@ input command can take an exit code: in this case, that exit code is returned.
FILES
=====
+For Windows-specifics, see `FILES ON WINDOWS`_ section.
+
``/usr/local/etc/mpv/mpv.conf``
mpv system-wide settings (depends on ``--prefix`` passed to configure - mpv
in default configuration will use ``/usr/local/etc/mpv/`` as config