8000 Merge branch '2.3' into 2.7 · symfony/symfony-docs@54d2df5 · GitHub
[go: up one dir, main page]
Skip to content

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 54d2df5

Browse files
xabbuhxabbuh
committed
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
2 parents 7b8b8aa + d8af809 commit 54d2df5

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

‎book/from_flat_php_to_symfony2.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ is primarily an HTML file that uses a template-like PHP syntax:
113113
<ul>
114114
<?php foreach ($posts as $post): ?>
115115
<li>
116-
<a href="/read?id=<?php echo $post['id'] ?>">
116+
<a href="/show.php?id=<?php echo $post['id'] ?>">
117117
<?php echo $post['title'] ?>
118118
</a>
119119
</li>
@@ -224,7 +224,7 @@ the layout:
224224
<ul>
225225
<?php foreach ($posts as $post): ?>
226226
<li>
227-
<a href="/read?id=<?php echo $post['id'] ?>">
227+
<a href="/show.php?id=<?php echo $post['id'] ?>">
228228
<?php echo $post['title'] ?>
229229
</a>
230230
</li>

‎components/console/usage.rst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,11 @@ with:
7777
$ php application.php list --verbose
7878
$ php application.php list -v
7979
80-
The verbose flag can optionally take a value between 1 (default) and 3 to
81-
output even more verbose messages:
80+
To output even more verbose messages you can use these options:
8281

8382
.. code-block:: bash
8483
85-
$ php application.php list --verbose=2
8684
$ php application.php list -vv
87-
$ php application.php list --verbose=3
8885
$ php application.php list -vvv
8986
9087
If you set the optional arguments to give your application a name and version::

‎cookbook/email/cloud.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ and complete the configuration with the provided ``username`` and ``password``:
3434
swiftmailer:
3535
transport: smtp
3636
host: email-smtp.us-east-1.amazonaws.com
37-
port: 465 # different ports are available, see SES console
37+
port: 587 # different ports are available, see SES console
3838
encryption: tls # TLS encryption is required
3939
username: AWS_SES_SMTP_USERNAME # to be created in the SES console
4040
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``:
5555
<swiftmailer:config
5656
transport="smtp"
5757
host="email-smtp.us-east-1.amazonaws.com"
58-
port="465"
58+
port="587"
5959
encryption="tls"
6060
username="AWS_SES_SMTP_USERNAME"
6161
password="AWS_SES_SMTP_PASSWORD"
@@ -68,7 +68,7 @@ and complete the configuration with the provided ``username`` and ``password``:
6868
$container->loadFromExtension('swiftmailer', array(
6969
'transport' => 'smtp',
7070
'host' => 'email-smtp.us-east-1.amazonaws.com',
71-
'port' => 465,
71+
'port' => 587,
7272
'encryption' => 'tls',
7373
'username' => 'AWS_SES_SMTP_USERNAME',
7474
'password' => 'AWS_SES_SMTP_PASSWORD',
@@ -94,7 +94,7 @@ And that's it, you're ready to start sending emails through the cloud!
9494
# ...
9595
mailer_transport: smtp
9696
mailer_host: email-smtp.us-east-1.amazonaws.com
97-
mailer_port: 465 # different ports are available, see SES console
97+
mailer_port: 587 # different ports are available, see SES console
9898
mailer_encryption: tls # TLS encryption is required
9999
mailer_user: AWS_SES_SMTP_USERNAME # to be created in the SES console
100100
mailer_password: AWS_SES_SMTP_PASSWORD # to be created in the SES console

‎reference/configuration/security.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Each part will be explained in the next section.
2727
always_authenticate_before_granting: false
2828
erase_credentials: true
2929
access_decision_manager:
30-
strategy: affirmative
30+
strategy: affirmative # One of affirmative, consensus, unanimous
3131
allow_if_all_abstain: false
3232
allow_if_equal_granted_denied: true
3333
acl:

0 commit comments

Comments
 (0)
0