diff options
| author | Carl Meyer <carl@oddbird.net> | 2012-01-04 23:55:34 +0000 |
|---|---|---|
| committer | Carl Meyer <carl@oddbird.net> | 2012-01-04 23:55:34 +0000 |
| commit | bc63ba700a0ae3ba435c267789d8c2e3931016df (patch) | |
| tree | 1d278fa48dd5e52b65e6bc16a36d33514e9b7b1a /docs/ref/django-admin.txt | |
| parent | 8e9043bccbe18d4b6d1550bffeff4c28e5135f6c (diff) | |
Fixed #17503 -- A destination directory passed to startproject or startapp as optional second argument is now reused as the project/app directory, rather than a new project/app directory created within it. Refs #17042.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17340 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/django-admin.txt')
| -rw-r--r-- | docs/ref/django-admin.txt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 27e3bb4a97..4bde86ce4a 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -922,13 +922,13 @@ template files. (See the `source`_ for more details.) If only the app name is given, the app directory will be created in the current working directory. -If the optional destination is provided, Django will create the new project -directory in that directory. You can use '.' to denote the current working -directory. +If the optional destination is provided, Django will use that existing +directory rather than creating a new one. You can use '.' to denote the current +working directory. For example:: - django-admin.py startapp myapp /Users/jezdez/Code + django-admin.py startapp myapp /Users/jezdez/Code/myapp .. versionadded:: 1.4 .. django-admin-option:: --template @@ -984,20 +984,20 @@ the current directory or the given destination. .. versionchanged:: 1.4 By default, the new directory contains ``manage.py`` and a project package -(containing ``settings.py`` file and other project template files). -See the `template source`_ for details. +(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 package will be named ``<projectname>`` and the project directory will be created in the current working directory. -If the optional destination is provided, Django will create the new project -directory in that directory. You can use '.' to denote 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. For example:: - django-admin.py startproject myproject /Users/jezdez/Code + django-admin.py startproject myproject /Users/jezdez/Code/myproject_repo .. versionadded:: 1.4 |