summaryrefslogtreecommitdiff
path: root/docs/narr/models.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-12-10 03:28:25 +0000
committerChris McDonough <chrism@agendaless.com>2009-12-10 03:28:25 +0000
commitfce5cb9e7d4ec5239fc65f3cad80805aaccf207c (patch)
tree917f3f33b7f4171b0528fd01d7fc53c315024110 /docs/narr/models.rst
parent16cdd27071ef91a56150f1d47d1a51a141f6c55f (diff)
downloadpyramid-fce5cb9e7d4ec5239fc65f3cad80805aaccf207c.tar.gz
pyramid-fce5cb9e7d4ec5239fc65f3cad80805aaccf207c.tar.bz2
pyramid-fce5cb9e7d4ec5239fc65f3cad80805aaccf207c.zip
Docs.
Diffstat (limited to 'docs/narr/models.rst')
-rw-r--r--docs/narr/models.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/narr/models.rst b/docs/narr/models.rst
index 535aa6ac3..e1d2fd635 100644
--- a/docs/narr/models.rst
+++ b/docs/narr/models.rst
@@ -191,9 +191,9 @@ 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 a model graph, all nodes in the graph
-must be "location-aware". This means they must have two attributes:
-``__parent__`` and ``__name__``.
+properly against a instances in an object graph, all nodes in the
+graph must be "location-aware". This means they must have two
+attributes: ``__parent__`` and ``__name__``.
The ``__parent__`` attribute should be a reference to the node's
parent model instance in the graph. The ``__name__`` attribute should
@@ -238,10 +238,10 @@ more information about how a model instance becomes the context.
The APIs provided by :ref:`traversal_module` are used against model
instances. These functions can be used to find the "path" of a model,
-find the URL of a model, the root model in a model graph, and so on.
+find the URL of a model, the root model in an object graph, and so on.
The APIs provided by :ref:`location_module` are used against model
-instances. These can be used to walk down a model graph, or
+instances. These can be used to walk down an object graph, or
conveniently locate one object "inside" another.
Some APIs in :ref:`security_module` accept a model object as a