Merge branch '2.5' into 2.6

symfony · Dec 31, 2014 · 3470c87 · 3470c87
2 parents 640b29e + 2bed07c
commit 3470c87
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/book/http_fundamentals.rst b/book/http_fundamentals.rst
@@ -242,8 +242,8 @@ have all the request information at your fingertips::
     $request->headers->get('host');
     $request->headers->get('content_type');
 
-    $request->getMethod();          // GET, POST, PUT, DELETE, HEAD
-    $request->getLanguages();       // an array of languages the client accepts
+    $request->getMethod();    // GET, POST, PUT, DELETE, HEAD
+    $request->getLanguages(); // an array of languages the client accepts
 
 As a bonus, the ``Request`` class does a lot of work in the background that
 you'll never need to worry about. For example, the ``isSecure()`` method

diff --git a/book/installation.rst b/book/installation.rst
@@ -108,7 +108,7 @@ Creating Symfony Applications without the Installer
 
 If you still use PHP 5.3, or if you can't execute the installer for any reason,
 you can create Symfony applications using the alternative installation method
-based con `Composer`_.
+based on `Composer`_.
 
 Composer is the dependency manager used by modern PHP applications and it can
 also be used to create new applications based on the Symfony framework. If you
@@ -364,7 +364,7 @@ a wide variety of articles about solving specific problems with Symfony.
     at this cookbook article: ":doc:`/cookbook/bundles/remove`"
 
 .. _`Symfony Release process`: http://symfony.com/doc/current/contributing/community/releases.html
-.. _`explained in this post`: http://fabien.potencier.org.nyud.net/article/73/signing-project-releases
+.. _`explained in this post`: http://fabien.potencier.org/article/73/signing-project-releases
 .. _`Composer`: http://getcomposer.org/
 .. _`Composer download page`: https://getcomposer.org/download/
 .. _`Apache`: http://httpd.apache.org/docs/current/mod/core.html#documentroot

diff --git a/cookbook/composer.rst b/cookbook/composer.rst
@@ -17,7 +17,7 @@ To install Composer on Linux or Mac OS X, execute the following two commands:
     $ curl -sS https://getcomposer.org/installer | php
     $ sudo mv composer.phar /usr/local/bin/composer
 
--.. note::
+.. note::
 
     If you don't have ``curl`` installed, you can also just download the
     ``installer`` file manually at http://getcomposer.org/installer and

diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -571,7 +571,7 @@ cache
 **type**: ``string``
 
 This value is used to determine the service that is used to persist class
-metadata in a cache. The actual service name is built by prefix the configured
+metadata in a cache. The actual service name is built by prefixing the configured
 value with ``validator.mapping.cache.`` (e.g. if the value is ``apc``, the
 ``validator.mapping.cache.apc`` service will be injected). The service has
 to implement the :class:`Symfony\\Component\\Validator\\Mapping\\Cache\\CacheInterface`.