Merge branch '3.2' into 3.3

weaverryan · weaverryan · commit d3aeca942c41 · 2017-06-12T22:30:15.000-04:00
* 3.2: Fix autoescape_service example align travis and platform build environments Minor reword of the intro of the routing/conditions article Minor reword for the intro of the Templating article Update LessThan.rst "Basic Usage" part Fix typo minor #7999 Small grammatical improvement (catchamonkey)
diff --git a/.platform.app.yaml b/.platform.app.yaml
@@ -57,4 +57,5 @@ hooks:
       export PIP_USER=
       pip install pip==9.0.1 wheel==0.29.0
       pip install -r _build/.requirements.txt
+      find .virtualenv -type f -name "*.rst" -delete
       make -C _build html
diff --git a/.travis.yml b/.travis.yml
@@ -6,9 +6,9 @@ sudo: false
 cache:
   directories: [$HOME/.cache/pip]
 
-install: pip install sphinx~=1.3.0 git+https://github.com/fabpot/sphinx-php.git
+install: pip install -r _build/.requirements.txt
 
-script: sphinx-build -nW -c _build/ -b html -d _build/doctrees . _build/html
+script: make -C _build SPHINXOPTS=-nW html
 
 branches:
   except:
diff --git a/_build/.requirements.txt b/_build/.requirements.txt
@@ -1,14 +1,13 @@
-alabaster==0.7.9
-Babel==2.3.4
+alabaster==0.7.10
+Babel==2.4.0
 docutils==0.13.1
 imagesize==0.7.1
-Jinja2==2.9.4
-MarkupSafe==0.23
+Jinja2==2.9.6
+MarkupSafe==1.0
 Pygments==2.2.0
-pytz==2016.10
+pytz==2017.2
 requests==2.12.5
 six==1.10.0
 snowballstemmer==1.2.1
-Sphinx==1.5.2
+Sphinx==1.3.6
 git+https://github.com/fabpot/sphinx-php.git@7312eccce9465640752e51373a480da700e02345#egg_name=sphinx-php
-
diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst
@@ -43,7 +43,7 @@ TwigBundle Configuration ("twig")
             autoescape:                ~
 
             # See http://twig.sensiolabs.org/doc/recipes.html#using-the-template-name-to-set-the-default-escaping-strategy
-            autoescape_service:        ~ # Example: '@my_service'
+            autoescape_service:        ~ # Example: 'my_service'
             autoescape_service_method: ~ # use in combination with autoescape_service option
             base_template_class:       ~ # Example: Twig_Template
             cache:                     '%kernel.cache_dir%/twig'
diff --git a/reference/constraints/LessThan.rst b/reference/constraints/LessThan.rst
@@ -23,8 +23,8 @@ Basic Usage
 
 The following constraints ensure that:
 
-* the number of ``siblings`` of a ``Person`` is less than or equal to ``5``
-* ``age`` is less than``80``
+* the number of ``siblings`` of a ``Person`` is less than ``5``
+* ``age`` is less than ``80``
 
 .. configuration-block::
 
diff --git a/reference/twig_reference.rst b/reference/twig_reference.rst
@@ -126,12 +126,12 @@ set for the package and the URL path. More information in
 :ref:`templating-assets`. For asset versioning, see
 :ref:`reference-framework-assets-version`.
 
-assets_version
+asset_version
 ~~~~~~~~~~~~~~
 
 .. code-block:: twig
 
-    {{ assets_version(packageName = null) }}
+    {{ asset_version(packageName = null) }}
 
 ``packageName`` *(optional)*
     **type**: ``string`` | ``null`` **default**: ``null``
diff --git a/routing/conditions.rst b/routing/conditions.rst
@@ -4,9 +4,9 @@
 How to Restrict Route Matching through Conditions
 =================================================
 
-As you've seen, a route can be made to match only certain routing wildcards
-(via regular expressions), HTTP methods, or host names. But the routing system
-can be extended to have an almost infinite flexibility using ``conditions``:
+A route can be made to match only certain routing placeholders (via regular
+expressions), HTTP methods, or host names. If you need more flexibility to
+define arbitrary matching logic, use the ``conditions`` routing option:
 
 .. configuration-block::
 
diff --git a/templating.rst b/templating.rst
@@ -4,21 +4,19 @@
 Creating and Using Templates
 ============================
 
-As you know, the :doc:`controller </controller>` is responsible for
-handling each request that comes into a Symfony application. In reality,
-the controller delegates most of the heavy work to other places so that
-code can be tested and reused. When a controller needs to generate HTML,
+As explained in :doc:`the previous article </controller>`, controllers are
+responsible for handling each request that comes into a Symfony application and
+the usually end up rendering a template to generate the response contents.
+
+In reality, the controller delegates most of the heavy work to other places so
+that code can be tested and reused. When a controller needs to generate HTML,
 CSS or any other content, it hands the work off to the templating engine.
+
 In this article, you'll learn how to write powerful templates that can be
 used to return content to the user, populate email bodies, and more. You'll
 learn shortcuts, clever ways to extend templates and how to reuse template
 code.
 
-.. note::
-
-    How to render templates is covered in the
-    :ref:`controller <controller-rendering-templates>` article.
-
 .. index::
    single: Templating; What is a template?
 
