summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSusanTan <onceuponatimeforever@gmail.com>2013-07-06 18:24:38 -0700
committerTim Graham <timograham@gmail.com>2013-07-09 07:11:41 -0400
commitef3fddf26e8bfe956a52c2aa678db6637caf7adf (patch)
tree79323eb3b668c2e3c9dc30c5e6b60bafdf68c4d2 /docs
parent95eb68c98fe2dc95277d4e26a0316d856dc868dd (diff)
Fixed #18261 -- Clarified 'project root directory'
Diffstat (limited to 'docs')
-rw-r--r--docs/intro/tutorial01.txt4
-rw-r--r--docs/topics/i18n/translation.txt5
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