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/api/configuration.rst | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docs/api/configuration.rst')

diff --git a/docs/api/configuration.rst b/docs/api/configuration.rst
index e872a91b9..7b411b92d 100644
--- a/docs/api/configuration.rst
+++ b/docs/api/configuration.rst
@@ -32,6 +32,8 @@
 
      .. automethod:: add_subscriber
 
+     .. automethod:: add_translation_dirs
+
      .. automethod:: add_view
 
      .. automethod:: load_zcml(spec)
@@ -46,6 +48,8 @@
 
      .. automethod:: set_notfound_view(view=None, attr=None, renderer=None, wrapper=None)
 
+     .. automethod:: set_locale_negotiator
+
      .. automethod:: testing_securitypolicy
 
      .. automethod:: testing_models
-- 
cgit v1.2.3