Merge branch '2.3' into 2.4

weaverryan · weaverryan · commit 08de8b2534a9 · 2013-11-28T12:27:57.000-06:00
diff --git a/book/translation.rst b/book/translation.rst
@@ -6,7 +6,7 @@ Translations
 
 The term "internationalization" (often abbreviated `i18n`_) refers to the
 process of abstracting strings and other locale-specific pieces out of your
-application and into a layer where they can be translated and converted based
+application into a layer where they can be translated and converted based
 on the user's locale (i.e. language and country). For text, this means
 wrapping each with a function capable of translating the text (or "message")
 into the language of the user::
diff --git a/cookbook/logging/channels_handlers.rst b/cookbook/logging/channels_handlers.rst
@@ -24,36 +24,65 @@ To do so, just create a new handler and configure it like this:
 
     .. code-block:: yaml
 
+        # app/config/config.yml
         monolog:
             handlers:
                 main:
-                    type: stream
-                    path: /var/log/symfony.log
-                    channels: !doctrine
+                    type:     stream
+                    path:     /var/log/symfony.log
+                    channels: [!doctrine]
                 doctrine:
-                    type: stream
-                    path: /var/log/doctrine.log
-                    channels: doctrine
+                    type:     stream
+                    path:     /var/log/doctrine.log
+                    channels: [doctrine]
 
     .. code-block:: xml
 
-        <monolog:config>
-            <monolog:handlers>
+        <!-- app/config/config.xml -->
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:monolog="http://symfony.com/schema/dic/monolog"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/monolog
+                http://symfony.com/schema/dic/monolog/monolog-1.0.xsd"
+        >
+            <monolog:config>
                 <monolog:handler name="main" type="stream" path="/var/log/symfony.log">
                     <monolog:channels>
-                        <type>exclusive</type>
-                        <channel>doctrine</channel>
+                        <monolog:channel>!doctrine</monolog:channel>
                     </monolog:channels>
                 </monolog:handler>
 
-                <monolog:handler name="doctrine" type="stream" path="/var/log/doctrine.log" />
+                <monolog:handler name="doctrine" type="stream" path="/var/log/doctrine.log">
                     <monolog:channels>
-                        <type>inclusive</type>
-                        <channel>doctrine</channel>
+                        <monolog:channel>doctrine</monolog:channel>
                     </monolog:channels>
                 </monolog:handler>
-            </monolog:handlers>
-        </monolog:config>
+            </monolog:config>
+        </container>
+
+    .. code-block:: php
+
+        // app/config/config.php
+        $container->loadFromExtension('monolog', array(
+            'handlers' => array(
+                'main'     => array(
+                    'type'     => 'stream',
+                    'path'     => '/var/log/symfony.log',
+                    'channels' => array(
+                        '!doctrine',
+                    ),
+                ),
+                'doctrine' => array(
+                    'type'     => 'stream',
+                    'path'     => '/var/log/doctrine.log',
+                    'channels' => array(
+                        'doctrine',
+                    ),
+                ),
+            ),
+        ));
 
 YAML specification
 ------------------
@@ -70,13 +99,6 @@ You can specify the configuration by many forms:
     channels: [foo, bar]   # Include only channels "foo" and "bar"
     channels: [!foo, !bar] # Include all channels, except "foo" and "bar"
 
-    channels:
-        type:     inclusive # Include only those listed below
-        elements: [ foo, bar ]
-    channels:
-        type:     exclusive # Include all, except those listed below
-        elements: [ foo, bar ]
-
 Creating your own Channel
 -------------------------
 
diff --git a/cookbook/security/voters.rst b/cookbook/security/voters.rst
@@ -67,6 +67,10 @@ and compare the IP address against a set of blacklisted IP addresses:
 
     class ClientIpVoter implements VoterInterface
     {
+        private $container;
+
+        private $blacklistedIp;
+            
         public function __construct(ContainerInterface $container, array $blacklistedIp = array())
         {
             $this->container     = $container;

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,10 @@ and compare the IP address against a set of blacklisted IP addresses:`
`67`	`67`
`68`	`68`	`class ClientIpVoter implements VoterInterface`
`69`	`69`	`{`
	`70`	`+ private $container;`
	`71`	`+`
	`72`	`+ private $blacklistedIp;`
	`73`	`+`
`70`	`74`	`public function __construct(ContainerInterface $container, array $blacklistedIp = array())`
`71`	`75`	`{`
`72`	`76`	`$this->container = $container;`