[MERGE] forward port branch 11.0 up to a9a556178d5

2 files changed, 22 insertions, 5 deletions

diff --git a/doc/_extensions/github_link.py b/doc/_extensions/github_link.py
index 155e4083025..72d51bfeb60 100644
--- a/doc/_extensions/github_link.py
+++ b/doc/_extensions/github_link.py
@@ -91,17 +91,17 @@ def make_github_link(app, path, line=None, mode="blob"):
         '',
         '' if line is None else 'L%d' % line
     ))
-
 def add_doc_link(app, pagename, templatename, context, doctree):
     """ Add github_link function linking to the current page on github """
     if not app.config.github_user and app.config.github_project:
         return
 
-    # FIXME: find other way to recover current document's source suffix
-    # in Sphinx 1.3 it's possible to have mutliple source suffixes and that
-    # may be useful in the future
     source_suffix = app.config.source_suffix
-    source_suffix = source_suffix if isinstance(source_suffix, pycompat.string_types) else source_suffix[0]
+    # in 1.3 source_suffix can be a list
+    # in 1.8 source_suffix can be a mapping
+    # FIXME: will break if we ever add support for !rst markdown documents maybe
+    if not isinstance(source_suffix, pycompat.string_types):
+        source_suffix = next(iter(source_suffix))
     # can't use functools.partial because 3rd positional is line not mode
     context['github_link'] = lambda mode='edit': make_github_link(
         app, 'doc/%s%s' % (pagename, source_suffix), mode=mode)
diff --git a/doc/cla/corporate/inspur.md b/doc/cla/corporate/inspur.md
new file mode 100644
index 00000000000..88999bdf10b
--- /dev/null
+++ b/doc/cla/corporate/inspur.md
@@ -0,0 +1,17 @@
+China, 2018-09-28
+
+Inspur Genersoft Co., Ltd agrees to the terms of the Odoo Corporate Contributor
+License Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+David Yu, yudw@inspur.com
+
+List of contributors:
+
+Brain Wang wangbuke@inspur.com
+David Yu yudw@inspur.com
+Alex Aisin-Gioro wubai@inspur.com