Merge branch '2.3' into 2.7

* 2.3: remove documentation of not supported "verbose" option value use port 587 in Amazon SES example [#6464] Minor tweak Fix one more occurence of /read Fix typo Added possible values for access_decision_manager.strategy
symfony · Apr 24, 2016 · 54d2df5 · 54d2df5
2 parents 7b8b8aa + d8af809
commit 54d2df5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git 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>
@@ -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>

diff --git 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::

diff --git 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

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