[doc] Fix ROADMAP.rst and conf.py after merge of documentation changes

Change-Id: Ic373ea45f85034e0b404556d2948985f09bb9eb3
---
M ROADMAP.rst
M docs/conf.py
2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ROADMAP.rst b/ROADMAP.rst
index 609c6ff..a4958c6 100644
--- a/ROADMAP.rst
+++ b/ROADMAP.rst
@@ -79,9 +79,4 @@
 * 6.2.0: Throttle.multiplydelay attribute is deprecated
 * 6.2.0: SequenceOutputter.format_list() is deprecated in favour of 'out' property
 * 6.0.0: config.register_family_file() is deprecated
-
-
-Will be removed in Pywikibot 8
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
 * 5.5.0: APISite.redirectRegex() will be removed in favour of APISite.redirect_regex()
diff --git a/docs/conf.py b/docs/conf.py
index 4a8b6eb..1a167d7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -200,12 +200,7 @@
 
 # Custom sidebar templates, maps document names to template names.
 #
-# html_sidebars = {
-#     '**': [
-#         'searchbox.html', 'localtoc.html', 'relations.html',
-#         'sourcelink.html',
-#     ]
-# }
+# html_sidebars = {}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.

