man: fix a whole bunch of typos

2025-01-02 21:12:23 +00:00 · 2014-09-01 04:25:57 +02:00 · 2014-09-01 04:25:57 +02:00 · 27a065182c
commit 27a065182c
parent 5ea84e17c0
11 changed files with 130 additions and 130 deletions
--- a/DOCS/man/af.rst
+++ b/DOCS/man/af.rst
@ -72,7 +72,7 @@ Available filters are:
    ``tospdif=<yes|no>``
        Output raw AC-3 stream if ``no``, output to S/PDIF for
-        passthrough if ``yes`` (default).
+        pass-through if ``yes`` (default).
    ``bitrate=<rate>``
        The bitrate use for the AC-3 stream. Set it to 384 to get 384 kbps.
@ -103,7 +103,7 @@ Available filters are:
        Sine function delta, use very low values to hear the sweep.
 ``sinesuppress[=freq:decay]``
-    Remove a sine at the specified frequency. Useful to get rid of the 50/60Hz
+    Remove a sine at the specified frequency. Useful to get rid of the 50/60 Hz
    noise on low quality audio equipment. It only works on mono input.
    ``<freq>``
@ -184,7 +184,7 @@ Available filters are:
        ``mpv --af=equalizer=11:11:10:5:0:-12:0:5:12:12 media.avi``
            Would amplify the sound in the upper and lower frequency region
-            while canceling it almost completely around 1kHz.
+            while canceling it almost completely around 1 kHz.
 ``channels=nch[:routes]``
    Can be used for adding, removing, routing and copying audio channels. If
@ -279,8 +279,8 @@ Available filters are:
    once for every audio stream.
    ``<volumedb>``
-        Sets the desired gain in dB for all channels in the stream from -200dB
+        Sets the desired gain in dB for all channels in the stream from -200 dB
-        to +60dB, where -200dB mutes the sound completely and +60dB equals a
+        to +60 dB, where -200 dB mutes the sound completely and +60 dB equals a
        gain of 1000 (default: 0).
    ``replaygain-track``
        Adjust volume gain according to the track-gain replaygain value stored
@ -313,7 +313,7 @@ Available filters are:
    .. admonition:: Example
        ``mpv --af=volume=10.1 media.avi``
-            Would amplify the sound by 10.1dB and hard-clip if the sound level
+            Would amplify the sound by 10.1 dB and hard-clip if the sound level
            is too high.
 ``pan=n:[<matrix>]``
@ -370,8 +370,8 @@ Available filters are:
        to the subwoofer.
    ``<fc>``
-        cutoff frequency in Hz for the low-pass filter (20Hz to 300Hz)
+        cutoff frequency in Hz for the low-pass filter (20 Hz to 300 Hz)
-        (default: 60Hz) For the best result try setting the cutoff frequency
+        (default: 60 Hz) For the best result try setting the cutoff frequency
        as low as possible. This will improve the stereo or surround sound
        experience.
    ``<ch>``
@ -383,7 +383,7 @@ Available filters are:
    .. admonition:: Example
        ``mpv --af=sub=100:4 --audio-channels=5 media.avi``
-            Would add a subwoofer channel with a cutoff frequency of 100Hz to
+            Would add a subwoofer channel with a cutoff frequency of 100 Hz to
            output channel 4.
 ``center``
@ -411,7 +411,7 @@ Available filters are:
    .. admonition:: Example
        ``mpv --af=surround=15 --audio-channels=4 media.avi``
-            Would add surround sound decoding with 15ms delay for the sound to
+            Would add surround sound decoding with 15 ms delay for the sound to
            the rear speakers.
 ``delay[=[ch1,ch2,...]]``
@ -439,8 +439,8 @@ Available filters are:
    .. admonition:: Example
        ``mpv --af=delay=[10.5,10.5,0,0,7,0] media.avi``
-            Would delay front left and right by 10.5ms, the two rear channels
+            Would delay front left and right by 10.5 ms, the two rear channels
-            and the subwoofer by 0ms and the center channel by 7ms.
+            and the subwoofer by 0 ms and the center channel by 7 ms.
 ``export=mmapped_file:nsamples]``
    Exports the incoming signal to other processes using memory mapping
@ -590,7 +590,7 @@ Available filters are:
            tempo.
        ``mpv --af=scaletempo=stride=30:overlap=.50:search=10 media.ogg``
-            Would tweak the quality and performace parameters.
+            Would tweak the quality and performance parameters.
        ``mpv --af=format=float,scaletempo media.ogg``
            Would make scaletempo use float code. Maybe faster on some
@ -602,7 +602,7 @@ Available filters are:
            1.2x.
 ``lavfi=graph``
-    Filter audio using ffmpeg's libavfilter.
+    Filter audio using FFmpeg's libavfilter.
    ``<graph>``
        Libavfilter graph. See ``lavfi`` video filter for details - the graph
