even more doc tweaks

Get the RTD links back into the long_description. Done for now?
neogeographica · Nov 19, 2013 · 3698585 · 3698585
1 parent 1d0f23f
commit 3698585
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -1,4 +1,4 @@
-Changelog for expak
+Changelog
 ===================
 
 - **0.9** (2013-11-19)

diff --git a/README.rst b/README.rst
@@ -46,3 +46,5 @@ Documentation
 
 .. _expak module: http://expak.readthedocs.org/en/latest/expak.html
 .. _simple expak utility: http://expak.readthedocs.org/en/latest/simple_expak.html
+
+
diff --git a/README.rst.in b/README.rst.in
@@ -26,11 +26,5 @@ available among the `downloads for expak`_ at the Python Package Index (PyPI)
 .. _pip: http://www.pip-installer.org/en/latest
 .. _downloads for expak: https://pypi.python.org/pypi/expak#downloads
 
-Documentation
-=============
+.. include:: docs/rtdlinks.txt
 
-- `expak module`_
-- `simple expak utility`_
-
-.. _expak module: http://expak.readthedocs.org/en/latest/expak.html
-.. _simple expak utility: http://expak.readthedocs.org/en/latest/simple_expak.html
diff --git a/docs/rtdlinks.txt b/docs/rtdlinks.txt
@@ -0,0 +1,8 @@
+Documentation
+=============
+
+- `expak module`_
+- `simple expak utility`_
+
+.. _expak module: http://expak.readthedocs.org/en/latest/expak.html
+.. _simple expak utility: http://expak.readthedocs.org/en/latest/simple_expak.html
diff --git a/setup.py b/setup.py
@@ -26,7 +26,9 @@ def find_version(*file_paths):
         return version_match.group(1)
     raise RuntimeError("Unable to find version string.")
 
-long_description = read('docs', 'blurb.txt') + '\n\n' + read('HISTORY.rst')
+long_description = '\n\n'.join([read('docs', 'blurb.txt'),
+                                read('docs', 'rtdlinks.txt'),
+                                read('HISTORY.rst')])
 
 class PyTest(TestCommand):
     def finalize_options(self):