summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2008-07-29 01:54:50 +0000
committerChris McDonough <chrism@agendaless.com>2008-07-29 01:54:50 +0000
commit35ff8e696a2c983cee119c936ea12ecb2f7da2c3 (patch)
tree2c4873cac17bc122ed0011574c0551f7370b5927 /docs
parent339c73892ba00d640ac7a22dccbd56e360cfea0d (diff)
downloadpyramid-35ff8e696a2c983cee119c936ea12ecb2f7da2c3.tar.gz
pyramid-35ff8e696a2c983cee119c936ea12ecb2f7da2c3.tar.bz2
pyramid-35ff8e696a2c983cee119c936ea12ecb2f7da2c3.zip
0.2.5: add model_url.
Diffstat (limited to 'docs')
-rw-r--r--docs/api/traversal.rst1
-rw-r--r--docs/conf.py4
-rw-r--r--docs/glossary.rst3
-rw-r--r--docs/narr/models.rst2
4 files changed, 7 insertions, 3 deletions
diff --git a/docs/api/traversal.rst b/docs/api/traversal.rst
index 41d66b2eb..eac63a271 100644
--- a/docs/api/traversal.rst
+++ b/docs/api/traversal.rst
@@ -7,4 +7,5 @@
.. autofunction:: find_interface
+ .. autofunction:: model_url
diff --git a/docs/conf.py b/docs/conf.py
index 979c6d9ac..8d19cf4db 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@ copyright = '2008, Agendaless Consulting'
# other places throughout the built documents.
#
# The short X.Y version.
-version = '0.2'
+version = '0.2.5'
# The full version, including alpha/beta/rc tags.
-release = '0.2'
+release = '0.2.5'
# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 4e88b51d2..27326f539 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -74,7 +74,8 @@ Glossary
Interface
An attribute of an object that determines its type.
Location
- The path to an object in a model graph.
+ The path to an object in a model graph. See :ref:`location_aware`
+ for more information about how to make a model object *location-aware*.
Security policy
An object that provides a mechanism to check authorization using
authentication data and a permission associated with a model. It
diff --git a/docs/narr/models.rst b/docs/narr/models.rst
index efbcd47b2..7df265657 100644
--- a/docs/narr/models.rst
+++ b/docs/narr/models.rst
@@ -58,6 +58,8 @@ instance nodes in the graph:
implement a ``__getitem__``, or if they do, their ``__getitem__``
method must raise a ``KeyError``.
+.. _location_aware:
+
Location-Aware Model Instances
------------------------------