summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorGary Wilson Jr <gary.wilson@gmail.com>2009-03-31 07:01:01 +0000
committerGary Wilson Jr <gary.wilson@gmail.com>2009-03-31 07:01:01 +0000
commit7372ea159aa192757cc5383e6857c29ca2fc53c6 (patch)
tree0fac8211109e3e785cd72d9a660dd45c5b5c3041 /docs/ref
parent184ea1c91f06d31d0e1d34b2c27c08b01d2d5033 (diff)
Fixed #10389, #10501, #10502, #10540, #10562, #10563, #10564, #10565, #10568, #10569, #10614, #10617, #10619 -- Fixed several typos as well as a couple minor issues in the docs, patches from timo, nih, bthomas, rduffield, UloPe, and sebleier@gmail.com.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/contrib/admin/index.txt2
-rw-r--r--docs/ref/databases.txt8
-rw-r--r--docs/ref/models/instances.txt7
3 files changed, 9 insertions, 8 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 4bea68d500..c2a8739dd4 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -677,7 +677,7 @@ The value is another dictionary; these arguments will be passed to
A list of actions to make available on the change list page. See
:ref:`ref-contrib-admin-actions` for details.
-``actions_on_top``, ``actions_on_buttom``
+``actions_on_top``, ``actions_on_bottom``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Controls where on the page the actions bar appears. By default, the admin
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index 63f78f7954..74a8145948 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -26,7 +26,7 @@ The implementation of the population statistics aggregates ``STDDEV_POP`` and
faulty`_. Users of these releases of PostgreSQL are advised to upgrade to
`Release 8.2.5`_ or later. Django will raise a ``NotImplementedError`` if you
attempt to use the ``StdDev(sample=False)`` or ``Variance(sample=False)``
-aggregate with an database backend falls within the affected release range.
+aggregate with a database backend that falls within the affected release range.
.. _known to be faulty: http://archives.postgresql.org/pgsql-bugs/2007-07/msg00046.php
.. _Release 8.2.5: http://developer.postgresql.org/pgdocs/postgres/release-8-2-5.html
@@ -35,7 +35,7 @@ Transaction handling
---------------------
:ref:`By default <topics-db-transactions>`, Django starts a transaction when a
-database connection if first used and commits the result at the end of the
+database connection is first used and commits the result at the end of the
request/response handling. The PostgreSQL backends normally operate the same
as any other Django backend in this respect.
@@ -87,8 +87,8 @@ MySQL notes
===========
Django expects the database to support transactions, referential integrity,
-and Unicode support (UTF-8 encoding). Fortunately, MySQL_ has all these
-features as available as far back as 3.23. While it may be possible to use
+and Unicode (UTF-8 encoding). Fortunately, MySQL_ has all these
+features available as far back as 3.23. While it may be possible to use
3.23 or 4.0, you'll probably have less trouble if you use 4.1 or 5.0.
MySQL 4.1
diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt
index f55ce65699..5e7151a89c 100644
--- a/docs/ref/models/instances.txt
+++ b/docs/ref/models/instances.txt
@@ -18,12 +18,13 @@ Throughout this reference we'll use the :ref:`example weblog models
Creating objects
================
-To create a new instance of a model, just instantiate it like any other Python class:
+To create a new instance of a model, just instantiate it like any other Python
+class:
.. class:: Model(**kwargs)
-The keyword arguments to are simply the names of the fields you've defined on
-your model. Note that instantiating a model in no way touches your database; for
+The keyword arguments are simply the names of the fields you've defined on your
+model. Note that instantiating a model in no way touches your database; for
that, you need to ``save()``.
Saving objects