Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

Backport of ef3fddf from master
  • Loading branch information...
commit c1b24b09f4e3a390d015fc53af02621b1b120bc6 1 parent f03398a
Susan  Tan authored July 06, 2013 timgraham committed July 09, 2013
4  docs/intro/tutorial01.txt
@@ -99,7 +99,7 @@ Let's look at what :djadmin:`startproject` created::
99 99
 
100 100
 These files are:
101 101
 
102  
-* The outer :file:`mysite/` directory is just a container for your
  102
+* The outer :file:`mysite/` root directory is just a container for your
103 103
   project. Its name doesn't matter to Django; you can rename it to anything
104 104
   you like.
105 105
 
@@ -109,7 +109,7 @@ These files are:
109 109
 
110 110
 * The inner :file:`mysite/` directory is the actual Python package for your
111 111
   project. Its name is the Python package name you'll need to use to import
112  
-  anything inside it (e.g. ``import mysite.settings``).
  112
+  anything inside it (e.g. ``mysite.urls``).
113 113
 
114 114
 * :file:`mysite/__init__.py`: An empty file that tells Python that this
115 115
   directory should be considered a Python package. (Read `more about
5  docs/topics/i18n/translation.txt
@@ -1238,8 +1238,9 @@ German.
1238 1238
 
1239 1239
 The script should be run from one of two places:
1240 1240
 
1241  
-* The root directory of your Django project.
1242  
-* The root directory of your Django app.
  1241
+* The root directory of your Django project (the one that contains
  1242
+  ``manage.py``).
  1243
+* The root directory of one of your Django apps.
1243 1244
 
1244 1245
 The script runs over your project source tree or your application source tree
1245 1246
 and pulls out all strings marked for translation (see

0 notes on commit c1b24b0

Please sign in to comment.
Something went wrong with that request. Please try again.