summaryrefslogtreecommitdiff
path: root/docs/narr/i18n.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-18 12:27:56 -0500
committerChris McDonough <chrism@plope.com>2011-01-18 12:27:56 -0500
commit8b4146009da0b612e8e001e68cd5f6f63d361c53 (patch)
tree5de4e743b2c007c0d5202db7be883d21cfe2bc88 /docs/narr/i18n.rst
parent566004501e8a28c0ba8f8c882ca5ea0742e5d285 (diff)
parentc9c3c487bcaedeca97bb6463a00188b0dc01203a (diff)
downloadpyramid-8b4146009da0b612e8e001e68cd5f6f63d361c53.tar.gz
pyramid-8b4146009da0b612e8e001e68cd5f6f63d361c53.tar.bz2
pyramid-8b4146009da0b612e8e001e68cd5f6f63d361c53.zip
Merge branch 'zcmlless'
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 c2a5b8ce7..e1b6acc7b 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`