Skip to content

Commit 7eb1847

Browse files
committed
unify "Symfony Standard Edition" usages
1 parent 85fb0b1 commit 7eb1847

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

book/performance.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ your ``php.ini`` configuration.
4646
Use Composer's Class Map Functionality
4747
--------------------------------------
4848

49-
By default, the Symfony standard edition uses Composer's autoloader
49+
By default, the Symfony Standard Edition uses Composer's autoloader
5050
in the `autoload.php`_ file. This autoloader is easy to use, as it will
5151
automatically find any new classes that you've placed in the registered
5252
directories.

cookbook/configuration/front_controllers_and_kernel.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ As you can see, this URL contains the PHP script to be used as the front
5858
controller. You can use that to easily switch the front controller or use
5959
a custom one by placing it in the ``web/`` directory (e.g. ``app_cache.php``).
6060

61-
When using Apache and the `RewriteRule shipped with the Standard Edition`_,
61+
When using Apache and the `RewriteRule shipped with the Symfony Standard Edition`_,
6262
you can omit the filename from the URL and the RewriteRule will use ``app.php``
6363
as the default one.
6464

@@ -145,15 +145,15 @@ configuration from the right *environment*.
145145

146146
Environments have been covered extensively
147147
:doc:`in the previous chapter </cookbook/configuration/environments>`,
148-
and you probably remember that the Standard Edition comes with three
148+
and you probably remember that the Symfony Standard Edition comes with three
149149
of them - ``dev``, ``prod`` and ``test``.
150150

151151
More technically, these names are nothing more than strings passed from the
152152
front controller to the ``AppKernel``'s constructor. This name can then be
153153
used in the :method:`Symfony\\Component\\HttpKernel\\KernelInterface::registerContainerConfiguration`
154154
method to decide which configuration files to load.
155155

156-
The Standard Edition's `AppKernel`_ class implements this method by simply
156+
The Symfony Standard Edition's `AppKernel`_ class implements this method by simply
157157
loading the ``app/config/config_*environment*.yml`` file. You are, of course,
158158
free to implement this method differently if you need a more sophisticated
159159
way of loading your configuration.
@@ -165,5 +165,5 @@ way of loading your configuration.
165165
.. _app/console: https://github.com/symfony/symfony-standard/blob/master/app/console
166166
.. _AppKernel: https://github.com/symfony/symfony-standard/blob/master/app/AppKernel.php
167167
.. _decorate: http://en.wikipedia.org/wiki/Decorator_pattern
168-
.. _RewriteRule shipped with the Standard Edition: https://github.com/symfony/symfony-standard/blob/master/web/.htaccess
168+
.. _RewriteRule shipped with the Symfony Standard Edition: https://github.com/symfony/symfony-standard/blob/master/web/.htaccess
169169
.. _template methods: http://en.wikipedia.org/wiki/Template_method_pattern

cookbook/logging/monolog.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ The basic handler is the ``StreamHandler`` which writes logs in a stream
4646
Monolog comes also with a powerful built-in handler for the logging in
4747
prod environment: ``FingersCrossedHandler``. It allows you to store the
4848
messages in a buffer and to log them only if a message reaches the
49-
action level (``error`` in the configuration provided in the Standard
49+
action level (``error`` in the configuration provided in the Symfony Standard
5050
Edition) by forwarding the messages to another handler.
5151

5252
Using several Handlers

cookbook/symfony1.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ So, sit back and relax as you travel from "then" to "now".
2020
Directory Structure
2121
-------------------
2222

23-
When looking at a Symfony2 project - for example, the `Symfony2 Standard Edition`_ -
23+
When looking at a Symfony2 project - for example, the `Symfony Standard Edition`_ -
2424
you'll notice a very different directory structure than in symfony1. The
2525
differences, however, are somewhat superficial.
2626

@@ -162,7 +162,7 @@ settings defined and Composer takes care of everything for you.
162162
For this to work, all third-party libraries used by your project must be
163163
defined in the ``composer.json`` file.
164164

165-
If you look at the ``HelloController`` from the Symfony2 Standard Edition you
165+
If you look at the ``HelloController`` from the Symfony Standard Edition you
166166
can see that it lives in the ``Acme\DemoBundle\Controller`` namespace. Yet, the
167167
AcmeDemoBundle is not defined in your ``composer.json`` file. Nonetheless are
168168
the files autoloaded. This is because you can tell Composer to autoload files
@@ -365,5 +365,5 @@ primarily to configure objects that you can use. For more information, see
365365
the chapter titled ":doc:`/book/service_container`".
366366

367367
.. _`Composer`: http://getcomposer.org
368-
.. _`Symfony2 Standard Edition`: https://github.com/symfony/symfony-standard
368+
.. _`Symfony Standard Edition`: https://github.com/symfony/symfony-standard
369369
.. _`the Composer documentation`: http://getcomposer.org/doc/04-schema.md#autoload

0 commit comments

Comments
 (0)