Merge branch 'master' into 27345-lock-mongodb

Author: Joe Bennett

.platform/routes.yaml

@@ -5,10 +5,7 @@
 name: symfonydocs
 
 # The toolstack used to build the application.
-type: "php"
-
-build:
-    flavor: "composer"
+type: "python:3.7"
 
 # The configuration of app when it is exposed to the web.
 web:
@@ -53,7 +50,7 @@ hooks:
     build: |
       virtualenv .virtualenv
       . .virtualenv/bin/activate
-      # Platform.sh currently sets PIP_USER=1.
+      # SymfonyCloud currently sets PIP_USER=1.
       export PIP_USER=
       pip install pip==9.0.1 wheel==0.29.0
       pip install -r _build/.requirements.txt

.platform.app.yaml renamed to .symfony.cloud.yaml

@@ -0,0 +1,11 @@
+https://{default}/:
+  cache:
+    cookies:
+      - '*'
+    default_ttl: 0
+    enabled: true
+    headers:
+      - Accept
+      - Accept-Language
+  type: upstream
+  upstream: symfonydocs:http

.symfony/routes.yaml

@@ -0,0 +1,16 @@
+FROM  python:2-stretch as builder
+
+WORKDIR /www
+
+COPY ./_build/.requirements.txt _build/
+
+RUN pip install  pip==9.0.1 wheel==0.29.0 \
+    && pip install -r _build/.requirements.txt
+
+COPY . /www
+
+RUN make -C _build html
+
+FROM  nginx:latest
+
+COPY --from=builder /www/_build/html /usr/share/nginx/html

.platform/services.yaml renamed to .symfony/services.yaml

@@ -7,15 +7,32 @@ Contributing
 ------------
 
 >**Note**
->Unless you're documenting a feature that was introduced *after* Symfony 2.8
->(e.g. in Symfony 3.4), all pull requests must be based off of the **2.8** branch,
+>Unless you're documenting a feature that was introduced *after* Symfony 3.4
+>(e.g. in Symfony 4.2), all pull requests must be based off of the **3.4** 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](https://symfony.com/doc/current/contributing/documentation/overview.html)
 
-Platform.sh
------------
+SymfonyCloud
+------------
+
+Pull requests are automatically built by [SymfonyCloud](https://symfony.com/cloud).
+
+Docker
+------
+
+You can build the doc locally with these commands:
+
+```bash
+# build the image...
+$ docker build . -t symfony-docs
+
+# ...and start the local web server
+# (if it's already in use, change the '8080' port by any other port)
+$ docker run --rm -p 8080:80 symfony-docs
+```
 
-Pull requests are automatically built by [Platform.sh](https://platform.sh).
+You can now read the docs at http://127.0.0.1:8080 (if you use a virtual
+machine, browse its IP instead of localhost; e.g. `http://192.168.99.100:8080`).

Dockerfile

@@ -6,7 +6,7 @@ Jinja2==2.9.6
 MarkupSafe==1.0
 Pygments==2.2.0
 pytz==2017.2
-requests==2.12.5
+requests==2.20.0
 six==1.10.0
 snowballstemmer==1.2.1
 Sphinx==1.3.6

README.markdown

@@ -119,7 +119,7 @@
 /cookbook/console/commands_as_services /console/commands_as_services
 /cookbook/console/console_command /console
 /cookbook/console/index /console
-/cookbook/console/logging /console/logging
+/cookbook/console/logging /console
 /cookbook/console/request_context /console/request_context
 /cookbook/console/style /console/style
 /cookbook/console/usage /console
@@ -390,3 +390,26 @@
 /quick_tour/the_view /quick_tour/flex_recipes
 /service_container/service_locators /service_container/service_subscribers_locators
 /templating/overriding /bundles/override
+/security/custom_provider /security/user_provider
+/security/multiple_user_providers /security/user_provider
+/security/custom_password_authenticator /security/guard_authentication
+/security/api_key_authentication /security/guard_authentication
+/security/pre_authenticated /security/auth_providers
+/security/host_restriction /security/firewall_restriction
+/security/acl_advanced /security/acl
+/security/password_encoding /security
+/weblink /web_link
+/components/weblink /components/web_link
+/frontend/encore/installation-no-flex /frontend/encore/installation
+/http_cache/form_csrf_caching /security/csrf
+/console/logging /console
+/reference/forms/twig_reference /form/form_customization
+/form/rendering /form/form_customization
+/profiler/matchers /profiler
+/profiler/profiling_data /profiler
+/profiler/wdt_follow_ajax /profiler
+/security/entity_provider /security/user_provider
+/session/avoid_session_start /session
+/session/sessions_directory /session
+/frontend/encore/legacy-apps /frontend/encore/legacy-applications
+/configuration/external_parameters /configuration/environment_variables