From 831da8a6969703d79c4efb27a96c734140babf45 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Sat, 26 Dec 2009 19:23:29 +0000
Subject: - Created new top-level documentation section: "ZCML Directives".  
 This section contains detailed ZCML directive information, some of   which
 was removed from various narrative chapters.

---
 repoze/bfg/includes/meta.zcml | 12 ++++++------
 repoze/bfg/view.py            | 15 +++++++++------
 2 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'repoze')

diff --git a/repoze/bfg/includes/meta.zcml b/repoze/bfg/includes/meta.zcml
index feb44f5dd..25894df71 100644
--- a/repoze/bfg/includes/meta.zcml
+++ b/repoze/bfg/includes/meta.zcml
@@ -46,6 +46,12 @@
         handler="repoze.bfg.zcml.static"
         />
 
+    <meta:directive
+        name="renderer"
+        schema="repoze.bfg.zcml.IRendererDirective"
+        handler="repoze.bfg.zcml.renderer"
+        />
+
     <meta:directive
         name="repozewho1authenticationpolicy"
         schema="repoze.bfg.zcml.IRepozeWho1AuthenticationPolicyDirective"
@@ -70,12 +76,6 @@
         handler="repoze.bfg.zcml.aclauthorizationpolicy"
         />
 
-    <meta:directive
-        name="renderer"
-        schema="repoze.bfg.zcml.IRendererDirective"
-        handler="repoze.bfg.zcml.renderer"
-        />
-
     <meta:directive
         name="adapter"
         schema="repoze.bfg.zcml.IAdapterDirective"
diff --git a/repoze/bfg/view.py b/repoze/bfg/view.py
index 61286f46c..26c7f4666 100644
--- a/repoze/bfg/view.py
+++ b/repoze/bfg/view.py
@@ -323,9 +323,9 @@ class bfg_view(object):
     If ``accept`` is specified, it must be a mimetype value.  If
     ``accept`` is specified, the view will only be invoked if the
     ``Accept`` HTTP header matches the value requested.  See the
-    description of ``accept`` in :ref:`the_view_zcml_directive` for
-    information about the allowable composition and matching behavior
-    of this value.
+    description of ``accept`` in :ref:`view_directive` for information
+    about the allowable composition and matching behavior of this
+    value.
 
     If ``header`` is specified, it must be a header name or a
     ``headername:headervalue`` pair.  If ``header`` is specified, and
@@ -333,9 +333,9 @@ class bfg_view(object):
     matches the value requested.  If ``header`` is specified without a
     value (a bare header name only), the view will only be invoked if
     the HTTP header exists with any value in the request.  See the
-    description of ``header`` in :ref:`the_view_zcml_directive` for
-    information about the allowable composition and matching behavior
-    of this value.
+    description of ``header`` in :ref:`view_directive` for information
+    about the allowable composition and matching behavior of this
+    value.
 
     If ``path_info`` is specified, it must be a regular
     expression. The view will only be invoked if the ``PATH_INFO``
@@ -444,6 +444,9 @@ class bfg_view(object):
     
       <scan package="."/>
 
+    See :ref:`scan_directive` for more information about the ZCML
+    ``scan`` directive.
+
     Or, if you don't use ZCML, use the
     :meth:`repoze.bfg.configuration.Configurator.scan` method::
 
-- 
cgit v1.2.3