Skip to content
This repository has been archived by the owner on Aug 27, 2021. It is now read-only.

Commit

Permalink
Merge pull request #1891 from sendgrid/develop
Browse files Browse the repository at this point in the history
6/8/2016 Docs Updates
  • Loading branch information
eschallock committed Jun 8, 2016
2 parents 680f005 + c3123bc commit 2277695
Show file tree
Hide file tree
Showing 8 changed files with 180 additions and 29 deletions.
48 changes: 48 additions & 0 deletions plugins/boostrap_column_nop.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#
# Author: Matt Bernier
# Make a bootstrap column
#
# Outputs the HTML for a bootstrap column of size 4 with id "best_column"
#
# {% html_column md-4 best_column %}
# Some content
# {% endhtml_column %}
# ...
# <div id="best_column" class="col-md-4">
# <p>Some content</p>
# </div>
#
module Jekyll

class Bootstrap_Column_Nop < Liquid::Block

def initialize(tag_name, markup, tokens)
parameters = markup.shellsplit

@size = "col-#{parameters[0]}"

@class = defined?(parameters[1]) ? " #{parameters[1]}" : ""

@id = parameters[2];

if defined?(parameters[2].to_str)
if !empty?(parameters[2].to_str)
@id = "id=\"#{parameters[2]}\""
end
end


super
end
def render(context)
output = super
output = <<HTML
<div #{@id} class="#{@size}#{@class}">#{output}</div>
HTML

#html = Kramdown::Document.new(output).to_html
return Liquid::Template.parse(output).render context
end
end
end
Liquid::Template.register_tag('html_column_nop', Jekyll::Bootstrap_Column_Nop)
48 changes: 48 additions & 0 deletions plugins/bootstrap_column.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#
# Author: Matt Bernier
# Make a bootstrap column
#
# Outputs the HTML for a bootstrap column of size 4 with id "best_column"
#
# {% html_column md-4 best_column %}
# Some content
# {% endhtml_column %}
# ...
# <div id="best_column" class="col-md-4">
# <p>Some content</p>
# </div>
#
module Jekyll

class Bootstrap_Column < Liquid::Block

def initialize(tag_name, markup, tokens)
parameters = markup.shellsplit

@size = "col-#{parameters[0]}"

@class = defined?(parameters[1]) ? " #{parameters[1]}" : ""

@id = parameters[2];

if defined?(parameters[2].to_str)
if !empty?(parameters[2].to_str)
@id = "id=\"#{parameters[2]}\""
end
end


super
end
def render(context)
output = super
output = <<HTML
<div #{@id} class="#{@size}#{@class}"><p>#{output}</p></div>
HTML

#html = Kramdown::Document.new(output).to_html
return Liquid::Template.parse(output).render context
end
end
end
Liquid::Template.register_tag('html_column', Jekyll::Bootstrap_Column)
65 changes: 65 additions & 0 deletions plugins/bootstrap_row.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
#
# Author: Matt Bernier
# Make a bootstrap row
#
# Outputs the HTML for a bootstrap row with id "best_row"
#
# {% html_row md-4 best_row %}
# Wheeee!
# {% endhtml_row %}
# ...
# <div id="best_row" class="row">
# Wheeee!
# </div>
#
# Use with html_column to output a proper bootstrap row and column pairing
#
# {% html_row md-4 best_row %}
# {% html_column md-4 best_column %}
# Some content
# {% endhtml_column %}
# {% html_column md-4 best_column2 %}
# Some content
# {% endhtml_column %}
# {% html_column md-4 best_column3 %}
# Some content
# {% endhtml_column %}
# {% endhtml_row %}
# ...
# <div id="best_row" class="row">
# <div id="best_column" class="col-md-4">
# <p>Some content</p>
# </div>
# <div id="best_column2" class="col-md-4">
# <p>Some content</p>
# </div>
# <div id="best_column3" class="col-md-4">
# <p>Some content</p>
# </div>
# </div>
#
module Jekyll

