summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-30 18:34:11 -0500
committerChris McDonough <chrism@plope.com>2011-01-30 18:34:11 -0500
commita9ff226bdeaa43d03759e9605cb8b51fb961979b (patch)
tree26214eb7a4b8445e0c66f9240bd72090e7b4b1fe
parent288072c4b28789a7d599d2d224ada5e18a57abd7 (diff)
downloadpyramid-a9ff226bdeaa43d03759e9605cb8b51fb961979b.tar.gz
pyramid-a9ff226bdeaa43d03759e9605cb8b51fb961979b.tar.bz2
pyramid-a9ff226bdeaa43d03759e9605cb8b51fb961979b.zip
fix references
-rw-r--r--docs/designdefense.rst5
-rw-r--r--docs/narr/resources.rst4
-rw-r--r--docs/narr/urldispatch.rst4
3 files changed, 5 insertions, 8 deletions
diff --git a/docs/designdefense.rst b/docs/designdefense.rst
index c0b570e6c..455e354e9 100644
--- a/docs/designdefense.rst
+++ b/docs/designdefense.rst
@@ -30,7 +30,7 @@ much more insidious and harmful set of duplication at higher levels in the
Python web community.
:app:`Pyramid` began its life as :mod:`repoze.bfg`, written by a team of
-people with many years of prior :ref:`Zope` experience. The idea of
+people with many years of prior :term:`Zope` experience. The idea of
:term:`traversal` and the way :term:`view lookup` works was stolen entirely
from Zope. The authorization subsystem provided by :app:`Pyramid` is a
derivative of Zope's. The idea that an application can be *extended* without
@@ -418,9 +418,6 @@ method was ``POST`` and that the remote user agent passed
"Under the hood", these features make no use of interfaces.
-For more information about predicates, see
-:ref:`view_predicates_in_1dot1` and :ref:`route_predicates_in_1dot1`.
-
Many "prebaked" predicates exist. However, use of only "prebaked" predicates,
however, doesn't entirely meet Ian's criterion. He would like to be able to
match a request using a lambda or another function which interrogates the
diff --git a/docs/narr/resources.rst b/docs/narr/resources.rst
index 90dd34bfe..a11466a87 100644
--- a/docs/narr/resources.rst
+++ b/docs/narr/resources.rst
@@ -205,12 +205,12 @@ In general, since so much :app:`Pyramid` infrastructure depends on
location-aware resources, it's a good idea to make each resource in your tree
location-aware.
-.. _generating_the_url_of_a_resource:
-
.. index::
single: resource_url
pair: generating; resource url
+.. _generating_the_url_of_a_resource:
+
Generating The URL Of A Resource
--------------------------------
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index db6977feb..ac74ed014 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -1019,12 +1019,12 @@ which you started the application from. For example:
See :ref:`environment_chapter` for more information about how, and where to
set these values.
-.. _displaying_application_routes:
-
.. index::
pair: routes; printing
single: paster proutes
+.. _displaying_application_routes:
+
Displaying All Application Routes
---------------------------------