summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorGary Wilson Jr <gary.wilson@gmail.com>2009-03-31 07:16:25 +0000
committerGary Wilson Jr <gary.wilson@gmail.com>2009-03-31 07:16:25 +0000
commit68aa33f901561d7ace48c525ef770e03f5adb53d (patch)
tree248bc6a60bd38ddae662b16e8caad5971d1689fd /docs/ref
parent9d808c14a589c9daf321a3847ab3e3d28c3c60f4 (diff)
[1.0.X]: 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.
Backport of r10242 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10243 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/databases.txt4
-rw-r--r--docs/ref/models/instances.txt7
2 files changed, 6 insertions, 5 deletions
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index acb152df68..d0ab9adae2 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -19,8 +19,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