Merge branch 'release/3.0.0' into develop

klen · Jun 13, 2013 · 7bb1338 · 7bb1338
2 parents 0c583bc + 6f058bb
commit 7bb1338
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/Changelog b/Changelog
@@ -1,4 +1,4 @@
-2013-06-08  horneds 3.0.0
+2013-06-13  horneds 3.0.0
 
 	* ``api.register`` method could be used as decorator;
 

diff --git a/README.rst b/README.rst
@@ -3,7 +3,7 @@
 
 Adrest is Another Django REST. Django application for simple make HTTP REST API.
 
-Documentation in construction.
+Documentation in `construction <http://adrest.readthedocs.org>`_.
 
 .. _badges:
 

diff --git a/adrest/__init__.py b/adrest/__init__.py
@@ -5,7 +5,7 @@
     :copyright: 2013 by Kirill Klenov.
     :license: BSD, see LICENSE for more details.
 """
-version_info = (2, 2, 2)
+version_info = (3, 0, 0)
 
 __version__ = version = '.'.join(map(str, version_info))
 __project__ = PROJECT = __name__
@@ -18,7 +18,7 @@
 
         if not 'adrest' in django_settings.INSTALLED_APPS:
             import logging
-            logging.warn('You should add "adrest" to INSTALLED_APPS.')
+            logging.warn('You should added "adrest" to INSTALLED_APPS.')
 
 except ImportError:
     pass

diff --git a/docs/index.html b/docs/index.html
@@ -0,0 +1,12 @@
+<html>
+    <head>
+        <title>A web page that points a browser to a different page after 2 seconds</title>
+        <meta http-equiv="refresh" content="2; URL=http://adrest.readthedocs.org">
+        <meta name="keywords" content="automatic redirection">
+    </head>
+    <body>
+        Documentation is maintained elsewhere.
+        You will be redirected to the new documentation within 2 seconds.
+        If the browser does not automatically redirect you, you may want to go to <a href="http://adrest.readthedocs.org">the destination</a> manually.
+    </body>
+</html>
diff --git a/docs/index.html.zip b/docs/index.html.zip