Skip to content

Commit 2277695

Browse files
eschallockeschallock
committed
Merge pull request sendgrid#1891 from sendgrid/develop
6/8/2016 Docs Updates
2 parents 680f005 + c3123bc commit 2277695

File tree

8 files changed

+180
-29
lines changed

8 files changed

+180
-29
lines changed

‎plugins/boostrap_column_nop.rb

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#
2+
# Author: Matt Bernier
3+
# Make a bootstrap column
4+
#
5+
# Outputs the HTML for a bootstrap column of size 4 with id "best_column"
6+
#
7+
# {% html_column md-4 best_column %}
8+
# Some content
9+
# {% endhtml_column %}
10+
# ...
11+
# <div id="best_column" class="col-md-4">
12+
# <p>Some content</p>
13+
# </div>
14+
#
15+
module Jekyll
16+
17+
class Bootstrap_Column_Nop < Liquid::Block
18+
19+
def initialize(tag_name, markup, tokens)
20+
parameters = markup.shellsplit
21+
22+
@size = "col-#{parameters[0]}"
23+
24+
@class = defined?(parameters[1]) ? " #{parameters[1]}" : ""
25+
26+
@id = parameters[2];
27+
28+
if defined?(parameters[2].to_str)
29+
if !empty?(parameters[2].to_str)
30+
@id = "id=\"#{parameters[2]}\""
31+
end
32+
end
33+
34+
35+
super
36+
end
37+
def render(context)
38+
output = super
39+
output = <<HTML
40+
<div #{@id} class="#{@size}#{@class}">#{output}</div>
41+
HTML
42+
43+
#html = Kramdown::Document.new(output).to_html
44+
return Liquid::Template.parse(output).render context
45+
end
46+
end
47+
end
48+
Liquid::Template.register_tag('html_column_nop', Jekyll::Bootstrap_Column_Nop)

‎plugins/bootstrap_column.rb

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#
2+
# Author: Matt Bernier
3+
# Make a bootstrap column
4+
#
5+
# Outputs the HTML for a bootstrap column of size 4 with id "best_column"
6+
#
7+
# {% html_column md-4 best_column %}
8+
# Some content
9+
# {% endhtml_column %}
10+
# ...
11+
# <div id="best_column" class="col-md-4">
12+
# <p>Some content</p>
13+
# </div>
14+
#
15+
module Jekyll
16+
17+
class Bootstrap_Column < Liquid::Block
18+
19+
def initialize(tag_name, markup, tokens)
20+
parameters = markup.shellsplit
21+
22+
@size = "col-#{parameters[0]}"
23+
24+
@class = defined?(parameters[1]) ? " #{parameters[1]}" : ""
25+
26+
@id = parameters[2];
27+
28+
if defined?(parameters[2].to_str)
29+
if !empty?(parameters[2].to_str)
30+
@id = "id=\"#{parameters[2]}\""
31+
end
32+
end
33+
34+
35+
super
36+
end
37+
def render(context)
38+
output = super
39+
output = <<HTML
40+
<div #{@id} class="#{@size}#{@class}"><p>#{output}</p></div>
41+
HTML
42+
43+
#html = Kramdown::Document.new(output).to_html
44+
return Liquid::Template.parse(output).render context
45+
end
46+
end
47+
end
48+
Liquid::Template.register_tag('html_column', Jekyll::Bootstrap_Column)

