Merge branch '2.2' into 2.3

Author: weaverryan

book/http_fundamentals.rst

@@ -531,9 +531,9 @@ regardless of how your project is developed. To name a few:
   PHP classes to be used without needing to manually ``require`` the files
   containing those classes;
 
-* :doc:`Templating</components/templating>` A toolkit for rendering templates,
-  handling template inheritance (i.e. a template is decorated with a layout)
-  and performing other common template tasks;
+* :doc:`Templating</components/templating/introduction>` A toolkit for rendering
+  templates, handling template inheritance (i.e. a template is decorated with
+  a layout) and performing other common template tasks;
 
 * `Security`_ - A powerful library for handling all types of security inside
   an application;

book/installation.rst

@@ -229,7 +229,7 @@ If there are any issues, correct them now before moving on.
 
     Many systems allow you to use the ``chmod +a`` command. Try this first,
     and if you get an error - try the next method. This uses a command to
-    try to determine your web server user and set is as ``APACHEUSER``:
+    try to determine your web server user and set it as ``APACHEUSER``:
 
     .. code-block:: bash
 
@@ -241,12 +241,12 @@ If there are any issues, correct them now before moving on.
         $ sudo chmod +a "`whoami` allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs
 
 
-    **2. Using Acl on a system that does not support chmod +a**
+    **2. Using ACL on a system that does not support chmod +a**
 
     Some systems don't support ``chmod +a``, but do support another utility
     called ``setfacl``. You may need to `enable ACL support`_ on your partition
     and install setfacl before using it (as is the case with Ubuntu). This
-    uses a command to try to determine your web server user and set is as
+    uses a command to try to determine your web server user and set it as
     ``APACHEUSER``:
 
     .. code-block:: bash

book/routing.rst

@@ -173,7 +173,7 @@ file:
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
                                 http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
-            <framework:config ...>
+            <framework:config>
                 <!-- ... -->
                 <framework:router resource="%kernel.root_dir%/config/routing.xml" />
             </framework:config>

contributing/documentation/format.rst

@@ -202,6 +202,8 @@ Installing the Sphinx extensions
     # enable highlighting for PHP code not between ``<?php ... ?>`` by default
     lexers['php'] = PhpLexer(startinline=True)
     lexers['php-annotations'] = PhpLexer(startinline=True)
+    lexers['php-standalone'] = PhpLexer(startinline=True)
+    lexers['php-symfony'] = PhpLexer(startinline=True)
 
     # use PHP as the primary domain
     primary_domain = 'php'

cookbook/bundles/extension.rst

@@ -494,7 +494,7 @@ configuration arrays together.
 The ``Configuration`` class can be much more complicated than shown here,
 supporting array nodes, "prototype" nodes, advanced validation, XML-specific
 normalization and advanced merging. You can read more about this in :doc:`the Config Component documentation</components/config/definition>`.
-You can also see it action by checking out some of the core Configuration classes,
+You can also see it in action by checking out some of the core Configuration classes,
 such as the one from the `FrameworkBundle Configuration`_ or the `TwigBundle Configuration`_.
 
 Modifying the configuration of another Bundle