Merge branch '2.7' into 2.8

Conflicts:
	_images/quick_tour/hello_fabien.png
	book/installation.rst
	book/routing.rst
	book/service_container.rst
	components/dependency_injection/index.rst
	components/index.rst
	components/map.rst.inc
	controller.rst
	cookbook/assetic/index.rst
	cookbook/configuration/index.rst
	cookbook/map.rst.inc
	cookbook/security/index.rst
	cookbook/service_container/index.rst
	forms.rst
	reference/twig_reference.rst
	security/custom_authentication_provider.rst
	templating.rst

Author: wouterj

CONTRIBUTING.md renamed to .github/CONTRIBUTING.md

@@ -1,2 +1,3 @@
-/_build
+/_build/doctrees
+/_build/html
 *.pyc

.gitignore

@@ -1,17 +1,14 @@
 language: python
 
-python: "2.7"
+python: 2.7
 
 sudo: false
-
 cache:
-    directories:
-        - $HOME/.cache/pip
-        - _build
+  directories: [$HOME/.cache/pip]
 
 install: pip install sphinx~=1.3.0 git+https://github.com/fabpot/sphinx-php.git
 
-script: sphinx-build -nW -b html -d _build/doctrees . _build/html
+script: sphinx-build -nW -c _build/ -b html -d _build/doctrees . _build/html
 
 branches:
   except:

.travis.yml

@@ -75,7 +75,7 @@
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_theme']
+exclude_patterns = ['_build']
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None
@@ -279,4 +279,3 @@
 
 # Use PHP syntax highlighting in code examples by default
 highlight_language='php'
-