diff options
| author | Boulder Sprinters <boulder-sprinters@djangoproject.com> | 2007-03-22 17:42:25 +0000 |
|---|---|---|
| committer | Boulder Sprinters <boulder-sprinters@djangoproject.com> | 2007-03-22 17:42:25 +0000 |
| commit | c4eb6bf708497d621e5bc0f731f26c800dee1d02 (patch) | |
| tree | 14986e18ef9a0bbd8d8d79b4180ab033af31d466 /docs | |
| parent | 4a4417787ba2d9bb90f70e441380f868198f860a (diff) | |
boulder-oracle-sprint: Merged to [4775] of trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@4777 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/add_ons.txt | 16 | ||||
| -rw-r--r-- | docs/serialization.txt | 3 | ||||
| -rw-r--r-- | docs/settings.txt | 3 |
3 files changed, 14 insertions, 8 deletions
diff --git a/docs/add_ons.txt b/docs/add_ons.txt index 1756fe5720..8f47847e3e 100644 --- a/docs/add_ons.txt +++ b/docs/add_ons.txt @@ -1,6 +1,6 @@ -===================== -The "contrib" add-ons -===================== +============================ +The "django.contrib" add-ons +============================ Django aims to follow Python's `"batteries included" philosophy`_. It ships with a variety of extra, optional tools that solve common Web-development @@ -153,12 +153,16 @@ markup A collection of template filters that implement these common markup languages: - * Textile - * Markdown - * ReST (ReStructured Text) + * `Textile`_ + * `Markdown`_ + * `ReST (ReStructured Text)`_ For documentation, read the source code in django/contrib/markup/templatetags/markup.py. +.. _Textile: http://en.wikipedia.org/wiki/Textile_%28markup_language%29 +.. _Markdown: http://en.wikipedia.org/wiki/Markdown +.. _ReST (ReStructured Text): http://en.wikipedia.org/wiki/ReStructuredText + redirects ========= diff --git a/docs/serialization.txt b/docs/serialization.txt index aee1b9a3bb..48ab46f0f9 100644 --- a/docs/serialization.txt +++ b/docs/serialization.txt @@ -31,7 +31,8 @@ but it'll almost always be a QuerySet). You can also use a serializer object directly:: - xml_serializer = serializers.get_serializer("xml") + XMLSerializer = serializers.get_serializer("xml") + xml_serializer = XMLSerializer() xml_serializer.serialize(queryset) data = xml_serializer.getvalue() diff --git a/docs/settings.txt b/docs/settings.txt index b41281ee49..6f85e312c0 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -245,7 +245,8 @@ DATABASE_ENGINE Default: ``''`` (Empty string) Which database backend to use. Either ``'postgresql_psycopg2'``, -``'postgresql'``, ``'mysql'``, ``'sqlite3'`` or ``'ado_mssql'``. +``'postgresql'``, ``'mysql'``, ``'mysql_old'``, ``'sqlite3'`` or +``'ado_mssql'``. DATABASE_HOST ------------- |