diff --git a/README.markdown b/README.markdown index 498ccb7adb9..33b41b86a96 100644 --- a/README.markdown +++ b/README.markdown @@ -6,10 +6,10 @@ This documentation is rendered online at http://symfony.com/doc/current/ Contributing ------------ ->**Note** ->Unless you're documenting a feature that's new to a specific version of Symfony ->(e.g. Symfony 2.2), all pull requests must be based off of the **2.1** branch, ->**not** the master or 2.2 branch. +> **Note** +> Unless you're documenting a feature that's new to a specific version of Symfony +> (e.g. Symfony 2.2), all pull requests must be based off of the **2.2** +> branch. We love contributors! For more information on how you can contribute to the Symfony documentation, please read diff --git a/book/forms.rst b/book/forms.rst index 272eae5e86e..1c2b7286083 100644 --- a/book/forms.rst +++ b/book/forms.rst @@ -1603,7 +1603,7 @@ Learn more from the Cookbook .. _`Symfony2 Form Component`: https://github.com/symfony/Form .. _`DateTime`: http://php.net/manual/en/class.datetime.php -.. _`Twig Bridge`: https://github.com/symfony/symfony/tree/2.2/src/Symfony/Bridge/Twig -.. _`form_div_layout.html.twig`: https://github.com/symfony/symfony/blob/2.2/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig +.. _`Twig Bridge`: https://github.com/symfony/symfony/tree/current/src/Symfony/Bridge/Twig +.. _`form_div_layout.html.twig`: https://github.com/symfony/symfony/blob/current/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig .. _`Cross-site request forgery`: http://en.wikipedia.org/wiki/Cross-site_request_forgery -.. _`view on GitHub`: https://github.com/symfony/symfony/tree/2.2/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form +.. _`view on GitHub`: https://github.com/symfony/symfony/tree/current/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form diff --git a/contributing/community/releases.rst b/contributing/community/releases.rst index 3a43ba425d2..ea54a3eda98 100644 --- a/contributing/community/releases.rst +++ b/contributing/community/releases.rst @@ -65,7 +65,7 @@ Below is the schedule for the first few versions that use this release model: This results in very predictable dates and maintenance periods. -* *(special)* Symfony 2.2 will be released at the end of February 2013; +* *(special)* Symfony 2.2 was released at the end of February 2013; * *(special)* Symfony 2.3 (the first LTS) will be released at the end of May 2013; * Symfony 2.4 will be released at the end of November 2013; @@ -98,7 +98,7 @@ Rationale This release process was adopted to give more *predictability* and *transparency*. It was discussed based on the following goals: - +was * Shorten the release cycle (allow developers to benefit from the new features faster); * Give more visibility to the developers using the framework and Open-Source diff --git a/contributing/documentation/overview.rst b/contributing/documentation/overview.rst index e48a1d73ca6..f01bd701c73 100644 --- a/contributing/documentation/overview.rst +++ b/contributing/documentation/overview.rst @@ -155,7 +155,7 @@ Whenever a new minor version of Symfony2 is released (e.g. 2.3, 2.4, etc), a new branch of the documentation is created from the ``master`` branch. At this point, all the ``versionadded`` tags for Symfony2 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`` +today, and 2.3 had recently reached its end-of-life, the 2.3 ``versionadded`` tags would be removed from the new 2.5 branch. Standards diff --git a/cookbook/form/form_customization.rst b/cookbook/form/form_customization.rst index def162d82ea..562da507f4b 100644 --- a/cookbook/form/form_customization.rst +++ b/cookbook/form/form_customization.rst @@ -969,4 +969,4 @@ customizations directly. Look at the following example: The array passed as the second argument contains form "variables". For more details about this concept in Twig, see :ref:`twig-reference-form-variables`. -.. _`form_div_layout.html.twig`: https://github.com/symfony/symfony/blob/2.2/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig +.. _`form_div_layout.html.twig`: https://github.com/symfony/symfony/blob/current/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig