10000 Merge branch '2.3' · symfony/symfony-docs@4dfdb36 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4dfdb36

Browse files
weaverryanweaverryan
committed
Merge branch '2.3'
2 parents b9b60d7 + 6af9d41 commit 4dfdb36

File tree

4 files changed

+43
-32
lines changed

4 files changed

+43
-32
lines changed

‎book/propel.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,6 @@ You should read the dedicated section for `Propel commands in Symfony2`_.
478478

479479
.. _`Working With Symfony2`: http://propelorm.org/Propel/cookbook/symfony2/working-with-symfony2.html#installation
480480
.. _`PropelBundle configuration section`: http://propelorm.org/Propel/cookbook/symfony2/working-with-symfony2.html#configuration
481-
.. _`Relationships`: http://propelorm.org/documentation/04-relationships.html
482-
.. _`Behaviors reference section`: http://propelorm.org/documentation/#behaviors-reference
481+
.. _`Relationships`: http://propelorm.org/Propel/documentation/04-relationships.html
482+
.. _`Behaviors reference section`: http://propelorm.org/Propel/documentation/#behaviors-reference
483483
.. _`Propel commands in Symfony2`: http://propelorm.org/Propel/cookbook/symfony2/working-with-symfony2#the-commands

‎cookbook/index.rst

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,31 @@ The Cookbook
44
.. toctree::
55
:hidden:
66

7-
workflow/index
8-
controller/index
9-
routing/index
107
assetic/index
11-
doctrine/index
12-
form/index
13-
validation/index
14-
configuration/index
15-
serializer
16-
service_container/index
17-
session/index
188
bundles/index
19-
email/index
20-
testing/index
21-
security/index
229
cache/index
23-
templating/index
24-
logging/index
10+
configuration/index
2511
console/index
12+
controller/index
2613
debugging
14+
deployment-tools
15+
doctrine/index
16+
email/index
2717
event_dispatcher/index
18+
form/index
19+
logging/index
20+
profiler/index
2821
request/index
22+
routing/index
23+
security/index
24+
serializer
25+
service_container/index
2926
session/index
30-
profiler/index
31-
web_services/index
3227
symfony1
33-
deployment-tools
28+
templating/index
29+
testing/index
30+
validation/index
31+
web_services/index
32+
workflow/index
3433

3534
.. include:: /cookbook/map.rst.inc

‎reference/forms/types/datetime.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ data can be a ``DateTime`` object, a string, a timestamp or an array.
1717
+----------------------+-----------------------------------------------------------------------------+
1818
| Options | - `date_widget`_ |
1919
| | - `time_widget`_ |
20+
| | - `widget`_ |
2021
| | - `input`_ |
2122
| | - `date_format`_ |
2223
| | - `hours`_ |
@@ -59,6 +60,15 @@ time_widget
5960

6061
Defines the ``widget`` option for the :doc:`time </reference/forms/types/time>` type
6162

63+
widget
64+
~~~~~~
65+
66+
**type**: ``string`` **default**: ``null``
67+
68+
Defines the ``widget`` option for both the :doc:`date </reference/forms/types/date>`
69+
type and :doc:`time </reference/forms/types/time>` type. This can be overridden with
70+
the `date_widget`_ and `time_widget`_ options.
71+
6272
input
6373
~~~~~
6474

