Merge branch '3.0' into 3.1

* 3.0: (119 commits)
  [KnpU] Making common 3.0 changes (e.g. app/console -> bin/console)
  using shorter command name
  fixing app/console
  Fixing heading styles that I just messed up!
  Minor tweaks!
  Tweaks!
  Fixed some misconfigured redirections
  Tweaks thanks to comments
  minor tweaks
  Completely updating the configuration main chapter to talk about parameters and a few other details
  more tweaks
  Moving configuration/configuration.rst -> configuration.rst
  Tweaks thanks to Javier
  Updating and massively shortening page creation
  Moving http_fundamentals into introduction
  Moving web server configuration out of configuration - it has nothing to do with Symfony configuration
  Fixing references
  Moving logging/monolog.rst to /logging.rst, removing some sections from it, rewriting others
  Another batch of build error fixes
  language tweak
  ...

Author: weaverryan

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'
-