summaryrefslogtreecommitdiff
path: root/docs/quick_tutorial/forms.rst
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2015-10-20 23:19:18 -0600
committerBert JW Regeer <bertjw@regeer.org>2015-10-20 23:19:18 -0600
commit18e54fe9619fd8b2aa6006126fc1c2840e32f2c1 (patch)
treeea26bbfd681ae5d821f2cde9ac5cbe2e80f5c714 /docs/quick_tutorial/forms.rst
parentbf40a3920278b3e7a01ef5403196b35f45cfcb3c (diff)
parentd4221720b8409eafb65b301562be327af0196c7e (diff)
downloadpyramid-18e54fe9619fd8b2aa6006126fc1c2840e32f2c1.tar.gz
pyramid-18e54fe9619fd8b2aa6006126fc1c2840e32f2c1.tar.bz2
pyramid-18e54fe9619fd8b2aa6006126fc1c2840e32f2c1.zip
Merge branch 'master' of github.com:Pylons/pyramid into feature/configurable-view-deriver
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