‎plugins/bootstrap_row.rb

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
#
2+
# Author: Matt Bernier
3+
# Make a bootstrap row
4+
#
5+
# Outputs the HTML for a bootstrap row with id "best_row"
6+
#
7+
# {% html_row md-4 best_row %}
8+
# Wheeee!
9+
# {% endhtml_row %}
10+
# ...
11+
# <div id="best_row" class="row">
12+
# Wheeee!
13+
# </div>
14+
#
15+
# Use with html_column to output a proper bootstrap row and column pairing
16+
#
17+
# {% html_row md-4 best_row %}
18+
# {% html_column md-4 best_column %}
19+
# Some content
20+
# {% endhtml_column %}
21+
# {% html_column md-4 best_column2 %}
22+
# Some content
23+
# {% endhtml_column %}
24+
# {% html_column md-4 best_column3 %}
25+
# Some content
26+
# {% endhtml_column %}
27+
# {% endhtml_row %}
28+
# ...
29+
# <div id="best_row" class="row">
30+
# <div id="best_column" class="col-md-4">
31+
# <p>Some content</p>
32+
# </div>
33+
# <div id="best_column2" class="col-md-4">
34+
# <p>Some content</p>
35+
# </div>
36+
# <div id="best_column3" class="col-md-4">
37+
# <p>Some content</p>
38+
# </div>
39+
# </div>
40+
#
41+
module Jekyll
42+
43+
class Bootstrap_Row < Liquid::Block
44+
45+
def initialize(tag_name, markup, tokens)
46+
parameters = markup.shellsplit
47+
48+
@class = defined?(parameters[0]) ? " #{parameters[1]}" : ""
49+
50+
@id = defined?(parameters[1]) ? "id=\"#{parameters[0]}\"" : ""
51+
52+
super
53+
end
54+
def render(context)
55+
output = super
56+
output = <<HTML
57+
<div #{@id} class="row#{@class}">#{output}</div>
58+
HTML
59+
60+
#html = Kramdown::Document.new(output).to_html
61+
return Liquid::Template.parse(output).render context
62+
end
63+
end
64+
end
65+
Liquid::Template.register_tag('html_row', Jekyll::Bootstrap_Row)

‎source/API_Reference/Web_API_v3/Mail/index.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
Every request made to <code>/v3/mail/send/beta</code> will require a request body formatted in JSON containing your email’s content and metadata. This may include information such as the recipient’s email address, the return address, and the subject.
104104

