summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2013-03-20 22:53:35 -0500
committerMichael Merickel <michael@merickel.org>2013-03-20 22:53:35 -0500
commit6f065c08410cc892e93f276ec711d82b92ba6020 (patch)
treef2e30a3997a00ac8baa2613e44374ac3aa8337f5 /docs
parent8345ae7d0f20b7c924d45b4c6afedf437d3e68b6 (diff)
parent924888ed7c8a953d427517bbd6bc3ae4dcd2e27b (diff)
downloadpyramid-6f065c08410cc892e93f276ec711d82b92ba6020.tar.gz
pyramid-6f065c08410cc892e93f276ec711d82b92ba6020.tar.bz2
pyramid-6f065c08410cc892e93f276ec711d82b92ba6020.zip
Merge branch 'pull.911'
Diffstat (limited to 'docs')
-rw-r--r--docs/api/paster.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/api/paster.rst b/docs/api/paster.rst
index bde128e05..edc3738fc 100644
--- a/docs/api/paster.rst
+++ b/docs/api/paster.rst
@@ -9,6 +9,6 @@
.. autofunction:: get_app(config_uri, name=None, options=None)
- .. autofunction:: get_appsettings(config_uri, name=None)
+ .. autofunction:: get_appsettings(config_uri, name=None, options=None)
.. autofunction:: setup_logging(config_uri)