summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/narr/views.rst2
-rw-r--r--pyramid/paster.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/views.rst b/docs/narr/views.rst
index dccbc6b5a..cda6de48b 100644
--- a/docs/narr/views.rst
+++ b/docs/narr/views.rst
@@ -1782,7 +1782,7 @@ view configuration, see :ref:`resources_which_implement_interfaces`.
Configuring View Security
~~~~~~~~~~~~~~~~~~~~~~~~~
-If a :term:`authorization policy` is active, any :term:`permission` attached
+If an :term:`authorization policy` is active, any :term:`permission` attached
to a :term:`view configuration` found during view lookup will be verified.
This will ensure that the currently authenticated user possesses that
permission against the :term:`context` before the view function is actually
diff --git a/pyramid/paster.py b/pyramid/paster.py
index 07f9ee458..bd0e13413 100644
--- a/pyramid/paster.py
+++ b/pyramid/paster.py
@@ -31,7 +31,7 @@ class ZODBProjectTemplate(PyramidTemplate):
class RoutesAlchemyProjectTemplate(PyramidTemplate):
_template_dir = 'paster_templates/routesalchemy'
- summary = 'pyramid SQLAlchemy project using Routes (no traversal)'
+ summary = 'pyramid SQLAlchemy project using url dispatch (no traversal)'
template_renderer = staticmethod(paste_script_template_renderer)
class AlchemyProjectTemplate(PyramidTemplate):