release 2014.12.04

diff --git a/README.md b/README.md
index d6e7ff902c86021db324cb3b9d06d441b8673cad..18be078d768b9afe76df42d8079bdbf50af62911 100644 (file)
--- a/README.md
+++ b/README.md
@@ -65,10 +65,10 @@ which means you can modify it, redistribute it or use it however you like.
                                      this is not possible instead of searching.
     --ignore-config                  Do not read configuration files. When given
                                      in the global configuration file /etc
-                                     /youtube-dl.conf: do not read the user
-                                     configuration in ~/.config/youtube-dl.conf
-                                     (%APPDATA%/youtube-dl/config.txt on
-                                     Windows)
+                                     /youtube-dl.conf: Do not read the user
+                                     configuration in ~/.config/youtube-
+                                     dl/config (%APPDATA%/youtube-dl/config.txt
+                                     on Windows)
     --flat-playlist                  Do not extract the videos of a playlist,
                                      only list them.
 

diff --git a/youtube_dl/version.py b/youtube_dl/version.py
index 61902a8cc9e7487ce5c31ed00d626e9aa953ab2a..7ff8633feb1a9555a0d475daacb3a9e41e704576 100644 (file)
--- a/youtube_dl/version.py
+++ b/youtube_dl/version.py
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-__version__ = '2014.12.03'
+__version__ = '2014.12.04'