summaryrefslogtreecommitdiff
path: root/docs/narr/security.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-05-23 14:57:01 -0400
committerChris McDonough <chrism@plope.com>2014-05-23 14:57:01 -0400
commitd76bdb514c92ee1fd9b1bd67387d15d34ea28bb3 (patch)
tree36784e20002ecc4cb6675901b3cc2bda36e54caa /docs/narr/security.rst
parent0c5bb0aa329239df877ccb053280e398766eb434 (diff)
parentc740e8bd20c049cbab43ce0a1cd5a4533fe6b849 (diff)
downloadpyramid-d76bdb514c92ee1fd9b1bd67387d15d34ea28bb3.tar.gz
pyramid-d76bdb514c92ee1fd9b1bd67387d15d34ea28bb3.tar.bz2
pyramid-d76bdb514c92ee1fd9b1bd67387d15d34ea28bb3.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/security.rst')
-rw-r--r--docs/narr/security.rst18
1 files changed, 13 insertions, 5 deletions
diff --git a/docs/narr/security.rst b/docs/narr/security.rst
index 9e6fb6c82..8db23a33b 100644
--- a/docs/narr/security.rst
+++ b/docs/narr/security.rst
@@ -113,9 +113,11 @@ authorization policies, it is an error to configure a Pyramid application
with an authentication policy but without the authorization policy or vice
versa. If you do this, you'll receive an error at application startup time.
-See also the :mod:`pyramid.authorization` and
-:mod:`pyramid.authentication` modules for alternate implementations
-of authorization and authentication policies.
+.. seealso::
+
+ See also the :mod:`pyramid.authorization` and
+ :mod:`pyramid.authentication` modules for alternate implementations of
+ authorization and authentication policies.
.. index::
single: permissions
@@ -495,8 +497,14 @@ is said to be *location-aware*. Location-aware objects define an
``__parent__`` attribute which points at their parent object. The
root object's ``__parent__`` is ``None``.
-See :ref:`location_module` for documentations of functions which use
-location-awareness. See also :ref:`location_aware`.
+.. seealso::
+
+ See also :ref:`location_module` for documentations of functions which use
+ location-awareness.
+
+.. seealso::
+
+ See also :ref:`location_aware`.
.. index::
single: forbidden view