summaryrefslogtreecommitdiff
path: root/docs/api/paster.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2017-05-12 21:24:15 -0700
committerGitHub <noreply@github.com>2017-05-12 21:24:15 -0700
commit5f3b95cf3e1b3005007e739d0e008b21cff2babf (patch)
treec69983404d7b9b8db62640809e6b81c5e46677b4 /docs/api/paster.rst
parentb5444950d84c507f26764a16021db6e01d0461e3 (diff)
parenta7d60de001ba14023d20d701d9697ad7d8de1dd4 (diff)
downloadpyramid-5f3b95cf3e1b3005007e739d0e008b21cff2babf.tar.gz
pyramid-5f3b95cf3e1b3005007e739d0e008b21cff2babf.tar.bz2
pyramid-5f3b95cf3e1b3005007e739d0e008b21cff2babf.zip
Merge branch 'master' into change-to-localhost
Diffstat (limited to 'docs/api/paster.rst')
-rw-r--r--docs/api/paster.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/api/paster.rst b/docs/api/paster.rst
index 27bc81a1f..f0784d0f8 100644
--- a/docs/api/paster.rst
+++ b/docs/api/paster.rst
@@ -7,8 +7,8 @@
.. autofunction:: bootstrap
- .. autofunction:: get_app(config_uri, name=None, options=None)
+ .. autofunction:: get_app
- .. autofunction:: get_appsettings(config_uri, name=None, options=None)
+ .. autofunction:: get_appsettings
- .. autofunction:: setup_logging(config_uri, global_conf=None)
+ .. autofunction:: setup_logging