--- a/DOCS/man/ao.rst
+++ b/DOCS/man/ao.rst
@ -23,7 +23,7 @@ normal driver parameters.
    where PulseAudio is used. On Windows, ``--ao=wasapi`` is preferred,
    though it might cause trouble sometimes, in which case ``--ao=dsound``
    should be used. On BSD systems, ``--ao=oss`` or `--ao=sndio`` may work
-    (the latter being experimental). On OSX systems, use ``--ao=coreaudio``.
+    (the latter being experimental). On OS X systems, use ``--ao=coreaudio``.
 .. admonition:: Examples
--- a/DOCS/man/changes.rst
+++ b/DOCS/man/changes.rst
@ -19,14 +19,14 @@ General Changes for MPlayer to mpv
  Linux 2.4 (including VIDIX)
 * Large internal cleanups
 * Removal of support for dead platforms
-* New buildsystem
+* New build system
-* No embedded copy of ffmpeg and other libraries
+* No embedded copy of FFmpeg and other libraries
 * Better pause handling (do not unpause on a command)
 * Better MKV support (such as ordered chapters)
 * vo_vdpau improvements
 * Precise seeking support
-* Native OpenGL backend for OSX
+* Native OpenGL backend for OS X
-* General OSX improvements
+* General OS X improvements
 * Improvements in audio/video sync handling
 * Cleaned up terminal output
 * Gapless audio support (``--gapless-audio``)
@ -35,14 +35,14 @@ General Changes for MPlayer to mpv
 * OSS4 volume control
 * More correct color reproduction (color matrix generation)
 * Use libass for subtitle rendering by default (better quality)
-* Generally preferring ffmpeg/libav over internal demuxers and decoders
+* Generally preferring FFmpeg/Libav over internal demuxers and decoders
 * Improvements when playing multiple files (``--fixed-vo``)
 * Screenshot improvements (instant screenshots without 1-frame delay, allow
  taking screenshots even with hardware decoding)
 * Improved support for PulseAudio
-* Generally improved MS Windows support (dealing with unicode filenames,
+* Generally improved MS Windows support (dealing with Unicode file names,
  improved ``--vo=direct3d``, improved window handling)
-* Better OSD rendering (using libass). This has full unicode support, and
+* Better OSD rendering (using libass). This has full Unicode support, and
  languages like Arabic should be better supported.
 * Cleaned up terminal output (nicer status line, less useless noise)
 * Support for playing URLs of popular streaming sites directly
@ -50,19 +50,19 @@ General Changes for MPlayer to mpv
 * Improved OpenGL output (``--vo=opengl-hq``)
 * Make ``--softvol`` default (**mpv** is not a mixer control panel)
 * Improved support for .cue files
-* Screenshot improvements (can save screenshots as JPG or PNG, configurable
+* Screenshot improvements (can save screenshots as JPEG or PNG, configurable
-  filenames, support for taking screenshots with or without subtitles - the
+  file names, support for taking screenshots with or without subtitles - the
  ``screenshot`` video filter is not needed anymore, and should not be put
  into the mpv config file)
 * Removal of teletext support
-* Removal of most builtin demuxers, using libavformat instead
+* Removal of most built-in demuxers, using libavformat instead
-* Removal of builtin network support, using libavformat instead (also,
+* Removal of built-in network support, using libavformat instead (also,
  support https via libavformat)
 * Replace image VOs (``--vo=jpeg`` etc.) with ``--vo=image``
 * Do not lose settings when playing a new file in the same player instance
 * New location for config files, new name for the binary.
 * Slave mode compatibility broken (see below)
-* Encoding functionality (replacement for mencoder, see ``DOCS/encoding.rst``)
+* Encoding functionality (replacement for MEncoder, see ``DOCS/encoding.rst``)
 * Remove ``--vo=gif89a``, ``--vo=md5sum``, ``--vo=yuv4mpeg``, as encoding can
  handle these use cases. For yuv4mpeg, for example, use:
  ``mpv input.mkv -o output.y4m --no-audio --oautofps --oneverdrop``.
@ -71,10 +71,10 @@ General Changes for MPlayer to mpv
 * Wayland support
 * Support for precise scrolling which scales the parameter of commands. If the
  input doesn't support precise scrolling the scale factor stays 1.
-* OSX: Cocoa event loop is independent from mplayer's event loop, so user
+* OS X: Cocoa event loop is independent from MPlayer's event loop, so user
  actions like accessing menus and live resizing do not block the playback.
-* OSX: Apple Remote support.
+* OS X: Apple Remote support.
-* OSX: Media Keys support.
+* OS X: Media Keys support.
 * Windows: Added WASAPI audio output.
 * New OSD bar with chapter marks and not positioned in the middle of the video
  (though this can be customized with the ``--osd-bar-align-y`` option).
@ -99,7 +99,7 @@ General Changes for MPlayer to mpv
 * Allow changing/adjusting video filters at runtime. (This is also used to make
  the ``D`` key insert vf_yadif if deinterlacing is not supported otherwise.)
 * Native VAAPI support
-* OSX: VDA support using libavcodec hwaccel API insted of FFmpeg's decoder. Up
+* OS X: VDA support using libavcodec hwaccel API instead of FFmpeg's decoder. Up
  to 2-2.5x reduction in CPU usage.
 * Make hardware decoding in general work with the ``opengl`` video output.
 * Lua scripting (see `LUA SCRIPTING`_)
--- a/DOCS/man/encode.rst
+++ b/DOCS/man/encode.rst
@ -38,7 +38,7 @@ You can encode files from one format/codec to another using this facility.
 ``--oautofps``
    Sets the output format time base to the guessed frame rate of the input
-    video (simulates mencoder behavior, useful for AVI; may cause frame drops).
+    video (simulates MEncoder behavior, useful for AVI; may cause frame drops).
    Note that not all codecs and not all formats support VFR encoding, and some
    which do have bugs when a target bitrate is specified - use ``--ofps`` or
    ``--oautofps`` to force CFR encoding in these cases.
@ -74,7 +74,7 @@ You can encode files from one format/codec to another using this facility.
    .. admonition:: Example
        "``--oac=libmp3lame --oacopts=b=128000``"
-            selects 128kbps MP3 encoding.
+            selects 128 kbps MP3 encoding.
    Options are managed in lists. There are a few commands to manage the
    options list.
--- a/DOCS/man/input.rst
+++ b/DOCS/man/input.rst
@ -114,7 +114,7 @@ List of Input Commands
    to be precise, not fast), and sometimes fails to behave as expected. How
    well this works depends on whether precise seeking works correctly (e.g.
    see the ``--hr-seek-demuxer-offset`` option). Video filters or other video
-    postprocessing that modifies timing of frames (e.g. deinterlacing) should
+    post-processing that modifies timing of frames (e.g. deinterlacing) should
    usually work, but might make backstepping silently behave incorrectly in
    corner cases. Using ``--hr-seek-framedrop=no`` should help, although it
    might make precise seeking slower.
@ -159,7 +159,7 @@ List of Input Commands
        Take a single screenshot.
    <each-frame>
        Take a screenshot each frame. Issue this command again to stop taking
-        screenshots. Note that you should disable framedropping when using
+        screenshots. Note that you should disable frame-dropping when using
        this mode - or you might receive duplicate images in cases when a
        frame was dropped.
@ -574,7 +574,7 @@ Property list
    See ``--osd-level``.
 ``osd-scale`` (RW)
-    OSD font size multiplicator, see ``--osd-scale``.
+    OSD font size multiplier, see ``--osd-scale``.
 ``loop`` (RW)
    See ``--loop``.
@ -650,7 +650,7 @@ Property list
 ``drop-frame-count``
    Frames dropped because they arrived to late. Doesn't necessarily indicate
-    actual framedrops, just the number of times the decoder was asked to drop.
+    actual frame-drops, just the number of times the decoder was asked to drop.
    Unavailable if video is disabled
 ``vo-drop-frame-count``
@ -783,7 +783,7 @@ Property list
    ::
        MPV_FORMAT_NODE_MAP
-            (key and string value for each metdata entry)
+            (key and string value for each metadata entry)
 ``chapter-metadata``
    Metadata of current chapter. Works similar to ``metadata`` property. It
@ -827,7 +827,7 @@ Property list
    this easier, the cache resizing code will allocate the new cache while the
    old cache is still allocated.
-    Don't use this when playing DVD or Bluray.
+    Don't use this when playing DVD or Blu-ray.
 ``cache-free`` (R)
    Total free cache size in KB.
@ -1052,7 +1052,7 @@ Property list
    Estimated/measured FPS of the video filter chain output. (If no filters
    are used, this corresponds to decoder output.) This uses the average of
    the 10 past frame durations to calculate the FPS. It will be inaccurate
-    if framedropping is involved (such as when framedrop is explicitly
+    if frame-dropping is involved (such as when framedrop is explicitly
    enabled, or after precise seeking). Files with imprecise timestamps (such
    as Matroska) might lead to unstable results.
@ -1117,7 +1117,7 @@ Property list
    See ``--sub-forced-only``.
 ``sub-scale`` (RW)
-    Subtitle font size multiplicator.
+    Subtitle font size multiplier.
 ``ass-use-margins`` (RW)
    See ``--ass-use-margins``.
--- a/DOCS/man/lua.rst
+++ b/DOCS/man/lua.rst
@ -2,7 +2,7 @@ LUA SCRIPTING
 =============
 mpv can load Lua scripts. Scripts in ``~/.mpv/lua/`` will be loaded on program
-start, or if passed to ``--lua``. mpv provides the builtin module ``mp``, which
+start, or if passed to ``--lua``. mpv provides the built-in module ``mp``, which
 provides functions to send commands to the mpv core and to retrieve information
 about playback state, user settings, file information, and so on.
@ -98,9 +98,9 @@ The ``mp`` module is preloaded, although it can be loaded manually with
    will always result in a string.
 ``mp.get_property_bool(name [,def])``
-    Similar to ``mp.get_property``, but return the property value as boolean.
+    Similar to ``mp.get_property``, but return the property value as Boolean.
-    Returns a boolean on success, or ``def, error`` on error.
+    Returns a Boolean on success, or ``def, error`` on error.
 ``mp.get_property_number(name [,def])``
    Similar to ``mp.get_property``, but return the property value as number.
@ -113,7 +113,7 @@ The ``mp`` module is preloaded, although it can be loaded manually with
 ``mp.get_property_native(name [,def])``
    Similar to ``mp.get_property``, but return the property value using the best
-    Lua type for the property. Most time, this will return a string, boolean,
+    Lua type for the property. Most time, this will return a string, Boolean,
    or number. Some properties (for example ``chapter-list``) are returned as
    tables.
@ -128,7 +128,7 @@ The ``mp`` module is preloaded, although it can be loaded manually with
 ``mp.set_property_bool(name, value)``
    Similar to ``mp.set_property``, but set the given property to the given
-    boolean value.
+    Boolean value.
 ``mp.set_property_number(name, value)``
    Similar to ``mp.set_property``, but set the given property to the given
@ -163,7 +163,7 @@ The ``mp`` module is preloaded, although it can be loaded manually with
    (e.g. ``ctrl+a``).
    After calling this function, key presses will cause the function ``fn`` to
-    be called (unless the user overmapped the key with another binding).
+    be called (unless the user remapped the key with another binding).
    The ``name`` argument should be a short symbolic string. It allows the user
    to remap the key binding via input.conf using the ``script_message``
@ -201,7 +201,7 @@ The ``mp`` module is preloaded, although it can be loaded manually with
    This will print the message when the key ``y`` is pressed. (``x`` will
-    still work, unless the user overmaps it.)
+    still work, unless the user remaps it.)
    You can also explicitly send a message to a named script only. Assume the
    above script was using the filename ``fooscript.lua``:
@ -315,7 +315,7 @@ The ``mp`` module is preloaded, although it can be loaded manually with
        ``oneshot`` (RW)
            Whether the timer is periodic (``false``) or fires just once
            (``true``). This value is used when the timer expires (but before
-            the timer calback function fn is run).
+            the timer callback function fn is run).
 ``mp.get_opt(key)``
@ -377,7 +377,7 @@ are useful only in special situations.
    control what the Lua script does (instead of being called by the default
    event loop), you can set the global variable ``mp_event_loop`` to your
    own function running the event loop. From your event loop, you should call
-    ``mp.dispatch_events()`` to unqueue and dispatch mpv events.
+    ``mp.dispatch_events()`` to dequeue and dispatch mpv events.
    If the ``allow_wait`` parameter is set to ``true``, the function will block
    until the next event is received or the next timer expires. Otherwise (and
--- a/DOCS/man/mpv.rst
+++ b/DOCS/man/mpv.rst
@ -163,7 +163,7 @@ corresponding adjustment, or the software equalizer (``--vf=eq``).)
 7 and 8
    Adjust saturation.
-(The following keys are valid only on OSX.)
+(The following keys are valid only on OS X.)
 command + 0
    Resize video window to half its original size.
@ -419,8 +419,8 @@ PROTOCOLS
    Play a path from  Samba share.
 ``bd://[title][/device]`` ``--bluray-device=PATH``
-    Play a Blu-Ray disc. Currently, this does not accept iso files. Instead,
+    Play a Blu-Ray disc. Currently, this does not accept ISO files. Instead,
-    you must mount the iso file as filesystem, and point ``--bluray-device``
+    you must mount the ISO file as filesystem, and point ``--bluray-device``
    to the mounted directly.
 ``bdnav://[title][/device]``
@ -672,7 +672,7 @@ Play only chapters 5, 6, 7:
 Play only titles 5, 6, 7:
    ``mpv dvd://5-7``
-Play a multiangle DVD:
+Play a multi-angle DVD:
    ``mpv dvd://1 --dvd-angle=2``
 Play from a different DVD device:
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@ -200,7 +200,7 @@ Playback Control
 ``--load-unsafe-playlists``
    Load URLs from playlists which are considered unsafe (default: no). This
    includes special protocols and anything that doesn't refer to normal files.
-    Local files and http links on the other hand are always considered safe.
+    Local files and HTTP links on the other hand are always considered safe.
    Note that ``--playlist`` always loads all entries, so you use that instead
    if you really have the need for this functionality.
@ -237,8 +237,8 @@ Playback Control
        Without ``--hr-seek``, skipping will snap to keyframes.
-Program Behaviour
+Program Behavior
-----------------
+----------------
 ``--help``
    Show short summary of options.
@ -324,7 +324,7 @@ Program Behaviour
 ``--merge-files``
    Pretend that all files passed to mpv are concatenated into a single, big
    file. This uses timeline/EDL support internally. Note that this won't work
-    for ordered chapter files or quvi-resolved URLs (such as youtube links).
+    for ordered chapter files or quvi-resolved URLs (such as YouTube links).
    This option is interpreted at program start, and doesn't affect for
    example files or playlists loaded with the ``loadfile`` or ``loadlist``
@ -453,7 +453,7 @@ Video
    .. note::
        ``--vo=vdpau`` (also the default VO) always has the ``vo`` framedrop
-        mode enabled. It doesn't increment the ``D:`` field in the statusline
+        mode enabled. It doesn't increment the ``D:`` field in the status line
        either.
 ``--display-fps=<fps>``
@ -475,7 +475,7 @@ Video
    :vdpau:     requires ``--vo=vdpau`` or ``--vo=opengl`` (Linux only)
    :vaapi:     requires ``--vo=opengl`` or ``--vo=vaapi`` (Linux with Intel GPUs only)
    :vaapi-copy: copies video back into system RAM (Linux with Intel GPUs only)
-    :vda:       requires ``--vo=opengl`` or ``--vo=corevideo`` (OSX only)
+    :vda:       requires ``--vo=opengl`` or ``--vo=corevideo`` (OS X only)
    ``auto`` tries to automatically enable hardware decoding using the first
    available method. This still depends what VO you are using. For example,
@ -788,7 +788,7 @@ Audio
    .. admonition:: Examples
        ``--ad=lavc:mp3float``
-            Prefer the FFmpeg/Libav ``mp3float`` decoder over all other mp3
+            Prefer the FFmpeg/Libav ``mp3float`` decoder over all other MP3
            decoders.
        ``--ad=spdif:ac3,lavc:*``
@ -859,12 +859,12 @@ Audio
    welcome. A full list of AVOptions can be found in the FFmpeg manual.
 ``--ad-spdif-dtshd=<yes|no>``, ``--dtshd``, ``--no-dtshd``
-    When using DTS passthrough, output any DTS-HD track as-is.
+    When using DTS pass-through, output any DTS-HD track as-is.
    With ``ad-spdif-dtshd=no`` (the default), only the DTS Core parts will be
    output.
    DTS-HD tracks can be sent over HDMI but not over the original
-    coax/toslink S/PDIF system.
+    coax/TOSLINK S/PDIF system.
    Some receivers don't accept DTS core-only when ``--ad-spdif-dtshd=yes`` is
    used, even though they accept DTS-HD.
@ -983,7 +983,7 @@ Audio
    (default: 3).
 ``--audiodrop``
-    If video is by more than 500ms behind, insert 500ms of silence, to make up
+    If video is by more than 500 ms behind, insert 500 ms of silence, to make up
    for audio getting ahead. Might help if video decoding is too slow beyond
    help.
@ -1179,7 +1179,7 @@ Subtitles
 ``--ass-vsfilter-color-compat=<basic|full|force-601|no>``
    Mangle colors like (xy-)vsfilter do (default: basic). Historically, VSFilter
-    was not colorspace aware. This was no problem as long as the colorspace
+    was not color space aware. This was no problem as long as the color space
    used for SD video (BT.601) was used. But when everything switched to HD
    (BT.709), VSFilter was still converting RGB colors to BT.601, rendered
    them into the video frame, and handled the frame to the video output, which
@ -1189,16 +1189,16 @@ Subtitles
    :basic: Handle only BT.601->BT.709 mangling, if the subtitles seem to
            indicate that this is required (default).
-    :full:  Handle the full ``YCbCr Matrix`` header with all video colorspaces
+    :full:  Handle the full ``YCbCr Matrix`` header with all video color spaces
            supported by libass and mpv. This might lead to bad breakages in
            corner cases and is not strictly needed for compatibility
            (hopefully), which is why this is not default.
    :force-601: Force BT.601->BT.709 mangling, regardless of subtitle headers
-            or video colorspace.
+            or video color space.
    :no:    Disable color mangling completely. All colors are RGB.
    Choosing anything other than ``no`` will make the subtitle color depend on
-    the video colorspace, and it's for example in theory not possible to reuse
+    the video color space, and it's for example in theory not possible to reuse
    a subtitle script with another video file. The ``--ass-style-override``
    option doesn't affect how this option is interpreted.
@ -1220,7 +1220,7 @@ Subtitles
    Many studios tend to use bitmap fonts designed for square pixels when
    authoring DVDs, causing the fonts to look stretched on playback on DVD
    players. This option fixes them, however at the price of possibly
-    misaligning sume subtitles (e.g. sign translations).
+    misaligning some subtitles (e.g. sign translations).
    Disabled by default.
@ -1327,7 +1327,7 @@ Subtitles
    Also see ``--sub-speed`` option.
 ``--sub-gauss=<0.0-3.0>``
-    Apply gaussian blur to image subtitles (default: 0). This can help making
+    Apply Gaussian blur to image subtitles (default: 0). This can help making
    pixelated DVD/Vobsubs look nicer. A value other than 0 also switches to
    software subtitle scaling. Might be slow.
@ -1407,7 +1407,7 @@ Window
 ``--fs-screen=<all|current|0-32>``
    In multi-monitor configurations (i.e. a single desktop that spans across
    multiple displays), this option tells mpv which screen to go fullscreen to.
-    If ``default`` is provided mpv will fallback on using the behaviour
+    If ``default`` is provided mpv will fallback on using the behavior
    depending on what the user provided with the ``screen`` option.
    .. admonition:: Note (X11)
@ -1417,7 +1417,7 @@ Window
    .. admonition:: Note (OS X)
-        ``all`` does not work on OSX and will behave like ``current``.
+        ``all`` does not work on OS X and will behave like ``current``.
    See also ``--screen``.
@ -1479,7 +1479,7 @@ Window
    .. admonition: Note (OS X)
-        On Mac OSX the origin of the screen coordinate system is located on the
+        On Mac OS X the origin of the screen coordinate system is located on the
        bottom-left corner. For instance, ``0:0`` will place the window at the
        bottom-left of the screen.
@ -1856,7 +1856,7 @@ Equalizer
    such as PC monitors use full range color levels. However, some TVs and
    video monitors expect studio RGB levels. Providing full range output to a
    device expecting studio level input results in crushed blacks and whites,
-    the reverse in dim grey blacks and dim whites.
+    the reverse in dim gray blacks and dim whites.
    The same limitations as with ``--colormatrix`` apply.
@ -1992,7 +1992,7 @@ Demuxer
    Sample format for ``--demuxer=rawaudio`` (default: s16le).
 ``--demuxer-rawaudio-rate=<value>``
-    Sample rate for ``--demuxer=rawaudio`` (default: 44KHz).
+    Sample rate for ``--demuxer=rawaudio`` (default: 44 kHz).
 ``--demuxer-rawvideo-fps=<value>``
    Rate in frames per second for ``--demuxer=rawvideo`` (default: 25.0).
@ -2008,11 +2008,11 @@ Demuxer
            --demuxer-rawvideo=w=720:h=576
 ``--demuxer-rawvideo-format=<value>``
-    Colorspace (fourcc) in hex or string for ``--demuxer=rawvideo``
+    Color space (fourcc) in hex or string for ``--demuxer=rawvideo``
    (default: ``YV12``).
 ``--demuxer-rawvideo-mp-format=<value>``
-    Colorspace by internal video format for ``--demuxer=rawvideo``. Use
+    Color space by internal video format for ``--demuxer=rawvideo``. Use
    ``--demuxer-rawvideo-mp-format=help`` for a list of possible formats.
 ``--demuxer-rawvideo-codec=<value>``
@ -2074,7 +2074,7 @@ Input
    ``~/.config/mpv/input.conf``.
 ``--no-input-default-bindings``
-    Disable mpv default (builtin) key bindings.
+    Disable mpv default (built-in) key bindings.
 ``--input-cmdlist``
    Prints all commands that can be bound to keys.
@ -2140,7 +2140,7 @@ Input
    Specifies a configuration file for LIRC (default: ``~/.lircrc``).
 ``--input-media-keys``, ``--no-input-media-keys``
-    OSX only: Enabled by default. Enables/disable media keys support.
+    OS X only: Enabled by default. Enables/disable media keys support.
 ``--input-right-alt-gr``, ``--no-input-right-alt-gr``
    (Cocoa and Windows only)
@ -2290,7 +2290,7 @@ OSD
    Default: 10.
 ``--osd-scale=<factor>``
-    OSD font size multiplicator, multiplied with ``--osd-font-size`` value.
+    OSD font size multiplier, multiplied with ``--osd-font-size`` value.
 ``--osd-scale-by-window=yes|no``
    Whether to scale the OSD with the window size (default: yes). If this is
@ -2334,7 +2334,7 @@ Screenshot
 ``--screenshot-template=<template>``
    Specify the filename template used to save screenshots. The template
    specifies the filename without file extension, and can contain format
-    specifiers, which will be substituted when taking a screeshot.
+    specifiers, which will be substituted when taking a screenshot.
    By default the template is ``shot%n``, which results in filenames like
    ``shot0012.png`` for example.
@ -2447,10 +2447,10 @@ Software Scaler
    Default: ``bicubic``.
 ``--sws-lgb=<0-100>``
-    Software scaler gaussian blur filter (luma). See ``--sws-scaler``.
+    Software scaler Gaussian blur filter (luma). See ``--sws-scaler``.
 ``--sws-cgb=<0-100>``
-    Software scaler gaussian blur filter (chroma). See ``--sws-scaler``.
+    Software scaler Gaussian blur filter (chroma). See ``--sws-scaler``.
 ``--sws-ls=<-100-100>``
    Software scaler sharpen filter (luma). See ``--sws-scaler``.
@ -2529,7 +2529,7 @@ Terminal
 ``--term-osd-bar-chars=<string>``
    Customize the ``--term-osd-bar`` feature. The string is expected to
    consist of 5 characters (start, left space, position indicator,
-    right space, end). You can use unicode characters, but note that double-
+    right space, end). You can use Unicode characters, but note that double-
    width characters will not be treated correctly.
    Default: ``[-+-]``.
@ -2746,7 +2746,7 @@ Cache
    May be useful when playing files from slow media, but can also have
    negative effects, especially with file formats that require a lot of
-    seeking, such as mp4.
+    seeking, such as MP4.
    Note that half the cache size will be used to allow fast seeking back. This
    is also the reason why a full cache is usually reported as 50% full. The
@ -2769,7 +2769,7 @@ Cache
    filled to this position rather than performing a stream seek (default:
    500).
-    This matters for small forward seeks. With slow streams (especially http
+    This matters for small forward seeks. With slow streams (especially HTTP
    streams) there is a tradeoff between skipping the data between current
    position and seek destination, or performing an actual seek. Depending
    on the situation, either of these might be slower than the other method.
@ -2873,11 +2873,11 @@ Network
 ``--tls-ca-file=<filename>``
    Certificate authority database file for use with TLS. (Silently fails with
-    older ffmpeg or libav versions.)
+    older FFmpeg or Libav versions.)
 ``--tls-verify``
    Verify peer certificates when using TLS (e.g. with ``https://...``).
-    (Silently fails with older ffmpeg or libav versions.)
+    (Silently fails with older FFmpeg or Libav versions.)
 ``--referrer=<string>``
    Specify a referrer path or URL for HTTP requests.
@ -2945,8 +2945,8 @@ PVR
 ``--pvr-vmode=<value>``
    Specify video encoding mode:
-    :vbr: Variable BitRate (default)
+    :vbr: Variable Bit Rate (default)
-    :cbr: Constant BitRate
+    :cbr: Constant Bit Rate
 ``--pvr-vpeak=<value>``
    Specify peak video bitrate encoding in Mbps (only useful for VBR
--- a/DOCS/man/osc.rst
+++ b/DOCS/man/osc.rst
@ -122,11 +122,11 @@ time remaining
    left-click      toggle between total and remaining time
    =============   ================================================
-Keybindings
+Key Bindings
-~~~~~~~~~~~
+~~~~~~~~~~~~
-These keybindings are active by default if nothing else is already bound to
+These key bindings are active by default if nothing else is already bound to
-these keys. In case of collosision, the function needs to be bound to a
+these keys. In case of collision, the function needs to be bound to a
 different key. See `Script Commands`_ section.
 =============   ================================================
--- a/DOCS/man/vf.rst
+++ b/DOCS/man/vf.rst
@ -93,7 +93,7 @@ Available filters are:
 ``scale[=w:h:param:param2:chr-drop:noup:arnd``
    Scales the image with the software scaler (slow) and performs a YUV<->RGB
-    colorspace conversion (see also ``--sws``).
+    color space conversion (see also ``--sws``).
    All parameters are optional.
@ -120,9 +120,9 @@ Available filters are:
                0.33:0.33 Mitchell-Netravali spline
                1.00:0.00 cubic B-spline
-            --sws=7 (gaussian): sharpness (0 (soft) - 100 (sharp))
+            --sws=7 (Gaussian): sharpness (0 (soft) - 100 (sharp))
-            --sws=9 (lanczos):  filter length (1-10)
+            --sws=9 (Lanczos):  filter length (1-10)
    ``<chr-drop>``
        chroma skipping
@ -222,8 +222,8 @@ Available filters are:
            ====================== =====================
 ``noformat[=fmt]``
-    Restricts the colorspace for the next filter without doing any conversion.
+    Restricts the color space for the next filter without doing any conversion.
-    Unlike the format filter, this will allow any colorspace except the one
+    Unlike the format filter, this will allow any color space except the one
    you specify.
    .. note:: For a list of available formats, see ``noformat=fmt=help``.
@ -232,7 +232,7 @@ Available filters are:
        Format name, e.g. rgb15, bgr24, 420p, etc. (default: 420p).
 ``pp[=[filter1[:option1[:option2...]]/[-]filter2...]]``
-    Enables the specified chain of postprocessing subfilters. Subfilters must
+    Enables the specified chain of post-processing subfilters. Subfilters must
    be separated by '/' and can be disabled by prepending a '-'. Each
    subfilter and some options have a short and a long name that can be used
    interchangeably, i.e. ``dr``/``dering`` are the same. All subfilters share
@ -336,7 +336,7 @@ Available filters are:
        filtering every second line with a (-1 4 2 4 -1) filter.
    ``l5/lowpass5``
-        Vertically applied FIR lowpass deinterlacing filter that deinterlaces
+        Vertically applied FIR low-pass deinterlacing filter that deinterlaces
        the given block by filtering all lines with a (-1 2 6 2 -1) filter.
    ``fq/forceQuant[:quantizer]``
@ -356,7 +356,7 @@ Available filters are:
    .. note::
-        This filter is only available if FFmpeg/libav has been compiled
+        This filter is only available if FFmpeg/Libav has been compiled
        with libpostproc enabled.
    .. admonition:: Examples
@ -443,7 +443,7 @@ Available filters are:
        temporal noise (noise pattern changes between frames)
    ``uniform``
-        uniform noise (gaussian otherwise)
+        uniform noise (Gaussian otherwise)
    ``hq``
        high quality (slightly better looking, slightly slower) - not available
@ -503,7 +503,7 @@ Available filters are:
        :1: linear interpolation (default)
 ``unsharp[=lx:ly:la:cx:cy:ca]``
-    unsharp mask / gaussian blur
+    unsharp mask / Gaussian blur
    ``l`` is for the luma component, ``c`` for the chroma component. ``x``/``y``
    is the filter size. ``a`` is the amount.
@ -769,8 +769,8 @@ Available filters are:
            anaglyph red/cyan color (red filter on left eye, cyan filter on
            right eye)
        ``arcd`` or ``anaglyph_red_cyan_dubois``
-            anaglyph red/cyan color optimized with the least squares
+            anaglyph red/cyan color optimized with the least-squares
-            projection of dubois (red filter on left eye, cyan filter on right
+            projection of Dubois (red filter on left eye, cyan filter on right
            eye)
        ``agmg`` or ``anaglyph_green_magenta_gray``
            anaglyph green/magenta gray (green filter on left eye, magenta
@ -803,7 +803,7 @@ Available filters are:
 ``gradfun[=strength[:radius|:size=<size>]]``
    Fix the banding artifacts that are sometimes introduced into nearly flat
-    regions by truncation to 8bit color depth. Interpolates the gradients that
+    regions by truncation to 8-bit color depth. Interpolates the gradients that
    should go where the bands are, and dithers them.
    ``<strength>``
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@ -38,36 +38,36 @@ Available video output drivers are:
    .. note:: This driver is for compatibility with old systems.
    ``adaptor=<number>``
-        Select a specific XVideo adaptor (check xvinfo results).
+        Select a specific XVideo adapter (check xvinfo results).
    ``port=<number>``
        Select a specific XVideo port.
    ``ck=<cur|use|set>``
-        Select the source from which the colorkey is taken (default: cur).
+        Select the source from which the color key is taken (default: cur).
        cur
-          The default takes the colorkey currently set in Xv.
+          The default takes the color key currently set in Xv.
        use
-          Use but do not set the colorkey from mpv (use the ``--colorkey``
+          Use but do not set the color key from mpv (use the ``--colorkey``
          option to change it).
        set
-          Same as use but also sets the supplied colorkey.
+          Same as use but also sets the supplied color key.
    ``ck-method=<man|bg|auto>``
-        Sets the colorkey drawing method (default: man).
+        Sets the color key drawing method (default: man).
        man
-          Draw the colorkey manually (reduces flicker in some cases).
+          Draw the color key manually (reduces flicker in some cases).
        bg
-          Set the colorkey as window background.
+          Set the color key as window background.
        auto
-          Let Xv draw the colorkey.
+          Let Xv draw the color key.
    ``colorkey=<number>``
-        Changes the colorkey to an RGB value of your choice. ``0x000000`` is
+        Changes the color key to an RGB value of your choice. ``0x000000`` is
        black and ``0xffffff`` is white.
    ``no-colorkey``
-        Disables colorkeying.
+        Disables color-keying.
 ``x11`` (X11 only)
    Shared memory video output driver without hardware acceleration that works
@ -82,7 +82,7 @@ Available video output drivers are:
    .. note::
        Earlier versions of mpv (and MPlayer, mplayer2) provided sub-options
-        to tune vdpau postprocessing, like ``deint``, ``sharpen``, ``denoise``,
+        to tune vdpau post-processing, like ``deint``, ``sharpen``, ``denoise``,
        ``chroma-deint``, ``pullup``, ``hqscaling``. These sub-options are
        deprecated, and you should use the ``vdpaupp`` video filter instead.
@ -173,7 +173,7 @@ Available video output drivers are:
        to a YUV format before the VO. Sometimes useful to force availability
        of certain YUV-only features, like video equalizer or deinterlacing.
-    Using the VDPAU frame queueing functionality controlled by the queuetime
+    Using the VDPAU frame queuing functionality controlled by the queuetime
    options makes mpv's frame flip timing less sensitive to system CPU load and
    allows mpv to start decoding the next frame(s) slightly earlier, which can
    reduce jitter caused by individual slow-to-decode frames. However, the
@ -282,7 +282,7 @@ Available video output drivers are:
    Hardware decoding over OpenGL-interop is supported to some degree. Note
    that in this mode, some corner case might not be gracefully handled, and
-    colorspace conversion and chroma upsampling is generally in the hand of
+    color space conversion and chroma upsampling is generally in the hand of
    the hardware decoder APIs.
    ``lscale=<filter>``
@ -370,7 +370,7 @@ Available video output drivers are:
        green-magenta
            Convert side by side input to full-color green-magenta stereo.
        quadbuffer
-            Convert side by side input to quadbuffered stereo. Only supported
+            Convert side by side input to quad buffered stereo. Only supported
            by very few OpenGL cards.
    ``srgb``
@ -487,7 +487,7 @@ Available video output drivers are:
        auto
            auto-select (default)
        cocoa
-            Cocoa/OSX
+            Cocoa/OS X
        win
            Win32/WGL
        x11
@ -514,7 +514,7 @@ Available video output drivers are:
    ``gamma=<0.0..10.0>``
        Set a gamma value. If gamma is adjusted in other ways (like with
-        the ``--gamma`` option or keybindings and the ``gamma`` property), the
+        the ``--gamma`` option or key bindings and the ``gamma`` property), the
        value is multiplied with the other gamma value.
        Setting this value to 1.0 can be used to always enable gamma control.
@ -522,7 +522,7 @@ Available video output drivers are:
    ``icc-profile=<file>``
        Load an ICC profile and use it to transform linear RGB to screen output.
-        Needs LittleCMS2 support compiled in. This option overrides the ``srgb``
+        Needs LittleCMS 2 support compiled in. This option overrides the ``srgb``
        property, as using both is somewhat redundant. It also enables linear
        light scaling.
@ -535,12 +535,12 @@ Available video output drivers are:
    ``icc-cache=<file>``
        Store and load the 3D LUT created from the ICC profile in this file.
-        This can be used to speed up loading, since LittleCMS2 can take a while
+        This can be used to speed up loading, since LittleCMS 2 can take a while
        to create the 3D LUT. Note that this file contains an uncompressed LUT.
        Its size depends on the ``3dlut-size``, and can be very big.
    ``icc-intent=<value>``
-        Specifies the ICC Intent used for transformations between colorspaces.
+        Specifies the ICC Intent used for transformations between color spaces.
        This affects the rendering when using ``icc-profile`` or ``srgb`` and
        also affects the way DCP XYZ content gets converted to RGB.
@ -606,7 +606,7 @@ Available video output drivers are:
    can achieve better quality or performance by changing the ``fbo-format``
    suboption to ``rgb16f``, ``rgb32f`` or ``rgb``. Known problems include
    Mesa/Intel not accepting ``rgb16``, Mesa sometimes not being compiled with
-    float texture support, and some OSX setups being very slow with ``rgb16``
+    float texture support, and some OS X setups being very slow with ``rgb16``
    but fast with ``rgb32f``.
 ``opengl-old``
@ -741,7 +741,7 @@ Available video output drivers are:
        2
            Convert side by side input to full-color green-magenta stereo.
        3
-            Convert side by side input to quadbuffered stereo. Only supported
+            Convert side by side input to quad buffered stereo. Only supported
            by very few OpenGL cards.
    The following options are only useful if writing your own fragment programs.
@ -783,7 +783,7 @@ Available video output drivers are:
        auto
            auto-select (default)
        cocoa
-            Cocoa/OSX
+            Cocoa/OS X
        win
            Win32/WGL
        x11