[MERGE] forward port branch 10.0 up to ac08e2ba532

3 files changed, 24 insertions, 1 deletions

diff --git a/doc/_extensions/odoo_ext/translator.py b/doc/_extensions/odoo_ext/translator.py
index 48c5e901f28..f466b9ad6d0 100644
--- a/doc/_extensions/odoo_ext/translator.py
+++ b/doc/_extensions/odoo_ext/translator.py
@@ -196,7 +196,7 @@ class BootstrapTranslator(nodes.NodeVisitor, object):
         else:
             opts = {}
 
-        def warner(msg):
+        def warner(msg, **kw):
             self.builder.warn(msg, (self.builder.current_docname, node.line))
         highlighted = self.builder.highlighter.highlight_block(
             node.rawsource, lang, opts=opts, warn=warner, linenos=linenos,
diff --git a/doc/cla/individual/anilkesariya.md b/doc/cla/individual/anilkesariya.md
new file mode 100644
index 00000000000..2b4158360eb
--- /dev/null
+++ b/doc/cla/individual/anilkesariya.md
@@ -0,0 +1,12 @@
+India, 17, Sept - 2018
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Anil Kesariya anil.r.kesariya@gmail.com https://github.com/AnilKesariya
+
diff --git a/doc/cla/individual/ark74.md b/doc/cla/individual/ark74.md
new file mode 100644
index 00000000000..e729859d95f
--- /dev/null
+++ b/doc/cla/individual/ark74.md
@@ -0,0 +1,11 @@
+Mexico, 2018-10-24
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Luis Guzman ark@switnet.org https://github.com/ark74