summaryrefslogtreecommitdiff
path: root/docs/zcml/translationdir.rst
diff options
context:
space:
mode:
authorCasey Duncan <casey.duncan@gmail.com>2010-12-12 09:40:19 -0700
committerCasey Duncan <casey.duncan@gmail.com>2010-12-12 09:40:19 -0700
commit226c469217cbddc3443da2a60dc414b82021bcbe (patch)
treec049b1c25b4b70a43f2b99f8515fd3d628cbffd2 /docs/zcml/translationdir.rst
parent87a6ffdb91ae9f983169c3e9da15ea0266745a74 (diff)
parentfee38663daccc0130d0c34dbc5a14e67bef2e183 (diff)
downloadpyramid-226c469217cbddc3443da2a60dc414b82021bcbe.tar.gz
pyramid-226c469217cbddc3443da2a60dc414b82021bcbe.tar.bz2
pyramid-226c469217cbddc3443da2a60dc414b82021bcbe.zip
fix merge conflicts
Diffstat (limited to 'docs/zcml/translationdir.rst')
-rw-r--r--docs/zcml/translationdir.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/zcml/translationdir.rst b/docs/zcml/translationdir.rst
index 56c0977db..5cf615d26 100644
--- a/docs/zcml/translationdir.rst
+++ b/docs/zcml/translationdir.rst
@@ -55,7 +55,7 @@ Example 3
Alternatives
~~~~~~~~~~~~
-Use :meth:`pyramid.configuration.Configurator.add_translation_dirs`
+Use :meth:`pyramid.config.Configurator.add_translation_dirs`
method instance during initial application setup.
See Also