Skip to content

Fixes for 2.3 branch #4945

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

Merged
merged 2 commits into from
Jan 31, 2015
Merged

Fixes for 2.3 branch #4945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2aa40e6
Change installation method order
ifdattic Jan 31, 2015
6b3b3bc
Fix typos
ifdattic Jan 31, 2015
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
4 changes: 2 additions & 2 deletions components/intl.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ Installation

You can install the component in two different ways:

* Using the official Git repository (https://github.com/symfony/Intl);
* :doc:`Install it via Composer</components/using_components>` (``symfony/intl`` on `Packagist`_).
* :doc:`Install it via Composer</components/using_components>` (``symfony/intl`` on `Packagist`_);
* Using the official Git repository (https://github.com/symfony/Intl).

If you install the component via Composer, the following classes and functions
of the intl extension will be automatically provided if the intl extension is
Expand Down
4 changes: 2 additions & 2 deletions components/routing/introduction.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ calls a closure and uses the result as a :class:`Symfony\\Component\\Routing\\Ro

use Symfony\Component\Routing\Loader\ClosureLoader;

$closure = function() {
$closure = function () {
return new RouteCollection();
};

Expand All @@ -307,7 +307,7 @@ out here.
The all-in-one Router
~~~~~~~~~~~~~~~~~~~~~

The :class:`Symfony\\Component\\Routing\\Router` class is a all-in-one package
The :class:`Symfony\\Component\\Routing\\Router` class is an all-in-one package
to quickly use the Routing component. The constructor expects a loader instance,
a path to the main route definition and some other settings::

Expand Down