From 1a587c51c28ff7ab7a590e74f39c08d65aa0a33f Mon Sep 17 00:00:00 2001 From: WouterJ Date: Sun, 1 Mar 2015 16:15:22 +0100 Subject: [PATCH 1/5] Added February changelog --- changelog.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/changelog.rst b/changelog.rst index d718537af87..e5116fa08ab 100644 --- a/changelog.rst +++ b/changelog.rst @@ -12,13 +12,13 @@ documentation. Do you also want to participate in the Symfony Documentation? Take a look at the ":doc:`/contributing/documentation/overview`" article. - February, 2015 -------------- New Documentation ~~~~~~~~~~~~~~~~~ +- `16dcf53 `_ #4980 [#4974] Added Twig loader priority Documentation (wizhippo) - `a25da10 `_ #4966 [#4231] Clarify that only the main command triggers events (riperez) - `c6bea37 `_ #4957 Added a mention to the @Security annotation (javiereguiluz) - `9cce63c `_ #4924 [swiftmailer] Document whitelist option to email redirect (TerjeBr) @@ -44,10 +44,13 @@ Minor Documentation Changes - `ff44111 `_ Merge branch '2.3' into 2.5 - `2a29225 `_ #4985 Fixed a typo (javiereguiluz) - `f75bc2b `_ #4972 Fix typos (ifdattic) +- `89e626f `_ #4952 symfony 2.7 requires at least php 5.3.9 (scaytrase) - `9fab10b `_ #4854 Removed no longer needed information about PHP 5.3 (WouterJ) - `1726054 `_ #4500 Link to standard edition (harikt) - `91ff6f8 `_ #4329 ensure consistency with the note (greg0ire) +- `f4ab4b6 `_ #5002 Revert very bad merge (WouterJ) - `e5dbd49 `_ #4977 Unnecessary comma (edsonmedina) +- `ed80100 `_ #4977 Unnecessary comma (edsonmedina) - `5d44987 `_ #4991 Fixed typo and tweaked syntax. (cdvrooman) - `b1aadbf `_ #4993 Bumped symfony version number to 2.6 in flat php composer.json example (TSchuermans) - `3845c9c `_ #4979 require_once path fixed (mvanmeerbeck) From 653ac94c95a82de79984bbf62152451431310b7f Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Mon, 2 Mar 2015 08:59:59 +0100 Subject: [PATCH 2/5] fix changelog syntax Terminate the `tip` directive with a blank line. --- changelog.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.rst b/changelog.rst index e5116fa08ab..a23cd8ad4c0 100644 --- a/changelog.rst +++ b/changelog.rst @@ -12,6 +12,7 @@ documentation. Do you also want to participate in the Symfony Documentation? Take a look at the ":doc:`/contributing/documentation/overview`" article. + February, 2015 -------------- From e84182d009949532a8bec606a51f79d15e813d3d Mon Sep 17 00:00:00 2001 From: WouterJ Date: Sun, 5 Apr 2015 17:28:59 +0200 Subject: [PATCH 3/5] Added March changelog --- changelog.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.rst b/changelog.rst index ec6efa1d502..c5460dec526 100644 --- a/changelog.rst +++ b/changelog.rst @@ -106,6 +106,7 @@ Minor Documentation Changes - `3be0081 `_ #4976 Improved sentence (edsonmedina) - `a444220 `_ #4885 Fix typos (ifdattic) - `482502d `_ #4793 [Contributing] Several tweaks (xelaris) +- `a2395ef `_ #5054 [Changelog] fix changelog syntax (xabbuh) - `6b66f03 `_ #5003 Updated the generic Deployment article (javiereguiluz) - `39a1487 `_ #4999 Fixed semantic error (beni0888) From 0c089ec73a3aa77321c961cf6e982497328e3faf Mon Sep 17 00:00:00 2001 From: jackdelin Date: Thu, 28 May 2015 17:13:09 +0300 Subject: [PATCH 4/5] Update create_form_type_extension.rst --- cookbook/form/create_form_type_extension.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook/form/create_form_type_extension.rst b/cookbook/form/create_form_type_extension.rst index 651d53ce849..ab1703c7596 100644 --- a/cookbook/form/create_form_type_extension.rst +++ b/cookbook/form/create_form_type_extension.rst @@ -195,7 +195,7 @@ it in the view:: use Symfony\Component\Form\FormView; use Symfony\Component\Form\FormInterface; use Symfony\Component\PropertyAccess\PropertyAccess; - use Symfony\Component\OptionsResolver\OptionsResolverInterface; + use Symfony\Component\OptionsResolver\OptionsResolver; class ImageTypeExtension extends AbstractTypeExtension { From a8c8c8d44c13e6489de8f507e79be8715f63a40a Mon Sep 17 00:00:00 2001 From: Oskar Stark Date: Tue, 18 Aug 2015 11:43:54 +0200 Subject: [PATCH 5/5] added example for info() --- components/config/definition.rst | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/components/config/definition.rst b/components/config/definition.rst index 27beb52e4d6..1dc62736b4f 100644 --- a/components/config/definition.rst +++ b/components/config/definition.rst @@ -295,6 +295,31 @@ the ``config:dump`` command. Since Symfony 2.6, the info will also be added to the exception message when an invalid type is given. +.. code-block:: php + + $rootNode + ->children() + ->inetegerNode('entries_per_page') + ->info('This value is only used for the search results page.') + ->devaultValue(25) + ->end() + ->end() + ; + +In YAML you may have: + +.. code-block:: yaml + + # This value is only used for the search results page. + entries_per_page: 25 + +and in XML: + +.. code-block:: xml + + + + Optional Sections -----------------