105105
{% api_table %}
106-
{% api_table_param personalizations "array of objects" Yes "Min 1, Max 100" "An array of messages and their metadata. Each object within personalizations can be thought of as an envelope - it defines who should receive an individual message and how that message should be handled. For more information, please see our <a href="{{root_url}}/Classroom/Send/v3_Mail_Send/personalizations.html">documentation on Personalizations</a>. Parameters in personalizations will override the parameters of the same name from the message level." 0 %}
106+
{% api_table_param personalizations "array of objects" Yes "Min 1, Max 100" "An array of messages and their metadata. Each object within personalizations can be thought of as an envelope - it defines who should receive an individual message and how that message should be handled. For more information, please see our <a href="https://sendgrid.com/docs/Classroom/Send/v3_Mail_Send/personalizations.html">documentation on Personalizations</a>. Parameters in personalizations will override the parameters of the same name from the message level." 0 %}
107107
{% api_table_param to "array of email objects" Yes "Min 1" "An array of recipients. Each email object within this array may contain the recipient’s name, but must always contain the recipient’s email." 1 %}
108108
{% api_table_param email string Yes "" "The email address of the recipient." 2 %}
109109
{% api_table_param name string No "" "The name of the recipient." 2 %}
@@ -140,10 +140,10 @@
140140
{% api_table_param categories "array of strings" No "Max 255" "An array of category names for this message. Each category name may not exceed 255 characters. You cannot have more than 10 categories per request." 0 %}
141141
{% api_table_param custom_args "custom object" No "" "Values that are specific to the entire send that will be carried along with the email and its activity data. Substitutions will not be made on custom arguments, so any string that is entered into this parameter will be assumed to be the custom argument that you would like to be used. This parameter is overridden by any conflicting <code>personalizations[x].custom_args</code> if that parameter has been defined. If <code>personalizations[x].custom_args</code> has been defined but does not conflict with the values defined within this parameter, the two will be merged. The combined total size of these custom arguments may not exceed 10,000 bytes." 0 %}
142142
{% api_table_param send_at integer No "" "A unix timestamp allowing you to specify when you want your email to be sent from SendGrid. This is not necessary if you want the email to be sent at the time of your API request." 0 %}
143-
{% api_table_param batch_id string No "" "This ID represents a batch of emails (AKA multiple sends of the same email) to be associated to each other for scheduling. Including a <code>batch_id</code> in your request allows you to include this email in that batch, and also enables you to cancel or pause the delivery of that entire batch. For more information, please read about <a href="{{root_url}}/API_Reference/Web_API_v3/cancel_schedule_send.html">Cancel Scheduled Sends</a>." 0 %}
143+
{% api_table_param batch_id string No "" "This ID represents a batch of emails (AKA multiple sends of the same email) to be associated to each other for scheduling. Including a <code>batch_id</code> in your request allows you to include this email in that batch, and also enables you to cancel or pause the delivery of that entire batch. For more information, please read about <a href="https://sendgrid.com/docs/API_Reference/Web_API_v3/cancel_schedule_send.html">Cancel Scheduled Sends</a>." 0 %}
144144
{% api_table_param asm "object" No "" "An object allowing you to specify how to handle unsubscribes." 0 %}
145145
{% api_table_param group_id integer Yes "" "The unsubscribe group to associate with this email." 1 %}
146-
{% api_table_param groups_to_display "array of integers" No "Max 25" "An array containing the unsubscribe groups that you would like to be displayed on the <a href="{{root_url}}/User_Guide/Suppressions/recipient_subscription_preferences.html">unsubscribe preferences page</a>." 1 %}
146+
{% api_table_param groups_to_display "array of integers" No "Max 25" "An array containing the unsubscribe groups that you would like to be displayed on the <a href="https://sendgrid.com/docs/User_Guide/Suppressions/recipient_subscription_preferences.html">unsubscribe preferences page</a>." 1 %}
147147
{% api_table_param ip_pool_name string No "Min 2, Max 64" "The IP Pool that you would like to send this email from." 0 %}
148148
{% api_table_param mail_settings "object" No "" "A collection of different mail settings that you can use to specify how you would like this email to be handled." 0 %}
149149
{% api_table_param bcc "object" No "" "This allows you to have a blind carbon copy automatically sent to the specified email address for every email that is sent." 1 %}
@@ -155,7 +155,7 @@
155155
{% api_table_param enable boolean No "true or false" "Indicates if this setting is enabled." 2 %}
156156
{% api_table_param text string No "" "The plain text content of your footer." 2 %}
157157
{% api_table_param html string No "" "The HTML content of your footer." 2 %}
158-
{% api_table_param sandbox_mode object No "" "This allows you to send a test email to ensure that your request body is valid and formatted correctly. For more information, please see our <a href="{{root_url}}/Classroom/Send/v3_Mail_Send/sandbox_mode.html">Classroom</a>." 1 %}
158+
{% api_table_param sandbox_mode object No "" "This allows you to send a test email to ensure that your request body is valid and formatted correctly. For more information, please see our <a href="https://sendgrid.com/docs/Classroom/Send/v3_Mail_Send/sandbox_mode.html">Classroom</a>." 1 %}
159159
{% api_table_param enable boolean No "true or false" "Indicates if this setting is enabled." 2 %}
160160
{% api_table_param spam_check object No "" "This allows you to test the content of your email for spam." 1 %}
161161
{% api_table_param enable boolean No "true or false" "Indicates if this setting is enabled." 2 %}

‎source/API_Reference/Web_API_v3/Marketing_Campaigns/contactdb.apiblueprint

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ Recipients
4646
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Marketing_Campaigns/contactdb.html#List-Recipients-GET">List Recipients - GET</a></li>
4747
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Marketing_Campaigns/contactdb.html#Retrieve-a-Recipient-GET">Retrieve a Recipient - GET</a></li>
4848
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Marketing_Campaigns/contactdb.html#Delete-a-Recipient-DELETE">Delete a single Recipient - DELETE</a></li>
49+
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Marketing_Campaigns/contactdb.html#Get-the-Lists-the-Recipient-Is-On-GET">Get the Lists the Recipient is On - GET</a></li>
4950
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Marketing_Campaigns/contactdb.html#Get-a-Count-of-Billable-Recipients-GET">Get Count of Billable Recipients - GET</a></li>
5051
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Marketing_Campaigns/contactdb.html#Get-a-Count-of-Recipients-GET">Get Count of Recipients - GET</a></li>
5152
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Marketing_Campaigns/contactdb.html#Get-Recipients-Matching-Search-Criteria-GET">Get Recipients Matching Search Criteria - GET</a></li>

‎source/Classroom/Deliver/Undeliverable_Email/how_sendgrid_handles_550_requested_action_not_taken_mailbox_unavailable_bounces.md

-20
This file was deleted.

‎source/Classroom/Deliver/Undeliverable_Email/what_do_i_do_if_im_blacklisted.md

+14-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
---
2+
st:
3+
published_at: 2016-06-07
4+
type: Classroom
25
seo:
36
title: What do I do if I'm blacklisted?
47
description: What do I do if I'm blacklisted?
@@ -15,15 +18,15 @@ Ending up on a blacklist can be detrimental to your domain’s email deliverabil
1518

1619

1720

18-
**Shared IP Plans (Free, Lite, Bronze, Shared Marketing)**
21+
**Shared IP Plans (Free, Legacy Lite, and Essentials)**
1922

2023

2124

2225
If you are on one of our shared IP plans and you notice a block message based on one of our IP addresses then please contact our Support team. We will handle all delisting requests for our shared IP users.
2326

2427

2528

26-
**Dedicated IP Plans (Silver, Gold, Platinum, High Volume)**
29+
**Dedicated IP Plans (Pro, and Premier)**
2730

2831

2932

@@ -54,18 +57,25 @@ Below are links to the delisting forms used by the more popular external blackli
5457

5558
- [AT&T](http://rbl.att.net/cgi-bin/rbl/block_admin.cgi "Link: http://rbl.att.net/end\_user\_request2.html")\*
5659
- [Barracuda](http://www.barracudacentral.org/rbl/removal-request)
60+
- [Cloudmark](https://csi.cloudmark.com/en/reset/)
5761
- [Comcast](http://postmaster.comcast.net/block-removal-request.html)
5862
- [Google](https://support.google.com/mail/contact/msgdelivery)
5963
- [McAfee](https://secure.mcafee.com/apps/mcafee-labs/threat-feedback.aspx)
6064
- [Microsoft/Outlook](https://support.live.com/eform.aspx?productKey=edfsmsbl3&ct=eformts)
6165
- [Mimecast](http://www.mimecast.com/senderfeedback)
66+
- [Office365](https://sender.office.com/)
67+
- [ProofPoint](https://support.proofpoint.com/dnsbl-lookup.cgi)
68+
- [SORBS](http://www.sorbs.net/overview.shtml)
6269
- [SpamCop](http://www.spamcop.net/bl.shtml)
6370
- [Spam Rats](http://www.spamrats.com/removal.php)
6471
- [Spamhaus](http://www.spamhaus.org/lookup/)
6572
- [SURBL](http://www.surbl.org/surbl-analysis)
6673
- [Trend Micro](https://ers.trendmicro.com/reputations)
6774
- [URIBL](https://admin.uribl.com/)
6875

69-
7076

71-
_\*AT&T's delisting request form URL will be changing on a regular basis according to their website so we will try to keep our link to them up-to-date._
77+
*IMPORTANT NOTE:* If you request a delisting from a blacklisting service, and don't do anything to change the behavior that caused the listing in the first place, it is likely to occur again. Depending on the blacklist, it can be progressively harder to get delisted after the second or third listing. Blacklists are in place
78+
79+
###TL;DR: Don't delist from major blacklists without a plan in place to address the issue that caused the listing! [Learn more about how to avoid and mitigate risk of blacklisting here](https://sendgrid.com/blog/avoiding-email-blacklists/).
80+
81+

‎source/Classroom/Deliver/index.html

-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ <h2><a href="#Undeliverable-Email">Undeliverable Email</a></h2>
100100
<li><a href="{{root_url}}Undeliverable_Email/help_my_emails_arent_being_delivered.html">Help, My emails aren't being delivered!</a></li>
101101
<li><a href="{{root_url}}Undeliverable_Email/how_can_i_guarantee_my_emails_arrive_in_my_recipients_inbox.html">How can I guarantee my emails arrive in my recipients inbox?</a></li>
102102
<li><a href="{{root_url}}Undeliverable_Email/how_do_i_keep_emails_from_dropping.html">How do I keep emails from dropping?</a></li>
103-
<li><a href="{{root_url}}Undeliverable_Email/how_sendgrid_handles_550_requested_action_not_taken_mailbox_unavailable_bounces.html">How SendGrid handles "550 Requested action not taken&#58; mailbox unavailable" bounces</a></li>
104103
<li><a href="{{root_url}}Undeliverable_Email/my_emails_are_being_blocked.html">My Emails Are Being Blocked</a></li>
105104
<li><a href="{{root_url}}Undeliverable_Email/my_emails_are_being_dropped.html">My Emails Are Being Dropped</a></li>
106105
<li><a href="{{root_url}}Undeliverable_Email/my_emails_are_going_to_spam.html">My Emails Are Going to Spam</a></li>

0 commit comments

Comments
 (0)