class Bootstrap_Row < Liquid::Block

def initialize(tag_name, markup, tokens)
parameters = markup.shellsplit

@class = defined?(parameters[0]) ? " #{parameters[1]}" : ""

@id = defined?(parameters[1]) ? "id=\"#{parameters[0]}\"" : ""

super
end
def render(context)
output = super
output = <<HTML
<div #{@id} class="row#{@class}">#{output}</div>
HTML

#html = Kramdown::Document.new(output).to_html
return Liquid::Template.parse(output).render context
end
end
end
Liquid::Template.register_tag('html_row', Jekyll::Bootstrap_Row)
8 changes: 4 additions & 4 deletions source/API_Reference/Web_API_v3/Mail/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
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.

{% api_table %}
{% 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 %}
{% 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 %}
{% 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 %}
{% api_table_param email string Yes "" "The email address of the recipient." 2 %}
{% api_table_param name string No "" "The name of the recipient." 2 %}
Expand Down Expand Up @@ -140,10 +140,10 @@
{% 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 %}
{% 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 %}
{% 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 %}
{% 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 %}
{% 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 %}
{% api_table_param asm "object" No "" "An object allowing you to specify how to handle unsubscribes." 0 %}
{% api_table_param group_id integer Yes "" "The unsubscribe group to associate with this email." 1 %}
{% 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 %}
{% 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 %}
{% 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 %}
{% 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 %}
{% 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 %}
Expand All @@ -155,7 +155,7 @@
{% api_table_param enable boolean No "true or false" "Indicates if this setting is enabled." 2 %}
{% api_table_param text string No "" "The plain text content of your footer." 2 %}
{% api_table_param html string No "" "The HTML content of your footer." 2 %}
{% 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 %}
{% 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 %}
{% api_table_param enable boolean No "true or false" "Indicates if this setting is enabled." 2 %}
{% api_table_param spam_check object No "" "This allows you to test the content of your email for spam." 1 %}
{% api_table_param enable boolean No "true or false" "Indicates if this setting is enabled." 2 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ Recipients
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Marketing_Campaigns/contactdb.html#List-Recipients-GET">List Recipients - GET</a></li>
<li><a href="{{root_url}}/API_Reference/Web_API_v3/Marketing_Campaigns/contactdb.html#Retrieve-a-Recipient-GET">Retrieve a Recipient - GET</a></li>
<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>
<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>
<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>
<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>
<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>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
---
st:
published_at: 2016-06-07
type: Classroom
seo:
title: What do I do if I'm blacklisted?
description: What do I do if I'm blacklisted?
Expand All @@ -15,15 +18,15 @@ Ending up on a blacklist can be detrimental to your domain’s email deliverabil



**Shared IP Plans (Free, Lite, Bronze, Shared Marketing)**
**Shared IP Plans (Free, Legacy Lite, and Essentials)**



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.



**Dedicated IP Plans (Silver, Gold, Platinum, High Volume)**
**Dedicated IP Plans (Pro, and Premier)**



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

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



_\*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._
*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

###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/).


1 change: 0 additions & 1 deletion source/Classroom/Deliver/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ <h2><a href="#Undeliverable-Email">Undeliverable Email</a></h2>
<li><a href="{{root_url}}Undeliverable_Email/help_my_emails_arent_being_delivered.html">Help, My emails aren't being delivered!</a></li>
<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>
<li><a href="{{root_url}}Undeliverable_Email/how_do_i_keep_emails_from_dropping.html">How do I keep emails from dropping?</a></li>
<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>
<li><a href="{{root_url}}Undeliverable_Email/my_emails_are_being_blocked.html">My Emails Are Being Blocked</a></li>
<li><a href="{{root_url}}Undeliverable_Email/my_emails_are_being_dropped.html">My Emails Are Being Dropped</a></li>
<li><a href="{{root_url}}Undeliverable_Email/my_emails_are_going_to_spam.html">My Emails Are Going to Spam</a></li>
Expand Down

0 comments on commit 2277695

Please sign in to comment.