More proper nouns and formatting fixes

Author: bicpi

book/doctrine.rst

@@ -1564,7 +1564,7 @@ Some notable or interesting tasks include:
 .. note::
 
    To be able to load data fixtures to your database, you will need to have
-   the ``DoctrineFixturesBundle`` bundle installed. To learn how to do it,
+   the DoctrineFixturesBundle bundle installed. To learn how to do it,
    read the ":doc:`/bundles/DoctrineFixturesBundle/index`" entry of the
    documentation.
 

book/internals.rst

@@ -66,8 +66,8 @@ Dependency Injection component and a powerful plugin system (bundles).
     :doc:`Dependency Injection </book/service_container>` and
     :doc:`Bundles </cookbook/bundles/best_practices>`.
 
-``FrameworkBundle`` Bundle
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+FrameworkBundle
+~~~~~~~~~~~~~~~
 
 The :namespace:`Symfony\\Bundle\\FrameworkBundle` bundle is the bundle that
 ties the main components and libraries together to make a lightweight and fast
@@ -254,7 +254,7 @@ or setup variables so that a Controller can be called after the event. Any
 listener can return a ``Response`` object via the ``setResponse()`` method on
 the event. In this case, all other listeners won't be called.
 
-This event is used by ``FrameworkBundle`` to populate the ``_controller``
+This event is used by the FrameworkBundle to populate the ``_controller``
 ``Request`` attribute, via the
 :class:`Symfony\\Bundle\\FrameworkBundle\\EventListener\\RouterListener`. RequestListener
 uses a :class:`Symfony\\Component\\Routing\\RouterInterface` object to match
@@ -273,7 +273,7 @@ the ``Request`` and determine the Controller name (stored in the
 
 *Event Class*: :class:`Symfony\\Component\\HttpKernel\\Event\\FilterControllerEvent`
 
-This event is not used by ``FrameworkBundle``, but can be an entry point used
+This event is not used by the FrameworkBundle, but can be an entry point used
 to modify the controller that should be executed::
 
     use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
@@ -299,7 +299,7 @@ to modify the controller that should be executed::
 
 *Event Class*: :class:`Symfony\\Component\\HttpKernel\\Event\\GetResponseForControllerResultEvent`
 
-This event is not used by ``FrameworkBundle``, but it can be used to implement
+This event is not used by the FrameworkBundle, but it can be used to implement
 a view sub-system. This event is called *only* if the Controller does *not*
 return a ``Response`` object. The purpose of the event is to allow some other
 return value to be converted into a ``Response``.
@@ -342,7 +342,7 @@ The purpose of this event is to allow other systems to modify or replace the
         // ... modify the response object
     }
 
-The ``FrameworkBundle`` registers several listeners:
+The FrameworkBundle registers several listeners:
 
 * :class:`Symfony\\Component\\HttpKernel\\EventListener\\ProfilerListener`:
   collects data for the current request;
@@ -387,7 +387,7 @@ was already served to the client.
 
 *Event Class*: :class:`Symfony\\Component\\HttpKernel\\Event\\GetResponseForExceptionEvent`
 
