Merge remote-tracking branch 'mercury/master'

* mercury/master: (205 commits)
  after merge fixes
  fix some issues after merging 2.7 into 2.8
  fix another bug due to choosing the wrong branch
  Update some screenshots to wrap them with a browser window
  some minor tweaks
  fix bugs due to choosing the wrong base branch
  complete component cross references
  Updated the Global Composer Installation article
  Removing an index to forms - this seemed to cause big errors in how the index/breadcrumbs were built
  Switching wrong link order
  Remove mentions of (cook)book
  Remove mentions of (cook)book
  Fix build
  Fix build
  Remove mentions of cookbook/book
  making sure the getting started navigation is smooth
  Add file extension to SOAP article
  Rename cache/ to http_cache/
  Correcting the "next" page to point to creating pages
  Rewords
  ...

Author: xabbuh

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

@@ -1,7 +1,6 @@
 <div class=submenu>
     {% set menu = [ 
-        ('The Book', 'book/index'),
-        ('The Cookbook', 'cookbook/index'),
+        ('Home', 'index'),
         ('The Components', 'components/index'),
         ('The Best Practices', 'best_practices/index'),
         ('The Quick Tour', 'quick_tour/index'),

Makefile renamed to _build/Makefile

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