diff options
| author | Michael Merickel <michael@merickel.org> | 2016-04-11 21:34:44 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-04-11 21:34:44 -0500 |
| commit | 167b7728a84202daa17004b88c57cb29970ce7d1 (patch) | |
| tree | 859e02f5eab85c6ae2b6478e4c38ecb108a1df0a /docs/api/paster.rst | |
| parent | db3aa086a25504f8faf0149875eb7ff73ef08352 (diff) | |
| parent | fa43952e617ad68c52447da28fc7f5be23ff4b10 (diff) | |
| download | pyramid-167b7728a84202daa17004b88c57cb29970ce7d1.tar.gz pyramid-167b7728a84202daa17004b88c57cb29970ce7d1.tar.bz2 pyramid-167b7728a84202daa17004b88c57cb29970ce7d1.zip | |
Merge branch 'master' into docs/easy-install-to-pip.2104
Diffstat (limited to 'docs/api/paster.rst')
| -rw-r--r-- | docs/api/paster.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/api/paster.rst b/docs/api/paster.rst index edc3738fc..27bc81a1f 100644 --- a/docs/api/paster.rst +++ b/docs/api/paster.rst @@ -11,4 +11,4 @@ .. autofunction:: get_appsettings(config_uri, name=None, options=None) - .. autofunction:: setup_logging(config_uri) + .. autofunction:: setup_logging(config_uri, global_conf=None) |