Merge remote-tracking branch 'remotes/upstream/2.7' into 2.7

# Conflicts:
#	book/security.rst

Author: bizmate

.gitignore

@@ -1,2 +1,2 @@
 /_build
-/_exts
+*.pyc

.gitmodules

@@ -0,0 +1,55 @@
+# This file describes an application. You can have multiple applications
+# in the same project.
+
+# The name of this app. Must be unique within a project.
+name: symfonydocs
+
+# The toolstack used to build the application.
+type: "php"
+
+build:
+    flavor: "composer"
+
+# The configuration of app when it is exposed to the web.
+web:
+    # The public directory of the app, relative to its root.
+    document_root: "/_build/html"
+    index_files:
+      - index.html
+    whitelist:
+      - \.html$
+      - \.txt$
+
+      # CSS and Javascript.
+      - \.css$
+      - \.js$
+      - \.hbs$
+
+      # image/* types.
+      - \.gif$
+      - \.png$
+      - \.ico$
+      - \.svgz?$
+
+      # fonts types.
+      - \.ttf$
+      - \.eot$
+      - \.woff$
+      - \.otf$
+
+      # robots.txt.
+      - /robots\.txt$
+
+# The size of the persistent disk of the application (in MB).
+disk: 512
+
+# Build time dependencies.
+dependencies:
+  python:
+    sphinx: ">=1"
+
+# The hooks that will be performed when the package is deployed.
+hooks:
+    build: |
+      pip install git+https://github.com/fabpot/sphinx-php.git
+      make html

.platform.app.yaml

@@ -0,0 +1,16 @@
+http://www.{default}/:
+  to: http://{default}/
+  type: redirect
+http://{default}/:
+  cache:
+    cookies:
+    - '*'
+    default_ttl: 0
+    enabled: true
+    headers:
+    - Accept
+    - Accept-Language
+  ssi:
+    enabled: false
+  type: upstream
+  upstream: symfonydocs:php

.platform/routes.yaml

@@ -0,0 +1 @@
+# Keeping this file empty to not deploy unused services.

.platform/services.yaml

@@ -1,16 +1,18 @@
 language: python
 
-python:
-    - "2.7"
+python: "2.7"
 
 sudo: false
 
-install: 
-    - "pip install -q -r requirements.txt --use-mirrors"
+cache:
+    directories:
+        - $HOME/.cache/pip
+        - _build
+
+install: pip install sphinx~=1.3 git+https://github.com/fabpot/sphinx-php.git
 
 script: sphinx-build -nW -b html -d _build/doctrees . _build/html
 
 branches:
   except:
     - github-comments
-

.travis.yml

@@ -2,6 +2,6 @@ Contributing
 ------------
 
 We love contributors! For more information on how you can contribute to the
-Symfony documentation, please read [Contributing to the Documentation](http://symfony.com/doc/current/contributing/documentation/overview.html)
-and notice the [Pull Request Format](http://symfony.com/doc/current/contributing/documentation/overview.html#pull-request-format)
+Symfony documentation, please read [Contributing to the Documentation](https://symfony.com/doc/current/contributing/documentation/overview.html)
+and notice the [Pull Request Format](https://symfony.com/doc/current/contributing/documentation/overview.html#pull-request-format)
 that helps us merge your pull requests faster!

CONTRIBUTING.md

@@ -1,16 +1,21 @@
 Symfony Documentation
 =====================
 
-This documentation is rendered online at http://symfony.com/doc/current/
+This documentation is rendered online at https://symfony.com/doc/current/
 
 Contributing
 ------------
 
 >**Note**
->Unless you're documenting a feature that was introduced *after* Symfony 2.3 
+>Unless you're documenting a feature that was introduced *after* Symfony 2.3
 >(e.g. in Symfony 2.4), all pull requests must be based off of the **2.3** branch,
 >**not** the master or older branches.
 
 We love contributors! For more information on how you can contribute to the
 Symfony documentation, please read
-[Contributing to the Documentation](http://symfony.com/doc/current/contributing/documentation/overview.html)
+[Contributing to the Documentation](https://symfony.com/doc/current/contributing/documentation/overview.html)
+
+Platform.sh
+-----------
+
+Pull requests are automatically built by [Platform.sh](https://platform.sh).