diff options
| author | Steve Piercy <web@stevepiercy.com> | 2013-03-21 13:32:14 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2013-03-21 13:32:14 -0700 |
| commit | a17c712f7f836b3506be069f60ee9ed8a8edb42b (patch) | |
| tree | d42a28e8b692fd6da1289c2ca8f99a18a8a3e59f /docs/api | |
| parent | 124daa3f3de2350ee4079d684736acd10b415046 (diff) | |
| parent | f38126c3214c936f022e68a1cac88c3cd8644879 (diff) | |
| download | pyramid-a17c712f7f836b3506be069f60ee9ed8a8edb42b.tar.gz pyramid-a17c712f7f836b3506be069f60ee9ed8a8edb42b.tar.bz2 pyramid-a17c712f7f836b3506be069f60ee9ed8a8edb42b.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
docs/tutorials/wiki2/installation.rst
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) |