From 2eeb2dfac27f781b1ab3beb69720b68971e0890c Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Mon, 18 Jan 2016 23:57:54 +0100 Subject: [PATCH 01/10] remove versionadded for unmaintained versions --- book/forms.rst | 4 ---- book/testing.rst | 3 --- components/event_dispatcher/introduction.rst | 4 ---- components/form/form_events.rst | 6 ------ components/http_foundation/introduction.rst | 3 --- cookbook/security/csrf_in_login_form.rst | 8 -------- reference/configuration/framework.rst | 11 ----------- reference/configuration/security.rst | 9 --------- 8 files changed, 48 deletions(-) diff --git a/book/forms.rst b/book/forms.rst index 8c43224040d..db36c2660d7 100644 --- a/book/forms.rst +++ b/book/forms.rst @@ -1828,10 +1828,6 @@ section. The ``csrf_token_id`` option is optional but greatly enhances the security of the generated token by making it different for each form. -.. versionadded:: 2.4 - The ``csrf_token_id`` option was introduced in Symfony 2.4. Prior, you - had to use the ``intention`` option. - .. caution:: CSRF tokens are meant to be different for every user. This is why you diff --git a/book/testing.rst b/book/testing.rst index 9dc85d4cba8..5b60af1c780 100644 --- a/book/testing.rst +++ b/book/testing.rst @@ -288,9 +288,6 @@ document:: // ...or simply check that the response is a redirect to any URL $this->assertTrue($client->getResponse()->isRedirect()); - .. versionadded:: 2.4 - Support for HTTP status code constants was introduced in Symfony 2.4. - .. index:: single: Tests; Client diff --git a/components/event_dispatcher/introduction.rst b/components/event_dispatcher/introduction.rst index 8a8654c8901..8a5b678cc95 100644 --- a/components/event_dispatcher/introduction.rst +++ b/components/event_dispatcher/introduction.rst @@ -628,10 +628,6 @@ and so on... Event Name Introspection ~~~~~~~~~~~~~~~~~~~~~~~~ -.. versionadded:: 2.4 - Before Symfony 2.4, the event name and the event dispatcher had to be - requested from the ``Event`` instance. These methods are now deprecated. - The ``EventDispatcher`` instance, as well as the name of the event that is dispatched, are passed as arguments to the listener:: diff --git a/components/form/form_events.rst b/components/form/form_events.rst index f9c72e26a34..d024cbdc3ea 100644 --- a/components/form/form_events.rst +++ b/components/form/form_events.rst @@ -113,9 +113,6 @@ View data Normalized data transformed using a view transformer .. sidebar:: ``FormEvents::POST_SET_DATA`` in the Form component - .. versionadded:: 2.4 - The data collector extension was introduced in Symfony 2.4. - The ``Symfony\Component\Form\Extension\DataCollector\EventListener\DataCollectorListener`` class is subscribed to listen to the ``FormEvents::POST_SET_DATA`` event in order to collect information about the forms from the denormalized @@ -226,9 +223,6 @@ View data Normalized data transformed using a view transformer .. sidebar:: ``FormEvents::POST_SUBMIT`` in the Form component - .. versionadded:: 2.4 - The data collector extension was introduced in Symfony 2.4. - The ``Symfony\Component\Form\Extension\DataCollector\EventListener\DataCollectorListener`` subscribes to the ``FormEvents::POST_SUBMIT`` event in order to collect information about the forms. diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst index 8b9073a1749..8ddf68fa2d4 100644 --- a/components/http_foundation/introduction.rst +++ b/components/http_foundation/introduction.rst @@ -255,9 +255,6 @@ by using the following methods: :method:`Symfony\\Component\\HttpFoundation\\Request::getEncodings` Returns the list of accepted encodings ordered by descending quality. - .. versionadded:: 2.4 - The ``getEncodings()`` method was introduced in Symfony 2.4. - If you need to get full access to parsed data from ``Accept``, ``Accept-Language``, ``Accept-Charset`` or ``Accept-Encoding``, you can use :class:`Symfony\\Component\\HttpFoundation\\AcceptHeader` utility class:: diff --git a/cookbook/security/csrf_in_login_form.rst b/cookbook/security/csrf_in_login_form.rst index c339454ec56..5eabdab0da3 100644 --- a/cookbook/security/csrf_in_login_form.rst +++ b/cookbook/security/csrf_in_login_form.rst @@ -72,10 +72,6 @@ provider available in the Security component: ), )); -.. versionadded:: 2.4 - The ``csrf_token_generator`` option was introduced in Symfony 2.4. Prior, - you had to use the ``csrf_provider`` option. - The Security component can be configured further, but this is all information it needs to be able to use CSRF in the login form. @@ -184,9 +180,5 @@ After this, you have protected your login form against CSRF attacks. ), )); -.. versionadded:: 2.4 - The ``csrf_token_id`` option was introduced in Symfony 2.4. Prior, you - had to use the ``intention`` option. - .. _`Cross-site request forgery`: https://en.wikipedia.org/wiki/Cross-site_request_forgery .. _`Forging Login Requests`: https://en.wikipedia.org/wiki/Cross-site_request_forgery#Forging_login_requests diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst index d9d0bc8c116..97989c67b76 100644 --- a/reference/configuration/framework.rst +++ b/reference/configuration/framework.rst @@ -526,11 +526,6 @@ profiler enabled ....... -.. versionadded:: 2.2 - The ``enabled`` option was introduced in Symfony 2.2. Prior to Symfony - 2.2, the profiler could only be disabled by omitting the ``framework.profiler`` - configuration entirely. - **type**: ``boolean`` **default**: ``false`` The profiler can be enabled by setting this option to ``true``. When you @@ -1397,9 +1392,6 @@ error messages. strict_email ............ -.. versionadded:: 2.5 - The ``strict_email`` option was introduced in Symfony 2.5. - **type**: ``Boolean`` **default**: ``false`` If this option is enabled, the `egulias/email-validator`_ library will be @@ -1409,9 +1401,6 @@ the validator uses a simple regular expression to validate email addresses. api ... -.. versionadded:: 2.5 - The ``api`` option was introduced in Symfony 2.5. - **type**: ``string`` Starting with Symfony 2.5, the Validator component introduced a new validation diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst index e4f99da35d0..593e750bd54 100644 --- a/reference/configuration/security.rst +++ b/reference/configuration/security.rst @@ -13,15 +13,6 @@ Full Default Configuration The following is the full default configuration for the security system. Each part will be explained in the next section. -.. versionadded:: 2.5 - Support for restricting security firewalls to specific http methods was introduced in - Symfony 2.5. - -.. versionadded:: 2.4 - The ``csrf_token_generator`` and ``csrf_token_id`` were introduced in - Symfony 2.4. Prior, you had to use the ``csrf_provider`` and ``intention`` - options. - .. configuration-block:: .. code-block:: yaml From f7eb43df56ade249413b4cc2d586ccdf2bf6f207 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Mon, 18 Jan 2016 23:59:33 +0100 Subject: [PATCH 02/10] replace EOL with EOM IIRC with end-of-life we usually refer to the time when a Symfony release does not receive Security fixes anymore. But we remove all the `versionadded` directives when a Symfony version does not receive bug fixes anymore. --- contributing/documentation/format.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contributing/documentation/format.rst b/contributing/documentation/format.rst index 599d7284152..aec7b9d5866 100644 --- a/contributing/documentation/format.rst +++ b/contributing/documentation/format.rst @@ -194,8 +194,8 @@ how the behavior has changed: Whenever a new minor version of Symfony is released (e.g. 2.4, 2.5, etc), a new branch of the documentation is created from the ``master`` branch. At this point, all the ``versionadded`` tags for Symfony versions that have -reached end-of-life will be removed. For example, if Symfony 2.5 were released -today, and 2.2 had recently reached its end-of-life, the 2.2 ``versionadded`` +reached end-of-maintenance will be removed. For example, if Symfony 2.5 were +released today, and 2.2 had recently reached its end-of-life, the 2.2 ``versionadded`` tags would be removed from the new ``2.5`` branch. Testing Documentation From 60e1d0d0deb7d5c2c089d168ae18958c1d0b7c03 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Tue, 19 Jan 2016 00:02:58 +0100 Subject: [PATCH 03/10] [Reference] add missing version number --- reference/configuration/debug.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/configuration/debug.rst b/reference/configuration/debug.rst index 78a3ba6c85f..1f09def2f4a 100644 --- a/reference/configuration/debug.rst +++ b/reference/configuration/debug.rst @@ -10,7 +10,7 @@ Symfony full-stack framework and can be configured under the ``debug`` key in your application configuration. When using XML, you must use the ``http://symfony.com/schema/dic/debug`` namespace. -.. versionadded:: +.. versionadded:: 2.6 The DebugBundle was introduced in Symfony 2.6. .. tip:: From cfa3bc4303c0658bd0d8e1e6a25f2ec6ac6bf289 Mon Sep 17 00:00:00 2001 From: Ilya Antipenko Date: Tue, 19 Jan 2016 10:33:48 +0200 Subject: [PATCH 04/10] Remove excessive pluses --- cookbook/form/unit_testing.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cookbook/form/unit_testing.rst b/cookbook/form/unit_testing.rst index 3791d0c0aaa..6ab99830165 100644 --- a/cookbook/form/unit_testing.rst +++ b/cookbook/form/unit_testing.rst @@ -165,10 +165,10 @@ It often happens that you use some options that are added by :doc:`form extensions `. One of the cases may be the ``ValidatorExtension`` with its ``invalid_message`` option. The ``TypeTestCase`` only loads the core form extension, which means an -+:class:`Symfony\\Component\\OptionsResolver\\Exception\\InvalidOptionsException` -+will be raised if you try to test a class that depends on other extensions. -+The :method:`Symfony\\Component\\Form\\Test\\TypeTestCase::getExtensions` method -+allows you to return a list of extensions to register:: +:class:`Symfony\\Component\\OptionsResolver\\Exception\\InvalidOptionsException` +will be raised if you try to test a class that depends on other extensions. +The :method:`Symfony\\Component\\Form\\Test\\TypeTestCase::getExtensions` method +allows you to return a list of extensions to register:: // src/AppBundle/Tests/Form/Type/TestedTypeTests.php namespace AppBundle\Tests\Form\Type; From ca7c08c70516fadd26add3b9eb01c5d1b4bdbed6 Mon Sep 17 00:00:00 2001 From: micheal Date: Thu, 7 Jan 2016 22:21:23 -0800 Subject: [PATCH 05/10] Remove phrase "in order" "In order" is usually unnecessary. The same meaning can be conveyed by removing the phrase in this case. --- cookbook/security/entity_provider.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook/security/entity_provider.rst b/cookbook/security/entity_provider.rst index 29a632c38af..e5dc35e601f 100644 --- a/cookbook/security/entity_provider.rst +++ b/cookbook/security/entity_provider.rst @@ -156,7 +156,7 @@ Next, make sure to :ref:`create the database table Date: Wed, 23 Dec 2015 04:22:39 -0600 Subject: [PATCH 06/10] Typo in When Things Get More Advanced --- best_practices/controllers.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/best_practices/controllers.rst b/best_practices/controllers.rst index 6afa28edb01..dc21bc9f767 100644 --- a/best_practices/controllers.rst +++ b/best_practices/controllers.rst @@ -157,7 +157,7 @@ also show a 404 page if no ``Post`` can be found. When Things Get More Advanced ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -This works without any configuration because the wildcard name ``{id}`` matches +The above example works without any configuration because the wildcard name ``{id}`` matches the name of the property on the entity. If this isn't true, or if you have even more complex logic, the easiest thing to do is just query for the entity manually. In our application, we have this situation in ``CommentController``: From 7a95ebbbde84475b54eafb422b82e8a6d9d883fb Mon Sep 17 00:00:00 2001 From: Henry Snoek Date: Sat, 23 Jan 2016 11:13:11 +0100 Subject: [PATCH 07/10] use single quotes for YAML strings --- components/dependency_injection/configurators.rst | 2 +- components/dependency_injection/factories.rst | 2 +- components/dependency_injection/introduction.rst | 2 +- components/dependency_injection/parentservices.rst | 14 +++++++------- components/dependency_injection/types.rst | 2 +- cookbook/logging/monolog.rst | 6 +++--- cookbook/service_container/scopes.rst | 2 +- reference/configuration/twig.rst | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/components/dependency_injection/configurators.rst b/components/dependency_injection/configurators.rst index 109b250ae8e..3c7fedf04ed 100644 --- a/components/dependency_injection/configurators.rst +++ b/components/dependency_injection/configurators.rst @@ -145,7 +145,7 @@ The service config for the above classes would look something like this: newsletter_manager: class: NewsletterManager calls: - - [setMailer, ["@my_mailer"]] + - [setMailer, ['@my_mailer']] configurator: ['@email_configurator', configure] greeting_card_manager: diff --git a/components/dependency_injection/factories.rst b/components/dependency_injection/factories.rst index 8807975d5f8..0f1af359092 100644 --- a/components/dependency_injection/factories.rst +++ b/components/dependency_injection/factories.rst @@ -152,7 +152,7 @@ method in the previous example takes the ``templating`` service as an argument: factory_service: newsletter_manager_factory factory_method: createNewsletterManager arguments: - - "@templating" + - '@templating' .. code-block:: xml diff --git a/components/dependency_injection/introduction.rst b/components/dependency_injection/introduction.rst index b71ac5a926a..42c526652fd 100644 --- a/components/dependency_injection/introduction.rst +++ b/components/dependency_injection/introduction.rst @@ -243,7 +243,7 @@ config files: newsletter_manager: class: NewsletterManager calls: - - [setMailer, ["@mailer"]] + - [setMailer, ['@mailer']] .. code-block:: xml diff --git a/components/dependency_injection/parentservices.rst b/components/dependency_injection/parentservices.rst index 1afcf43b72c..aa1ec8622d8 100644 --- a/components/dependency_injection/parentservices.rst +++ b/components/dependency_injection/parentservices.rst @@ -192,8 +192,8 @@ a parent for a service. mail_manager: abstract: true calls: - - [setMailer, ["@my_mailer"]] - - [setEmailFormatter, ["@my_email_formatter"]] + - [setMailer, ['@my_mailer']] + - [setEmailFormatter, ['@my_email_formatter']] newsletter_manager: class: "NewsletterManager" @@ -320,17 +320,17 @@ to the ``NewsletterManager`` class, the config would look like this: mail_manager: abstract: true calls: - - [setMailer, ["@my_mailer"]] - - [setEmailFormatter, ["@my_email_formatter"]] + - [setMailer, ['@my_mailer']] + - [setEmailFormatter, ['@my_email_formatter']] newsletter_manager: - class: "NewsletterManager" + class: 'NewsletterManager' parent: mail_manager calls: - - [setMailer, ["@my_alternative_mailer"]] + - [setMailer, ['@my_alternative_mailer']] greeting_card_manager: - class: "GreetingCardManager" + class: 'GreetingCardManager' parent: mail_manager .. code-block:: xml diff --git a/components/dependency_injection/types.rst b/components/dependency_injection/types.rst index 87dd02b87c7..3799fdf8ace 100644 --- a/components/dependency_injection/types.rst +++ b/components/dependency_injection/types.rst @@ -126,7 +126,7 @@ that accepts the dependency:: newsletter_manager: class: NewsletterManager calls: - - [setMailer, ["@my_mailer"]] + - [setMailer, ['@my_mailer']] .. code-block:: xml diff --git a/cookbook/logging/monolog.rst b/cookbook/logging/monolog.rst index e3a25bd2a02..e6d66b9469e 100644 --- a/cookbook/logging/monolog.rst +++ b/cookbook/logging/monolog.rst @@ -347,7 +347,7 @@ using a processor. monolog.processor.session_request: class: AppBundle\SessionRequestProcessor - arguments: ["@session"] + arguments: ['@session'] tags: - { name: monolog.processor, method: processRecord } @@ -446,7 +446,7 @@ the ``monolog.processor`` tag: services: monolog.processor.session_request: class: AppBundle\SessionRequestProcessor - arguments: ["@session"] + arguments: ['@session'] tags: - { name: monolog.processor, method: processRecord, handler: main } @@ -497,7 +497,7 @@ the ``monolog.processor`` tag: services: monolog.processor.session_request: class: AppBundle\SessionRequestProcessor - arguments: ["@session"] + arguments: ['@session'] tags: - { name: monolog.processor, method: processRecord, channel: main } diff --git a/cookbook/service_container/scopes.rst b/cookbook/service_container/scopes.rst index 5aa114d50d1..bb58aaf938f 100644 --- a/cookbook/service_container/scopes.rst +++ b/cookbook/service_container/scopes.rst @@ -149,7 +149,7 @@ your code. This should also be taken into account when declaring your service: greeting_card_manager: class: AppBundle\Mail\GreetingCardManager calls: - - [setRequest, ["@?request="]] + - [setRequest, ['@?request=']] .. code-block:: xml diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst index 15c1170299a..9097d55e613 100644 --- a/reference/configuration/twig.rst +++ b/reference/configuration/twig.rst @@ -21,7 +21,7 @@ TwigBundle Configuration ("twig") globals: # Examples: - foo: "@bar" + foo: '@bar' pi: 3.14 # Example options, but the easiest use is as seen above From 6a48af64a6ac09095a3809dc246359faaf975cfb Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 25 Jan 2016 18:22:08 +0100 Subject: [PATCH 08/10] added Javier as a merger for the WebProfiler bundle --- contributing/code/core_team.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contributing/code/core_team.rst b/contributing/code/core_team.rst index 01c9db29270..985912f7905 100644 --- a/contributing/code/core_team.rst +++ b/contributing/code/core_team.rst @@ -69,6 +69,9 @@ Active Core Members * **Christian Flothmann** (`xabbuh`_) can merge into the Yaml_ component. + * **Javier Eguiluz** (`javiereguiluz`_) can merge into the WebProfilerBundle_ + bundle. + * **Deciders** (``@symfony/deciders`` on GitHub): * **Jordi Boggiano** (`seldaek`_); @@ -175,6 +178,7 @@ discretion of the **Project Leader**. .. _TwigBridge: https://github.com/symfony/twig-bridge .. _Validator: https://github.com/symfony/validator .. _Yaml: https://github.com/symfony/yaml +.. _WebProfilerBundle: https://github.com/symfony/web-profiler-bundle .. _`fabpot`: https://github.com/fabpot/ .. _`webmozart`: https://github.com/webmozart/ .. _`Tobion`: https://github.com/Tobion/ @@ -188,3 +192,4 @@ discretion of the **Project Leader**. .. _`weaverryan`: https://github.com/weaverryan/ .. _`aitboudad`: https://github.com/aitboudad/ .. _`xabbuh`: https://github.com/xabbuh/ +.. _`javiereguiluz`: https://github.com/javiereguiluz/ From 674becd10ccc1062d5305e88b411d53b0a0908e8 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Mon, 25 Jan 2016 16:40:26 +0100 Subject: [PATCH 09/10] use valid XML in code block --- book/service_container.rst | 2 +- components/dependency_injection/parameters.rst | 2 +- components/intl.rst | 6 ++++-- cookbook/assetic/apply_to_option.rst | 2 +- cookbook/configuration/override_dir_structure.rst | 2 -- cookbook/deployment/heroku.rst | 2 +- cookbook/doctrine/mongodb_session_storage.rst | 2 +- cookbook/install/unstable_versions.rst | 1 - cookbook/logging/monolog.rst | 15 ++++++++++----- cookbook/logging/monolog_email.rst | 13 +++++++------ cookbook/symfony1.rst | 6 ++++-- cookbook/testing/bootstrap.rst | 1 - 12 files changed, 30 insertions(+), 24 deletions(-) diff --git a/book/service_container.rst b/book/service_container.rst index da165ceae4b..1482d6223d3 100644 --- a/book/service_container.rst +++ b/book/service_container.rst @@ -269,7 +269,7 @@ parameter and uses it in the service definition. .. code-block:: xml - http://symfony.com/?foo=%%s&bar=%%d + http://symfony.com/?foo=%%s&bar=%%d .. caution:: diff --git a/components/dependency_injection/parameters.rst b/components/dependency_injection/parameters.rst index fd2e8f99f9d..e38fd0efd1d 100644 --- a/components/dependency_injection/parameters.rst +++ b/components/dependency_injection/parameters.rst @@ -155,7 +155,7 @@ the parameter value in one place if needed. .. code-block:: xml - http://symfony.com/?foo=%%s&bar=%%d + http://symfony.com/?foo=%%s&bar=%%d .. code-block:: php diff --git a/components/intl.rst b/components/intl.rst index dda3830e4d2..b8047db0cd0 100644 --- a/components/intl.rst +++ b/components/intl.rst @@ -126,8 +126,10 @@ code:: .. code-block:: json - "require: { - "symfony/icu": "1.1.*" + { + "require": { + "symfony/icu": "1.1.*" + } } Set the version to diff --git a/cookbook/assetic/apply_to_option.rst b/cookbook/assetic/apply_to_option.rst index 0e329087506..8f5776c7fe0 100644 --- a/cookbook/assetic/apply_to_option.rst +++ b/cookbook/assetic/apply_to_option.rst @@ -142,7 +142,7 @@ In this case you can specify that the ``coffee`` filter is applied to all bin: /usr/bin/coffee node: /usr/bin/node node_paths: [/usr/lib/node_modules/] - apply_to: "\.coffee$" + apply_to: '\.coffee$' .. code-block:: xml diff --git a/cookbook/configuration/override_dir_structure.rst b/cookbook/configuration/override_dir_structure.rst index d6032b9ce38..a17185e0730 100644 --- a/cookbook/configuration/override_dir_structure.rst +++ b/cookbook/configuration/override_dir_structure.rst @@ -177,12 +177,10 @@ The change in the ``composer.json`` will look like this: .. code-block:: json { - ... "config": { "bin-dir": "bin", "vendor-dir": "/some/dir/vendor" }, - ... } Then, update the path to the ``autoload.php`` file in ``app/autoload.php``:: diff --git a/cookbook/deployment/heroku.rst b/cookbook/deployment/heroku.rst index 92feaabe329..0bb743fada1 100644 --- a/cookbook/deployment/heroku.rst +++ b/cookbook/deployment/heroku.rst @@ -167,7 +167,7 @@ variables, you can issue a single command to prepare your app for a deployment: Next up, it's finally time to deploy your application to Heroku. If you are doing this for the very first time, you may see a message such as the following: -.. code-block:: bash +.. code-block:: text The authenticity of host 'heroku.com (50.19.85.132)' can't be established. RSA key fingerprint is 8b:48:5e:67:0e:c9:16:47:32:f2:87:0c:1f:c8:60:ad. diff --git a/cookbook/doctrine/mongodb_session_storage.rst b/cookbook/doctrine/mongodb_session_storage.rst index 7a2277cb2cc..f4669e936a3 100644 --- a/cookbook/doctrine/mongodb_session_storage.rst +++ b/cookbook/doctrine/mongodb_session_storage.rst @@ -162,7 +162,7 @@ Because MongoDB uses dynamic collection schemas, you do not need to do anything session collection. However, you may want to add an index to improve garbage collection performance. From the `MongoDB shell`_: -.. code-block:: sql +.. code-block:: text use session_db db.session.ensureIndex( { "expires_at": 1 }, { expireAfterSeconds: 0 } ) diff --git a/cookbook/install/unstable_versions.rst b/cookbook/install/unstable_versions.rst index b1d2b9abc77..6d8464c9489 100644 --- a/cookbook/install/unstable_versions.rst +++ b/cookbook/install/unstable_versions.rst @@ -41,7 +41,6 @@ dependency as follows: { "require": { - // ... "symfony/symfony" : "2.7.*@dev" } } diff --git a/cookbook/logging/monolog.rst b/cookbook/logging/monolog.rst index e6d66b9469e..376bf5affba 100644 --- a/cookbook/logging/monolog.rst +++ b/cookbook/logging/monolog.rst @@ -252,17 +252,22 @@ option of your handler to ``rotating_file``: .. code-block:: xml - - + + + max_files="10" /> diff --git a/cookbook/logging/monolog_email.rst b/cookbook/logging/monolog_email.rst index cf801de561b..f23f0510cc6 100644 --- a/cookbook/logging/monolog_email.rst +++ b/cookbook/logging/monolog_email.rst @@ -41,6 +41,7 @@ it is broken down. .. code-block:: xml + + ^/ - --> /> From cdd858ea450d4b2377cd41e64fb70ecbb8103bdc Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Wed, 27 Jan 2016 19:33:41 +0100 Subject: [PATCH 10/10] fix list items --- contributing/code/core_team.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contributing/code/core_team.rst b/contributing/code/core_team.rst index 985912f7905..be7e365543c 100644 --- a/contributing/code/core_team.rst +++ b/contributing/code/core_team.rst @@ -65,9 +65,9 @@ Active Core Members * **Abdellatif AitBoudad** (`aitboudad`_) can merge into the Translation_ component; - * **Jakub Zalas** (`jakzal`_) can merge into the DomCrawler_ component. + * **Jakub Zalas** (`jakzal`_) can merge into the DomCrawler_ component; - * **Christian Flothmann** (`xabbuh`_) can merge into the Yaml_ component. + * **Christian Flothmann** (`xabbuh`_) can merge into the Yaml_ component; * **Javier Eguiluz** (`javiereguiluz`_) can merge into the WebProfilerBundle_ bundle.