diff --git a/docs/intro/reusable-apps.txt b/docs/intro/reusable-apps.txt index 7497da52b0..9d1630ce14 100644 --- a/docs/intro/reusable-apps.txt +++ b/docs/intro/reusable-apps.txt @@ -74,11 +74,11 @@ After the previous tutorials, our project should look like this:: results.html urls.py views.py - mytemplates/ + templates/ admin/ base_site.html -You created ``mysite/mytemplates`` in :doc:`Tutorial 2 `, +You created ``mysite/templates`` in :doc:`Tutorial 2 `, and ``polls/templates`` in :doc:`Tutorial 3 `. Now perhaps it is clearer why we chose to have separate template directories for the project and application: everything that is part of the polls application is in diff --git a/docs/intro/tutorial02.txt b/docs/intro/tutorial02.txt index 128e1b0a57..1f7c0e8501 100644 --- a/docs/intro/tutorial02.txt +++ b/docs/intro/tutorial02.txt @@ -440,7 +440,7 @@ system. Customizing your *project's* templates -------------------------------------- -Create a ``mytemplates`` directory in your project directory. Templates can +Create a ``templates`` directory in your project directory. Templates can live anywhere on your filesystem that Django can access. (Django runs as whatever user your server runs.) However, keeping your templates within the project is a good convention to follow. @@ -449,16 +449,16 @@ By default, :setting:`TEMPLATE_DIRS` is empty. So, let's add a line to it, to tell Django where our templates live:: TEMPLATE_DIRS = ( - '/path/to/mysite/mytemplates', # Change this to your own directory. + '/path/to/mysite/templates', # Change this to your own directory. ) Now copy the template ``admin/base_site.html`` from within the default Django admin template directory in the source code of Django itself (``django/contrib/admin/templates``) into an ``admin`` subdirectory of whichever directory you're using in :setting:`TEMPLATE_DIRS`. For example, if -your :setting:`TEMPLATE_DIRS` includes ``'/path/to/mysite/mytemplates'``, as +your :setting:`TEMPLATE_DIRS` includes ``'/path/to/mysite/templates'``, as above, then copy ``django/contrib/admin/templates/admin/base_site.html`` to -``/path/to/mysite/mytemplates/admin/base_site.html``. Don't forget that +``/path/to/mysite/templates/admin/base_site.html``. Don't forget that ``admin`` subdirectory. .. admonition:: Where are the Django source files? diff --git a/docs/intro/tutorial03.txt b/docs/intro/tutorial03.txt index abc61a23ba..975e3fc668 100644 --- a/docs/intro/tutorial03.txt +++ b/docs/intro/tutorial03.txt @@ -300,7 +300,7 @@ Django knows to find the polls templates even though we didn't modify and it would work perfectly well. However, this template belongs to the polls application, so unlike the admin template we created in the previous tutorial, we'll put this one in the application's template directory - (``polls/templates``) rather than the project's (``mytemplates``). We'll + (``polls/templates``) rather than the project's (``templates``). We'll discuss in more detail in the :doc:`reusable apps tutorial ` *why* we do this.