From 78d75b86e3e45ec3ca9f2ace21255922046dd509 Mon Sep 17 00:00:00 2001
From: Honza Král <honza.kral@gmail.com>
Date: Fri, 11 Sep 2009 21:06:15 +0000
Subject: [soc2009/model-validation] Merged to trunk at r11478

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/model-validation@11504 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/ref/contrib/formtools/form-wizard.txt |  2 +-
 docs/ref/databases.txt                     |  4 ++++
 docs/ref/forms/widgets.txt                 | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'docs/ref')

diff --git a/docs/ref/contrib/formtools/form-wizard.txt b/docs/ref/contrib/formtools/form-wizard.txt
index c81c24242a..98f0dbad42 100644
--- a/docs/ref/contrib/formtools/form-wizard.txt
+++ b/docs/ref/contrib/formtools/form-wizard.txt
@@ -95,7 +95,7 @@ Creating a ``FormWizard`` class
 The next step is to create a :class:`~django.contrib.formtools.wizard.FormWizard`
 class, which should be a subclass of ``django.contrib.formtools.wizard.FormWizard``.
 
-As your :class:`~django.forms.forms.Form` classes, this
+As with your :class:`~django.forms.forms.Form` classes, this
 :class:`~django.contrib.formtools.wizard.FormWizard` class can live anywhere
 in your codebase, but convention is to put it in :file:`forms.py`.
 
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index 007a7079b7..fc58dbaf47 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -476,6 +476,10 @@ version of the driver should **not** be used with Django;
 ``cx_Oracle`` 5.0.1 resolved this issue, so if you'd like to use a
 more recent ``cx_Oracle``, use version 5.0.1.
 
+``cx_Oracle`` 5.0.1 or greater can optionally be compiled with the
+``WITH_UNICODE`` environment variable.  This is recommended but not
+required.
+
 .. _`Oracle Database Server`: http://www.oracle.com/
 .. _`cx_Oracle`: http://cx-oracle.sourceforge.net/
 
diff --git a/docs/ref/forms/widgets.txt b/docs/ref/forms/widgets.txt
index 9735c8181f..e2ba0d7889 100644
--- a/docs/ref/forms/widgets.txt
+++ b/docs/ref/forms/widgets.txt
@@ -24,6 +24,13 @@ commonly used groups of widgets:
 
     Password input: ``<input type='password' ...>``
 
+    Takes one optional argument:
+
+    .. attribute:: PasswordInput.render_value
+
+        Determines whether the widget will have a value filled in when the
+        form is re-displayed after a validation error (default is ``True``).
+
 .. class:: HiddenInput
 
     Hidden input: ``<input type='hidden' ...>``
@@ -88,6 +95,14 @@ commonly used groups of widgets:
 
     Checkbox: ``<input type='checkbox' ...>``
 
+    Takes one optional argument:
+
+    .. attribute:: CheckboxInput.check_test
+     
+        A callable that takes the value of the CheckBoxInput 
+        and returns ``True`` if the checkbox should be checked for
+        that value. 
+
 .. class:: Select
 
     Select widget: ``<select><option ...>...</select>``
-- 
cgit v1.3