From 0f38ed615d848869bb48cb5abae83f017796fe00 Mon Sep 17 00:00:00 2001
From: Mort Yao <mort.yao@gmail.com>
Date: Sat, 8 Feb 2014 04:13:29 +0100
Subject: [PATCH] Update README to reflect merge of #286

---
 README.md             | 1 +
 README.txt            | 1 +
 src/you_get/common.py | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c258e6a7..52763e48 100644
--- a/README.md
+++ b/README.md
@@ -172,6 +172,7 @@ For a complete list of all available options, see:
         -u | --url                               Display the real URLs of videos without downloading.
         -n | --no-merge                          Don't merge video parts.
         -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.
              --no-proxy                          Don't use any proxy. (ignore $http_proxy)
         -S | --sogou                             Use a Sogou proxy server for downloading.
diff --git a/README.txt b/README.txt
index e77db5de..5e259da9 100644
--- a/README.txt
+++ b/README.txt
@@ -180,6 +180,7 @@ For a complete list of all available options, see::
         -u | --url                               Display the real URLs of videos without downloading.
         -n | --no-merge                          Don't merge video parts.
         -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.
              --no-proxy                          Don't use any proxy. (ignore $http_proxy)
         -S | --sogou                             Use a Sogou proxy server for downloading.
diff --git a/src/you_get/common.py b/src/you_get/common.py
index 257e31c5..a440b580 100644
--- a/src/you_get/common.py
+++ b/src/you_get/common.py
@@ -806,7 +806,7 @@ def script_main(script_name, download, download_playlist = None):
     -u | --url                               Display the real URLs of videos without downloading.
     -n | --no-merge                          Don't merge video parts.
     -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.
          --no-proxy                          Don't use any proxy. (ignore $http_proxy)
     -S | --sogou                             Use a Sogou proxy server for downloading.