Skip to content

Commit

Permalink
Edited django-admin.txt changes from [17340]
Browse files Browse the repository at this point in the history
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17422 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
adrianholovaty committed Feb 3, 2012
1 parent 442ab47 commit f950a99
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions docs/ref/django-admin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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::

Expand Down

0 comments on commit f950a99

Please sign in to comment.