summaryrefslogtreecommitdiff
path: root/docs/narr/i18n.rst
diff options
context:
space:
mode:
authorCasey Duncan <casey.duncan@gmail.com>2011-01-18 23:05:54 -0700
committerCasey Duncan <casey.duncan@gmail.com>2011-01-18 23:05:54 -0700
commitb0240d3d5a39a504d5a5155a23a6d6a431b457ef (patch)
treeb0c3b4f5dd8a0ec1c01912bfeff769d1329a9c97 /docs/narr/i18n.rst
parent278b302270823336d770761aaac22d854e348ea6 (diff)
parent48bccbe4ff7351d823a471005effea1afc06bb4f (diff)
downloadpyramid-b0240d3d5a39a504d5a5155a23a6d6a431b457ef.tar.gz
pyramid-b0240d3d5a39a504d5a5155a23a6d6a431b457ef.tar.bz2
pyramid-b0240d3d5a39a504d5a5155a23a6d6a431b457ef.zip
Merge https://github.com/Pylons/pyramid
Diffstat (limited to 'docs/narr/i18n.rst')
-rw-r--r--docs/narr/i18n.rst5
1 files changed, 0 insertions, 5 deletions
diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst
index c7ed18e4c..83973a17e 100644
--- a/docs/narr/i18n.rst
+++ b/docs/narr/i18n.rst
@@ -890,9 +890,6 @@ will be merged into translations from a message catalog added earlier
if both translation directories contain translations for the same
locale and :term:`translation domain`.
-.. note:: You can also add a translation directory via ZCML. See
- :ref:`zcml_adding_a_translation_directory`
-
Setting the Locale
~~~~~~~~~~~~~~~~~~
@@ -1019,5 +1016,3 @@ For example:
config = Configurator()
config.set_locale_negotiator(my_locale_negotiator)
-.. note:: You can also add a custom locale negotiator via ZCML. See
- :ref:`zcml_adding_a_locale_negotiator`