From 1f0ca4d59264bd1e924198d1cfe1ecececa8ef4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Piboub=C3=A8s?= <theo.piboubes@gmail.com>
Date: Fri, 4 Sep 2015 18:39:22 +0200
Subject: [PATCH] Update README.rst and docs

---
 README.rst  | 24 ++++++++++++++----------
 rtv/docs.py |  4 ++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/README.rst b/README.rst
index 17628a3..7de1152 100644
--- a/README.rst
+++ b/README.rst
@@ -155,18 +155,10 @@ If you prefer to stay in the terminal, use ``$BROWSER`` to specify a console-bas
 Config File
 -----------
 
-RTV will read two configuration files:
-
-* ``~/.config/rtv/rtv.cfg`` (or ``$XDG_CONFIG_HOME/.rtv``)
-* ``~/.config/rtv/oauth.cfg`` (or ``$XDG_CONFIG_HOME/.rtv-oauth``)
-
+RTV will read a configuration placed at ``~/.config/rtv/rtv.cfg`` (or ``$XDG_CONFIG_HOME``).
 Each line in the files will replace the corresponding default argument in the launch script.
 This can be used to avoid having to re-enter login credentials every time the program is launched.
 
-The OAuth section contains a boolean to trigger auto-login (defaults to false).
-When authenticated, two additional fields are written : **access_token** and **refresh_token**.
-Those are basically like username and password : they are used to authenticate you on Reddit servers.
-
 Example initial config:
 
 **rtv.cfg**
@@ -187,7 +179,19 @@ Example initial config:
   # This may be necessary for compatibility with some terminal browsers
   # ascii=True
 
-**oauth.cfg**
+-----
+OAuth
+-----
+
+OAuth is an authentication standard, that replaces authentication with login and password.
+
+RTV implements OAuth. It stores OAuth configuration at ``~/.config/rtv/oauth.cfg``(or ``$XDG_CONFIG_HOME``).
+**The OAuth configuration file must be writable, and is created automatically if it doesn't exist.**
+It contains a boolean to trigger auto-login (defaults to false).
+When authenticated, an additional field is written : **refresh_token**.
+This acts as a replacement to username and password : it is used to authenticate you on Reddit servers.
+
+Example **oauth.cfg**:
 
 .. code-block:: ini
 
diff --git a/rtv/docs.py b/rtv/docs.py
index cefd7b0..4f427c8 100644
--- a/rtv/docs.py
+++ b/rtv/docs.py
@@ -18,8 +18,8 @@ given, the program will display a secure prompt to enter a password.
 """
 
 OAUTH = """\
-Authentication is now done by OAuth, since PRAW will stop supporting login with
-username and password soon.
+Authentication is now done by OAuth, since PRAW will drop
+password authentication soon.
 """
 
 CONTROLS = """