Skip to content

Commit 2d1aad8

Browse files
committed
Merge remote branch 'bshaffer/misc_typo_fixes'
* bshaffer/misc_typo_fixes: removes unnecessary whitespace in registerNamespaces examples fixes typo in glossary fixes broken link at bottom of templating section editorial fix - 'be sure to always make sure' is redundant fixes link to Controller API fixes small typo in validation.rst
2 parents 481a8e8 + 88f8c07 commit 2d1aad8

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

book/from_flat_php_to_symfony2.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ files in the application and to configure the autoloader:
438438

439439
$loader = new Symfony\Component\ClassLoader\UniversalClassLoader();
440440
$loader->registerNamespaces(array(
441-
'Symfony' => __DIR__.'/vendor/symfony/src',
441+
'Symfony' => __DIR__.'/vendor/symfony/src',
442442
));
443443

444444
$loader->register();

book/page_creation.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ to the ``app/autoload.php`` file (see the :ref:`Autoloading sidebar<autoloading-
6666
.. code-block:: php
6767
6868
$loader->registerNamespaces(array(
69-
'Acme' => __DIR__.'/../src',
69+
'Acme' => __DIR__.'/../src',
7070
// ...
7171
));
7272
@@ -268,7 +268,7 @@ of writing the HTML inside the controller, use a template instead::
268268
.. note::
269269

270270
In order to use the ``render()`` method, you must extend the
271-
:class:`Symfony\Bundle\FrameworkBundle\Controller\Controller` class, which
271+
:class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller` class, which
272272
adds shortcuts for tasks that are common inside controllers.
273273

274274
The ``render()`` method creates a ``Response`` object filled with the content
@@ -466,7 +466,7 @@ about each of these directories in later chapters.
466466
behalf the instance you need a class::
467467
468468
$loader->registerNamespaces(array(
469-
'Acme' => __DIR__.'/../src',
469+
'Acme' => __DIR__.'/../src',
470470
// ...
471471
));
472472
@@ -619,8 +619,8 @@ tools later.
619619

620620
.. tip::
621621

622-
Whenever creating a new bundle or using a third-party bundle, be sure
623-
to always make sure that the bundle has been enabled in ``registerBundles()``.
622+
Whenever creating a new bundle or using a third-party bundle, always make
623+
sure the bundle has been enabled in ``registerBundles()``.
624624

625625
Bundle Directory Structure
626626
~~~~~~~~~~~~~~~~~~~~~~~~~~

book/templating.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1121,7 +1121,7 @@ and in Symfony2, that's absolutely fine.
11211121
Learn more from the Cookbook
11221122
----------------------------
11231123

1124-
* :doc:`/cookbook/controller/PHP`
1124+
* :doc:`/cookbook/templating/PHP`
11251125
* :doc:`/cookbook/controller/error_pages`
11261126

11271127
.. _`Twig`: http://www.twig-project.org

book/validation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ For more information, see the :doc:`Forms</book/forms>` chapter.
212212
Configuration
213213
-------------
214214

215-
To use the Symfony2 validator, ensure that it's enable in your application
215+
To use the Symfony2 validator, ensure that it's enabled in your application
216216
configuration:
217217

218218
.. configuration-block::

glossary.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Glossary
2727
lives inside a bundle. (see :ref:`page-creation-bundles`)
2828

2929
Front Controller
30-
A *Front Controller* is a short PHP that lives in the web directory
30+
A *Front Controller* is a short PHP script that lives in the web directory
3131
of your project. Typically, *all* requests are handled by executing
3232
the same front controller, whose job is to bootstrap the Symfony
3333
application.

0 commit comments

Comments
 (0)