summaryrefslogtreecommitdiff
path: root/docs/api.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2010-04-25 00:02:12 +0000
committerChris McDonough <chrism@agendaless.com>2010-04-25 00:02:12 +0000
commit7534bae0c5eeb34a0146e76a81a9312797f6ba5c (patch)
tree15d3fd388eb3c5538c50da20c3691a9f39ca6de3 /docs/api.rst
parent51981a128c7ed05e51938a3f358c0970dcc33a6f (diff)
downloadpyramid-7534bae0c5eeb34a0146e76a81a9312797f6ba5c.tar.gz
pyramid-7534bae0c5eeb34a0146e76a81a9312797f6ba5c.tar.bz2
pyramid-7534bae0c5eeb34a0146e76a81a9312797f6ba5c.zip
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.
Diffstat (limited to 'docs/api.rst')
-rw-r--r--docs/api.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/api.rst b/docs/api.rst
index 2bd5fca01..a97c79fa9 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -15,6 +15,7 @@ documentation is organized alphabetically by module name.
api/configuration
api/events
api/exceptions
+ api/i18n
api/interfaces
api/location
api/paster