From 48bd03dd912321b8bfa12b8b201d2f0b3aa43ae0 Mon Sep 17 00:00:00 2001
From: Martin Herkt <lachs0r@srsfckn.biz>
Date: Thu, 24 Apr 2014 18:44:46 +0200
Subject: options: remove deprecated --identify

Also remove MSGL_SMODE and friends.

Note: The indent in options.rst was added to work around a bug in
ReportLab that causes the PDF manual build to fail.
---
 DOCS/man/en/changes.rst |  1 +
 DOCS/man/en/options.rst | 24 +++++++++---------------
 2 files changed, 10 insertions(+), 15 deletions(-)

(limited to 'DOCS/man/en')

diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index 36ea47b3ef..e06f779ec9 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -167,6 +167,7 @@ Command Line Switches
     ``-fsmode-dontuse``         (removed)
     ``-fstype``                 ``--x11-fstype``
     ``-hardframedrop``          ``--framedrop=hard``
+    ``-identify``               (removed; use TOOLS/mpv_identify.sh)
     ``-lavdopts ...``           ``--vd-lavc-...``
     ``-lavfdopts``              ``--demuxer-lavf-...``
     ``-lircconf``               ``--input-lirc-conf``
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index c9e514e457..3bd9cd27e1 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -1151,9 +1151,6 @@ OPTIONS
         ``mpv --hwdec=vdpau --vo=vdpau --hwdec-codecs=h264,mpeg2video``
             Enable vdpau decoding for h264 and mpeg2 only.
 
-``--identify``
-    Deprecated. Use ``TOOLS/mpv_identify.sh``.
-
 ``--idle``
     Makes mpv wait idly instead of quitting when there is no file to play.
     Mostly useful in slave mode, where mpv can be controlled through input
@@ -1389,18 +1386,15 @@ OPTIONS
 
     Available levels:
 
-    :no:        complete silence
-    :fatal:     fatal messages only
-    :error:     error messages
-    :warn:      warning messages
-    :info:      informational messages
-    :status:    status messages (default)
-    :v:         verbose messages
-    :debug:     debug messages
-    :trace:     very noisy debug messages
-
-    One special case is the ``identify`` module name. This is silenced by
-    default, and can be enabled with the ``-identify`` option.
+        :no:        complete silence
+        :fatal:     fatal messages only
+        :error:     error messages
+        :warn:      warning messages
+        :info:      informational messages
+        :status:    status messages (default)
+        :v:         verbose messages
+        :debug:     debug messages
+        :trace:     very noisy debug messages
 
 ``--msg-module``
     Prepend module name to each console message.
-- 
cgit v1.2.3