-``FrameworkBundle`` registers an
+The FrameworkBundle registers an
 :class:`Symfony\\Component\\HttpKernel\\EventListener\\ExceptionListener` that
 forwards the ``Request`` to a given Controller (the value of the
 ``exception_listener.controller`` parameter -- must be in the

book/page_creation.rst

@@ -840,7 +840,7 @@ format you prefer:
 
 Each top-level entry like ``framework`` or ``twig`` defines the configuration
 for a particular bundle. For example, the ``framework`` key defines the configuration
-for the core Symfony ``FrameworkBundle`` and includes configuration for the
+for the core Symfony FrameworkBundle and includes configuration for the
 routing, templating, and other core systems.
 
 For now, don't worry about the specific configuration options in each section.

book/security.rst

@@ -1007,7 +1007,7 @@ authorization from inside a controller::
 
 .. _book-security-securing-controller-annotations:
 
-You can also choose to install and use the optional ``JMSSecurityExtraBundle``,
+You can also choose to install and use the optional JMSSecurityExtraBundle,
 which can secure your controller using annotations::
 
     // ...

book/service_container.rst

@@ -464,9 +464,9 @@ In other words, a service container extension configures the services for
 a bundle on your behalf. And as you'll see in a moment, the extension provides
 a sensible, high-level interface for configuring the bundle.
 
-Take the ``FrameworkBundle`` - the core Symfony2 framework bundle - as an
+Take the FrameworkBundle - the core Symfony2 framework bundle - as an
 example. The presence of the following code in your application configuration
-invokes the service container extension inside the ``FrameworkBundle``:
+invokes the service container extension inside the FrameworkBundle:
 
 .. configuration-block::
 
@@ -514,21 +514,21 @@ invokes the service container extension inside the ``FrameworkBundle``:
 
 When the configuration is parsed, the container looks for an extension that
 can handle the ``framework`` configuration directive. The extension in question,
-which lives in the ``FrameworkBundle``, is invoked and the service configuration
-for the ``FrameworkBundle`` is loaded. If you remove the ``framework`` key
+which lives in the FrameworkBundle, is invoked and the service configuration
+for the FrameworkBundle is loaded. If you remove the ``framework`` key
 from your application configuration file entirely, the core Symfony2 services
 won't be loaded. The point is that you're in control: the Symfony2 framework
 doesn't contain any magic or perform any actions that you don't have control
 over.
 
 Of course you can do much more than simply "activate" the service container
-extension of the ``FrameworkBundle``. Each extension allows you to easily
+extension of the FrameworkBundle. Each extension allows you to easily
 customize the bundle, without worrying about how the internal services are
 defined.
 
 In this case, the extension allows you to customize the ``error_handler``,
 ``csrf_protection``, ``router`` configuration and much more. Internally,
-the ``FrameworkBundle`` uses the options specified here to define and configure
+the FrameworkBundle uses the options specified here to define and configure
 the services specific to it. The bundle takes care of creating all the necessary
 ``parameters`` and ``services`` for the service container, while still allowing
 much of the configuration to be easily customized. As an added bonus, most
@@ -934,7 +934,7 @@ the framework.
     Be sure that the ``swiftmailer`` entry appears in your application
     configuration. As was mentioned in :ref:`service-container-extension-configuration`,
     the ``swiftmailer`` key invokes the service extension from the
-    ``SwiftmailerBundle``, which registers the ``mailer`` service.
+    SwiftmailerBundle, which registers the ``mailer`` service.
 
 .. _book-service-container-tags:
 
@@ -975,7 +975,7 @@ to be used for a specific purpose. Take the following example:
         $definition->addTag('twig.extension');
         $container->setDefinition('foo.twig.extension', $definition);
 
-The ``twig.extension`` tag is a special tag that the ``TwigBundle`` uses
+The ``twig.extension`` tag is a special tag that the TwigBundle uses
 during configuration. By giving the service this ``twig.extension`` tag,
 the bundle knows that the ``foo.twig.extension`` service should be registered
 as a Twig extension with Twig. In other words, Twig finds all services tagged

book/templating.rst

@@ -1278,10 +1278,10 @@ Overriding Core Templates
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Since the Symfony2 framework itself is just a bundle, core templates can be
-overridden in the same way. For example, the core ``TwigBundle`` contains
+overridden in the same way. For example, the core TwigBundle contains
 a number of different "exception" and "error" templates that can be overridden
 by copying each from the ``Resources/views/Exception`` directory of the
-``TwigBundle`` to, you guessed it, the
+TwigBundle to, you guessed it, the
 ``app/Resources/TwigBundle/views/Exception`` directory.
 
 .. index::

components/http_kernel/introduction.rst

@@ -482,7 +482,7 @@ as possible to the client (e.g. sending emails).
 
 .. sidebar:: ``kernel.terminate`` in the Symfony Framework
 
-    If you use the ``SwiftmailerBundle`` with Symfony2 and use ``memory``
+    If you use the SwiftmailerBundle with Symfony2 and use ``memory``
     spooling, then the :class:`Symfony\\Bundle\\SwiftmailerBundle\\EventListener\\EmailSenderListener`
     is activated, which actually delivers any emails that you scheduled to
     send during the request.

contributing/code/tests.rst

@@ -19,8 +19,8 @@ Dependencies (optional)
 
 To run the entire test suite, including tests that depend on external
 dependencies, Symfony2 needs to be able to autoload them. By default, they are
-autoloaded from `vendor/` under the main root directory (see
-`autoload.php.dist`).
+autoloaded from ``vendor/`` under the main root directory (see
+``autoload.php.dist``).
 
 The test suite needs the following third-party libraries:
 
@@ -80,12 +80,12 @@ command:
 
     $ phpunit
 
-The output should display `OK`. If not, you need to figure out what's going on
+The output should display ``OK``. If not, you need to figure out what's going on
 and if the tests are broken because of your modifications.
 
 .. tip::
 
-    If you want to test a single component type its path after the `phpunit`
+    If you want to test a single component type its path after the ``phpunit``
     command, e.g.:
 
     .. code-block:: bash
@@ -101,18 +101,18 @@ Code Coverage
 -------------
 
 If you add a new feature, you also need to check the code coverage by using
-the `coverage-html` option:
+the ``coverage-html`` option:
 
 .. code-block:: bash
 
     $ phpunit --coverage-html=cov/
 
-Check the code coverage by opening the generated `cov/index.html` page in a
+Check the code coverage by opening the generated ``cov/index.html`` page in a
 browser.
 
 .. tip::
 
-    The code coverage only works if you have XDebug enabled and all
+    The code coverage only works if you have Xdebug enabled and all
     dependencies installed.
 
 .. _install: http://www.phpunit.de/manual/current/en/installation.html

cookbook/bundles/extension.rst

@@ -11,7 +11,7 @@ you'll see a number of different configuration "namespaces", such as ``framework
 you to configure things at a high level and then let the bundle make all the
 low-level, complex changes that result.
 
-For example, the following tells the ``FrameworkBundle`` to enable the form
+For example, the following tells the FrameworkBundle to enable the form
 integration, which involves the defining of quite a few services as well
 as integration of other related components:
 

cookbook/controller/error_pages.rst

@@ -8,7 +8,7 @@ How to customize Error Pages
 When any exception is thrown in Symfony2, the exception is caught inside the
 ``Kernel`` class and eventually forwarded to a special controller,
 ``TwigBundle:Exception:show`` for handling. This controller, which lives
-inside the core ``TwigBundle``, determines which error template to display and
+inside the core TwigBundle, determines which error template to display and
 the status code that should be set for the given exception.
 
 Error pages can be customized in two different ways, depending on how much
@@ -29,7 +29,7 @@ control you need:
     which allows complete control over exception handling. For more
     information, see :ref:`kernel-kernel.exception`.
 
-All of the error templates live inside ``TwigBundle``. To override the
+All of the error templates live inside the TwigBundle. To override the
 templates, simply rely on the standard method for overriding templates that
 live inside a bundle. For more information, see
 :ref:`overriding-bundle-templates`.
@@ -98,10 +98,10 @@ Symfony uses the following algorithm to determine which template to use:
 .. tip::
 
     To see the full list of default error templates, see the
-    ``Resources/views/Exception`` directory of the ``TwigBundle``. In a
-    standard Symfony2 installation, the ``TwigBundle`` can be found at
+    ``Resources/views/Exception`` directory of the TwigBundle. In a
+    standard Symfony2 installation, the TwigBundle can be found at
     ``vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle``. Often, the easiest way
-    to customize an error page is to copy it from the ``TwigBundle`` into
+    to customize an error page is to copy it from the TwigBundle into
     ``app/Resources/TwigBundle/views/Exception`` and then modify it.
 
 .. note::

cookbook/email/dev_environment.rst

@@ -6,7 +6,7 @@ How to Work with Emails During Development
 
 When developing an application which sends email, you will often
 not want to actually send the email to the specified recipient during
-development. If you are using the ``SwiftmailerBundle`` with Symfony2, you
+development. If you are using the SwiftmailerBundle with Symfony2, you
 can easily achieve this through configuration settings without having to
 make any changes to your application's code at all. There are two main
 choices when it comes to handling email during development: (a) disabling the

cookbook/email/email.rst

@@ -6,7 +6,7 @@ How to send an Email
 
 Sending emails is a classic task for any web application and one that has
 special complications and potential pitfalls. Instead of recreating the wheel,
-one solution to send emails is to use the ``SwiftmailerBundle``, which leverages
+one solution to send emails is to use the SwiftmailerBundle, which leverages
 the power of the `Swift Mailer`_ library.
 
 .. note::

cookbook/email/gmail.rst

@@ -5,7 +5,7 @@ How to use Gmail to send Emails
 ===============================
 
 During development, instead of using a regular SMTP server to send emails, you
-might find using Gmail easier and more practical. The ``SwiftmailerBundle`` makes
+might find using Gmail easier and more practical. The SwiftmailerBundle makes
 it really easy.
 
 .. tip::

cookbook/email/spool.rst

@@ -4,7 +4,7 @@
 How to Spool Emails
 ===================
 
-When you are using the ``SwiftmailerBundle`` to send an email from a Symfony2
+When you are using the SwiftmailerBundle to send an email from a Symfony2
 application, it will default to sending the email immediately. You may, however,
 want to avoid the performance hit of the communication between Swift Mailer
 and the email transport, which could cause the user to wait for the next

cookbook/email/testing.rst

@@ -5,7 +5,7 @@ How to test that an Email is sent in a functional Test
 ======================================================
 
 Sending e-mails with Symfony2 is pretty straightforward thanks to the
-``SwiftmailerBundle``, which leverages the power of the `Swift Mailer`_ library.
+SwiftmailerBundle, which leverages the power of the `Swift Mailer`_ library.
 
 To functionally test that an email was sent, and even assert the email subject,
 content or any other headers, you can use :ref:`the Symfony2 Profiler <internals-profiler>`.

cookbook/security/securing_services.rst

@@ -219,7 +219,7 @@ You can then achieve the same results as above using an annotation::
     annotations on public and protected methods, you cannot use them with
     private methods or methods marked final.
 
-The ``JMSSecurityExtraBundle`` also allows you to secure the parameters and return
+The JMSSecurityExtraBundle also allows you to secure the parameters and return
 values of methods. For more information, see the `JMSSecurityExtraBundle`_
 documentation.
 

cookbook/symfony1.rst

@@ -164,7 +164,7 @@ defined in the ``composer.json`` file.
 
 If you look at the ``HelloController`` from the Symfony2 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
+AcmeDemoBundle is not defined in your ``composer.json`` file. Nonetheless are
 the files autoloaded. This is because you can tell composer to autoload files
 from specific directories without defining a dependency:
 

cookbook/workflow/new_project_svn.rst

@@ -37,7 +37,7 @@ widespread standard structure:
 
 .. tip::
 
-    Most subversion hosting should follow this standard practice. This
+    Most Subversion hosting should follow this standard practice. This
     is the recommended layout in `Version Control with Subversion`_ and the
     layout used by most free hosting (see :ref:`svn-hosting`).
 
@@ -59,14 +59,14 @@ To get started, you'll need to download Symfony2 and get the basic Subversion se
 
         $ svn checkout http://myproject.googlecode.com/svn/trunk myproject
 
-4. Copy the Symfony2 project files in the subversion folder:
+4. Copy the Symfony2 project files in the Subversion folder:
 
    .. code-block:: bash
 
         $ mv Symfony/* myproject/
 
 5. Let's now set the ignore rules. Not everything *should* be stored in your
-   subversion repository. Some files (like the cache) are generated and
+   Subversion repository. Some files (like the cache) are generated and
    others (like the database configuration) are meant to be customized
    on each machine. This makes use of the ``svn:ignore`` property, so that
    specific files can be ignored.

quick_tour/the_architecture.rst

@@ -193,8 +193,8 @@ PHP. Have a look at the default configuration:
         spool:     { type: memory }
 
 Each entry like ``framework`` defines the configuration for a specific bundle.
-For example, ``framework`` configures the ``FrameworkBundle`` while ``swiftmailer``
-configures the ``SwiftmailerBundle``.
+For example, ``framework`` configures the FrameworkBundle while ``swiftmailer``
+configures the SwiftmailerBundle.
 
 Each :term:`environment` can override the default configuration by providing a
 specific configuration file. For example, the ``dev`` environment loads the

reference/configuration/framework.rst

@@ -7,7 +7,7 @@ FrameworkBundle Configuration ("framework")
 This reference document is a work in progress. It should be accurate, but
 all options are not yet fully covered.
 
-The ``FrameworkBundle`` contains most of the "base" framework functionality
+The FrameworkBundle contains most of the "base" framework functionality
 and can be configured under the ``framework`` key in your application configuration.
 This includes settings related to sessions, translation, forms, validation,
 routing and more.