Author: adrian
Date: 2008-09-08 20:54:20 -0500 (Mon, 08 Sep 2008)
New Revision: 8987
Modified:
django/trunk/docs/ref/contrib/admin.txt
django/trunk/docs/ref/contrib/comments/index.txt
django/trunk/docs/ref/contrib/formtools/form-wizard.txt
django/trunk/docs/ref/django-admin.txt
django/trunk/docs/ref/files/file.txt
django/trunk/docs/ref/request-response.txt
django/trunk/docs/ref/templates/api.txt
django/trunk/docs/ref/templates/builtins.txt
django/trunk/docs/topics/forms/formsets.txt
django/trunk/docs/topics/forms/index.txt
django/trunk/docs/topics/http/sessions.txt
django/trunk/docs/topics/i18n.txt
django/trunk/docs/topics/templates.txt
Log:
Fixed #8979 -- Made a bunch of typo/formatting fixes to the docs. Thanks, ramiro
Modified: django/trunk/docs/ref/contrib/admin.txt
===================================================================
--- django/trunk/docs/ref/contrib/admin.txt 2008-09-09 01:43:17 UTC (rev
8986)
+++ django/trunk/docs/ref/contrib/admin.txt 2008-09-09 01:54:20 UTC (rev
8987)
@@ -924,8 +924,10 @@
To continue the example above, we want to add a new link next to the
``History``
tool for the ``Page`` model. After looking at ``change_form.html`` we determine
that we only need to override the ``object-tools`` block. Therefore here is our
-new ``change_form.html`` ::
+new ``change_form.html`` :
+.. code-block:: html+django
+
{% extends "admin/change_form.html" %}
{% load i18n %}
{% block object-tools %}
Modified: django/trunk/docs/ref/contrib/comments/index.txt
===================================================================
--- django/trunk/docs/ref/contrib/comments/index.txt 2008-09-09 01:43:17 UTC
(rev 8986)
+++ django/trunk/docs/ref/contrib/comments/index.txt 2008-09-09 01:54:20 UTC
(rev 8987)
@@ -7,6 +7,8 @@
.. module:: django.contrib.comments
:synopsis: Django's comment framework
+.. highlightlang:: html+django
+
Django includes a simple, yet customizable comments framework. The built-in
comments framework can be used to attach comments to any model, so you can use
it for comments on blog entries, photos, book chapters, or anything else.
Modified: django/trunk/docs/ref/contrib/formtools/form-wizard.txt
===================================================================
--- django/trunk/docs/ref/contrib/formtools/form-wizard.txt 2008-09-09
01:43:17 UTC (rev 8986)
+++ django/trunk/docs/ref/contrib/formtools/form-wizard.txt 2008-09-09
01:54:20 UTC (rev 8987)
@@ -169,8 +169,10 @@
* Pass :attr:`~django.contrib.formtools.wizard.FormWizard.extra_context`
as extra parameters in the URLconf.
-Here's a full example template::
-
+Here's a full example template:
+
+.. code-block:: html+django
+
{% extends "base.html" %}
{% block content %}
Modified: django/trunk/docs/ref/django-admin.txt
===================================================================
--- django/trunk/docs/ref/django-admin.txt 2008-09-09 01:43:17 UTC (rev
8986)
+++ django/trunk/docs/ref/django-admin.txt 2008-09-09 01:54:20 UTC (rev
8987)
@@ -385,7 +385,7 @@
------------
.. versionchanged:: 1.0
- Before 1.0 this was the "bin/make-messages.py" command.
+ Before 1.0 this was the ``bin/make-messages.py`` command.
Runs over the entire source tree of the current directory and pulls out all
strings marked for translation. It creates (or updates) a message file in the
Modified: django/trunk/docs/ref/files/file.txt
===================================================================
--- django/trunk/docs/ref/files/file.txt 2008-09-09 01:43:17 UTC (rev
8986)
+++ django/trunk/docs/ref/files/file.txt 2008-09-09 01:54:20 UTC (rev
8987)
@@ -88,7 +88,7 @@
.. attribute:: File.height
- Heigght of the image.
+ Height of the image.
Additional methods on files attached to objects
-----------------------------------------------
Modified: django/trunk/docs/ref/request-response.txt
===================================================================
--- django/trunk/docs/ref/request-response.txt 2008-09-09 01:43:17 UTC (rev
8986)
+++ django/trunk/docs/ref/request-response.txt 2008-09-09 01:54:20 UTC (rev
8987)
@@ -93,19 +93,8 @@
A standard Python dictionary containing all cookies. Keys and values are
strings.
-.. attribute:: HttpRequest.FILES
+.. attribute:: HttpRequest.FILES
- .. admonition:: Changed in Django development version
-
- In previous versions of Django, ``request.FILES`` contained
- simple ``dict`` objects representing uploaded files. This is
- no longer true -- files are represented by ``UploadedFile``
- objects as described below.
-
- These ``UploadedFile`` objects will emulate the old-style ``dict``
- interface, but this is deprecated and will be removed in the next
- release of Django.
-
A dictionary-like object containing all uploaded files. Each key in
``FILES`` is the ``name`` from the ``<input type="file" name="" />``. Each
value in ``FILES`` is an ``UploadedFile`` object containing the following
@@ -123,6 +112,16 @@
``enctype="multipart/form-data"``. Otherwise, ``FILES`` will be a blank
dictionary-like object.
+ .. versionchanged:: 1.0
+
+ In previous versions of Django, ``request.FILES`` contained simple ``dict``
+ objects representing uploaded files. This is no longer true -- files are
+ represented by ``UploadedFile`` objects as described below.
+
+ These ``UploadedFile`` objects will emulate the old-style ``dict``
+ interface, but this is deprecated and will be removed in the next release
of
+ Django.
+
.. attribute:: HttpRequest.META
A standard Python dictionary containing all available HTTP headers.
Modified: django/trunk/docs/ref/templates/api.txt
===================================================================
--- django/trunk/docs/ref/templates/api.txt 2008-09-09 01:43:17 UTC (rev
8986)
+++ django/trunk/docs/ref/templates/api.txt 2008-09-09 01:54:20 UTC (rev
8987)
@@ -29,16 +29,20 @@
Block tags are surrounded by ``"{%"`` and ``"%}"``.
-Example template with block tags::
+Example template with block tags:
+.. code-block:: html+django
+
{% if is_logged_in %}Thanks for logging in!{% else %}Please log in.{%
endif %}
A **variable** is a symbol within a template that outputs a value.
Variable tags are surrounded by ``"{{"`` and ``"}}"``.
-Example template with variables::
+Example template with variables:
+.. code-block:: html+django
+
My first name is {{ first_name }}. My last name is {{ last_name }}.
A **context** is a "variable name" -> "variable value" mapping that is passed
@@ -566,7 +570,7 @@
The ``render_to_string`` shortcut takes one required argument --
``template_name``, which should be the name of the template to load
-and render -- and two optional arguments::
+and render -- and two optional arguments:
dictionary
A dictionary to be used as variables and values for the
Modified: django/trunk/docs/ref/templates/builtins.txt
===================================================================
--- django/trunk/docs/ref/templates/builtins.txt 2008-09-09 01:43:17 UTC
(rev 8986)
+++ django/trunk/docs/ref/templates/builtins.txt 2008-09-09 01:54:20 UTC
(rev 8987)
@@ -14,6 +14,8 @@
Built-in tag reference
----------------------
+.. highlightlang:: html+django
+
.. templatetag:: autoescape
autoescape
@@ -473,8 +475,10 @@
This complex tag is best illustrated by use of an example: say that ``people``
is a list of people represented by dictionaries with ``first_name``,
-``last_name``, and ``gender`` keys::
+``last_name``, and ``gender`` keys:
+.. code-block:: python
+
people = [
{'first_name': 'George', 'last_name': 'Bush', 'gender': 'Male'},
{'first_name': 'Bill', 'last_name': 'Clinton', 'gender': 'Male'},
@@ -530,8 +534,10 @@
If the ``people`` list did *not* order its members by ``gender``, the
regrouping
would naively display more than one group for a single gender. For example,
say the ``people`` list was set to this (note that the males are not grouped
-together)::
+together):
+.. code-block:: python
+
people = [
{'first_name': 'Bill', 'last_name': 'Clinton', 'gender': 'Male'},
{'first_name': 'Pat', 'last_name': 'Smith', 'gender': 'Unknown'},
@@ -657,13 +663,17 @@
For example, suppose you have a view, ``app_views.client``, whose URLconf
takes a client ID (here, ``client()`` is a method inside the views file
-``app_views.py``). The URLconf line might look like this::
+``app_views.py``). The URLconf line might look like this:
+.. code-block:: python
+
('^client/(\d+)/$', 'app_views.client')
If this app's URLconf is included into the project's URLconf under a path
-such as this::
+such as this:
+.. code-block:: python
+
('^clients/', include('project_name.app_name.urls'))
...then, in a template, you can create a link to this view like this::
@@ -682,20 +692,19 @@
:exc:`NoReverseMatch` exception raised, which will cause your site to display
an
error page.
-**New in development verson:** If you'd like to retrieve a URL without
displaying it,
-you can use a slightly different call:
+.. versionadded:: 1.0
-.. code-block:: html+django
+If you'd like to retrieve a URL without displaying it, you can use a slightly
+different call::
+
{% url path.to.view arg, arg2 as the_url %}
<a href="{{ the_url }}">I'm linking to {{ the_url }}</a>
This ``{% url ... as var %}`` syntax will *not* cause an error if the view is
-missing. In practice you'll use this to link to views that are optional:
+missing. In practice you'll use this to link to views that are optional::
-.. code-block:: html+django
-
{% url path.to.view as the_url %}
{% if the_url %}
<a href="{{ the_url }}">Link to optional stuff</a>
@@ -845,16 +854,20 @@
{{ value|dictsort:"name" }}
-If ``value`` is::
+If ``value`` is:
+.. code-block:: python
+
[
{'name': 'zed', 'age': 19},
{'name': 'amy', 'age': 22},
{'name': 'joe', 'age': 31},
]
-then the output would be::
+then the output would be:
+.. code-block:: python
+
[
{'name': 'amy', 'age': 22},
{'name': 'joe', 'age': 31},
@@ -1274,8 +1287,10 @@
http://diveintopython.org/native_data_types/lists.html#odbchelper.list.slice
for an introduction.
-Example: ``{{ some_list|slice:":2" }}``
+Example::
+ {{ some_list|slice:":2" }}
+
.. templatefilter:: slugify
slugify
Modified: django/trunk/docs/topics/forms/formsets.txt
===================================================================
--- django/trunk/docs/topics/forms/formsets.txt 2008-09-09 01:43:17 UTC (rev
8986)
+++ django/trunk/docs/topics/forms/formsets.txt 2008-09-09 01:54:20 UTC (rev
8987)
@@ -306,8 +306,10 @@
formset = ArticleFormSet()
return render_to_response('manage_articles.html', {'formset': formset})
-The ``manage_articles.html`` template might look like this::
+The ``manage_articles.html`` template might look like this:
+.. code-block:: html+django
+
<form method="POST" action="">
{{ formset.management_form }}
<table>
@@ -318,8 +320,10 @@
</form>
However the above can be slightly shortcutted and let the formset itself deal
-with the management form::
+with the management form:
+.. code-block:: html+django
+
<form method="POST" action="">
<table>
{{ formset }}
Modified: django/trunk/docs/topics/forms/index.txt
===================================================================
--- django/trunk/docs/topics/forms/index.txt 2008-09-09 01:43:17 UTC (rev
8986)
+++ django/trunk/docs/topics/forms/index.txt 2008-09-09 01:54:20 UTC (rev
8987)
@@ -10,6 +10,8 @@
For a more detailed look at the forms API, see :ref:`ref-forms-api`. For
documentation of the available field types, see :ref:`ref-forms-fields`.
+.. highlightlang:: html+django
+
``django.forms`` is Django's form-handling library.
While it is possible to process form submissions just using Django's
@@ -60,8 +62,10 @@
Django's database models.
For example, consider a form used to implement "contact me" functionality on a
-personal Web site::
+personal Web site:
+.. code-block:: python
+
from django import forms
class ContactForm(forms.Form):
@@ -82,8 +86,10 @@
Using a form in a view
----------------------
-The standard pattern for processing a form in a view looks like this::
+The standard pattern for processing a form in a view looks like this:
+.. code-block:: python
+
def contact(request):
if request.method == 'POST': # If the form has been submitted...
form = ContactForm(request.POST) # A form bound to the POST data
@@ -133,8 +139,10 @@
``cc_myself`` will be a boolean value. Likewise, fields such as
``IntegerField``
and ``FloatField`` convert values to a Python int and float respectively.
-Extending the above example, here's how the form data could be processed::
+Extending the above example, here's how the form data could be processed:
+.. code-block:: python
+
if form.is_valid():
subject = form.cleaned_data['subject']
message = form.cleaned_data['message']
Modified: django/trunk/docs/topics/http/sessions.txt
===================================================================
--- django/trunk/docs/topics/http/sessions.txt 2008-09-09 01:43:17 UTC (rev
8986)
+++ django/trunk/docs/topics/http/sessions.txt 2008-09-09 01:54:20 UTC (rev
8987)
@@ -36,7 +36,7 @@
Configuring the session engine
==============================
-.. versionadded:: 1.0.
+.. versionadded:: 1.0
By default, Django stores sessions in your database (using the model
``django.contrib.sessions.models.Session``). Though this is convenient, in
Modified: django/trunk/docs/topics/i18n.txt
===================================================================
--- django/trunk/docs/topics/i18n.txt 2008-09-09 01:43:17 UTC (rev 8986)
+++ django/trunk/docs/topics/i18n.txt 2008-09-09 01:54:20 UTC (rev 8987)
@@ -395,7 +395,7 @@
application) and English strings (from Django itself). If you want to
support a locale for your application that is not already part of
Django, you'll need to make at least a minimal translation of the Django
- core. See the relevant :ref:LocaleMiddleware
note`<locale-middleware-notes>`
+ core. See the relevant :ref:`LocaleMiddleware
note<locale-middleware-notes>`
for more details.
Message files
Modified: django/trunk/docs/topics/templates.txt
===================================================================
--- django/trunk/docs/topics/templates.txt 2008-09-09 01:43:17 UTC (rev
8986)
+++ django/trunk/docs/topics/templates.txt 2008-09-09 01:54:20 UTC (rev
8987)
@@ -38,6 +38,8 @@
Templates
=========
+.. highlightlang:: html+django
+
A template is simply a text file. It can generate any text-based format (HTML,
XML, CSV, etc.).
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
