diff options
| author | Steve Piercy <web@stevepiercy.com> | 2016-12-06 02:55:52 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-06 02:55:52 -0800 |
| commit | fedfacf0bd1cbefbe922618d4df93917465f1307 (patch) | |
| tree | 818259ca5e25cfb7593589301eb8e2d32755e99a | |
| parent | c7974fe0a3363d84afd0db506dbc71b97cb84247 (diff) | |
| parent | 9c120b5e9983c89bd9824269801b4d463d5c892a (diff) | |
| download | pyramid-fedfacf0bd1cbefbe922618d4df93917465f1307.tar.gz pyramid-fedfacf0bd1cbefbe922618d4df93917465f1307.tar.bz2 pyramid-fedfacf0bd1cbefbe922618d4df93917465f1307.zip | |
Merge pull request #2848 from miohtama/fix/sphinx-1.5
Fix docs for Sphinx 1.5
| -rw-r--r-- | CONTRIBUTORS.txt | 2 | ||||
| -rw-r--r-- | docs/conf.py | 4 | ||||
| -rw-r--r-- | pyramid/config/util.py | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 98e243c1f..b4e30e085 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -286,3 +286,5 @@ Contributors - Keith Yang, 2016/07/22 - Moriyoshi Koizumi, 2016/11/20 + +- Mikko Ohtamaa, 2016/12/6 diff --git a/docs/conf.py b/docs/conf.py index c3a7170fc..84fd5cf1b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -191,10 +191,10 @@ latex_documents = [ # For "manual" documents, if this is true, then toplevel headings are parts, # not chapters. -latex_use_parts = True +latex_toplevel_sectioning = "section" # If false, no module index is generated. -latex_use_modindex = False +latex_domain_indices = False ## Say, for a moment that you have a twoside document that needs a 3cm ## inner margin to allow for binding and at least two centimetres the diff --git a/pyramid/config/util.py b/pyramid/config/util.py index b70dae7f3..67bba9593 100644 --- a/pyramid/config/util.py +++ b/pyramid/config/util.py @@ -4,8 +4,7 @@ import inspect from pyramid.compat import ( bytes_, getargspec, - is_nonstr_iter, - string_types, + is_nonstr_iter ) from pyramid.compat import im_func |