Fix spacing, wording and style

Daniel Tschinder · Daniel Tschinder · commit 425aa8f07e38 · 2014-03-14T16:09:13.000+01:00
diff --git a/book/security.rst b/book/security.rst
@@ -181,11 +181,10 @@ firewall is activated does *not* mean, however, that the HTTP authentication
 username and password box is displayed for every URL. For example, any user
 can access ``/foo`` without being prompted to authenticate.
 
-.. note::
+.. tip::
 
-    You can also match a request against other options of the request and 
-    not only the URL. For more information and examples read
-    :doc:`/cookbook/security/firewall_restriction`.
+    You can also match a request against other options of the request. For more
+    information and examples read :doc:`/cookbook/security/firewall_restriction`.
 
 .. image:: /images/book/security_anonymous_user_access.png
    :align: center
diff --git a/cookbook/security/firewall_restriction.rst b/cookbook/security/firewall_restriction.rst
@@ -5,15 +5,15 @@ How to Restrict Firewalls to a Specific Request
 ===============================================
 
 When using the Security component, you can create firewalls that match certain request options.
-In most cases matching against the URL is sufficient but in special cases you can further 
-restrict the initialization of a firewall against other options from the request.
+In most cases, matching against the URL is sufficient, but in special cases you can further 
+restrict the initialization of a firewall against other options of the request.
 
 .. note::
 
     You can use any of this restrictions individually or mix them together to get 
     your desired firewall configuration. 
 
-Restricting by pattern
+Restricting by Pattern
 ----------------------
 
 This is the default restriction and restricts a firewall to only be initialized if the request URL 
@@ -26,11 +26,10 @@ matches the configured ``pattern``.
         # app/config/security.yml
 
         # ...
-
         security:
             firewalls:
                 secured_area:
-                    pattern:    ^/admin
+                    pattern: ^/admin
                     # ...
 
     .. code-block:: xml
@@ -56,11 +55,10 @@ matches the configured ``pattern``.
         // app/config/security.php
 
         // ...
-
         $container->loadFromExtension('security', array(
             'firewalls' => array(
                 'secured_area' => array(
-                    'pattern'    => '^/admin',
+                    'pattern' => '^/admin',
                     // ...
                 ),
             ),
@@ -71,16 +69,16 @@ activated if the URL starts (due to the ``^`` regex character) with ``/admin`. I
 the URL does not match this pattern, the firewall will not be activated and subsequent 
 firewalls will have the opportunity to be matched for this request.
 
-Restricting by host
+Restricting by Host
 -------------------
 
 .. versionadded:: 2.4
     Support for restricting security firewalls to a specific host was introduced in
     Symfony 2.4.
 
-If matching against the pattern only is not enough, the request can also be matched against 
-``host``. When the configuration option ``host`` is set the firewall will be restricted to 
-only initialize if the host from the request matches against the configuration option.
+If matching against the ``pattern`` only is not enough, the request can also be matched against 
+``host``. When the configuration option ``host`` is set, the firewall will be restricted to 
+only initialize if the host from the request matches against the configuration.
 
 .. configuration-block::
 
@@ -89,11 +87,10 @@ only initialize if the host from the request matches against the configuration o
         # app/config/security.yml
 
         # ...
-
         security:
             firewalls:
                 secured_area:
-                    host:       ^admin\.example\.com$
+                    host: ^admin\.example\.com$
                     # ...
 
     .. code-block:: xml
@@ -119,11 +116,10 @@ only initialize if the host from the request matches against the configuration o
         // app/config/security.php
 
         // ...
-
         $container->loadFromExtension('security', array(
             'firewalls' => array(
                 'secured_area' => array(
-                    'host'       => '^admin\.example\.com$',
+                    'host' => '^admin\.example\.com$',
                     // ...
                 ),
             ),
@@ -136,7 +132,7 @@ If the hostname does not match this pattern, the firewall will not be activated
 and subsequent firewalls will have the opportunity to be matched for this
 request.
 
-Restricting by http methods
+Restricting by Http Methods
 ---------------------------
 
 .. versionadded:: 2.5
@@ -153,11 +149,10 @@ the provided http methods.
         # app/config/security.yml
 
         # ...
-
         security:
             firewalls:
                 secured_area:
-                    methods:    [GET, POST]
+                    methods: [GET, POST]
                     # ...
 
     .. code-block:: xml
@@ -183,11 +178,10 @@ the provided http methods.
         // app/config/security.php
 
         // ...
-
         $container->loadFromExtension('security', array(
             'firewalls' => array(
                 'secured_area' => array(
-                    'methods'    => array('GET', 'POST'),
+                    'methods' => array('GET', 'POST'),
                     // ...
                 ),
             ),
diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst
@@ -109,7 +109,7 @@ Each part will be explained in the next section.
                     # restrict the firewall to a specific host
                     host: admin\.example\.com
                      # restrict the firewall to specific http methods
-                    methods: [GET,POST]
+                    methods: [GET, POST]
                     request_matcher: some.service.id
                     access_denied_url: /foo/error403
                     access_denied_handler: some.service.id
