diff options
| author | SusanTan <onceuponatimeforever@gmail.com> | 2013-07-06 18:24:38 -0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-07-09 07:16:31 -0400 |
| commit | c1b24b09f4e3a390d015fc53af02621b1b120bc6 (patch) | |
| tree | 5e8fd71e4b5c2ca32bb689151491960616176b92 | |
| parent | f03398a2461e240c7e7401e1c51878c8af619ed2 (diff) | |
[1.6.x] Fixed #18261 -- Clarified 'project root directory'
Backport of ef3fddf26e from master
| -rw-r--r-- | docs/intro/tutorial01.txt | 4 | ||||
| -rw-r--r-- | docs/topics/i18n/translation.txt | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt index 6e5988b15a..f2b01758aa 100644 --- a/docs/intro/tutorial01.txt +++ b/docs/intro/tutorial01.txt @@ -99,7 +99,7 @@ Let's look at what :djadmin:`startproject` created:: These files are: -* The outer :file:`mysite/` directory is just a container for your +* The outer :file:`mysite/` root directory is just a container for your project. Its name doesn't matter to Django; you can rename it to anything you like. @@ -109,7 +109,7 @@ These files are: * The inner :file:`mysite/` directory is the actual Python package for your project. Its name is the Python package name you'll need to use to import - anything inside it (e.g. ``import mysite.settings``). + anything inside it (e.g. ``mysite.urls``). * :file:`mysite/__init__.py`: An empty file that tells Python that this directory should be considered a Python package. (Read `more about diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt index 80925d7648..0d51bac504 100644 --- a/docs/topics/i18n/translation.txt +++ b/docs/topics/i18n/translation.txt @@ -1238,8 +1238,9 @@ German. The script should be run from one of two places: -* The root directory of your Django project. -* The root directory of your Django app. +* The root directory of your Django project (the one that contains + ``manage.py``). +* The root directory of one of your Django apps. The script runs over your project source tree or your application source tree and pulls out all strings marked for translation (see |