Merge branch '3.1'

* 3.1:
  [#7044] minor tweak
  Add Nginx configuration to environment variables
  Update the Apache Router article to deprecate it entirely
  Fix typo in doctrine.rst (to manage)
  Changed RFC links from drafts to proposed standarts
  Remove a dead link to the PR header
  Minor improvements for the contribution guide
  use single quotes for YAML strings
  Fix incorrect callback validation example
  Fix a typo in the serializer doc
  Fix 404 error link for American English Oxford Dictionary
  Use strict comparison

Author: xabbuh

.github/CONTRIBUTING.md

@@ -2,6 +2,4 @@ Contributing
 ------------
 
 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)
-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!
+Symfony documentation, please read [Contributing to the Documentation](https://symfony.com/doc/current/contributing/documentation/overview.html).

_build/redirection_map

@@ -2,6 +2,7 @@
 /cookbook/index /index
 /book/stable_api /contributing/code/bc
 /book/internals /reference/events
+/configuration/apache_router /routing
 /cookbook/console/sending_emails /cookbook/console/request_context
 /cookbook/deployment-tools /cookbook/deployment/tools
 /cookbook/doctrine/migrations /bundles/DoctrineFixturesBundle/index
@@ -95,7 +96,7 @@
 /cookbook/cache/form_csrf_caching /http_cache/form_csrf_caching
 /cookbook/cache/varnish /http_cache/varnish
 /cookbook/composer /setup/composer
-/cookbook/configuration/apache_router /configuration/apache_router
+/cookbook/configuration/apache_router /routing
 /cookbook/configuration/configuration_organization /configuration/configuration_organization
 /cookbook/configuration/environments /configuration/environments
 /cookbook/configuration/external_parameters /configuration/external_parameters

components/routing.rst

@@ -536,7 +536,6 @@ Learn more
     /routing/*
     /controller
     /controller/*
-    /configuration/apache_router
 
 .. _Packagist: https://packagist.org/packages/symfony/routing
 .. _PCRE Unicode properties: http://php.net/manual/en/regexp.reference.unicode.php

components/serializer.rst

@@ -492,8 +492,8 @@ There are several types of normalizers available:
     the "get"/"set"/"has"/"remove" prefix and converted to lower case) to property
     values.
 
-    The ``ObjectNormalizer`` is the most powerful normalizer. It is a configured
-    by default when using the Symfony Standard Edition with the serializer enabled.
+    The ``ObjectNormalizer`` is the most powerful normalizer. It is configured by
+    default when using the Symfony Standard Edition with the serializer enabled.
 
 :class:`Symfony\\Component\\Serializer\\Normalizer\\GetSetMethodNormalizer`
     This normalizer reads the content of the class by calling the "getters"

configuration/apache_router.rst

@@ -22,8 +22,8 @@ applied to the resulting parameter name:
 * Double underscores are replaced with a period, as a period is not
   a valid character in an environment variable name.
 
-For example, if you're using Apache, environment variables can be set using
-the following ``VirtualHost`` configuration:
+For example, if you're using Apache, environment variables can be set using the
+`SetEnv`_ directive with the following ``VirtualHost`` configuration:
 
 .. code-block:: apache
 
@@ -40,13 +40,41 @@ the following ``VirtualHost`` configuration:
         </Directory>
     </VirtualHost>
 
+For Nginx web servers, the environment variables can be set with the `fastcgi_param`_
+directive. For example, in the configuration file where the ``fastcgi_params``
+file is included:
+
+.. code-block:: nginx
+
+    server {
+        server_name domain.tld www.domain.tld;
+        root /var/www/project/web;
+
+        location / {
+            try_files $uri /app.php$is_args$args;
+        }
+
+        location ~ ^/app\.php(/|$) {
+            fastcgi_pass unix:/var/run/php5-fpm.sock;
+            fastcgi_split_path_info ^(.+\.php)(/.*)$;
+            include fastcgi_params;
+            fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
+            fastcgi_param DOCUMENT_ROOT $realpath_root;
+            fastcgi_param SYMFONY__DATABASE__USER user;
+            fastcgi_param SYMFONY__DATABASE__PASSWORD secret;
+            internal;
+        }
+
+        # ...
+    }
+
 .. note::
 
-    The example above is for an Apache configuration, using the `SetEnv`_
-    directive. However, this will work for any web server which supports
-    the setting of environment variables.
+    The examples above are for an Apache and Nginx configuration. However, this
+    will work for any web server which supports the setting of environment
+    variables.
 
-    Also, in order for your console to work (which does not use Apache),
+    Also, in order for your console to work (which does not use a web server),
     you must export these as shell variables. On a Unix system, you can run
     the following:
 
@@ -148,3 +176,4 @@ the Symfony service container.
     $container->setParameter('drupal.database.url', $db_url);
 
 .. _`SetEnv`: http://httpd.apache.org/docs/current/env.html
+.. _`fastcgi_param`: http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html#fastcgi_param

configuration/external_parameters.rst

@@ -90,7 +90,7 @@ this value accordingly):
 .. code-block:: terminal
 
     $ cd projects/
-    $ git clone git://github.com/<YOUR GITHUB USERNAME>/symfony-docs.git
+    $ git clone git://github.com/YOUR-GITHUB-USERNAME/symfony-docs.git
 
 **Step 3.** Add the original Symfony docs repository as a "Git remote" executing
 this command:
@@ -106,8 +106,8 @@ your project:
 .. code-block:: terminal
 
     $ git remote -v
-    origin  git@github.com:<YOUR GITHUB USERNAME>/symfony-docs.git (fetch)
-    origin  git@github.com:<YOUR GITHUB USERNAME>/symfony-docs.git (push)
+    origin  git@github.com:YOUR-GITHUB-USERNAME/symfony-docs.git (fetch)
+    origin  git@github.com:YOUR-GITHUB-USERNAME/symfony-docs.git (push)
     upstream  https://github.com/symfony/symfony-docs.git (fetch)
     upstream  https://github.com/symfony/symfony-docs.git (push)
 
@@ -158,7 +158,7 @@ forked repository and ``improve_install_chapter`` is the name of the branch you
 created previously.
 
 **Step 7.** Everything is now ready to initiate a **pull request**. Go to your
-forked repository at ``https//github.com/<YOUR GITHUB USERNAME>/symfony-docs``
+forked repository at ``https//github.com/YOUR-GITHUB-USERNAME/symfony-docs``
 and click on the **Pull Requests** link located in the sidebar.
 
 Then, click on the big **New pull request** button. As GitHub cannot guess the
@@ -223,12 +223,14 @@ contribution to the Symfony docs:
 
     # ... do your changes
 
-    # add and commit your changes
-    $ git add xxx.rst     # (optional) only if this is a new content
+    # (optional) add your changes if this is a new content
+    $ git add xxx.rst
+
+    # commit your changes and push them to your fork
     $ git commit xxx.rst
     $ git push origin my_changes
 
-    # go to GitHub and create the Pull Request
+    # ... go to GitHub and create the Pull Request
 
     # (optional) make the changes requested by reviewers and commit them
     $ git commit xxx.rst

contributing/documentation/overview.rst

@@ -179,7 +179,7 @@ In addition, documentation follows these rules:
 .. _`Twig Coding Standards`: http://twig.sensiolabs.org/doc/coding_standards.html
 .. _`reserved by the IANA`: http://tools.ietf.org/html/rfc2606#section-3
 .. _`American English`: https://en.wikipedia.org/wiki/American_English
-.. _`American English Oxford Dictionary`: http://www.oxforddictionaries.com/definition/american_english/
+.. _`American English Oxford Dictionary`: http://en.oxforddictionaries.com/definition/american_english/
 .. _`headings and titles`: https://en.wikipedia.org/wiki/Letter_case#Headings_and_publication_titles
 .. _`Serial (Oxford) Commas`: https://en.wikipedia.org/wiki/Serial_comma
 .. _`nosism`: https://en.wikipedia.org/wiki/Nosism

contributing/documentation/standards.rst

@@ -875,7 +875,7 @@ list of all available types and more information, see Doctrine's
 Relationships and Associations
 ------------------------------
 
-Doctrine provides all the functionality you need to manager database relationships
+Doctrine provides all the functionality you need to manage database relationships
 (also known as associations). For info, see :doc:`/doctrine/associations`.
 
 Final Thoughts

doctrine.rst

@@ -193,9 +193,8 @@ These four headers are used to help cache your responses via *two* different mod
 
     All of the HTTP headers you'll read about are *not* invented by Symfony! They're
     part of an HTTP specification that's used by sites all over the web. To dig deeper
-    into HTTP Caching, check out the original `RFC 2616`_ document, or these two
-    other pieces: `P4 - Conditional Requests`_ and `P6 -
-    Caching: Browser and intermediary caches`_.
+    into HTTP Caching, check out the documents `RFC 7234 - Caching`_ and 
+    `RFC 7232 - Conditional Requests`_.
 
     As a web developer, you are strongly urged to read the specification. Its
     clarity and power - even more than fifteen years after its creation - is
@@ -364,9 +363,8 @@ Learn more
 .. _`Cache Tutorial`: http://www.mnot.net/cache_docs/
 .. _`Varnish`: https://www.varnish-cache.org/
 .. _`Squid in reverse proxy mode`: http://wiki.squid-cache.org/SquidFaq/ReverseProxy
-.. _`RFC 2616`: http://tools.ietf.org/html/rfc2616
 .. _`HTTP Bis`: http://tools.ietf.org/wg/httpbis/
-.. _`P4 - Conditional Requests`: http://tools.ietf.org/html/draft-ietf-httpbis-p4-conditional
-.. _`P6 - Caching: Browser and intermediary caches`: http://tools.ietf.org/html/draft-ietf-httpbis-p6-cache
+.. _`RFC 7234 - Caching`: https://tools.ietf.org/html/rfc7234
+.. _`RFC 7232 - Conditional Requests`: https://tools.ietf.org/html/rfc7232
 .. _`FOSHttpCacheBundle`: http://foshttpcachebundle.readthedocs.org/
 .. _`HTTP specification`: http://www.w3.org/Protocols/rfc2616/rfc2616.html

http_cache.rst

@@ -60,7 +60,7 @@ Configuration
         # src/AppBundle/Resources/config/validation.yml
         AppBundle\Entity\Author:
             constraints:
-                - Callback: [validate]
+                - Callback: validate
 
     .. code-block:: xml
 

reference/constraints/Callback.rst

@@ -173,7 +173,7 @@ Before diving into the specifics of the most common edge cases, the general
 recommendation is to **not rely on the Symfony Kernel version** to decide which
 code to use::
 
-    if (Kernel::VERSION_ID <= 20800) {
+    if (Kernel::VERSION_ID < 20800) {
         // code for Symfony 2.x
     } else {
         // code for Symfony 3.x

setup/bundles.rst

@@ -46,7 +46,7 @@ directory:
         twig:
             # ...
             paths:
-                "%kernel.root_dir%/../vendor/acme/foo-bar/templates": foo_bar
+                '%kernel.root_dir%/../vendor/acme/foo-bar/templates': foo_bar
 
     .. code-block:: xml
 
@@ -96,9 +96,9 @@ specific template doesn't exist.
         twig:
             # ...
             paths:
-                "%kernel.root_dir%/../vendor/acme/themes/theme1": theme
-                "%kernel.root_dir%/../vendor/acme/themes/theme2": theme
-                "%kernel.root_dir%/../vendor/acme/themes/common": theme
+                '%kernel.root_dir%/../vendor/acme/themes/theme1': theme
+                '%kernel.root_dir%/../vendor/acme/themes/theme2': theme
+                '%kernel.root_dir%/../vendor/acme/themes/common': theme
 
     .. code-block:: xml