summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/models/options.txt4
-rw-r--r--docs/releases/1.7.txt3
2 files changed, 2 insertions, 5 deletions
diff --git a/docs/ref/models/options.txt b/docs/ref/models/options.txt
index c1bf34ba86..ba07dfaeb9 100644
--- a/docs/ref/models/options.txt
+++ b/docs/ref/models/options.txt
@@ -33,7 +33,7 @@ Available ``Meta`` options
.. versionadded:: 1.7
``app_label`` is no longer required for models that are defined
- in a ``models`` package within an app.
+ outside the ``models`` module of an application.
``db_table``
------------
@@ -81,7 +81,7 @@ Django quotes column and table names behind the scenes.
db_table = '"name_left_in_lowercase"'
- Such quoted names can also be used with Django's other supported database
+ Such quoted names can also be used with Django's other supported database
backends; except for Oracle, however, the quotes have no effect. See the
:ref:`Oracle notes <oracle-notes>` for more details.
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index fced7a7508..2d040d92f9 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -466,9 +466,6 @@ Models
``Meta`` option allows you to customize (or disable) creation of the default
add, change, and delete permissions.
-* :attr:`~django.db.models.Options.app_label` is no longer required for models
- that are defined in a ``models`` package within an app.
-
* Explicit :class:`~django.db.models.OneToOneField` for
:ref:`multi-table-inheritance` are now discovered in abstract classes.