diff options
| author | Steve Piercy <web@stevepiercy.com> | 2016-10-22 13:01:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-22 13:01:37 -0400 |
| commit | 52a97fe7bf71affa257b1d036388a18737b2d15f (patch) | |
| tree | 33c40cae8ef8c156bcd72c85b606eb111e58191b | |
| parent | 316a0151f32cf5d99320c403082cd61bdcb2eff7 (diff) | |
| parent | 6339bbf290823114dd9527d17c374a15065584e8 (diff) | |
| download | waitress-52a97fe7bf71affa257b1d036388a18737b2d15f.tar.gz | |
Merge pull request #144 from stevepiercy/master
undo canonical_url theme option because RTD has it already configured
| -rw-r--r-- | docs/conf.py | 5 | ||||
| -rw-r--r-- | rtd.txt | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/docs/conf.py b/docs/conf.py index 8a1d5da..aa9b3fb 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -91,10 +91,7 @@ pygments_style = 'sphinx' # Add and use Pylons theme html_theme = 'pylons' html_theme_path = pylons_sphinx_themes.get_html_themes_path() -html_theme_options = dict( - github_url='http://github.com/Pylons/waitress', - canonical_url='http://docs.pylonsproject.org/projects/waitress/en/latest/' -) +html_theme_options = dict(github_url='http://github.com/Pylons/waitress') # The style sheet to use for HTML and HTML Help pages. A file of that name # must exist either in Sphinx' static/ path, or in one of the custom paths @@ -1,3 +1,3 @@ -Sphinx >= 1.2.3 +Sphinx >= 1.3.1 repoze.sphinx.autointerface pylons-sphinx-themes |