Permalink
Browse files

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 bbf7183 into 8d7f7f5).
  • Loading branch information...
2 parents 8d7f7f5 + bbf7183 commit 72b2f6984cf057b01aa93202c93593fc06f686e2 @fabpot fabpot committed May 14, 2012
@@ -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' => '/',
);
@@ -17,7 +17,7 @@
* 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>
*

0 comments on commit 72b2f69

Please sign in to comment.