schema-evolution: merged trunk:HEAD into schema-evolution branch

git-svn-id: http://code.djangoproject.com/svn/django/branches/schema-evolution@5734 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 8 insertions, 8 deletions

diff --git a/docs/tutorial02.txt b/docs/tutorial02.txt
index f6d4045fa3..99f586b4a1 100644
--- a/docs/tutorial02.txt
+++ b/docs/tutorial02.txt
@@ -5,7 +5,7 @@ Writing your first Django app, part 2
 This tutorial begins where `Tutorial 1`_ left off. We're continuing the Web-poll
 application and will focus on Django's automatically-generated admin site.
 
-.. _Tutorial 1: http://www.djangoproject.com/documentation/tutorial1/
+.. _Tutorial 1: ../tutorial01/
 
 .. admonition:: Philosophy
 
@@ -61,10 +61,10 @@ tutorial, remember?) You should see the Django admin index page:
    :alt: Django admin index page
    :target: http://media.djangoproject.com/img/doc/tutorial/admin02.png
 
-By default, you should see two types of editable content: groups and users.
-These are core features Django ships with by default.
+You should see a few other types of editable content, including groups, users
+and sites. These are core features Django ships with by default.
 
-.. _"I can't log in" questions: http://www.djangoproject.com/documentation/faq/#the-admin-site
+.. _"I can't log in" questions: ../faq/#the-admin-site
 
 Make the poll app modifiable in the admin
 =========================================
@@ -320,7 +320,7 @@ method a ``short_description`` attribute::
 
 
 Let's add another improvement to the Poll change list page: Filters. Add the
-following line to ``Poll.admin``::
+following line to ``Poll.Admin``::
 
     list_filter = ['pub_date']
 
@@ -402,7 +402,7 @@ Django automatically looks for a ``templates/`` subdirectory within each app
 package, for use as a fallback. See the `loader types documentation`_ for full
 information.
 
-.. _loader types documentation: http://www.djangoproject.com/documentation/templates_python/#loader-types
+.. _loader types documentation: ../templates_python/#loader-types
 
 Customize the admin index page
 ==============================
@@ -433,5 +433,5 @@ general, see the `Django admin CSS guide`_.
 When you're comfortable with the admin site, read `part 3 of this tutorial`_ to
 start working on public poll views.
 
-.. _Django admin CSS guide: http://www.djangoproject.com/documentation/admin_css/
-.. _part 3 of this tutorial: http://www.djangoproject.com/documentation/tutorial3/
+.. _Django admin CSS guide: ../admin_css/
+.. _part 3 of this tutorial: ../tutorial03/