Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

magic-removal: Fixes #1263 -- Updated docs to reflect changes in data…

…base table names used by admin, auth, etc. Thanks, Malcolm Tredinnick.

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit f8b3f9391b2421107a8575c35e8a2a21f75adfeb 1 parent 1764a4d
Russell Keith-Magee freakboy3742 authored
2  docs/authentication.txt
View
@@ -388,7 +388,7 @@ Default permissions
Three basic permissions -- add, create and delete -- are automatically created
for each Django model that has ``admin`` set. Behind the scenes, these
-permissions are added to the ``auth_permissions`` database table when you run
+permissions are added to the ``auth_permission`` database table when you run
``django-admin.py install [app]``. You can view the exact SQL ``INSERT``
statements by running ``django-admin.py sqlinitialdata [app]``.
4 docs/flatpages.txt
View
@@ -35,9 +35,9 @@ How it works
============
``django-admin.py install flatpages`` creates two tables in your database:
-``django_flatpages`` and ``django_flatpages_sites``. ``django_flatpages`` is a
+``django_flatpage`` and ``django_flatpage_sites``. ``django_flatpage`` is a
simple lookup table that essentially maps a URL to a title and bunch of text
-content. ``django_flatpages_sites`` associates a flatpage with a site.
+content. ``django_flatpage_sites`` associates a flatpage with a site.
The ``FlatpageFallbackMiddleware`` does all of the work. Each time any Django
application raises a 404 error, this middleware checks the flatpages database
21 docs/legacy_databases.txt
View
@@ -66,17 +66,16 @@ in your database::
This won't work if your database already contains tables that have any of the
following names:
- * ``sites``
- * ``packages``
- * ``content_types``
- * ``core_sessions``
- * ``auth_permissions``
- * ``auth_groups``
- * ``auth_users``
- * ``auth_messages``
- * ``auth_groups_permissions``
- * ``auth_users_groups``
- * ``auth_users_user_permissions``
+ * ``django_site``
+ * ``django_content_type``
+ * ``django_sessions``
+ * ``auth_permission``
+ * ``auth_group``
+ * ``auth_user``
+ * ``auth_message``
+ * ``auth_group_permissions``
+ * ``auth_user_groups``
+ * ``auth_user_user_permission``
If that's the case, try renaming one of your tables to resolve naming
conflicts. Currently, there's no way of customizing the names of Django's
2  docs/model-api.txt
View
@@ -733,7 +733,7 @@ Here's a list of all possible ``Meta`` options. No options are required. Adding
db_table = "pizza_orders"
- If this isn't given, Django will use ``app_label + '_' + module_name``.
+ If this isn't given, Django will use ``app_label + '_' + model_class_name``.
If your database table name is an SQL reserved word, or contains characters
that aren't allowed in Python variable names -- notably, the hyphen --
2  docs/redirects.txt
View
@@ -21,7 +21,7 @@ To install the redirects app, follow these two steps:
How it works
============
-``django-admin.py install redirects`` creates a ``django_redirects`` table in
+``django-admin.py install redirects`` creates a ``django_redirect`` table in
your database. This is a simple lookup table with ``site_id``, ``old_path`` and
``new_path`` fields.
2  docs/sessions.txt
View
@@ -239,7 +239,7 @@ Technical details
* The session dictionary should accept any pickleable Python object. See
`the pickle module`_ for more information.
- * Session data is stored in a database table named ``core_sessions`` .
+ * Session data is stored in a database table named ``django_session`` .
* Django only sends a cookie if it needs to. If you don't set any session
data, it won't send a session cookie.
6 docs/settings.txt
View
@@ -587,9 +587,9 @@ SITE_ID
Default: Not defined
-The ID, as an integer, of the current site in the ``sites`` database. This is
-used so that application data can hook into specific site(s) and a single
-database can manage content for multiple sites.
+The ID, as an integer, of the current site in the ``django_site`` database
+table. This is used so that application data can hook into specific site(s)
+and a single database can manage content for multiple sites.
TEMPLATE_CONTEXT_PROCESSORS
---------------------------
Please sign in to comment.
Something went wrong with that request. Please try again.