Merge branch '1.0.0-beta7' into 1.0.0-beta8

.travis.yml

@@ -0,0 +1,11 @@
+sudo: false
+language: python
+python:
+  - "3.3"
+# command to install dependencies
+install: "pip install -q -r requirements.txt"
+# command to run tests
+script: ./build.sh
+# Flags used here, not in `make html`:
+#  -n   Run in nit-picky mode. Currently, this generates warnings for all missing references.
+#  -W   Turn warnings into errors. This means that the build stops at the first warning and sphinx-build exits with exit status 1.

aspnet/conf.py

@@ -147,7 +147,7 @@ def setup(app):
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = 'favicon.ico'
+html_favicon = '../common/_static/favicon.ico'
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,

build.sh

@@ -0,0 +1,2 @@
+echo "Trying to build the aspnet directory..." && cd aspnet && sphinx-build -nW -b html -d _build/doctrees . _build/html
+echo "Trying to build the mvc directory..." && cd ../mvc && sphinx-build -nW -b html -d _build/doctrees . _build/html

mvc/conf.py

@@ -155,7 +155,7 @@ def setup(app):
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = 'favicon.ico'
+html_favicon = '../common/_static/favicon.ico'
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,

requirements.txt

@@ -0,0 +1 @@
+Sphinx==1.3.1