Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 3470c87

Browse filesBrowse files
committed
Merge branch '2.5' into 2.6
2 parents 640b29e + 2bed07c commit 3470c87
Copy full SHA for 3470c87

File tree

Expand file treeCollapse file tree

4 files changed

+6
-6
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+6
-6
lines changed

‎book/http_fundamentals.rst

Copy file name to clipboardExpand all lines: book/http_fundamentals.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,8 @@ have all the request information at your fingertips::
242242
$request->headers->get('host');
243243
$request->headers->get('content_type');
244244

245-
$request->getMethod(); // GET, POST, PUT, DELETE, HEAD
246-
$request->getLanguages(); // an array of languages the client accepts
245+
$request->getMethod(); // GET, POST, PUT, DELETE, HEAD
246+
$request->getLanguages(); // an array of languages the client accepts
247247

248248
As a bonus, the ``Request`` class does a lot of work in the background that
249249
you'll never need to worry about. For example, the ``isSecure()`` method

‎book/installation.rst

Copy file name to clipboardExpand all lines: book/installation.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Creating Symfony Applications without the Installer
108108

109109
If you still use PHP 5.3, or if you can't execute the installer for any reason,
110110
you can create Symfony applications using the alternative installation method
111-
based con `Composer`_.
111+
based on `Composer`_.
112112

113113
Composer is the dependency manager used by modern PHP applications and it can
114114
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.
364364
at this cookbook article: ":doc:`/cookbook/bundles/remove`"
365365

366366
.. _`Symfony Release process`: http://symfony.com/doc/current/contributing/community/releases.html
367-
.. _`explained in this post`: http://fabien.potencier.org.nyud.net/article/73/signing-project-releases
367+
.. _`explained in this post`: http://fabien.potencier.org/article/73/signing-project-releases
368368
.. _`Composer`: http://getcomposer.org/
369369
.. _`Composer download page`: https://getcomposer.org/download/
370370
.. _`Apache`: http://httpd.apache.org/docs/current/mod/core.html#documentroot

‎cookbook/composer.rst

Copy file name to clipboardExpand all lines: cookbook/composer.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ To install Composer on Linux or Mac OS X, execute the following two commands:
1717
$ curl -sS https://getcomposer.org/installer | php
1818
$ sudo mv composer.phar /usr/local/bin/composer
1919
20-
-.. note::
20+
.. note::
2121

2222
If you don't have ``curl`` installed, you can also just download the
2323
``installer`` file manually at http://getcomposer.org/installer and

‎reference/configuration/framework.rst

Copy file name to clipboardExpand all lines: reference/configuration/framework.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ cache
571571
**type**: ``string``
572572

573573
This value is used to determine the service that is used to persist class
574-
metadata in a cache. The actual service name is built by prefix the configured
574+
metadata in a cache. The actual service name is built by prefixing the configured
575575
value with ``validator.mapping.cache.`` (e.g. if the value is ``apc``, the
576576
``validator.mapping.cache.apc`` service will be injected). The service has
577577
to implement the :class:`Symfony\\Component\\Validator\\Mapping\\Cache\\CacheInterface`.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.