‎reference/twig_reference.rst

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Functions
2929
| ``render(path('route', {params}))`` | |
3030
| ``render(url('route', {params}))`` | |
3131
+----------------------------------------------------+--------------------------------------------------------------------------------------------+
32-
| ``render_esi(controller('B:C:a', {params}))`` | This will generates an ESI tag when possible or fallback to the ``render`` |
32+
| ``render_esi(controller('B:C:a', {params}))`` | This will generate an ESI tag when possible or fallback to the ``render`` |
3333
| ``render_esi(url('route', {params}))`` | behavior otherwise. For more information, see :ref:`templating-embedding-controller`. |
3434
| ``render_esi(path('route', {params}))`` | |
3535
+- 341A ---------------------------------------------------+--------------------------------------------------------------------------------------------+
@@ -82,25 +82,28 @@ Functions
8282
+----------------------------------------------------+--------------------------------------------------------------------------------------------+
8383
| ``logout_path(key)`` | This will generate the relative logout URL for the given firewall |
8484
+----------------------------------------------------+--------------------------------------------------------------------------------------------+
85-
| ``logout_url(key)`` | Equal to ``logout_path(...)`` but this will generate an absolute url |
85+
| ``logout_url(key)`` | Equal to ``logout_path(...)`` but this will generate an absolute URL |
8686
+----------------------------------------------------+--------------------------------------------------------------------------------------------+
87-
| ``path(name, parameters = {})`` | Get a relative url for the given route, more information in |
87+
| ``path(name, parameters = {})`` | Get a relative URL for the given route, more information in |
8888
| | ":ref:`book-templating-pages`". |
8989
+----------------------------------------------------+--------------------------------------------------------------------------------------------+
90-
| ``url(name, parameters = {})`` | Equal to ``path(...)`` but it generates an absolute url |
90+
| ``url(name, parameters = {})`` | Equal to ``path(...)`` but it generates an absolute URL |
9191
+----------------------------------------------------+--------------------------------------------------------------------------------------------+
9292

9393
Filters
9494
-------
9595

96+
.. versionadded:: 2.1
97+
The ``humanize`` filter was added in Symfony 2.1
98+
9699
+---------------------------------------------------------------------------------+-------------------------------------------------------------------+
97100
| Filter Syntax | Usage |
98101
+=================================================================================+===================================================================+
99102
| ``text|humanize`` | Makes a technical name human readable (replaces underscores by |
100-
| | spaces and capitalizes the string) |
103+
| | spaces and capitalizes the string). |
101104
+---------------------------------------------------------------------------------+-------------------------------------------------------------------+
102105
| ``text|trans(arguments = {}, domain = 'messages', locale = null)`` | This will translate the text into the current language, more |
103-
| | information in . |
106+
| | information in |
104107
| | :ref:`Translation Filters <book-translation-filters>`. |
105108
+---------------------------------------------------------------------------------+-------------------------------------------------------------------+
106109
| ``text|transchoice(count, arguments = {}, domain = 'messages', locale = null)`` | This will translate the text with pluralization, more information |
@@ -172,8 +175,8 @@ Global Variables
172175
+-------------------------------------------------------+------------------------------------------------------------------------------------+
173176
| Variable | Usage |
174177
+=======================================================+====================================================================================+
175-
| ``app`` *Attributes*: ``app.user``, ``app.request`` | The ``app`` variable is available everywhere, and gives you quick |
176-
| ``app.session``, ``app.environment``, ``app.debug`` | access to many commonly needed objects. The ``app`` variable is |
178+
| ``app`` *Attributes*: ``app.user``, ``app.request``, | The ``app`` variable is available everywhere, and gives you quick |
179+
| ``app.session``, ``app.environment``, ``app.debug``, | access to many commonly needed objects. The ``app`` variable is |
177180
| ``app.security`` | instance of :class:`Symfony\\Bundle\\FrameworkBundle\\Templating\\GlobalVariables` |
178181
+-------------------------------------------------------+------------------------------------------------------------------------------------+
179182

@@ -183,12 +186,11 @@ Symfony Standard Edition Extensions
183186
The Symfony Standard Edition adds some bundles to the Symfony2 Core Framework.
184187
Those bundles can have other Twig extensions:
185188

186-
* **Twig Extension** includes all extensions that do not belong to the
187-
Twig core but can be interesting. You can read more in
188-
`the official Twig Extensions documentation`_
189+
* **Twig Extensions** includes some interesting extensions that do not belong to the
190+
Twig core. You can read more in `the official Twig Extensions documentation`_;
189191
* **Assetic** adds the ``{% stylesheets %}``, ``{% javascripts %}`` and
190192
``{% image %}`` tags. You can read more about them in
191-
:doc:`the Assetic Documentation </cookbook/assetic/asset_management>`;
193+
:doc:`the Assetic Documentation </cookbook/assetic/asset_management>`.
192194

193195
.. _`the official Twig Extensions documentation`: http://twig.sensiolabs.org/doc/extensions/index.html
194196
.. _`http://twig.sensiolabs.org/documentation`: http://twig.sensiolabs.org/documentation

0 commit comments

Comments
 (0)
0