Skip to content

Some version fixes for 2.2 #2692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Some version fixes for 2.2 #2692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your change in #2690 is better :) - so let's remove this. This one doesn't quite make sense.


We love contributors! For more information on how you can contribute to the
Symfony documentation, please read
Expand Down
6 changes: 3 additions & 3 deletions book/forms.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no current, this should be master. Eventually, we should add a sphinx extension so we can generate these file URLs dynamically and have the version change on build (like is done with the :class: links to the API docs). But for now, I think all of these should link to master.

4 changes: 2 additions & 2 deletions contributing/community/releases.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2.3 is also released, should be reflected here, I guess

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, that should be reflected on the 2.3 branch (did that in #2690 )

2013;
* Symfony 2.4 will be released at the end of November 2013;
Expand Down Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was what? :P

* 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
Expand Down
2 changes: 1 addition & 1 deletion contributing/documentation/overview.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, now that we have the "Managing Releases" section, this entire section should be removed.


Standards
Expand Down
2 changes: 1 addition & 1 deletion cookbook/form/form_customization.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

master - just like the other spot