summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-01-04 10:52:20 -0500
committerTim Graham <timograham@gmail.com>2016-01-04 10:55:30 -0500
commit0a72ad3952c0a2e335ed8518d31647e6536ee3fe (patch)
tree6ce3b4d07b3b415de9c355fdc48573310761abaf /docs
parent6e5d77dc052cbd0dbb92dd9142d408e011be65f8 (diff)
[1.9.x] Fixed #26032 -- Moved "project root directory" to a separate paragraph.
Backport of b07f91600d61a2f8d58adb4c92d36dd0b2b34fe7 from master
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/applications.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/docs/ref/applications.txt b/docs/ref/applications.txt
index 9cecb8283b..5768858dba 100644
--- a/docs/ref/applications.txt
+++ b/docs/ref/applications.txt
@@ -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
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
features. Applications :doc:`may be reused </intro/reusable-apps/>` in various
-projects. 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.
+projects.
Applications include some combination of models, views, templates, template
tags, static files, URLs, middleware, etc. They're generally wired into