Merge branch '3.0' into 3.1

Conflicts:
	book/installation.rst
	components/http_kernel.rst
	components/index.rst
	components/map.rst.inc
	components/phpunit_bridge.rst
	cookbook/controller/index.rst
	cookbook/map.rst.inc
	create_framework/http_kernel_controller_resolver.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'
-

Makefile renamed to _build/Makefile

@@ -0,0 +1,6 @@
+.. tip::
+
+    By using rewrite rules in your
+    :doc:`web server configuration </configuration/web_server_configuration>`,
+    the ``index.php`` won't be needed and you will have beautiful, clean URLs
+    (e.g. ``/show``).

_theme/_exts/symfonycom/__init__.py renamed to _build/_theme/_exts/symfonycom/__init__.py

@@ -1,5 +1,5 @@
 .. caution::
 
     Starting from Symfony 2.8, Assetic is no longer included by default in the
-    Symfony Standard Edition. Refer to :doc:`this article </cookbook/assetic/asset_management>`
+    Symfony Standard Edition. Refer to :doc:`this article </assetic/asset_management>`
     to learn how to install and enable Assetic in your Symfony application.