diff options
| author | Michael Merickel <michael@merickel.org> | 2013-03-19 17:02:57 -0700 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2013-03-19 17:02:57 -0700 |
| commit | ea1f05799cab69881b0bef292033965abfdb16cb (patch) | |
| tree | 70d99d2c7cd9f0576e1bcdabc3e5639dc1ce4575 /docs/api | |
| parent | 411acbba3402aba9d09856a0c4cb88f572ba77da (diff) | |
| parent | 96957012b93bbe8798c085591c3e01da10312add (diff) | |
| download | pyramid-ea1f05799cab69881b0bef292033965abfdb16cb.tar.gz pyramid-ea1f05799cab69881b0bef292033965abfdb16cb.tar.bz2 pyramid-ea1f05799cab69881b0bef292033965abfdb16cb.zip | |
Merge branch 'master' of madjar/pyramid into pull.911
Diffstat (limited to 'docs/api')
| -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 bde128e05..edc3738fc 100644 --- a/docs/api/paster.rst +++ b/docs/api/paster.rst @@ -9,6 +9,6 @@ .. autofunction:: get_app(config_uri, name=None, options=None) - .. autofunction:: get_appsettings(config_uri, name=None) + .. autofunction:: get_appsettings(config_uri, name=None, options=None) .. autofunction:: setup_logging(config_uri) |