Merge branch 'master' into agj/force-neat-19

Author: agjohnson

docs/demo/api.rst

@@ -1,15 +1,34 @@
-
-*********************
-:mod:`test_py_module`
-*********************
+***************************************
+API documentation and generated content
+***************************************
 
 .. contents:: Table of Contents
 
+:mod:`test_py_module`
+=====================
+
 .. automodule:: test_py_module.test
     :members:
     :private-members:
     :special-members:
 
+
+C++ API
+=======
+
+.. cpp:type:: MyType
+
+   Some type
+
+.. cpp:function:: const MyType Foo(const MyType bar)
+
+   Some function type thing
+
+.. cpp:class:: template<typename T, std::size_t N> std::array
+
+   Some cpp class
+
+
 Generated Index
 ===============
 

sphinx_rtd_theme/layout.html

@@ -116,7 +116,7 @@
           {% if logo and theme_logo_only %}
             <a href="{{ pathto(master_doc) }}">
           {% else %}
-            <a href="{{ pathto(master_doc) }}" class="icon icon-home"> {{ project }}
+            <a href="{{ pathto(master_doc) }}" class="icon icon-home" alt="{{ _("Documentation Home") }}"> {{ project }}
           {% endif %}
 
           {% if logo %}

src/sass/_theme_rst.sass

@@ -328,7 +328,7 @@
   // that output similar, but not quite the same nesting so this is really the best we can do.
   dl:not(.docutils)
     // In Sphinx 2.0+ most DLs no longer contain .docutils, needs tighter scoping using next line
-    &.class, &.data
+    &.class, &.data, &.type, &.function
       margin-bottom: $base-line-height
       // This would be the equivilant of a .. class::
       dt