Clarify --no-playlist documentation (Closes #4309)

diff --git a/README.md b/README.md
index cce2819fd6e26e41c77f7f7dcb050aea232b54ed..6669c1d7ce61fb77ef6810569a601cf2fd8b42a9 100644 (file)
--- a/README.md
+++ b/README.md
@@ -93,7 +93,8 @@ which means you can modify it, redistribute it or use it however you like.
                                      COUNT views
     --max-views COUNT                Do not download any videos with more than
                                      COUNT views
-    --no-playlist                    download only the currently playing video
+    --no-playlist                    If the URL refers to a video and a
+                                     playlist, download only the video.
     --age-limit YEARS                download only videos suitable for the given
                                      age
     --download-archive FILE          Download only videos not listed in the

diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 21c7c298a830dd8b4a1b4651419506aaa8c8a8bc..6342ae7679efc9aaa18dda5a5ed810e71ba6cec2 100755 (executable)
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -174,6 +174,8 @@ class YoutubeDL(object):
     extract_flat:      Do not resolve URLs, return the immediate result.
                        Pass in 'in_playlist' to only show this behavior for
                        playlist items.
+    no_playlist:       If the URL contains both a playlist and a video ID,
+                       download the video, not the playlist.
 
     The following parameters are not used by YoutubeDL itself, they are used by
     the FileDownloader:

diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index da02fb6bb73bcc43a81f93dba32216c9ebf4cdb9..2e8c715084616a565472fb8700a8d995cb8c6d04 100644 (file)
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -222,7 +222,7 @@ def parseOpts(overrideArguments=None):
     selection.add_option(
         '--no-playlist',
         action='store_true', dest='noplaylist', default=False,
-        help='download only the currently playing video')
+        help='If the URL refers to a video and a playlist, download only the video.')
     selection.add_option(
         '--age-limit',
         metavar='YEARS', dest='age_limit', default=None, type=int,