summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <mmerickel@users.noreply.github.com>2016-04-06 13:19:26 -0500
committerMichael Merickel <mmerickel@users.noreply.github.com>2016-04-06 13:19:26 -0500
commit23feec43c9005001ba2ea4cd401d52ff83cf4081 (patch)
tree9c570ca7f28fbbad24b184dea605e483851d55f9
parentd6ee2312b8e3b155452682d2400fac7c773d3a9e (diff)
parentf19d8b325392043631be7254d226b71a300c6e40 (diff)
downloadpyramid-23feec43c9005001ba2ea4cd401d52ff83cf4081.tar.gz
pyramid-23feec43c9005001ba2ea4cd401d52ff83cf4081.tar.bz2
pyramid-23feec43c9005001ba2ea4cd401d52ff83cf4081.zip
Merge pull request #2432 from msabramo/setup_logging_intersphinx_link_to_fileConfig
setup_logging: Intersphinx link to fileConfig
-rw-r--r--pyramid/paster.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pyramid/paster.py b/pyramid/paster.py
index 5e2200ea7..b371eea6f 100644
--- a/pyramid/paster.py
+++ b/pyramid/paster.py
@@ -56,8 +56,8 @@ def setup_logging(config_uri, global_conf=None,
fileConfig=fileConfig,
configparser=configparser):
"""
- Set up logging via the logging module's fileConfig function with the
- filename specified via ``config_uri`` (a string in the form
+ Set up logging via :func:`logging.config.fileConfig` with the filename
+ specified via ``config_uri`` (a string in the form
``filename#sectionname``).
ConfigParser defaults are specified for the special ``__file__``