Merge remote-tracking branch 'origin/master' into stop-running-mkdocs-json

Author: ericholscher

docs/team.rst

@@ -109,8 +109,7 @@ Members
 * `Eric Holscher <https://github.com/ericholscher>`_
 * `Anthony Johnson <https://github.com/agjohnson>`_
 * `Manuel Kaufmann <https://github.com/humitos>`_
-* `Gregor Müllegger <https://github.com/gregmuellegger>`_
-* `Stein Magnus Jodal <https://github.com/jodal>`_
+* `David Fischer <https://github.com/davidfischer>`_
 * Your name here
 
 Feel free to ask any of us if you have questions or want to join!

docs/yaml-config.rst

@@ -89,11 +89,11 @@ This lets users specify a more experimental build image,
 if they want to be on the cutting edge.
 
 Certain Python versions require a certain build image,
-as defined here::
+as defined here:
 
-* `'1.0': 2, 2.7, 3, 3.4`
-* `'2.0': 2, 2.7, 3, 3.5`
-* `'latest': 2, 2.7, 3, 3.3, 3.4, 3.5, 3.6`
+* ``1.0``: 2, 2.7, 3, 3.4
+* ``2.0``: 2, 2.7, 3, 3.5
+* ``latest``: 2, 2.7, 3, 3.3, 3.4, 3.5, 3.6
 
 .. code-block:: yaml
 

readthedocs/core/static-src/core/js/readthedocs-doc-embed.js

@@ -1,7 +1,7 @@
 var sponsorship = require('./sponsorship'),
     footer = require('./doc-embed/footer.js'),
     // grokthedocs = require('./doc-embed/grokthedocs-client'),
-    mkdocs = require('./doc-embed/mkdocs'),
+    // mkdocs = require('./doc-embed/mkdocs'),
     rtddata = require('./doc-embed/rtd-data'),
     sphinx = require('./doc-embed/sphinx'),
     search = require('./doc-embed/search');

readthedocs/core/static-src/core/js/sponsorship.js

@@ -117,14 +117,16 @@ Promo.prototype.place_promo = function (selector, promo_class) {
 Promo.prototype.get_alabaster_promo_selector = function () {
     // Return a jQuery selector where the promo goes on the Alabaster theme
     var self = this,
-        selector;
+        selector,
+        wrapper;
 
     if (self.display_type === constants.PROMO_TYPES.FOOTER) {
-        selector = $('<div />')
+        wrapper = $('<div />')
             .attr('class', 'rtd-pro-footer-wrapper body')
             .appendTo('div.bodywrapper');
-        $('<hr />').insertBefore(selector);
-        $('<hr />').insertAfter(selector);
+        $('<hr />').appendTo(wrapper);
+        selector = $('<div />').appendTo(wrapper);
+        $('<hr />').appendTo(wrapper);
     } else {
         selector = $('div.sphinxsidebar > div.sphinxsidebarwrapper');
     }

readthedocs/core/static/core/js/readthedocs-doc-embed.js

@@ -123,6 +123,7 @@ def generate_rtd_data(self, docs_dir):
             'project': self.version.project.slug,
             'version': self.version.slug,
             'language': self.version.project.language,
+            'programming_language': self.version.project.programming_language,
             'page': None,
             'theme': "readthedocs",
             'builder': "mkdocs",

readthedocs/doc_builder/backends/mkdocs.py

@@ -93,6 +93,7 @@ context = {
     'slug': '{{ project.slug }}',
     'name': u'{{ project.name }}',
     'rtd_language': u'{{ project.language }}',
+    'programming_language': u'{{ project.programming_language }}',
     'canonical_url': '{{ project.get_canonical_url }}',
     'analytics_code': '{{ project.analytics_code }}',
     'single_version': {{ project.single_version }},

readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl

@@ -18,7 +18,7 @@ class Meta(object):
         fields = (
             'id',
             'name', 'slug', 'description', 'language',
-            'repo', 'repo_type',
+            'programming_language', 'repo', 'repo_type',
             'default_version', 'default_branch',
             'documentation_type',
             'users',

readthedocs/restapi/serializers.py

@@ -560,6 +560,7 @@ def test_get_version_by_id(self):
                 'install_project': False,
                 'language': 'en',
                 'name': 'Pip',
+                'programming_language': 'words',
                 'python_interpreter': 'python',
                 'repo': 'https://github.com/pypa/pip',
                 'repo_type': 'git',