From da8b7ad73c69d48322f118aa902787cd01684f90 Mon Sep 17 00:00:00 2001
From: arthur <arthur@wallstreetweb.net>
Date: Sat, 28 May 2016 02:15:22 +0200
Subject: [PATCH] Fix installation instruction in README and documentation

---
 README.rst            | 28 +++++++++++++++++++++-------
 docs/contributing.rst |  4 ++--
 docs/installation.rst | 32 ++++++++++++++++++++++++--------
 3 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/README.rst b/README.rst
index 8dd5239..705658e 100644
--- a/README.rst
+++ b/README.rst
@@ -96,18 +96,17 @@ Add djadmin2 urls to your URLconf:
 
 .. code-block:: python
 
-   # urls.py
-   from django.conf.urls import patterns, include
+    # urls.py
+    from django.conf.urls import include
 
-   import djadmin2
+    from djadmin2.site import djadmin2_site
 
-   djadmin2.default.autodiscover()
+    djadmin2_site.autodiscover()
 
-
-   urlpatterns = patterns(
+    urlpatterns = [
       ...
       url(r'^admin2/', include(djadmin2.default.urls)),
-   )
+    ]
 
 
 How to write django-admin2 modules
@@ -155,6 +154,21 @@ Therefore, your `settings` need to include this:
         'PAGE_SIZE': 10
     }
 
+The default admin2 site has move into djadmin2.site make sure your use the news djadmin2_site in your urls.py:
+
+.. code-block:: python
+
+    # urls.py
+    from django.conf.urls import include
+
+    from djadmin2.site import djadmin2_site
+
+    djadmin2_site.autodiscover()
+
+    urlpatterns = [
+      ...
+      url(r'^admin2/', include(djadmin2.default.urls)),
+    ]
 
 Migrating from 0.5.x
 ====================
diff --git a/docs/contributing.rst b/docs/contributing.rst
index 31a28d4..7af32da 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -37,8 +37,8 @@ Local Installation
 Try the example projects
 --------------------------
 
-1. cd into example/ (or example2/)
-2. create the database: ``$ python manage.py syncdb``
+1. cd into example/
+2. create the database: ``$ python manage.py migrate``
 3. run the dev server: ``$ python manage.py runserver``
 
 .. _virtualenv: http://www.virtualenv.org/en/latest/
diff --git a/docs/installation.rst b/docs/installation.rst
index f00f2b0..4d4f37d 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -36,18 +36,17 @@ Add djadmin2 urls to your URLconf:
 
 .. code-block:: python
 
-   # urls.py
-   from django.conf.urls import include
-   
-   import djadmin2
-   
-   djadmin2.default.autodiscover()
+    # urls.py
+    from django.conf.urls import include
 
+    from djadmin2.site import djadmin2_site
 
-   urlpatterns = [
+    djadmin2_site.autodiscover()
+
+    urlpatterns = [
       ...
       url(r'^admin2/', include(djadmin2.default.urls)),
-   ]
+    ]
 
 Development Installation
 =========================
@@ -74,6 +73,23 @@ Therefore, your `settings` need to include this:
     }
 
 
+The default admin2 site has move into djadmin2.site make sure your use the news djadmin2_site in your urls.py:
+
+.. code-block:: python
+
+    # urls.py
+    from django.conf.urls import include
+
+    from djadmin2.site import djadmin2_site
+
+    djadmin2_site.autodiscover()
+
+    urlpatterns = [
+      ...
+      url(r'^admin2/', include(djadmin2.default.urls)),
+    ]
+
+
 Migrating from 0.5.x
 ====================