Merge remote-tracking branch 'upstream/master'

doc/conf.py.in

@@ -23,6 +23,8 @@ AutoStructify = transform.AutoStructify
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, '@PROJ_ROOT@/python')
 
+templates_path = ["@PROJ_ROOT@/doc/templates"]
+
 # -- Doxygen Settings
 breathe_projects = {
    'paddle': '@PADDLE_DOXYGEN_OUTPUT@/xml'
@@ -66,8 +68,6 @@ extensions = [
 
 autodoc_member_order = 'bysource'
 
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:

doc/templates/layout.html

+{# layout.html #}
+{# Import the theme's layout. #}
+{% extends "!layout.html" %}
+
+
+{%- block extrahead %} 
+<script>
+var _hmt = _hmt || [];
+(function() {
+  var hm = document.createElement("script");
+  hm.src = "//hm.baidu.com/hm.js?b9a314ab40d04d805655aab1deee08ba";
+  var s = document.getElementsByTagName("script")[0]; 
+  s.parentNode.insertBefore(hm, s);
+})();
+</script>
+{% endblock %}

doc_cn/conf.py.in

@@ -22,6 +22,7 @@ AutoStructify = transform.AutoStructify
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, '@PROJ_ROOT@/python')
+templates_path = ["@PROJ_ROOT@/doc/templates"]
 
 # -- General configuration ------------------------------------------------
 
@@ -51,9 +52,6 @@ table_styling_embed_css = True
 
 autodoc_member_order = 'bysource'
 
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 # source_suffix = ['.rst', '.md']