merged branch sstok/spelling-fix (PR #4275)

Commits
-------

bbf7183 [Routing] fixed spelling errors in phpdoc

Discussion
----------

[Routing] fixed spelling errors in phpdoc

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes

---------------------------------------------------------------------------

by travisbot at 2012-05-14T11:17:26Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1326017) (merged bbf7183c into 8d7f7f5b).
This commit is contained in:
Fabien Potencier 2012-05-14 13:26:54 +02:00
commit 72b2f6984c
2 changed files with 2 additions and 2 deletions

View File

@ -29,7 +29,7 @@ class UrlGenerator implements UrlGeneratorInterface
{
protected $context;
protected $decodedChars = array(
// %2F is not valid in a URL, so we don't encode it (which is fine as the requirements explicitely allowed it)
// %2F is not valid in a URL, so we don't encode it (which is fine as the requirements explicitly allowed it)
'%2F' => '/',
);

View File

@ -17,7 +17,7 @@ use Symfony\Component\Config\Resource\ResourceInterface;
* A RouteCollection represents a set of Route instances.
*
* When adding a route, it overrides existing routes with the
* same name defined in theinstance or its children and parents.
* same name defined in the instance or its children and parents.
*
* @author Fabien Potencier <fabien@symfony.com>
*