Skip to content

Commit

Permalink
unify "Symfony Standard Edition" usages
Browse files Browse the repository at this point in the history
  • Loading branch information
xabbuh committed May 1, 2015
1 parent 85fb0b1 commit 7eb1847
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion book/performance.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ your ``php.ini`` configuration.
Use Composer's Class Map Functionality
--------------------------------------

By default, the Symfony standard edition uses Composer's autoloader
By default, the Symfony Standard Edition uses Composer's autoloader
in the `autoload.php`_ file. This autoloader is easy to use, as it will
automatically find any new classes that you've placed in the registered
directories.
Expand Down
8 changes: 4 additions & 4 deletions cookbook/configuration/front_controllers_and_kernel.rst
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ As you can see, this URL contains the PHP script to be used as the front
controller. You can use that to easily switch the front controller or use
a custom one by placing it in the ``web/`` directory (e.g. ``app_cache.php``).

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

Expand Down Expand Up @@ -145,15 +145,15 @@ configuration from the right *environment*.

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

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

The Standard Edition's `AppKernel`_ class implements this method by simply
The Symfony Standard Edition's `AppKernel`_ class implements this method by simply
loading the ``app/config/config_*environment*.yml`` file. You are, of course,
free to implement this method differently if you need a more sophisticated
way of loading your configuration.
Expand All @@ -165,5 +165,5 @@ way of loading your configuration.
.. _app/console: https://github.com/symfony/symfony-standard/blob/master/app/console
.. _AppKernel: https://github.com/symfony/symfony-standard/blob/master/app/AppKernel.php
.. _decorate: http://en.wikipedia.org/wiki/Decorator_pattern
.. _RewriteRule shipped with the Standard Edition: https://github.com/symfony/symfony-standard/blob/master/web/.htaccess
.. _RewriteRule shipped with the Symfony Standard Edition: https://github.com/symfony/symfony-standard/blob/master/web/.htaccess
.. _template methods: http://en.wikipedia.org/wiki/Template_method_pattern
2 changes: 1 addition & 1 deletion cookbook/logging/monolog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ The basic handler is the ``StreamHandler`` which writes logs in a stream
Monolog comes also with a powerful built-in handler for the logging in
prod environment: ``FingersCrossedHandler``. It allows you to store the
messages in a buffer and to log them only if a message reaches the
action level (``error`` in the configuration provided in the Standard
action level (``error`` in the configuration provided in the Symfony Standard
Edition) by forwarding the messages to another handler.

Using several Handlers
Expand Down
6 changes: 3 additions & 3 deletions cookbook/symfony1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ So, sit back and relax as you travel from "then" to "now".
Directory Structure
-------------------

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

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

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

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

0 comments on commit 7eb1847

Please sign in to comment.