From 73d96d4d2c861bde5c8440986fc7575be4c4024c Mon Sep 17 00:00:00 2001
From: Andrey Astakhov <andrey.astakhov@gmail.com>
Date: Tue, 12 Apr 2016 20:56:05 +0200
Subject: [PATCH 1/6] Added possible values for
 access_decision_manager.strategy

Added a comment with the list of possible values for access_decision_manager.strategy (like for session_fixation_strategy)
---
 reference/configuration/security.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst
index 13be9393268..9a12c168061 100644
--- a/reference/configuration/security.rst
+++ b/reference/configuration/security.rst
@@ -27,6 +27,7 @@ Each part will be explained in the next section.
             always_authenticate_before_granting:  false
             erase_credentials:    true
             access_decision_manager:
+                # strategy can be: affirmative, consensus, unanimous
                 strategy:             affirmative
                 allow_if_all_abstain:  false
                 allow_if_equal_granted_denied:  true

From 9231389b4406f759d790b355adf993308449ec8f Mon Sep 17 00:00:00 2001
From: gregfriedrice <gregfriedrice@gmail.com>
Date: Wed, 20 Apr 2016 11:32:42 +0100
Subject: [PATCH 2/6] Fix typo

---
 book/from_flat_php_to_symfony2.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/from_flat_php_to_symfony2.rst b/book/from_flat_php_to_symfony2.rst
index 63243ef3a23..be759a1c176 100644
--- a/book/from_flat_php_to_symfony2.rst
+++ b/book/from_flat_php_to_symfony2.rst
@@ -113,7 +113,7 @@ is primarily an HTML file that uses a template-like PHP syntax:
             <ul>
                 <?php foreach ($posts as $post): ?>
                 <li>
-                    <a href="/read?id=<?php echo $post['id'] ?>">
+                    <a href="/show.php?id=<?php echo $post['id'] ?>">
                         <?php echo $post['title'] ?>
                     </a>
                 </li>

From a712e6bbdfb43a0798ab532301847a5b1bfc060b Mon Sep 17 00:00:00 2001
From: WouterJ <waldio.webdesign@gmail.com>
Date: Wed, 20 Apr 2016 20:54:18 +0200
Subject: [PATCH 3/6] Fix one more occurence of /read

---
 book/from_flat_php_to_symfony2.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/from_flat_php_to_symfony2.rst b/book/from_flat_php_to_symfony2.rst
index be759a1c176..8d933ffad59 100644
--- a/book/from_flat_php_to_symfony2.rst
+++ b/book/from_flat_php_to_symfony2.rst
@@ -224,7 +224,7 @@ the layout:
         <ul>
             <?php foreach ($posts as $post): ?>
             <li>
-                <a href="/read?id=<?php echo $post['id'] ?>">
+                <a href="/show.php?id=<?php echo $post['id'] ?>">
                     <?php echo $post['title'] ?>
                 </a>
             </li>

From bbec4cce67bcec5efa4e567be73a04b850867a0a Mon Sep 17 00:00:00 2001
From: Ryan Weaver <ryan@thatsquality.com>
Date: Wed, 20 Apr 2016 20:58:07 -0400
Subject: [PATCH 4/6] [#6464] Minor tweak

---
 reference/configuration/security.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst
index 9a12c168061..26d35970507 100644
--- a/reference/configuration/security.rst
+++ b/reference/configuration/security.rst
@@ -27,8 +27,7 @@ Each part will be explained in the next section.
             always_authenticate_before_granting:  false
             erase_credentials:    true
             access_decision_manager:
-                # strategy can be: affirmative, consensus, unanimous
-                strategy:             affirmative
+                strategy:             affirmative # One of affirmative, consensus, unanimous
                 allow_if_all_abstain:  false
                 allow_if_equal_granted_denied:  true
             acl:

From 29d73316cba582bb66b3f92505139cf6d164e5e2 Mon Sep 17 00:00:00 2001
From: Henry Snoek <snoek09@gmail.com>
Date: Fri, 22 Apr 2016 18:51:19 +0200
Subject: [PATCH 5/6] use port 587 in Amazon SES example

---
 cookbook/email/cloud.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cookbook/email/cloud.rst b/cookbook/email/cloud.rst
index b7401468f62..3b2e67ad32c 100644
--- a/cookbook/email/cloud.rst
+++ b/cookbook/email/cloud.rst
@@ -34,7 +34,7 @@ and complete the configuration with the provided ``username`` and ``password``:
         swiftmailer:
             transport:  smtp
             host:       email-smtp.us-east-1.amazonaws.com
-            port:       465 # different ports are available, see SES console
+            port:       587 # different ports are available, see SES console
             encryption: tls # TLS encryption is required
             username:   AWS_SES_SMTP_USERNAME  # to be created in the SES console
             password:   AWS_SES_SMTP_PASSWORD  # to be created in the SES console
@@ -55,7 +55,7 @@ and complete the configuration with the provided ``username`` and ``password``:
             <swiftmailer:config
                 transport="smtp"
                 host="email-smtp.us-east-1.amazonaws.com"
-                port="465"
+                port="587"
                 encryption="tls"
                 username="AWS_SES_SMTP_USERNAME"
                 password="AWS_SES_SMTP_PASSWORD"
@@ -68,7 +68,7 @@ and complete the configuration with the provided ``username`` and ``password``:
         $container->loadFromExtension('swiftmailer', array(
             'transport'  => 'smtp',
             'host'       => 'email-smtp.us-east-1.amazonaws.com',
-            'port'       => 465,
+            'port'       => 587,
             'encryption' => 'tls',
             'username'   => 'AWS_SES_SMTP_USERNAME',
             'password'   => 'AWS_SES_SMTP_PASSWORD',
@@ -94,7 +94,7 @@ And that's it, you're ready to start sending emails through the cloud!
             # ...
             mailer_transport:  smtp
             mailer_host:       email-smtp.us-east-1.amazonaws.com
-            mailer_port:       465 # different ports are available, see SES console
+            mailer_port:       587 # different ports are available, see SES console
             mailer_encryption: tls # TLS encryption is required
             mailer_user:       AWS_SES_SMTP_USERNAME # to be created in the SES console
             mailer_password:   AWS_SES_SMTP_PASSWORD # to be created in the SES console

From a658623f87a2a69fdf3394e7fcc3b04ca941011c Mon Sep 17 00:00:00 2001
From: Tobias Schmidt <tobias.schmidt403@gmail.com>
Date: Tue, 19 Apr 2016 19:50:25 +0200
Subject: [PATCH 6/6] remove documentation of not supported "verbose" option
 value

---
 components/console/usage.rst | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/components/console/usage.rst b/components/console/usage.rst
index f2dbfcd43d4..f238de69eaf 100644
--- a/components/console/usage.rst
+++ b/components/console/usage.rst
@@ -77,14 +77,11 @@ with:
     $ php application.php list --verbose
     $ php application.php list -v
 
-The verbose flag can optionally take a value between 1 (default) and 3 to
-output even more verbose messages:
+To output even more verbose messages you can use these options:
 
 .. code-block:: bash
 
-    $ php application.php list --verbose=2
     $ php application.php list -vv
-    $ php application.php list --verbose=3
     $ php application.php list -vvv
 
 If you set the optional arguments to give your application a name and version::