Skip to content

Commit 0cc1a38

Browse files
committed
Merge pull request symfony#3189 from bicpi/component_names_consistency_2_3_only
2.3 only: Making consistent component names
2 parents 36ed7b9 + 4c2348c commit 0cc1a38

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Diff for: components/debug.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
The Debug Component
66
===================
77

8-
The Debug Component provides tools to ease debugging PHP code.
8+
The Debug component provides tools to ease debugging PHP code.
99

1010
.. versionadded:: 2.3
11-
The Debug Component is new to Symfony 2.3. Previously, the classes were
12-
located in the ``HttpKernel`` component.
11+
The Debug component is new to Symfony 2.3. Previously, the classes were
12+
located in the HttpKernel component.
1313

1414
Installation
1515
------------

Diff for: components/intl.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ code::
6666
The intl extension internally uses the `ICU library`_ to obtain localization
6767
data such as number formats in different languages, country names and more.
6868
To make this data accessible to userland PHP libraries, Symfony2 ships a copy
69-
in the `ICU component`_.
69+
in the `Icu component`_.
7070

7171
Depending on the ICU version compiled with your intl extension, a matching
7272
version of that component needs to be installed. It sounds complicated,
@@ -87,7 +87,7 @@ code::
8787

8888
For example, consider that your development machines ship ICU 4.8 and the server
8989
ICU 4.2. When you run ``php composer.phar update`` on the development machine, version
90-
1.2.* of the ICU component will be installed. But after deploying the
90+
1.2.* of the Icu component will be installed. But after deploying the
9191
application, ``php composer.phar install`` will fail with the following error:
9292

9393
.. code-block:: bash
@@ -102,7 +102,7 @@ code::
102102
library icu has the wrong version installed or is missing from your
103103
system, make sure to have the extension providing it.
104104
105-
The error tells you that the requested version of the ICU component, version
105+
The error tells you that the requested version of the Icu component, version
106106
1.2, is not compatible with PHP's ICU version 4.2.
107107

108108
One solution to this problem is to run ``php composer.phar update`` instead of
@@ -118,7 +118,7 @@ code::
118118
$ php -i | grep ICU
119119
ICU version => 4.2.1
120120
121-
Then fix the ICU component in your composer.json file to a matching version:
121+
Then fix the Icu component in your ``composer.json`` file to a matching version:
122122

123123
.. code-block:: json
124124
@@ -408,7 +408,7 @@ to the current default locale::
408408
That's all you need to know for now. Have fun coding!
409409

410410
.. _Packagist: https://packagist.org/packages/symfony/intl
411-
.. _ICU component: https://packagist.org/packages/symfony/icu
411+
.. _Icu component: https://packagist.org/packages/symfony/icu
412412
.. _intl extension: http://www.php.net/manual/en/book.intl.php
413413
.. _install the intl extension: http://www.php.net/manual/en/intl.setup.php
414414
.. _ICU library: http://site.icu-project.org/

Diff for: cookbook/configuration/front_controllers_and_kernel.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ to `decorate`_ the kernel with additional features. Examples include:
4646
* Adding HTTP level caching by wrapping the kernel with an instance of
4747
:ref:`AppCache <symfony-gateway-cache>`;
4848
* Enabling (or skipping) the :doc:`ClassCache </cookbook/debugging>`
49-
* Enabling the :doc:`Debug Component </components/debug>`.
49+
* Enabling the :doc:`Debug component </components/debug>`.
5050

5151
The front controller can be chosen by requesting URLs like:
5252

0 commit comments

Comments
 (0)