From 7534bae0c5eeb34a0146e76a81a9312797f6ba5c Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Sun, 25 Apr 2010 00:02:12 +0000
Subject: Merge i18n branch via svn merge --ignore-ancestry -r9030:9150
 $REPOZE_SVN/repoze.bfg/branches/i18n

No foreigners were harmed in the coding of this feature.
---
 docs/zcml.rst | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docs/zcml.rst')

diff --git a/docs/zcml.rst b/docs/zcml.rst
index 0e45f7692..e1bfc4f4b 100644
--- a/docs/zcml.rst
+++ b/docs/zcml.rst
@@ -16,6 +16,7 @@ directive documentation is organized alphabetically by directive name.
    zcml/configure
    zcml/forbidden
    zcml/include
+   zcml/localenegotiator
    zcml/notfound
    zcml/remoteuserauthenticationpolicy
    zcml/renderer
@@ -25,5 +26,6 @@ directive documentation is organized alphabetically by directive name.
    zcml/scan
    zcml/static
    zcml/subscriber
+   zcml/translationdir
    zcml/utility
    zcml/view
-- 
cgit v1.2.3