summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-07-26 22:38:48 +0200
committerwm4 <wm4@nowhere>2014-07-26 23:19:47 +0200
commit3c7675ae9a9b9a04cde9335807097805114003ab (patch)
tree2138d1c52025b40831d439fb0623a826cb91e97c
parent025431a7aee455899184115a8a739b8bd26b6329 (diff)
downloadmpv-3c7675ae9a9b9a04cde9335807097805114003ab.tar.bz2
mpv-3c7675ae9a9b9a04cde9335807097805114003ab.tar.xz
manpage: eliminate the word "movie"
It's evil and sounds outdated. Use the words "media" and "video" instead. Closes #935.
-rw-r--r--DOCS/man/mpv.rst20
-rw-r--r--DOCS/man/options.rst30
-rw-r--r--DOCS/man/vf.rst6
-rw-r--r--DOCS/man/vo.rst2
4 files changed, 29 insertions, 29 deletions
diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst
index 3d206b1ab4..9ddb6863e5 100644
--- a/DOCS/man/mpv.rst
+++ b/DOCS/man/mpv.rst
@@ -2,7 +2,7 @@ mpv
###
##############
-a movie player
+a media player
##############
:Copyright: GPLv2+
@@ -19,7 +19,7 @@ SYNOPSIS
DESCRIPTION
===========
-**mpv** is a movie player based on MPlayer and mplayer2. It supports a wide variety of video
+**mpv** is a media player based on MPlayer and mplayer2. It supports a wide variety of video
file formats, audio and video codecs, and subtitle types. Special input URL
types are available to read input from a variety of sources other than disk
files. Depending on platform, a variety of different video and audio output
@@ -69,11 +69,11 @@ p / SPACE
Pause (pressing again unpauses).
\.
- Step forward. Pressing once will pause movie, every consecutive press will
+ Step forward. Pressing once will pause, every consecutive press will
play one frame and then go into pause mode again.
,
- Step backward. Pressing once will pause movie, every consecutive press will
+ Step backward. Pressing once will pause, every consecutive press will
play one frame in reverse and then go into pause mode again.
q / ESC
@@ -190,21 +190,21 @@ corresponding adjustment, or the software equalizer (``--vf=eq``).)
(The following keys are valid only on OSX.)
command + 0
- Resize movie window to half its original size.
+ Resize video window to half its original size.
(On other platforms, you can bind keys to change the ``window-scale``
property.)
command + 1
- Resize movie window to its original size.
+ Resize video window to its original size.
command + 2
- Resize movie window to double its original size.
+ Resize video window to double its original size.
command + f
Toggle fullscreen (see also ``--fs``).
command + [ and command + ]
- Set movie window alpha.
+ Set video window alpha.
(The following keys are valid if you have a keyboard with multimedia keys.)
@@ -373,8 +373,8 @@ File-specific Configuration Files
---------------------------------
You can also write file-specific configuration files. If you wish to have a
-configuration file for a file called 'movie.avi', create a file named
-'movie.avi.conf' with the file-specific options in it and put it in
+configuration file for a file called 'video.avi', create a file named
+'video.avi.conf' with the file-specific options in it and put it in
``~/.mpv/``. You can also put the configuration file in the same directory
as the file to be played, as long as you give the ``--use-filedir-conf``
option (either on the command line or in your global config file). If a
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 2175254c9f..1e02d0f2b5 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -344,7 +344,7 @@ OPTIONS
Specifying ``--autosync=0``, the default, will cause frame timing to be
based entirely on audio delay measurements. Specifying ``--autosync=1``
will do the same, but will subtly change the A/V correction algorithm. An
- uneven video framerate in a movie which plays fine with ``--no-audio`` can
+ uneven video framerate in a video which plays fine with ``--no-audio`` can
often be helped by setting this to an integer value greater than 1. The
higher the value, the closer the timing will be to ``--no-audio``. Try
``--autosync=30`` to smooth out problems with sound drivers which do not
@@ -371,7 +371,7 @@ OPTIONS
``mpv bd:// --bluray-device=/path/to/bd/``
``--border``, ``--no-border``
- Play movie with window border and decorations. Since this is on by
+ Play video with window border and decorations. Since this is on by
default, use ``--no-border`` to disable the standard window decorations.
``--brightness=<-100-100>``
@@ -1686,7 +1686,7 @@ OPTIONS
``--panscan=<0.0-1.0>``
Enables pan-and-scan functionality (cropping the sides of e.g. a 16:9
- movie to make it fit a 4:3 display without black bands). The range
+ video to make it fit a 4:3 display without black bands). The range
controls how much of the image is cropped. May not work with all video
output drivers.
@@ -1762,7 +1762,7 @@ OPTIONS
based cards are known as PVR capture cards. Be aware that only Linux
2.6.18 kernel and above is able to handle MPEG stream through V4L2 layer.
For hardware capture of an MPEG stream and watching it with mpv, use
- ``pvr://`` as a movie URL.
+ ``pvr://`` as media URL.
``--pvr-aspect=<0-3>``
@@ -1920,7 +1920,7 @@ OPTIONS
``--screen=<default|0-32>``
In multi-monitor configurations (i.e. a single desktop that spans across
multiple displays), this option tells mpv which screen to display the
- movie on.
+ video on.
.. admonition:: Note (X11)
@@ -2228,7 +2228,7 @@ OPTIONS
:no: Don't automatically load external subtitle files.
:exact: Load the media filename with subtitle file extension (default).
- :fuzzy: Load all subs containing movie name.
+ :fuzzy: Load all subs containing media filename.
:all: Load all subs in the current and ``--sub-paths`` directories.
``--sub-paths=<path1:path2:...>``
@@ -2239,13 +2239,13 @@ OPTIONS
.. admonition:: Example
- Assuming that ``/path/to/movie/movie.avi`` is played and
+ Assuming that ``/path/to/video/video.avi`` is played and
``--sub-paths=sub:subtitles:/tmp/subs`` is specified, mpv searches for
subtitle files in these directories:
- - ``/path/to/movie/``
- - ``/path/to/movie/sub/``
- - ``/path/to/movie/subtitles/``
+ - ``/path/to/video/``
+ - ``/path/to/video/sub/``
+ - ``/path/to/video/subtitles/``
- ``/tmp/subs/``
- ``~/.mpv/sub/``
@@ -2318,11 +2318,11 @@ OPTIONS
Delays subtitles by ``<sec>`` seconds. Can be negative.
``--sub-fps=<rate>``
- Specify the framerate of the subtitle file (default: movie fps).
+ Specify the framerate of the subtitle file (default: video fps).
.. note::
- ``<rate>`` > movie fps speeds the subtitles up for frame-based
+ ``<rate>`` > video fps speeds the subtitles up for frame-based
subtitle files and slows them down for time-based ones.
Also see ``--sub-speed`` option.
@@ -2465,8 +2465,8 @@ OPTIONS
These options tune various properties of the TV capture module. For
watching TV with mpv, use ``tv://`` or ``tv://<channel_number>`` or
even ``tv://<channel_name>`` (see option ``tv-channels`` for ``channel_name``
- below) as a movie URL. You can also use ``tv:///<input_id>`` to start
- watching a movie from a composite or S-Video input (see option ``input`` for
+ below) as a media URL. You can also use ``tv:///<input_id>`` to start
+ watching a video from a composite or S-Video input (see option ``input`` for
details).
``--no-tv-audio``
@@ -2755,7 +2755,7 @@ OPTIONS
This option is disabled if the ``--no-keepaspect`` option is used.
``--video-aspect=<ratio>``
- Override movie aspect ratio, in case aspect information is incorrect or
+ Override video aspect ratio, in case aspect information is incorrect or
missing in the file being played. See also ``--no-video-aspect``.
Two values have special meaning:
diff --git a/DOCS/man/vf.rst b/DOCS/man/vf.rst
index 7c5c3a0893..d25686f137 100644
--- a/DOCS/man/vf.rst
+++ b/DOCS/man/vf.rst
@@ -47,7 +47,7 @@ Available filters are:
``crop[=w:h:x:y]``
Crops the given part of the image and discards the rest. Useful to remove
- black bands from widescreen movies.
+ black bands from widescreen videos.
``<w>,<h>``
Cropped width and height, defaults to original width and height.
@@ -55,7 +55,7 @@ Available filters are:
Position of the cropped picture, defaults to center.
``expand[=w:h:x:y:aspect:round]``
- Expands (not scales) movie resolution to the given value and places the
+ Expands (not scales) video resolution to the given value and places the
unscaled original at coordinates x, y.
``<w>,<h>``
@@ -617,7 +617,7 @@ Available filters are:
``phase[=t|b|p|a|u|T|B|A|U][:v]``
Delay interlaced video by one field time so that the field order changes.
- The intended use is to fix PAL movies that have been captured with the
+ The intended use is to fix PAL videos that have been captured with the
opposite field order to the film-to-video transfer. The options are:
``t``
diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index 587cdd2afd..f9a22e3c0e 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -524,7 +524,7 @@ Available video output drivers are:
for mastering instead of the true curve. Most notably, anything in the
Apple ecosystem uses this approximation - including all programs
compatible with it. It's a sound idea to try enabling this flag first
- when watching movies and shows to see if things look better that way.
+ when watching videos and shows to see if things look better that way.
This only affects the output when using either ``icc-profile`` or ``srgb``.