summaryrefslogtreecommitdiffstats
path: root/DOCS/man/en/mplayer.rst
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-09-27 03:20:12 +0200
committerwm4 <wm4@nowhere>2012-10-12 10:10:33 +0200
commit65074ec1f074d22101b4c8bd95eb4a0354401246 (patch)
tree6cfb64c8f6e8817e25f50f18646857b65331657b /DOCS/man/en/mplayer.rst
parent1d1f59234b0e60df0b9461dd8194b639d334dd61 (diff)
downloadmpv-65074ec1f074d22101b4c8bd95eb4a0354401246.tar.bz2
mpv-65074ec1f074d22101b4c8bd95eb4a0354401246.tar.xz
manpage: document input.conf related things
This directly corresponds to DOCS/OUTDATED-tech/slave.txt. Changes from the recent commits are included too.
Diffstat (limited to 'DOCS/man/en/mplayer.rst')
-rw-r--r--DOCS/man/en/mplayer.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/DOCS/man/en/mplayer.rst b/DOCS/man/en/mplayer.rst
index 89b03737c3..840f36f23c 100644
--- a/DOCS/man/en/mplayer.rst
+++ b/DOCS/man/en/mplayer.rst
@@ -409,6 +409,8 @@ OPTIONS
.. include:: encode.rst
+.. include:: input.rst
+
Taking screenshots
==================