summaryrefslogtreecommitdiffstats
path: root/DOCS/man/options.rst
diff options
context:
space:
mode:
authorAvi Halachmi (:avih) <avihpit@yahoo.com>2014-12-15 01:31:30 +0200
committerwm4 <wm4@nowhere>2014-12-15 04:39:56 +0100
commit39e04e929483847a3e0722d86d53f69837ed99db (patch)
tree56901ce1b9d1cb35f05d3e059d2aca83319491ff /DOCS/man/options.rst
parent06828f71a134e0b880601665c0daea78e6523633 (diff)
downloadmpv-39e04e929483847a3e0722d86d53f69837ed99db.tar.bz2
mpv-39e04e929483847a3e0722d86d53f69837ed99db.tar.xz
options: deprecate 'lua' based options/dirs for 'script'
- --lua and --lua-opts change to --script and --script-opts - 'lua' default script dirs change to 'scripts' - DOCS updated - 'lua-settings' dir was _not_ modified The old lua-based names/dirs still work, but display a warning. Signed-off-by: wm4 <wm4@nowhere>
Diffstat (limited to 'DOCS/man/options.rst')
-rw-r--r--DOCS/man/options.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 9b1ce379ab..7ae04a3b26 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -345,18 +345,18 @@ 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 the ``lua`` configuration
- subdirectory (usually ``~/.config/mpv/lua/``).
+ If set to ``no``, don't auto-load scripts from the ``scripts``
+ configuration subdirectory (usually ``~/.config/mpv/scripts/``).
(Default: ``yes``)
-``--lua=<filename>``
+``--script=<filename>``
Load a Lua script. You can load multiple scripts by separating them with
commas (``,``).
-``--lua-opts=key1=value1,key2=value2,...``
- Set options for scripts. A Lua script can query an option by key. If an
+``--script-opts=key1=value1,key2=value2,...``
+ Set options for scripts. A script can query an option by key. If an
option is used and what semantics the option value has depends entirely on
- the loaded Lua scripts. Values not claimed by any scripts are ignored.
+ the loaded scripts. Values not claimed by any scripts are ignored.
``--merge-files``
Pretend that all files passed to mpv are concatenated into a single, big