From b04e67379b7b8f4e82ce740c3f8c86838a00ccda Mon Sep 17 00:00:00 2001
From: Michael Lazar <mlazar@intellisis.com>
Date: Wed, 14 Oct 2015 17:48:58 -0700
Subject: [PATCH] Minor changes to project structure, updated changelog and
 contributors.

---
 .gitignore                          |  1 +
 CHANGELOG.rst                       | 16 +++++++++++++
 CONTRIBUTORS.rst                    | 35 ++++++++++++++++-------------
 MANIFEST.in                         |  2 +-
 rtv.1                               |  2 +-
 scripts/build_manpage.py            |  6 ++---
 templates/{rtv.1 => rtv.1.template} |  0
 7 files changed, 42 insertions(+), 20 deletions(-)
 rename templates/{rtv.1 => rtv.1.template} (100%)

diff --git a/.gitignore b/.gitignore
index 526dedd..8a0f46a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .*
+*~
 *.pyc
 build
 dist
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f787f2b..46e9bc4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,7 @@
 RTV Changelog
 =============
 
+.. _1.6: http://github.com/michael-lazar/rtv/releases/tag/v1.6
 .. _1.5: http://github.com/michael-lazar/rtv/releases/tag/v1.5
 .. _1.4.2: http://github.com/michael-lazar/rtv/releases/tag/v1.4.2
 .. _1.4.1: http://github.com/michael-lazar/rtv/releases/tag/v1.4.1
@@ -11,6 +12,21 @@ RTV Changelog
 .. _1.2.1: http://github.com/michael-lazar/rtv/releases/tag/v1.2.1
 .. _1.2: http://github.com/michael-lazar/rtv/releases/tag/v1.2
 
+-----------------
+1.6_ (2015-10-14)
+-----------------
+Features
+
+* Switched all authentication to OAuth.
+* Can now list the version with `rtv --version`.
+* Added a man page.
+
+Documentation
+
+* Added missing docs for the `i` key.
+* New documentation for OAuth.
+* New FAQ section.
+
 -----------------
 1.5_ (2015-08-26)
 -----------------
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 273168e..b0ce92a 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -5,19 +5,24 @@ RTV Contributors
 
 Thanks to the following people for their contributions to this project.
 
-* `michael-lazar <http://github.com/michael-lazar>`_
-* `Tobin Brown <http://github.com/Brobin>`_
-* `Yusuke Sakamoto <http://github.com/yskmt>`_
-* `Noah Morrison <http://github.com/noahmorrison>`_
-* `Toby Hughes <http://github.com/tobywhughes>`_
-* `Shawn Hind <http://github.com/shanhind>`_
-* `mekhami <http://github.com/mekhami>`_
-* `JuanPablo <http://github.com/juanpabloaj>`_
-* `Robert Greener <http://github.com/ragreener1>`_
-* `Hans Roman <http://github.com/snahor>`_
-* `peterpans01 <http://github.com/peterpans01>`_
-* `Ram-Z <http://github.com/Ram-Z>`_
-* `Marc Abramowitz <http://github.com/msabramo>`_
-* `Adam Talsma <http://github.com/a-tal>`_
+* `Michael Lazar <https://github.com/michael-lazar>`_
+* `Tobin Brown <https://github.com/Brobin>`_
+* `Théo Piboubès <https://github.com/TheoPib>`_
+* `Yusuke Sakamoto <https://github.com/yskmt>`_
+* `Johnathan Jenkins <https://github.com/shaggytwodope>`_
+* `obosob <https://github.com/obosob>`_
+* `mekhami <https://github.com/mekhami>`_
+* `Noah Morrison <https://github.com/noahmorrison>`_
+* `Toby Hughes <https://github.com/tobywhughes>`_
+* `Shawn Hind <https://github.com/shanhind>`_
+* `JuanPablo <https://github.com/juanpabloaj>`_
+* `Robert Greener <https://github.com/ragreener1>`_
+* `peterpans01 <https://github.com/peterpans01>`_
+* `Adam Talsma <https://github.com/a-tal>`_
+* `Ram-Z <https://github.com/Ram-Z>`_
+* `mralext20 <https://github.com/mralext20>`_
 * `Wieland Hoffmann <http://github.com/mineo>`_
-* `Thomas Kajder <http://github.com/tkajder>`_
+* `Marc Abramowitz <http://github.com/msabramo>`_
+* `Hans Roman <http://github.com/snahor>`_
+* `Gustavo Zambonin <https://github.com/zambonin>`_
+
diff --git a/MANIFEST.in b/MANIFEST.in
index 1770656..c06d665 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,4 +4,4 @@ include CONTRIBUTORS.rst
 include README.rst
 include LICENSE
 include rtv.1
-include templates/*
+include templates/index.html
diff --git a/rtv.1 b/rtv.1
index d02593a..38a92f3 100644
--- a/rtv.1
+++ b/rtv.1
@@ -1,4 +1,4 @@
-.TH "RTV" "1" "September 28, 2015" "Version 1.5" "Usage and Commands"
+.TH "RTV" "1" "October 15, 2015" "Version 1.6" "Usage and Commands"
 .SH NAME
 RTV - Reddit Terminal Viewer
 .SH SYNOPSIS
diff --git a/scripts/build_manpage.py b/scripts/build_manpage.py
index 172b4c9..4ac0c33 100644
--- a/scripts/build_manpage.py
+++ b/scripts/build_manpage.py
@@ -54,8 +54,8 @@ def main():
     data['copyright'] = rtv.__copyright__
     # Escape dashes is all of the sections
     data = {k:v.replace('-', r'\-') for k,v in data.items()}
-    print('Reading from %s/templates/rtv.1' % ROOT)
-    with open(os.path.join(ROOT, 'templates/rtv.1')) as fp:
+    print('Reading from %s/templates/rtv.1.template' % ROOT)
+    with open(os.path.join(ROOT, 'templates/rtv.1.template')) as fp:
         template = fp.read()
     print('Populating template')
     out = template.format(**data)
@@ -64,4 +64,4 @@ def main():
         fp.write(out)
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()
diff --git a/templates/rtv.1 b/templates/rtv.1.template
similarity index 100%
rename from templates/rtv.1
rename to templates/rtv.1.template