Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit ff8ce24

Browse filesBrowse files
weaverryanweaverryan
committed
Merge branch '2.8' into 3.2
* 2.8: 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 symfony#7999 Small grammatical improvement (catchamonkey)
2 parents 63b585e + b091786 commit ff8ce24
Copy full SHA for ff8ce24

File tree

Expand file treeCollapse file tree

9 files changed

+25
-27
lines changed
Filter options
Expand file treeCollapse file tree

9 files changed

+25
-27
lines changed

‎.platform.app.yaml

Copy file name to clipboardExpand all lines: .platform.app.yaml
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,5 @@ hooks:
5757
export PIP_USER=
5858
pip install pip==9.0.1 wheel==0.29.0
5959
pip install -r _build/.requirements.txt
60+
find .virtualenv -type f -name "*.rst" -delete
6061
make -C _build html

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ sudo: false
66
cache:
77
directories: [$HOME/.cache/pip]
88

9-
install: pip install sphinx~=1.3.0 git+https://github.com/fabpot/sphinx-php.git
9+
install: pip install -r _build/.requirements.txt
1010

11-
script: sphinx-build -nW -c _build/ -b html -d _build/doctrees . _build/html
11+
script: make -C _build SPHINXOPTS=-nW html
1212

1313
branches:
1414
except:

‎_build/.requirements.txt

Copy file name to clipboard
+6-7Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
alabaster==0.7.9
2-
Babel==2.3.4
1+
alabaster==0.7.10
2+
Babel==2.4.0
33
docutils==0.13.1
44
imagesize==0.7.1
5-
Jinja2==2.9.4
6-
MarkupSafe==0.23
5+
Jinja2==2.9.6
6+
MarkupSafe==1.0
77
Pygments==2.2.0
8-
pytz==2016.10
8+
pytz==2017.2
99
requests==2.12.5
1010
six==1.10.0
1111
snowballstemmer==1.2.1
12-
Sphinx==1.5.2
12+
Sphinx==1.3.6
1313
git+https://github.com/fabpot/sphinx-php.git@7312eccce9465640752e51373a480da700e02345#egg_name=sphinx-php
14-

‎reference/configuration/twig.rst

Copy file name to clipboardExpand all lines: reference/configuration/twig.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ TwigBundle Configuration ("twig")
4343
autoescape: ~
4444
4545
# See http://twig.sensiolabs.org/doc/recipes.html#using-the-template-name-to-set-the-default-escaping-strategy
46-
autoescape_service: ~ # Example: '@my_service'
46+
autoescape_service: ~ # Example: 'my_service'
4747
autoescape_service_method: ~ # use in combination with autoescape_service option
4848
base_template_class: ~ # Example: Twig_Template
4949
cache: '%kernel.cache_dir%/twig'

‎reference/constraints/LessThan.rst

Copy file name to clipboardExpand all lines: reference/constraints/LessThan.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ Basic Usage
2323

2424
The following constraints ensure that:
2525

26-
* the number of ``siblings`` of a ``Person`` is less than or equal to ``5``
27-
* ``age`` is less than``80``
26+
* the number of ``siblings`` of a ``Person`` is less than ``5``
27+
* ``age`` is less than ``80``
2828

2929
.. configuration-block::
3030

‎reference/twig_reference.rst

Copy file name to clipboardExpand all lines: reference/twig_reference.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,12 @@ set for the package and the URL path. More information in
126126
:ref:`templating-assets`. For asset versioning, see
127127
:ref:`reference-framework-assets-version`.
128128

129-
assets_version
129+
asset_version
130130
~~~~~~~~~~~~~~
131131

132132
.. code-block:: twig
133133
134-
{{ assets_version(packageName = null) }}
134+
{{ asset_version(packageName = null) }}
135135
136136
``packageName`` *(optional)*
137137
**type**: ``string`` | ``null`` **default**: ``null``

‎routing/conditions.rst

Copy file name to clipboardExpand all lines: routing/conditions.rst
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
How to Restrict Route Matching through Conditions
55
=================================================
66

7-
As you've seen, a route can be made to match only certain routing wildcards
8-
(via regular expressions), HTTP methods, or host names. But the routing system
9-
can be extended to have an almost infinite flexibility using ``conditions``:
7+
A route can be made to match only certain routing placeholders (via regular
8+
expressions), HTTP methods, or host names. If you need more flexibility to
9+
define arbitrary matching logic, use the ``conditions`` routing option:
1010

1111
.. configuration-block::
1212

‎service_container/alias_private.rst

Copy file name to clipboardExpand all lines: service_container/alias_private.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ However, if a service has been marked as private, you can still alias it
7474
.. note::
7575

7676
Services are by default public, but it's considered a good practice to mark
77-
as much services private as possible.
77+
as many services private as possible.
7878

7979
Aliasing
8080
--------

‎templating.rst

Copy file name to clipboardExpand all lines: templating.rst
+7-9Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,19 @@
44
Creating and Using Templates
55
============================
66

7-
As you know, the :doc:`controller </controller>` is responsible for
8-
handling each request that comes into a Symfony application. In reality,
9-
the controller delegates most of the heavy work to other places so that
10-
code can be tested and reused. When a controller needs to generate HTML,
7+
As explained in :doc:`the previous article </controller>`, controllers are
8+
responsible for handling each request that comes into a Symfony application and
9+
the usually end up rendering a template to generate the response contents.
10+
11+
In reality, the controller delegates most of the heavy work to other places so
12+
that code can be tested and reused. When a controller needs to generate HTML,
1113
CSS or any other content, it hands the work off to the templating engine.
14+
1215
In this article, you'll learn how to write powerful templates that can be
1316
used to return content to the user, populate email bodies, and more. You'll
1417
learn shortcuts, clever ways to extend templates and how to reuse template
1518
code.
1619

17-
.. note::
18-
19-
How to render templates is covered in the
20-
:ref:`controller <controller-rendering-templates>` article.
21-
2220
.. index::
2321
single: Templating; What is a template?
2422

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.