diff options
| author | Chris McDonough <chrism@plope.com> | 2011-11-28 16:19:04 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-11-28 16:19:04 -0500 |
| commit | dafb0b3271f525fb8552d155a4dd840ced1656c8 (patch) | |
| tree | 786cccbf8f2287be8e2fa43afd33e503b5366739 /docs/api | |
| parent | 8786a5719950900ba7a8390323476076e737ac9e (diff) | |
| parent | 14e5fa938b5354154f724101f444b1826b01aa3a (diff) | |
| download | pyramid-dafb0b3271f525fb8552d155a4dd840ced1656c8.tar.gz pyramid-dafb0b3271f525fb8552d155a4dd840ced1656c8.tar.bz2 pyramid-dafb0b3271f525fb8552d155a4dd840ced1656c8.zip | |
merge master to feature.introspection
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/paster.rst | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/docs/api/paster.rst b/docs/api/paster.rst index 2a32e07e9..3f7a1c364 100644 --- a/docs/api/paster.rst +++ b/docs/api/paster.rst @@ -5,13 +5,10 @@ .. automodule:: pyramid.paster - .. function:: get_app(config_uri, name=None) + .. autofunction:: bootstrap - Return the WSGI application named ``name`` in the PasteDeploy - config file specified by ``config_uri``. + .. autofunction:: get_app(config_uri, name=None) - If the ``name`` is None, this will attempt to parse the name from - the ``config_uri`` string expecting the format ``inifile#name``. - If no name is found, the name will default to "main". + .. autofunction:: get_appsettings(config_uri, name=None) - .. autofunction:: bootstrap + .. autofunction:: setup_logging(config_uri) |