summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-12-28 04:12:10 +0000
committerChris McDonough <chrism@agendaless.com>2009-12-28 04:12:10 +0000
commit125e9746a5da925243dabf67b2609b556bb9215a (patch)
tree2ef52dadcf40f840586293f8cf66e9a11d0f04b0 /docs/narr
parent48ed96bf621128adf59b225f1c8e33af44bc0594 (diff)
downloadpyramid-125e9746a5da925243dabf67b2609b556bb9215a.tar.gz
pyramid-125e9746a5da925243dabf67b2609b556bb9215a.tar.bz2
pyramid-125e9746a5da925243dabf67b2609b556bb9215a.zip
Adjust for 7.5x9.25in output.
Diffstat (limited to 'docs/narr')
-rw-r--r--docs/narr/MyProject/myproject/templates/mytemplate.pt3
-rw-r--r--docs/narr/security.rst11
-rw-r--r--docs/narr/templates.rst8
-rw-r--r--docs/narr/traversal.rst4
-rw-r--r--docs/narr/views.rst18
-rw-r--r--docs/narr/webob.rst2
6 files changed, 24 insertions, 22 deletions
diff --git a/docs/narr/MyProject/myproject/templates/mytemplate.pt b/docs/narr/MyProject/myproject/templates/mytemplate.pt
index 72e4fec9d..e50d7cff2 100644
--- a/docs/narr/MyProject/myproject/templates/mytemplate.pt
+++ b/docs/narr/MyProject/myproject/templates/mytemplate.pt
@@ -7,7 +7,8 @@
<title>${project} Application</title>
<meta name="keywords" content="python web application" />
<meta name="description" content="repoze.bfg web application" />
-<link href="${request.application_url}/static/default.css" rel="stylesheet" type="text/css" />
+<link href="${request.application_url}/static/default.css" rel="stylesheet"
+ type="text/css" />
</head>
<body>
<!-- start header -->
diff --git a/docs/narr/security.rst b/docs/narr/security.rst
index 36469def0..66db64f7f 100644
--- a/docs/narr/security.rst
+++ b/docs/narr/security.rst
@@ -646,12 +646,11 @@ example, it might be desirable to construct an alternate authorization
policy which allows the application to use an authorization mechanism
that does not involve :term:`ACL` objects.
-:mod:`repoze.bfg` ships with only its single default
-:class:`repoze.bfg.authorization.ACLAuthorizationPolicy`, so you'll
-need to create your own if you'd like to use a different one.
-Creating and using your own authorization policy is a matter of
-creating an instance of an object that implements the following
-interface:
+:mod:`repoze.bfg` ships with only a single default authorization
+policy, so you'll need to create your own if you'd like to use a
+different one. Creating and using your own authorization policy is a
+matter of creating an instance of an object that implements the
+following interface:
.. code-block:: python
diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index ac44b64da..769d3590f 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -417,15 +417,17 @@ bindings. It lives in the Repoze Subversion repository at
`http://svn.repoze.org/repoze.bfg.xslt
<http://svn.repoze.org/repoze.bfg.xslt>`_.
-:mod:`repoze.bfg.chameleon_genshi` package is an add-on which provides
+:mod:`repoze.bfg.chameleon_genshi` is an add-on which provides
Chameleon Genshi-style template support. It lives in the Repoze
-Subversion repository at `http://svn.repoze.org/repoze.bfg.chameleon_genshi
+Subversion repository at
+`http://svn.repoze.org/repoze.bfg.chameleon_genshi
<http://svn.repoze.org/repoze.bfg.chameleon_genshi>`_.
Jinja2 template bindings are available for :mod:`repoze.bfg` in the
:mod:`repoze.bfg.jinja2` package. It lives in the Repoze Subversion
repository at `http://svn.repoze.org/repoze.bfg.jinja2
-<http://svn.repoze.org/repoze.bfg.jinja2>`_.
+<http://svn.repoze.org/repoze.bfg.jinja2>`_; it is also available from
+:term:`PyPI`.
Courtesy of Carlos de la Guardia, bindings for the Zope
:mod:`zope.pagetemplate` package ("old TAL") are available from
diff --git a/docs/narr/traversal.rst b/docs/narr/traversal.rst
index e59212728..acf2b7493 100644
--- a/docs/narr/traversal.rst
+++ b/docs/narr/traversal.rst
@@ -161,8 +161,6 @@ the :term:`context`.
How :mod:`repoze.bfg` Processes a Request Using Traversal
---------------------------------------------------------
-.. image:: modelgraphtraverser.png
-
When a user requests a page from your :mod:`repoze.bfg` -powered
application, the system uses this algorithm to determine which Python
code to execute:
@@ -248,6 +246,8 @@ code to execute:
In either case, the result is returned upstream via the :term:`WSGI`
protocol.
+.. image:: modelgraphtraverser.png
+
.. index::
pair: traversal; example
diff --git a/docs/narr/views.rst b/docs/narr/views.rst
index b25756fd9..8ad343f39 100644
--- a/docs/narr/views.rst
+++ b/docs/narr/views.rst
@@ -400,8 +400,8 @@ the following:
<scan package="."/>
-- If you are using :term:`imperative configuration`, use the
- :meth:`repoze.bfg.configuration.Configurator.scan` method:
+- If you are using :term:`imperative configuration`, use the ``scan``
+ method of a :class:`repoze.bfg.configuration.Configurator`:
.. code-block:: python
@@ -1288,8 +1288,7 @@ CSS files) within a :mod:`repoze.bfg` application. These mechanisms
makes static files available at a name relative to the application
root URL, e.g. ``/static``.
-Use of the imperative configuration method
-:meth:`repoze.bfg.configuration.configurator.add_static_view` is
+Use of the ``add_static_view`` imperative configuration method is
completely equivalent to using ZCML for the same purpose.
Here's an example of a ``static`` ZCML directive that will serve files
@@ -1341,8 +1340,8 @@ these will be resolved by the static view as you would expect.
See :ref:`static_directive` for detailed information.
-.. note:: The ``<static>`` ZCML directive is new in :mod:`repoze.bfg`
- 1.1.
+.. note:: The :ref:`static_directive` ZCML directive is new in
+ :mod:`repoze.bfg` 1.1.
.. index::
pair: generating; static resource
@@ -1352,9 +1351,10 @@ See :ref:`static_directive` for detailed information.
Generating Static Resource URLs
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When a ``<static>`` ZCML directive or a call to
-:meth:`repoze.bfg.configuration.configurator.add_static_view` is used
-to register a static resource directory, a special helper API named
+When a ref::`static_directive` ZCML directive or a call to the
+``add_static_view`` method of a
+:class:`repoze.bfg.configuration.Configurator` is used to register a
+static resource directory, a special helper API named
:func:`repoze.bfg.static_url` can be used to generate the appropriate
URL for a package resource that lives in one of the directories named
by the static registration ``path`` attribute.
diff --git a/docs/narr/webob.rst b/docs/narr/webob.rst
index 91413efd0..5c9549d9a 100644
--- a/docs/narr/webob.rst
+++ b/docs/narr/webob.rst
@@ -261,7 +261,7 @@ default to anything, though if you subclass ``Response`` and set
.. index::
pair: WebOb; exceptions
-xceptions
+Exceptions
++++++++++
To facilitate error responses like 404 Not Found, the module