Update README to reflect merge of #286

This commit is contained in:
Mort Yao 2014-02-08 04:13:29 +01:00
parent 7b15064bd6
commit 0f38ed615d
3 changed files with 3 additions and 1 deletions

View File

@ -172,6 +172,7 @@ For a complete list of all available options, see:
-u | --url Display the real URLs of videos without downloading. -u | --url Display the real URLs of videos without downloading.
-n | --no-merge Don't merge video parts. -n | --no-merge Don't merge video parts.
-o | --output-dir <PATH> Set the output directory for downloaded videos. -o | --output-dir <PATH> Set the output directory for downloaded videos.
-p | --player <PLAYER [options]> Directly play the video with PLAYER like vlc/smplayer.
-x | --http-proxy <HOST:PORT> Use specific HTTP proxy for downloading. -x | --http-proxy <HOST:PORT> Use specific HTTP proxy for downloading.
--no-proxy Don't use any proxy. (ignore $http_proxy) --no-proxy Don't use any proxy. (ignore $http_proxy)
-S | --sogou Use a Sogou proxy server for downloading. -S | --sogou Use a Sogou proxy server for downloading.

View File

@ -180,6 +180,7 @@ For a complete list of all available options, see::
-u | --url Display the real URLs of videos without downloading. -u | --url Display the real URLs of videos without downloading.
-n | --no-merge Don't merge video parts. -n | --no-merge Don't merge video parts.
-o | --output-dir <PATH> Set the output directory for downloaded videos. -o | --output-dir <PATH> Set the output directory for downloaded videos.
-p | --player <PLAYER [options]> Directly play the video with PLAYER like vlc/smplayer.
-x | --http-proxy <HOST:PORT> Use specific HTTP proxy for downloading. -x | --http-proxy <HOST:PORT> Use specific HTTP proxy for downloading.
--no-proxy Don't use any proxy. (ignore $http_proxy) --no-proxy Don't use any proxy. (ignore $http_proxy)
-S | --sogou Use a Sogou proxy server for downloading. -S | --sogou Use a Sogou proxy server for downloading.

View File

@ -806,7 +806,7 @@ def script_main(script_name, download, download_playlist = None):
-u | --url Display the real URLs of videos without downloading. -u | --url Display the real URLs of videos without downloading.
-n | --no-merge Don't merge video parts. -n | --no-merge Don't merge video parts.
-o | --output-dir <PATH> Set the output directory for downloaded videos. -o | --output-dir <PATH> Set the output directory for downloaded videos.
-p | --player <PLAYER [options]> Directly play the video with PLAYER like vlc/smplayer -p | --player <PLAYER [options]> Directly play the video with PLAYER like vlc/smplayer.
-x | --http-proxy <HOST:PORT> Use specific HTTP proxy for downloading. -x | --http-proxy <HOST:PORT> Use specific HTTP proxy for downloading.
--no-proxy Don't use any proxy. (ignore $http_proxy) --no-proxy Don't use any proxy. (ignore $http_proxy)
-S | --sogou Use a Sogou proxy server for downloading. -S | --sogou Use a Sogou proxy server for downloading.