[FIX] doc warnings

* add Sphinx 1.6 compatibility (use app.set_translator when
  available as in that case programmatically setting
  html_translator_class is broken)
* fix a bunch of code block lexers to avoid warnings & get better
  coloration
* add a few options which were referred to without being actually
  defined
* fix some rST formatting

2 files changed, 8 insertions, 5 deletions

diff --git a/doc/_extensions/html_domain.py b/doc/_extensions/html_domain.py
index 2ee896486b4..4b0f18a9b82 100644
--- a/doc/_extensions/html_domain.py
+++ b/doc/_extensions/html_domain.py
@@ -24,7 +24,7 @@ def setup(app):
     app.add_node(address, html=(
         lambda self, node: self.body.append(self.starttag(node, 'address')),
         lambda self, node: self.body.append('</address>\n')
-    ))
+    ), override=True) # docutils.nodes.address exists and is a bibliographic element
     app.add_node(cite, html=(visit_cite, depart_cite))
     for name, node in [('mark', mark), ('ins', insert), ('del', delete),
                        ('s', strikethrough), ('u', underline), ('small', small),
diff --git a/doc/_extensions/odoo_ext/__init__.py b/doc/_extensions/odoo_ext/__init__.py
index 0ec55620497..c1637623e62 100644
--- a/doc/_extensions/odoo_ext/__init__.py
+++ b/doc/_extensions/odoo_ext/__init__.py
@@ -8,10 +8,13 @@ import sphinx.environment
 import sphinx.builders.html
 from docutils import nodes
 def setup(app):
-    if getattr(app.config, 'html_translator_class', None):
-        app.warn("Overriding the explicitly set  html_translator_class setting",
-                 location="odoo extension")
-    app.config.html_translator_class = 'odoo_ext.translator.BootstrapTranslator'
+    if hasattr(app, 'set_translator'):
+        app.set_translator('html', translator.BootstrapTranslator)
+    else:
+        if getattr(app.config, 'html_translator_class', None):
+            app.warn("Overriding the explicitly set  html_translator_class setting",
+                     location="odoo extension")
+        app.config.html_translator_class = 'odoo_ext.translator.BootstrapTranslator'
 
     switcher.setup(app)
     app.add_config_value('odoo_cover_default', None, 'env')