From 6385c59af37e013f1b28b5ce1229ee466e136b1a Mon Sep 17 00:00:00 2001 From: "Matth?us G. Chajdas" Date: Tue, 2 Apr 2019 14:24:14 +0200 Subject: Fix documentation build using Sphinx 2.0 (fixes #1501.) --- CHANGES | 9 +++++---- doc/conf.py | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 15863b27..1447e0ee 100644 --- a/CHANGES +++ b/CHANGES @@ -30,13 +30,14 @@ Version 2.4.0 * Terraform (PR#787) - Add solarized style (PR#708) +- Add support for Markdown reference-style links (PR#753) - Change ANSI color names (PR#777) -- Fix rare unicode errors on Python 2.7 (PR#798, #1492) -- Updated Trove classifiers and ``pip`` requirements (PR#799) -- TypoScript uses ``.typoscript`` now (#1498) - Fix catastrophic backtracking in the bash lexer (#1494) +- Fix documentation failing to build using Sphinx 2.0 (#1501) - Fix incorrect links in the Lisp and R lexer documentation (PR#775) -- Add support for Markdown reference-style links (PR#753) +- Fix rare unicode errors on Python 2.7 (PR#798, #1492) +- TypoScript uses ``.typoscript`` now (#1498) +- Updated Trove classifiers and ``pip`` requirements (PR#799) Version 2.3.1 ------------- diff --git a/doc/conf.py b/doc/conf.py index 51a91617..00db7d9b 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -125,8 +125,8 @@ html_static_path = ['_static'] #html_use_smartypants = True # Custom sidebar templates, maps document names to template names. -html_sidebars = {'index': 'indexsidebar.html', - 'docs/*': 'docssidebar.html'} +html_sidebars = {'index': ['indexsidebar.html'], + 'docs/*': ['docssidebar.html']} # Additional templates that should be rendered to pages, maps page names to # template names. -- cgit v1.2.1