summaryrefslogtreecommitdiff
path: root/docs/api
diff options
context:
space:
mode:
authorMichael Merickel <mmerickel@users.noreply.github.com>2016-04-06 13:18:34 -0500
committerMichael Merickel <mmerickel@users.noreply.github.com>2016-04-06 13:18:34 -0500
commitd6ee2312b8e3b155452682d2400fac7c773d3a9e (patch)
treed9f257b9edb5699b1eb3886f71797a11217d555e /docs/api
parenta9cdf5be43d9dd915f8611f540e2f839c2e8d6a0 (diff)
parent1514ea003dfe39fa79a0ec07bbbc14f239cb4eb2 (diff)
downloadpyramid-d6ee2312b8e3b155452682d2400fac7c773d3a9e.tar.gz
pyramid-d6ee2312b8e3b155452682d2400fac7c773d3a9e.tar.bz2
pyramid-d6ee2312b8e3b155452682d2400fac7c773d3a9e.zip
Merge pull request #2399 from msabramo/logging_global_conf
Pass vars to logging.config.fileConfig
Diffstat (limited to 'docs/api')
-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 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)