Skip to content

Commit 18687b9

Browse files
committed
[#1798] Minor tweaks after a bunch of consistency and format fixes
1 parent 0887fee commit 18687b9

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

book/page_creation.rst

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,7 @@ of writing the HTML inside the controller, render a template instead:
301301

302302
In order to use the :method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller::render`
303303
method, your controller must extend the
304-
:class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller` class
305-
(API docs: :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller`),
304+
:class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller` class,
306305
which adds shortcuts for tasks that are common inside controllers. This
307306
is done in the above example by adding the ``use`` statement on line 4
308307
and then extending ``Controller`` on line 6.
@@ -971,21 +970,21 @@ hopefully discovered how easy and flexible it can be. And while there are
971970
in mind:
972971

973972
* Creating a page is a three-step process involving a **route**, a **controller**
974-
And (optionally) a **template**;
973+
and (optionally) a **template**;
975974

976975
* Each project contains just a few main directories: ``web/`` (web assets and
977-
The front controllers), ``app/`` (configuration), ``src/`` (your bundles),
978-
And ``vendor/`` (third-party code) (there's also a ``bin/`` directory that's
979-
Used to help updated vendor libraries);
976+
the front controllers), ``app/`` (configuration), ``src/`` (your bundles),
977+
and ``vendor/`` (third-party code) (there's also a ``bin/`` directory that's
978+
used to help updated vendor libraries);
980979

981980
* Each feature in Symfony2 (including the Symfony2 framework core) is organized
982-
Into a *bundle*, which is a structured set of files for that feature;
981+
into a *bundle*, which is a structured set of files for that feature;
983982

984983
* The **configuration** for each bundle lives in the ``Resources/config``
985-
Directory of the bundle and can be specified in YAML, XML or PHP;
984+
directory of the bundle and can be specified in YAML, XML or PHP;
986985

987986
* The global **application configuration** lives in the ``app/config``
988-
Directory;
987+
directory;
989988

990989
* Each **environment** is accessible via a different front controller (e.g.
991990
``app.php`` and ``app_dev.php``) and loads a different configuration file.

book/security.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1753,7 +1753,7 @@ Learn more from the Cookbook
17531753
* :doc:`Access Control Lists (ACLs) </cookbook/security/acl>`
17541754
* :doc:`/cookbook/security/remember_me`
17551755

1756-
.. _`security component`: https://github.com/symfony/Security
1756+
.. _`Symfony's security component`: https://github.com/symfony/Security
17571757
.. _`JMSSecurityExtraBundle`: https://github.com/schmittjoh/JMSSecurityExtraBundle
17581758
.. _`FOSUserBundle`: https://github.com/FriendsOfSymfony/FOSUserBundle
17591759
.. _`implement the \Serializable interface`: http://php.net/manual/en/class.serializable.php

0 commit comments

Comments
 (0)