From 63df9c1da6b090ab03a9bb892807914da9e71a17 Mon Sep 17 00:00:00 2001 From: Joseph Kocherhans Date: Tue, 16 May 2006 21:07:14 +0000 Subject: [PATCH] multi-auth: Merged to [2924] git-svn-id: http://code.djangoproject.com/svn/django/branches/multi-auth@2925 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/backends/mysql/introspection.py | 1 + docs/tutorial02.txt | 4 ++-- docs/tutorial03.txt | 2 +- docs/tutorial04.txt | 5 +++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/django/db/backends/mysql/introspection.py b/django/db/backends/mysql/introspection.py index a2eeb6de7b..e1fbfff828 100644 --- a/django/db/backends/mysql/introspection.py +++ b/django/db/backends/mysql/introspection.py @@ -87,6 +87,7 @@ DATA_TYPES_REVERSE = { FIELD_TYPE.SHORT: 'IntegerField', FIELD_TYPE.STRING: 'TextField', FIELD_TYPE.TIMESTAMP: 'DateTimeField', + FIELD_TYPE.TINY: 'IntegerField', FIELD_TYPE.TINY_BLOB: 'TextField', FIELD_TYPE.MEDIUM_BLOB: 'TextField', FIELD_TYPE.LONG_BLOB: 'TextField', diff --git a/docs/tutorial02.txt b/docs/tutorial02.txt index 6cdda32fbb..d95476aeaf 100644 --- a/docs/tutorial02.txt +++ b/docs/tutorial02.txt @@ -71,8 +71,8 @@ Make the poll app modifiable in the admin But where's our poll app? It's not displayed on the admin index page. Just one thing to do: We need to specify in the ``Poll`` model that ``Poll`` -objects have an admin interface. Edit the ``mysite/polls/models/polls.py`` -file and make the following change to add an inner ``Admin`` class:: +objects have an admin interface. Edit the ``mysite/polls/models.py`` file and +make the following change to add an inner ``Admin`` class:: class Poll(models.Model): # ... diff --git a/docs/tutorial03.txt b/docs/tutorial03.txt index 9dce729d24..f368d54c53 100644 --- a/docs/tutorial03.txt +++ b/docs/tutorial03.txt @@ -91,7 +91,7 @@ Finally, it calls that ``detail()`` function like so:: The ``poll_id='23'`` part comes from ``(?P\d+)``. Using parenthesis around a pattern "captures" the text matched by that pattern and sends it as an argument to the view function; the ``?P`` defines the name that will be used to -identify the matched pattern; and \d+ is a regular experession to match a sequence of +identify the matched pattern; and ``\d+`` is a regular experession to match a sequence of digits (i.e., a number). Because the URL patterns are regular expressions, there really is no limit on diff --git a/docs/tutorial04.txt b/docs/tutorial04.txt index 67974327a3..8ef4a03c6d 100644 --- a/docs/tutorial04.txt +++ b/docs/tutorial04.txt @@ -218,8 +218,9 @@ from ``polls/views.py``. We don't need them anymore -- they have been replaced by generic views. The ``vote()`` view is still required. However, it must be modified to match -the new templates and context variables. Change the template call from ``polls/detail`` -to ``polls/polls_detail``, and pass ``object`` in the context instead of ``poll``. +the new templates and context variables. Change the template call from +``polls/detail.html`` to ``polls/poll_detail.html``, and pass ``object`` in the +context instead of ``poll``. Run the server, and use your new polling app based on generic views.