[1.9.x] Fixed #26032 -- Moved "project root directory" to a separate paragraph.

Backport of b07f91600d61a2f8d58adb4c92d36dd0b2b34fe7 from master
This commit is contained in:
Tim Graham 2016-01-04 10:52:20 -05:00
parent 6e5d77dc05
commit 0a72ad3952

View File

@ -26,11 +26,13 @@ package with ``settings.py``, ``urls.py``, and ``wsgi.py``. The project package
is often extended to include things like fixtures, CSS, and templates which is often extended to include things like fixtures, CSS, and templates which
aren't tied to a particular application. aren't tied to a particular application.
A **project's root directory** (the one that contains ``manage.py``) is usually
the container for all of a project's applications which aren't installed
separately.
The term **application** describes a Python package that provides some set of The term **application** describes a Python package that provides some set of
features. Applications :doc:`may be reused </intro/reusable-apps/>` in various features. Applications :doc:`may be reused </intro/reusable-apps/>` in various
projects. A project's root directory (the one that contains ``manage.py``) is projects.
usually the container for all of a project's applications which aren't
installed separately.
Applications include some combination of models, views, templates, template Applications include some combination of models, views, templates, template
tags, static files, URLs, middleware, etc. They're generally wired into tags, static files, URLs, middleware, etc. They're generally wired into