Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Reference] Add missing option delivery_whitelist #5056

Merged
merged 5 commits into from
Mar 14, 2015

Conversation

TerjeBr
Copy link
Contributor

@TerjeBr TerjeBr commented Mar 2, 2015

Q A
Doc fix? yes
New docs? no
Applies to SwiftMailerBundle 2.1
Fixed tickets #4925

Q | A
--------
Doc fix? |	yes
New docs? | no
Applies to 	| SwiftMailerBundle 2.1
Fixed tickets | no
@TerjeBr
Copy link
Contributor Author

TerjeBr commented Mar 2, 2015

Added this PR since @e-weimann just closed his PR #4925 without it being merged.

@@ -156,6 +157,17 @@ emails sent during development go to a single account.
This uses ``Swift_Plugins_RedirectingPlugin``. Original recipients are available
on the ``X-Swift-To``, ``X-Swift-Cc`` and ``X-Swift-Bcc`` headers.

delivery_whitelist
+~~~~~~~~~~~~~~~~~~
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have to remove the plus characters you copied from the old PR's diff. :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, forgot that. Done that now.


Used in combination with ``delivery_address``. If set, emails matching any of these
patterns will be delivered like normal, instead of being sent to `delivery_address`.
For details, see `the Cookbook entry.`_
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use the ref role for internal links like this:

:ref:`the cookbook entry <sending-to-a-specified-address-but-with-exceptions>`

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, changed that.

@xabbuh
Copy link
Member

xabbuh commented Mar 2, 2015

@TerjeBr Can you please also add the label in /cookbook/email/dev_environment.rst?

It should look like this (around line 122):

.. _sending-to-a-specified-address-but-with-exceptions:

Sending to a Specified Address but with Exceptions
..................................................

**type**: ``array``

Used in combination with ``delivery_address``. If set, emails matching any of these
patterns will be delivered like normal, instead of being sent to `delivery_address`.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry, one last thing: you have to use double backticks for inline codeblocks in reStructured text.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, done that.

@wouterj
Copy link
Member

wouterj commented Mar 3, 2015

Looking good, thanks! 👍

@xabbuh
Copy link
Member

xabbuh commented Mar 3, 2015

👍 I like it.

And a huge thank you to @e-weimann for the initial work on this.

@TerjeBr
Copy link
Contributor Author

TerjeBr commented Mar 3, 2015

@e-weimann opened #4925 just after I had filed #4924 . I did the initial work of documenting this feature, and I also provided @e-weimann with the text for the reference update.

But I guess we can thank @e-weimann for taking the initiative to help us not letting the reference section be forgotten on this issue.

@e-weimann
Copy link
Contributor

@TerjeBr It is her PR, not his and it was coincidence that I opened the pull request after #4924. I found the option in the source, but couldn't find information about it in the documentation. Thanks for finishing the this.

@weaverryan
Copy link
Member

Thanks very much to both of you (@TerjeBr and @e-weimann) for making sure this cool little feature got its docs. Like I said on the original PR, I didn't even know this existed! Cheers!

@weaverryan weaverryan merged commit 03279dc into symfony:2.3 Mar 14, 2015
weaverryan added a commit that referenced this pull request Mar 14, 2015
…eBr)

This PR was merged into the 2.3 branch.

Discussion
----------

  [Reference] Add missing option delivery_whitelist

Q | A
---|---
Doc fix? |	yes
New docs? | no
Applies to | SwiftMailerBundle 2.1
Fixed tickets | #4925

Commits
-------

03279dc Added double backticks. And also a full stop.
2aab241 added link target/label in the cookbook
ce8719d Changed link into ref
07855f6 Removed + from copied diff
0195619   [Reference] Add missing option delivery_whitelist
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants