summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorCarlos de la Guardia <cguardia@yahoo.com>2010-03-20 16:08:59 +0000
committerCarlos de la Guardia <cguardia@yahoo.com>2010-03-20 16:08:59 +0000
commitcc3f2612d834a7404de288c20a3faddfded2e705 (patch)
treef13cb9107bfcac33494b0251266f0b576dbee0cd /docs
parentf84cf074f429d5c9edf0285bd4ab91e31c6a3c4c (diff)
downloadpyramid-cc3f2612d834a7404de288c20a3faddfded2e705.tar.gz
pyramid-cc3f2612d834a7404de288c20a3faddfded2e705.tar.bz2
pyramid-cc3f2612d834a7404de288c20a3faddfded2e705.zip
just two small fixes here
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/models.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/models.rst b/docs/narr/models.rst
index 2964ccb20..c6f896119 100644
--- a/docs/narr/models.rst
+++ b/docs/narr/models.rst
@@ -259,7 +259,7 @@ In order for :mod:`repoze.bfg` location, security, URL-generation, and
traversal functions (such as the functions exposed in
:ref:`location_module`, :ref:`traversal_module`, and :ref:`url_module`
as well as certain functions in :ref:`security_module` ) to work
-properly against a instances in an object graph, all nodes in the
+properly against the instances in an object graph, all nodes in the
graph must be :term:`location` -aware. This means they must have two
attributes: ``__parent__`` and ``__name__``.
@@ -280,7 +280,7 @@ The ``__parent__`` of the root object should be ``None`` and its
A node returned from the root item's ``__getitem__`` method should
have a ``__parent__`` attribute that is a reference to the root
object, and its ``__name__`` attribute should match the name by which
-it is are reachable via the root object's ``__getitem__``. *That*
+it is reachable via the root object's ``__getitem__``. *That*
object's ``__getitem__`` should return objects that have a
``__parent__`` attribute that points at that object, and
``__getitem__``-returned objects should have a ``__name__`` attribute