summaryrefslogtreecommitdiff
path: root/docs/quick_tutorial/forms.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2015-10-21 16:57:52 -0500
committerMichael Merickel <michael@merickel.org>2015-10-21 16:57:52 -0500
commitadb9377a963d7fdc7b7bf616740fb5dd2e40b2bf (patch)
tree1038d03a21148607c79f740f0b32b147929251bf /docs/quick_tutorial/forms.rst
parent452fdbef94bb29560497ec8a9ccbc3b9c2ecd2dd (diff)
parentd4221720b8409eafb65b301562be327af0196c7e (diff)
downloadpyramid-adb9377a963d7fdc7b7bf616740fb5dd2e40b2bf.tar.gz
pyramid-adb9377a963d7fdc7b7bf616740fb5dd2e40b2bf.tar.bz2
pyramid-adb9377a963d7fdc7b7bf616740fb5dd2e40b2bf.zip
Merge branch 'master' into feature/alchemy-scaffold-update
Diffstat (limited to 'docs/quick_tutorial/forms.rst')
-rw-r--r--docs/quick_tutorial/forms.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/quick_tutorial/forms.rst b/docs/quick_tutorial/forms.rst
index b08167edc..f81b88fc2 100644
--- a/docs/quick_tutorial/forms.rst
+++ b/docs/quick_tutorial/forms.rst
@@ -12,13 +12,13 @@ Background
Modern web applications deal extensively with forms. Developers,
though, have a wide range of philosophies about how frameworks should
help them with their forms. As such, Pyramid doesn't directly bundle
-one particular form library. Instead, there are a variety of form
+one particular form library. Instead there are a variety of form
libraries that are easy to use in Pyramid.
:ref:`Deform <deform:overview>`
is one such library. In this step, we introduce Deform for our
-forms and validation. This also gives us the
-:ref:`Colander <colander:overview>` for schemas and validation.
+forms and validation. This also gives us :ref:`Colander <colander:overview>`
+for schemas and validation.
Deform is getting a facelift, with styling from Twitter Bootstrap and
advanced widgets from popular JavaScript projects. The work began in