Merge branch 'master' into fix-mkdocs-page-name-issue

Author: ericholscher

.gitignore

@@ -7,6 +7,8 @@
 .idea
 .vagrant
 .tox
+.rope_project/
+.ropeproject/
 _build
 cnames
 bower_components/
@@ -33,3 +35,5 @@ prod_artifacts
 wheelhouse
 whoosh_index
 xml_output
+public_cnames
+public_symlinks

.travis.yml

@@ -16,6 +16,6 @@ after_success:
 notifications:
   slack:
     rooms:
-      - readthedocs:y3hjODOi7EIz1JAbD1Zb41sz#general
+      - readthedocs:y3hjODOi7EIz1JAbD1Zb41sz#random
     on_success: change
     on_failure: always

README.rst

@@ -60,4 +60,4 @@ when you push to GitHub.
 .. |docs| image:: https://readthedocs.org/projects/docs/badge/?version=latest
     :alt: Documentation Status
     :scale: 100%
-    :target: https://readthedocs.org/projects/docs/
+    :target: https://docs.readthedocs.org/en/latest/?badge=latest

bower.json

@@ -14,12 +14,16 @@
     "tests"
   ],
   "dependencies": {
-    "jquery": "~2.0.3",
+    "jquery": "2.0.3",
     "underscore": "~1.7.0",
     "readthedocs-client": "https://github.com/agjohnson/readthedocs-client-js.git",
+    "sphinx-rtd-theme": "https://github.com/snide/sphinx-rtd-theme.git#0.1.9",
     "knockout": "~3.3.0",
-    "jquery.payment": "~1.2.3",
+    "jquery.payment": "~1.3.0",
     "jquery-migrate": "~1.2.1",
     "jquery-ui": "1.8.23"
+  },
+  "resolutions": {
+    "jquery": "2.0.3"
   }
 }

deploy/delete_stale_projects.py

@@ -1,7 +1,7 @@
 import shutil
 import os
 
-from projects.models import Project
+from readthedocs.projects.models import Project
 
 slugs = [p.slug for p in Project.objects.all()]
 build_projects = os.listdir('/home/docs/checkouts/readthedocs.org/user_builds/')

deploy/flask-redirects.py

@@ -1,3 +1,7 @@
+"""
+A flask app for redirecting documentation from the root / URL.
+"""
+
 import json
 
 from flask import Flask, make_response, redirect, request

docs/alternate_domains.rst

@@ -6,7 +6,7 @@ Read the Docs supports a number of custom domains for your convenience. Shorter
 Subdomain Support
 ------------------
 
-Every project has a subdomain that is available to serve it's documentation. If you go to <slug>.readthedocs.org, it should show you the latest version of documentation. A good example is http://pip.readthedocs.org
+Every project has a subdomain that is available to serve its documentation. If you go to <slug>.readthedocs.org, it should show you the latest version of documentation. A good example is http://pip.readthedocs.org
 
 .. note:: If you have an old project that has an underscore (_) in the name, it will use a subdomain with a hypen (-).
           `RFC 1035 <http://tools.ietf.org/html/rfc1035>`_ has more information on valid subdomains.