Commits

Anonymous committed b5419c2

fix typos, fix wrong argument order in example

Comments (0)

Files changed (2)

docs/source/intro.rst

 
 flatland is a Python implementation of techniques I've been using for form and
 web data processing for ages, in many different languages.  It is an immediate
-conceptual decendent and re-write of "springy", a closed-source library used
+conceptual descendant and re-write of "springy", a closed-source library used
 interally at Virtuous, Inc.  The Genshi filter support was donated to the
 flatland project by Virtuous.

docs/source/validation/index.rst

 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 :meth:`~flatland.Element.validate` is recursive by default.  Called on a
-parent node, it will decend through all of its children, validating each.  If
+parent node, it will descend through all of its children, validating each.  If
 the parent or any one of its children are invalid, ``validate`` returns false.
 Note that recursion does **not** stop if it finds an invalid child: all
 children are evaluated, and each will have its :attr:`~flatland.Element.valid`
 This capability comes in handy in a web environment when designing rich UIs.
 
 Containers will run any validators in their
-:attr:`~flatland.Container.descent_validators` list during the decent phase.
-Decent validation is the only phase that may be short-circuited.
+:attr:`~flatland.Container.descent_validators` list during the descent phase.
+Descent validation is the only phase that may be short-circuited.
 
 .. doctest::
 
 
       def validate(self, element, state):
           if element.value.isupper():
-              self.note_error('has_shouting', element, state)
+              self.note_error(element, state, 'has_shouting')
               return False
           return True