Merge branch 'feature/rtfd' into develop

Fantomas42 · May 14, 2015 · 6c08e67 · 6c08e67
2 parents 99854e1 + cbc85ea
commit 6c08e67
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 19 deletions.
diff --git a/INSTALL.txt b/INSTALL.txt
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,4 @@
 include CHANGELOG.txt
-include INSTALL.txt
 include LICENSE.txt
 include MANIFEST.in
 include README.rst

diff --git a/README.rst b/README.rst
@@ -6,10 +6,11 @@ Django Tagging
 
 This is a generic tagging application for Django projects
 
-For installation instructions, see the file "INSTALL.txt" in this
-directory; for instructions on how to use this application, and on
-what it provides, see the file "overview.txt" in the "docs/"
-directory.
+http://django-tagging.readthedocs.org/
+
+Note that this application requires Python 2.7 or later, and Django
+1.7 or later. You can obtain Python from http://www.python.org/ and
+Django from http://www.djangoproject.com/.
 
 .. |travis-develop| image:: https://travis-ci.org/Fantomas42/django-tagging.png?branch=develop
    :alt: Build Status - develop branch

diff --git a/docs/overview.txt → docs/index.rst b/docs/overview.txt → docs/index.rst