summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2019-12-05 08:38:39 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-12-05 08:40:19 +0100
commit6ede5a3cb7ae92d6d8fdbd71805fb4742c672dd9 (patch)
tree080c47024c01a417233ff86908d05fe1b77488a5 /docs
parent7263c7710cfb00628dbefb8f644e8c2c21d94c32 (diff)
[3.0.x] Fixed #31062 -- Doc'd asgi.py in tutorials and project templates.
Backport of 3930ec1bf275d17f1c36cd38b38114177b1d1565 from master
Diffstat (limited to 'docs')
-rw-r--r--docs/intro/reusable-apps.txt1
-rw-r--r--docs/intro/tutorial01.txt4
-rw-r--r--docs/ref/applications.txt6
3 files changed, 8 insertions, 3 deletions
diff --git a/docs/intro/reusable-apps.txt b/docs/intro/reusable-apps.txt
index 3041fbe8e9..58069dc10a 100644
--- a/docs/intro/reusable-apps.txt
+++ b/docs/intro/reusable-apps.txt
@@ -61,6 +61,7 @@ After the previous tutorials, our project should look like this::
__init__.py
settings.py
urls.py
+ asgi.py
wsgi.py
polls/
__init__.py
diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt
index 2f4c59be18..c6554f3437 100644
--- a/docs/intro/tutorial01.txt
+++ b/docs/intro/tutorial01.txt
@@ -86,6 +86,7 @@ Let's look at what :djadmin:`startproject` created::
__init__.py
settings.py
urls.py
+ asgi.py
wsgi.py
These files are:
@@ -113,6 +114,9 @@ These files are:
"table of contents" of your Django-powered site. You can read more about
URLs in :doc:`/topics/http/urls`.
+* :file:`mysite/asgi.py`: An entry-point for ASGI-compatible web servers to
+ serve your project. See :doc:`/howto/deployment/asgi/index` for more details.
+
* :file:`mysite/wsgi.py`: An entry-point for WSGI-compatible web servers to
serve your project. See :doc:`/howto/deployment/wsgi/index` for more details.
diff --git a/docs/ref/applications.txt b/docs/ref/applications.txt
index 89ba64e691..c5aa36144e 100644
--- a/docs/ref/applications.txt
+++ b/docs/ref/applications.txt
@@ -22,9 +22,9 @@ The term **project** describes a Django web application. The project Python
package is defined primarily by a settings module, but it usually contains
other things. For example, when you run ``django-admin startproject mysite``
you'll get a ``mysite`` project directory that contains a ``mysite`` Python
-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.
+package with ``settings.py``, ``urls.py``, ``asgi.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