From 1b7fb29dfb8579dc627208b8ca6500b5341489a9 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Sat, 23 Feb 2013 09:19:32 -0500 Subject: [PATCH] Changed "mysite/mytemplates/" -> "mysite/templates" in tutorial. Thanks James Pic. --- docs/intro/reusable-apps.txt | 4 ++-- docs/intro/tutorial02.txt | 11 +++++------ docs/intro/tutorial03.txt | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/docs/intro/reusable-apps.txt b/docs/intro/reusable-apps.txt index dcccd583c0..0e0c9d2ba5 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 966921f8a5..4382602c54 100644 --- a/docs/intro/tutorial02.txt +++ b/docs/intro/tutorial02.txt @@ -404,7 +404,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. @@ -412,13 +412,12 @@ project is a good convention to follow. Open your settings file (``mysite/settings.py``, remember) and add a :setting:`TEMPLATE_DIRS` setting:: - TEMPLATE_DIRS = (os.path.join(BASE_DIR, 'mytemplates'),) + TEMPLATE_DIRS = [os.path.join(BASE_DIR, 'templates')] -Don't forget the trailing comma. :setting:`TEMPLATE_DIRS` is a tuple of -filesystem directories to check when loading Django templates; it's a search -path. +:setting:`TEMPLATE_DIRS` is an iterable of filesystem directories to check when +loading Django templates; it's a search path. -Now create a directory called ``admin`` inside ``mytemplates``, and copy the +Now create a directory called ``admin`` inside ``templates``, and 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 that directory. 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.