innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.6.x] Fixed #18261 -- Clarified 'project root directory' 

Backport of ef3fddf26e from master
This commit is contained in:
SusanTan 2013-07-06 18:24:38 -07:00 committed by Tim Graham
parent f03398a246
commit c1b24b09f4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/intro/tutorial01.txt
View File

@ -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

5
docs/topics/i18n/translation.txt
View File

@ -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