Merge branch 'master' into LeonardoGentile-master

interalia-desarrolloweb · Aug 2, 2013 · 26b641b · 26b641b
2 parents 0fe9f6c + 6bcc1e1
commit 26b641b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/README.mkd b/README.mkd
@@ -11,8 +11,4 @@ Complete documentation about the
 [installation](http://docs.django-userena.org/en/latest/installation.html),
 [settings](http://docs.django-userena.org/en/latest/settings.html) and
 [F.A.Q.](http://docs.django-userena.org/en/latest/faq.html) is available on
-[Read the Docs](http://docs.django-userena.org/en/latest/index.html).
-
-## [Demo](http://django-userena.org/)
-
-Want to test userena first, you can do just that at [django-userena.org](http://django-userena.org/).
+[Read the Docs](http://docs.django-userena.org/en/latest/index.html).
diff --git a/demo/README.md b/demo/README.md
@@ -1,7 +1,4 @@
 # Userena Demo
 
-These are the files for the Userena demo running on
-http://www.django-userena.org.
-
-Thanks go out to [dotcloud](https://www.dotcloud.com/index.html) for supplying
-us with free hosting.
+You can use this project to see how to setup Django userena for your own
+project.
diff --git a/docs/index.rst b/docs/index.rst
@@ -6,7 +6,7 @@
 Userena Introduction
 ====================
 
-This documentation covers 1.0 release of django-userena application. A Django
+This documentation covers 1.2.1 release of django-userena application. A Django
 application that takes care of your account needs.
 
 Why userena?