summaryrefslogtreecommitdiff
path: root/docs/ref/django-admin.txt
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2012-02-03 17:52:39 +0000
committerAdrian Holovaty <adrian@holovaty.com>2012-02-03 17:52:39 +0000
commitf950a99acbc2e881389cfb64c6bc5a021d467d7f (patch)
treed9736b9b4825867771883cd35e9df76a4b4eb070 /docs/ref/django-admin.txt
parent442ab475c86323b407b10e048f3d319280fb690b (diff)
Edited django-admin.txt changes from [17340]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17422 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/django-admin.txt')
-rw-r--r--docs/ref/django-admin.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index bdbef5ea9c..3f5840bfd5 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -362,7 +362,7 @@ Fixtures may be compressed in ``zip``, ``gz``, or ``bz2`` format. For example::
django-admin.py loaddata mydata.json
would look for any of ``mydata.json``, ``mydata.json.zip``,
-``mydata.json.gz``, or ``mydata.json.bz2``. The first file contained within a
+``mydata.json.gz``, or ``mydata.json.bz2``. The first file contained within a
zip-compressed archive is used.
Note that if two fixtures with the same name but different
@@ -984,7 +984,7 @@ the current directory or the given destination.
.. versionchanged:: 1.4
By default, the new directory contains ``manage.py`` and a project package
-(containing a ``settings.py`` and other files). See the `template source`_ for
+(containing a ``settings.py`` and other files). See the `template source`_ for
details.
If only the project name is given, both the project directory and project
@@ -993,7 +993,7 @@ will be created in the current working directory.
If the optional destination is provided, Django will use that existing
directory as the project directory, and create ``manage.py`` and the project
-package within it. You can use '.' to denote the current working directory.
+package within it. Use '.' to denote the current working directory.
For example::