diff --git a/doc/_ext/configext.py b/doc/_ext/configext.py index 097f8768a8..021b4505cc 100644 --- a/doc/_ext/configext.py +++ b/doc/_ext/configext.py @@ -179,7 +179,7 @@ class ConfigFileDomain(Domain): labelid, contnode) def get_objects(self): - for (type, name), info in self.data['objects'].iteritems(): + for (type, name), info in self.data['objects'].items(): yield (name, name, type, info[0], info[1], self.object_types[type].attrs['searchprio']) diff --git a/doc/conf.py b/doc/conf.py index 7bb11c4b21..b6b5536304 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -127,7 +127,7 @@ html_theme = 'default' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +#html_static_path = ['_static'] # Add any extra paths that contain custom files (such as robots.txt or # .htaccess) here, relative to this directory. These files are copied diff --git a/doc/faq.rst b/doc/faq.rst index 29f2e35a56..7b291416a6 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -1602,7 +1602,7 @@ mimetypes by heart so he/she can enter it at will? .. _faqbookmark: 6.18 Bookmarks: Where can I store bookmarks? Why can't I see any bookmarks below the query box? What are these variables for? --------------------------------------------------------------------------------------------------------------------------- +----------------------------------------------------------------------------------------------------------------------------- Any query you have executed can be stored as a bookmark on the page where the results are displayed. You will find a button labeled