From 4c2348c8a333961b842091cde43773364afa0e05 Mon Sep 17 00:00:00 2001 From: Philipp Rieber Date: Fri, 15 Nov 2013 08:18:55 +0100 Subject: [PATCH] 2.3 only: Making consistent component names --- components/debug.rst | 6 +++--- components/intl.rst | 10 +++++----- .../configuration/front_controllers_and_kernel.rst | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/debug.rst b/components/debug.rst index ac7e3a1948a..0d20a13ee9a 100644 --- a/components/debug.rst +++ b/components/debug.rst @@ -5,11 +5,11 @@ The Debug Component =================== - The Debug Component provides tools to ease debugging PHP code. + The Debug component provides tools to ease debugging PHP code. .. versionadded:: 2.3 - The Debug Component is new to Symfony 2.3. Previously, the classes were - located in the ``HttpKernel`` component. + The Debug component is new to Symfony 2.3. Previously, the classes were + located in the HttpKernel component. Installation ------------ diff --git a/components/intl.rst b/components/intl.rst index a335f3a98b3..e65ba77dbf5 100644 --- a/components/intl.rst +++ b/components/intl.rst @@ -66,7 +66,7 @@ code:: The intl extension internally uses the `ICU library`_ to obtain localization data such as number formats in different languages, country names and more. To make this data accessible to userland PHP libraries, Symfony2 ships a copy - in the `ICU component`_. + in the `Icu component`_. Depending on the ICU version compiled with your intl extension, a matching version of that component needs to be installed. It sounds complicated, @@ -87,7 +87,7 @@ code:: For example, consider that your development machines ship ICU 4.8 and the server ICU 4.2. When you run ``php composer.phar update`` on the development machine, version - 1.2.* of the ICU component will be installed. But after deploying the + 1.2.* of the Icu component will be installed. But after deploying the application, ``php composer.phar install`` will fail with the following error: .. code-block:: bash @@ -102,7 +102,7 @@ code:: library icu has the wrong version installed or is missing from your system, make sure to have the extension providing it. - The error tells you that the requested version of the ICU component, version + The error tells you that the requested version of the Icu component, version 1.2, is not compatible with PHP's ICU version 4.2. One solution to this problem is to run ``php composer.phar update`` instead of @@ -118,7 +118,7 @@ code:: $ php -i | grep ICU ICU version => 4.2.1 - Then fix the ICU component in your composer.json file to a matching version: + Then fix the Icu component in your ``composer.json`` file to a matching version: .. code-block:: json @@ -408,7 +408,7 @@ to the current default locale:: That's all you need to know for now. Have fun coding! .. _Packagist: https://packagist.org/packages/symfony/intl -.. _ICU component: https://packagist.org/packages/symfony/icu +.. _Icu component: https://packagist.org/packages/symfony/icu .. _intl extension: http://www.php.net/manual/en/book.intl.php .. _install the intl extension: http://www.php.net/manual/en/intl.setup.php .. _ICU library: http://site.icu-project.org/ diff --git a/cookbook/configuration/front_controllers_and_kernel.rst b/cookbook/configuration/front_controllers_and_kernel.rst index 38526a08823..ecc8db747cb 100644 --- a/cookbook/configuration/front_controllers_and_kernel.rst +++ b/cookbook/configuration/front_controllers_and_kernel.rst @@ -46,7 +46,7 @@ to `decorate`_ the kernel with additional features. Examples include: * Adding HTTP level caching by wrapping the kernel with an instance of :ref:`AppCache `; * Enabling (or skipping) the :doc:`ClassCache ` -* Enabling the :doc:`Debug Component `. +* Enabling the :doc:`Debug component `. The front controller can be chosen by requesting URLs like: