summaryrefslogtreecommitdiff
path: root/docs/django-admin.txt
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2006-04-24 00:29:31 +0000
committerAdrian Holovaty <adrian@holovaty.com>2006-04-24 00:29:31 +0000
commit489d5bae5c5e53891c71796427e205625c8afe74 (patch)
treeb674d675428ad1647cb686f99589944b17c4429c /docs/django-admin.txt
parent0f89743539b2129bab5bbaa719ea5be00d05c294 (diff)
magic-removal: Removed 'New in Django development version' notes in all docs
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2744 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/django-admin.txt')
-rw-r--r--docs/django-admin.txt18
1 files changed, 9 insertions, 9 deletions
diff --git a/docs/django-admin.txt b/docs/django-admin.txt
index f77aebd330..5edf5d5bc1 100644
--- a/docs/django-admin.txt
+++ b/docs/django-admin.txt
@@ -110,12 +110,12 @@ output:
``'This field type is a guess.'`` next to the field in the generated
model.
- * **New in Django development version.** If the database column name is a
- Python reserved word (such as ``'pass'``, ``'class'`` or ``'for'``),
- ``inspectdb`` will append ``'_field'`` to the attribute name. For
- example, if a table has a column ``'for'``, the generated model will have
- a field ``'for_field'``, with the ``db_column`` attribute set to
- ``'for'``. ``inspectdb`` will insert the Python comment
+ * If the database column name is a Python reserved word (such as
+ ``'pass'``, ``'class'`` or ``'for'``), ``inspectdb`` will append
+ ``'_field'`` to the attribute name. For example, if a table has a column
+ ``'for'``, the generated model will have a field ``'for_field'``, with
+ the ``db_column`` attribute set to ``'for'``. ``inspectdb`` will insert
+ the Python comment
``'Field renamed because it was a Python reserved word.'`` next to the
field.
@@ -180,9 +180,9 @@ shell
Starts the Python interactive interpreter.
-**New in Django development version:** Uses IPython_, if it's installed. If you
-have IPython installed and want to force use of the "plain" Python interpreter,
-use the ``--plain`` option, like so::
+Django will use IPython_, if it's installed. If you have IPython installed and
+want to force use of the "plain" Python interpreter, use the ``--plain``
+option, like so::
django-admin.py shell --plain