From d9aa233295ac4b679d408fd1ca8f85b3f30ddd9c Mon Sep 17 00:00:00 2001
From: pukkandan <pukkandan.ytdlp@gmail.com>
Date: Sat, 10 Apr 2021 20:52:54 +0530
Subject: [PATCH] Deprecate more options

* `--all-formats` = `-f all`
* `--include-ads` is not implemented
---
 README.md         | 7 +++----
 yt_dlp/options.py | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 0b238b846..e689f955a 100644
--- a/README.md
+++ b/README.md
@@ -297,9 +297,6 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
     --break-on-reject                Stop the download process when encountering
                                      a file that has been filtered out
     --no-download-archive            Do not use archive file (default)
-    --include-ads                    Download advertisements as well
-                                     (experimental)
-    --no-include-ads                 Do not download advertisements (default)
 
 ## Download Options:
     -N, --concurrent-fragments N     Number of fragments to download
@@ -558,7 +555,6 @@ Then simply run `make`. You can also run `make yt-dlp` instead to compile only t
                                      into a single file
     --no-audio-multistreams          Only one audio stream is downloaded for
                                      each output file (default)
-    --all-formats                    Download all available video formats
     --prefer-free-formats            Prefer video formats with free containers
                                      over non-free ones of same quality. Use
                                      with "-S ext" to strictly prefer free
@@ -1245,6 +1241,7 @@ These are all the deprecated options and the current alternative to achieve the
     -A, --auto-number                -o "%(autonumber)s-%(id)s.%(ext)s"
     -t, --title                      -o "%(title)s-%(id)s.%(ext)s"
     -l, --literal                    -o accepts literal names
+    --all-formats                    -f all
     --autonumber-size NUMBER         Use string formatting. Eg: %(autonumber)03d
     --metadata-from-title FORMAT     --parse-metadata "%(title)s:FORMAT"
     --prefer-avconv                  avconv is no longer officially supported (Alias: --no-prefer-ffmpeg)
@@ -1254,6 +1251,8 @@ These are all the deprecated options and the current alternative to achieve the
     --avconv-location                avconv is no longer officially supported
     -C, --call-home                  Not implemented
     --no-call-home                   Default
+    --include-ads                    Not implemented
+    --no-include-ads                 Default
     --write-srt                      --write-subs
     --no-write-srt                   --no-write-subs
     --srt-lang LANGS                 --sub-langs LANGS
diff --git a/yt_dlp/options.py b/yt_dlp/options.py
index 7f36777d9..ace353042 100644
--- a/yt_dlp/options.py
+++ b/yt_dlp/options.py
@@ -402,11 +402,11 @@ def parseOpts(overrideArguments=None):
     selection.add_option(
         '--include-ads',
         dest='include_ads', action='store_true',
-        help='Download advertisements as well (experimental)')
+        help=optparse.SUPPRESS_HELP)
     selection.add_option(
         '--no-include-ads',
         dest='include_ads', action='store_false',
-        help='Do not download advertisements (default)')
+        help=optparse.SUPPRESS_HELP)
 
     authentication = optparse.OptionGroup(parser, 'Authentication Options')
     authentication.add_option(
@@ -489,7 +489,7 @@ def parseOpts(overrideArguments=None):
     video_format.add_option(
         '--all-formats',
         action='store_const', dest='format', const='all',
-        help='Download all available video formats')
+        help=optparse.SUPPRESS_HELP)
     video_format.add_option(
         '--prefer-free-formats',
         action='store_true', dest='prefer_free_formats', default=False,