Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

Backport of ef3fddf from master
  • Loading branch information...
commit 5192dbbf5546eb62e1c24d36d91f270b1a2b5eaf 1 parent 0a91a8d
Susan  Tan onceuponatimeforever authored timgraham committed
Showing with 5 additions and 4 deletions.
  1. +2 −2 docs/intro/tutorial01.txt
  2. +3 −2 docs/topics/i18n/translation.txt
4 docs/intro/tutorial01.txt
View
@@ -98,7 +98,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.
@@ -108,7 +108,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
@@ -1199,8 +1199,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
Please sign in to comment.
Something went wrong with that request. Please try again.