Merge pull request #1292 from sendgrid/develop

Matt Bernier · Matt Bernier · commit 5ef962197920 · 2015-10-06T14:25:58.000-06:00
ASM -&gt; Unsub manager
diff --git a/source/API_Reference/Marketing_Emails_API/emails.md b/source/API_Reference/Marketing_Emails_API/emails.md
@@ -138,7 +138,7 @@ Remove one or more emails from a Recipient List.
 
 {% parameters delete %} 
   
-  {% parameter list Yes 'Must be an existing Recipient List.' 'The list which you are adding email addresses too.' %}  
+  {% parameter list Yes 'Must be an existing Recipient List.' 'The list which you are removing email addresses from.' %}  
   {% parameter email[] Yes 'Must be an email or emails in the Recipient List.' 'Specify the email address or email addresses you wish to remove from the specified Recipient List. May list multiple addresses with multiple <code>email[]</code> parameters' %}
 {% endparameters %}
 
diff --git a/source/API_Reference/SMTP_API/suppressions.md b/source/API_Reference/SMTP_API/suppressions.md
@@ -45,7 +45,7 @@ You can specify up to 25 groups to display.
 Groups
 {% endanchor %}
 
-You can find your group IDs by looking at the Group ID column in the Advanced Suppression Manager UI, or by calling the [GET method]({{root_url}}/API_Reference/Web_API_v3/Advanced_Suppression_Manager/groups.html#-GET) of the groups resource.
+You can find your group IDs by looking at the Group ID column in the Advanced Suppression Manager UI, or by calling the [GET method]({{root_url}}/API_Reference/Web_API_v3/Suppression_Management/groups.html#-GET) of the groups resource.
 
 Related Articles:
 
diff --git a/source/API_Reference/Web_API/filter_settings.md b/source/API_Reference/Web_API/filter_settings.md
@@ -185,8 +185,8 @@ All fields except version are required for each call.
  {% parameter 'group_unsubscribe' 'Yes' 'Notify when recipient unsubscribes from group' '1' %}
  {% parameter 'group_resubscribe' 'Yes' 'Notify when recipient resubscribes to group' '1' %}
  {% parameter 'spamreport' 'Yes' 'Notify when email is marked as spam' '1' %}
- {% parameter 'group_unsubscribe' 'Yes' 'Notify when email unsubscribes from an [ASM Group]({{root_url}}//API_Reference/Web_API_v3/Advanced_Suppression_Manager/groups.html)' '1' %}
- {% parameter 'group_resubscribe' 'Yes' 'Notify when email resubscribes to an [ASM Group]({{root_url}}//API_Reference/Web_API_v3/Advanced_Suppression_Manager/groups.html)' '1' %}
+ {% parameter 'group_unsubscribe' 'Yes' 'Notify when email unsubscribes from an [ASM Group]({{root_url}}//API_Reference/Web_API_v3/Suppression_Management/groups.html)' '1' %}
+ {% parameter 'group_resubscribe' 'Yes' 'Notify when email resubscribes to an [ASM Group]({{root_url}}//API_Reference/Web_API_v3/Suppression_Management/groups.html)' '1' %}
  {% parameter 'url' 'Yes' 'The post notification url to post these event messages to' 'https://notificationurl.example.com/event' %}
  {% parameter 'version' 'No' 'The version of the Event API you wish to use. (1-3)' '3' %}
 {% endparameters %}
diff --git a/source/API_Reference/Web_API_v3/Advanced_Suppression_Manager/index.md b/source/API_Reference/Web_API_v3/Advanced_Suppression_Manager/index.md
diff --git a/source/API_Reference/Web_API_v3/Stats/index.html b/source/API_Reference/Web_API_v3/Stats/index.html
@@ -32,20 +32,20 @@
 <ul>
   <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Blocks">Blocks</a></li>
   <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Bounces-amp-Repeat-Bounces">Bounces</a></li>
-  <li><a href="{{root_url}}/User_Guide/Email_Deliverability/Undelivered_Email/drops.html">Bounce Drops</a></li>
+  <li><a href="{{root_url}}/Glossary/drops.html">Bounce Drops</a></li>
   <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Clicks-amp-Unique-Clicks">Clicks</a></li>
   <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Delivered">Delivered</a></li>
   <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Deferrals">Deferrals</a></li>
-  <li><a href="{{root_url}}/User_Guide/Email_Deliverability/Undelivered_Email/drops.html">Drops</a></li>
+  <li><a href="{{root_url}}/Glossary/drops.html">Drops</a></li>
   <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Invalid-email">Invalid Emails</a></li>
   <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Opens-amp-Unique-Opens">Processed</a></li>
   <li><a href="{{root_url}}/API_Reference/Webhooks/parse.html">Received</a></li>
   <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Requests">Requests</a></li>
   <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Spam-reports-amp-repeat-spam-reports">Spam Reports</a></li>
   <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Clicks-amp-Unique-Clicks">Unique Clicks</a></li>
   <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Opens-amp-Unique-Opens">Unique Opens</a></li>
-  <li><a href="{{root_url}}/User_Guide/Email_Deliverability/Undelivered_Email/drops.html">Spam Report Drops</a></li>
-  <li><a href="{{root_url}}/User_Guide/Email_Deliverability/Undelivered_Email/drops.html">Unsubscribe Drops</a></li>
+  <li><a href="{{root_url}}/Glossary/drops.html">Spam Report Drops</a></li>
+  <li><a href="{{root_url}}/Glossary/drops.html">Unsubscribe Drops</a></li>
   <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Unsubscribes">Unsubscribes</a></li>
 </ul>
 
diff --git a/source/API_Reference/Web_API_v3/Suppression_Management/global_suppressions.md b/source/API_Reference/Web_API_v3/Suppression_Management/global_suppressions.md
diff --git a/source/API_Reference/Web_API_v3/Suppression_Management/groups.md b/source/API_Reference/Web_API_v3/Suppression_Management/groups.md
@@ -1,9 +1,10 @@
 ---
 layout: page
-title: Groups
+title: Unsubscribe Groups
 weight: 90
 navigation:
   show: true
+  title: Unsubscribe Groups
 ---
 
 Groups are specific types of email you would like your recipients to be able to unsubscribe from or subscribe to. For example: Daily Newsletters, Invoices, System Alerts.
@@ -43,7 +44,7 @@ HTTP/1.1 201 OK
 {% anchor h2 %}
 GET
 {% endanchor %}
-Retrieve all suppression groups associated with the user. 
+Retrieve all suppression groups associated with the user.
 
 {% apiv3example get GET https://api.sendgrid.com/v3/asm/groups %}
 {% v3response %}
diff --git a/source/API_Reference/Web_API_v3/Suppression_Management/index.md b/source/API_Reference/Web_API_v3/Suppression_Management/index.md
@@ -0,0 +1,20 @@
+---
+layout: page
+title: Suppression Management Overview
+weight: 100
+navigation:
+  show: true
+  title: Overview
+  keywords: advanced suppression manager, unsubscribe manager, customer unsubscribes, unsubscribe lists
+---
+
+Unsubscribe Manager gives your recipients more control over the types of emails they want to receive by letting them opt out of messages from a certain type of email.
+
+Learn more in the [Unsubscribe Manager User Guide]({{root_url}}/User_Guide/Suppressions/index.html), or check out the following API resources:
+
+- [Suppression
+Group]({{root_url}}/API_Reference/Web_API_v3/Suppression_Management/groups.html) allow you to segment your email by a grouping which is most often defined by the types of email. Example: Receipts, Deals emails, and notification.
+
+- [Suppressions]({{root_url}}/API_Reference/Web_API_v3/Suppression_Management/suppressions.html) Allow you to manually add or retrieve specific emails that are in your suppression groups.
+
+- [Global Suppressions]({{root_url}}/API_Reference/Web_API_v3/Suppression_Management/global_suppressions.html) Allows you to keep all emails from going to a specific contact
diff --git a/source/API_Reference/Web_API_v3/Suppression_Management/suppressions.md b/source/API_Reference/Web_API_v3/Suppression_Management/suppressions.md
@@ -6,7 +6,7 @@ navigation:
   show: true
 ---
 
-Suppressions are email addresses that can be added to [groups]({{ root_url }}/API_Reference/Web_API_v3/Advanced_Suppression_Manager/groups.html) to prevent certain types of emails from being delivered to those addresses.
+Suppressions are email addresses that can be added to [groups]({{ root_url }}/API_Reference/Web_API_v3/Suppression_Management/groups.html) to prevent certain types of emails from being delivered to those addresses.
 
 {% anchor h2 %}
 POST
@@ -32,7 +32,7 @@ HTTP/1.1 201
 * * * * *
 
 {% anchor h2 %}
-GET 
+GET
 {% endanchor %}
 
 Get suppressed addresses for a given group.
@@ -87,4 +87,3 @@ Delete a recipient email from the suppressions list for a group.
 HTTP/1.1 204
 {% endv3response %}
 {% endapiv3example %}
-
diff --git a/source/API_Reference/Web_API_v3/bounces.apiblueprint b/source/API_Reference/Web_API_v3/bounces.apiblueprint
@@ -0,0 +1,96 @@
+---
+layout: page
+weight: 100
+title: Bounces API
+seo:
+  description: Manage your bounce list
+  title: Bounce API
+navigation:
+  show: true
+---
+FORMAT: 1A
+
+# Bounces
+
+## Bounces Collection [/v3/suppression/bounces?start_time={start_time}&end_time={end_time}]
+
++ Parameters
+
+    + start_time (optional, number, `1443651141`) ... Refers start of the time range in unix timestamp when a bounce was created (inclusive).
+    + end_time (optional, number, `1443651154`) ... Refers end of the time range in unix timestamp when a bounce was created (inclusive).
+
+### List all bounces [GET]
+
++ Response 200 (application/json)
+
+    + Body
+
+            [
+                {
+                    "created": 1443651125,
+                    "email": "testemail1@test.com",
+                    "reason": "550 5.1.1 The email account that you tried to reach does not exist. Please try double-checking the recipient's email address for typos or unnecessary spaces. Learn more at  https://support.google.com/mail/answer/6596 o186si2389584ioe.63 - gsmtp ",
+                    "status": "5.1.1"
+                },
+                {
+                    "created": 1433800303,
+                    "email": "testemail2@testing.com",
+                    "reason": "550 5.1.1 <testemail2@testing.com>: Recipient address rejected: User unknown in virtual alias table ",
+                    "status": "5.1.1"
+                }
+            ]
+
+## Bounces Collection [/v3/suppression/bounces]
+
+There's two bounce delete options:
+1) deleting all bounces by specifying "delete_all" to true in the request body, or
+2) deleteing some emails by specificy "emails" and an array of emails in the response body.
+
+### Delete bounces [DELETE]
+
++ Request (application/json)
+
+    + Body
+
+            {
+                "delete_all": true
+            }
+
++ Response 204
+
++ Request (application/json)
+
+    + Body
+
+            {
+                "emails": [
+                    "email1@test.com",
+                    "email2@test.com"
+                ]
+            }
+
++ Response 204
+
+## Bounces Item [/v3/suppression/bounces/{email}]
++ Parameters
+
+    + email ('required', string, `bounce1@test.com`) ... Email address of bounce entry to retrieve
+
+### Get a bounce [GET]
+
++ Response 200 (application/json)
+
+    + Body
+
+            [
+                {
+                    "created": 1443651125,
+                    "email": "bounce1@test.com",
+                    "reason": "550 5.1.1 The email account that you tried to reach does not exist. Please try double-checking the recipient's email address for typos or unnecessary spaces. Learn more at  https://support.google.com/mail/answer/6596 o186si2389584ioe.63 - gsmtp ",
+                    "status": "5.1.1"
+                }
+            ]
+
+### Delete a bounce [DELETE]
+
++ Response 204
diff --git a/source/API_Reference/index.html b/source/API_Reference/index.html
@@ -19,7 +19,7 @@ <h3>Web API</h3>
 <p>If SMTP is not used, we also offer a simple <a href="{{root_url}}/API_Reference/Web_API/mail.html">Web API mail method</a> to send email. </p>
 
 <h3>Web API V3</h3>
-<p>Our V3 Web API provides functionality for <a href="{{root_url}}/API_Reference/Web_API_v3/Advanced_Suppression_Manager/index.html">managing user unsubscribes</a>, <a href="{{root_url}}/API_Reference/Web_API_v3/Template_Engine/index.html">templating emails</a>, <a href="{{root_url}}/API_Reference/Web_API_v3/IP_Management/index.html">managing IP addresses</a>, and <a href="{{root_url}}/API_Reference/Web_API_v3/Settings/enforced_tls.html">enforcing TLS</a>.</p>
+<p>Our V3 Web API provides functionality for <a href="{{root_url}}/API_Reference/Web_API_v3/Suppression_Management/index.html">managing user unsubscribes</a>, <a href="{{root_url}}/API_Reference/Web_API_v3/Template_Engine/index.html">templating emails</a>, <a href="{{root_url}}/API_Reference/Web_API_v3/IP_Management/index.html">managing IP addresses</a>, and <a href="{{root_url}}/API_Reference/Web_API_v3/Settings/enforced_tls.html">enforcing TLS</a>.</p>
 
 <h3>Marketing Email API</h3>
 <p>The SendGrid Marketing Email API provides developers with the ability to <a href="{{root_url}}/API_Reference/Marketing_Emails_API/emails.html">manage marketing emails</a>, <a href="{{root_url}}/API_Reference/Marketing_Emails_API/lists.html">lists</a>, <a href="{{root_url}}/API_Reference/Marketing_Emails_API/sender_address.html">identities</a>, and <a href="{{root_url}}/API_Reference/Marketing_Emails_API/schedule.html">schedule delivery events</a></p>
diff --git a/source/Glossary/black_hat_sender.md b/source/Glossary/black_hat_sender.md
@@ -13,7 +13,7 @@ A black hat sender is a sender/company who sends email to recipients who either
 
 Not all black hat activity is intentional, though.  Even senders who have their recipient's permission but send an excessive amount of email or who send at an alarming frequency may be flagged by users as “spam”. These senders will be identified by the recipients’ ISP, which may throttle the sender's email, send it to spam traps, or totally block the emails.
 
-If your emails are not getting the clicks and opens you expect, you may want to re-evaluate your sending habits.  Also, please take a look at our [email deliverability tips]({{root_url}}/User_Guide/Email_Deliverability/index.html) for help in being a white hat sender.
+If your emails are not getting the clicks and opens you expect, you may want to re-evaluate your sending habits.  Also, please take a look at our [email deliverability tips]({{root_url}}/Classroom/Deliver/index.html) for help in being a white hat sender.
 
 For more information:
 
diff --git a/source/Glossary/bulk_mail_folder.md b/source/Glossary/bulk_mail_folder.md
@@ -14,4 +14,4 @@ The Bulk Mail Folder is also called the “spam” or “junk” folder, the fol
 
 There are many factors which determine whether or not a message lands in the Bulk Mail Folder. Each receiving mail server will use its own criteria to determine the quality of each message it receives. 
 
-SendGrid offers many [best practices]({{root_url}}/User_Guide/Email_Deliverability/index.html) to help ensure your message lands appropriately in the inbox. Keep your emails out of the Junk folder by learning more about [Email Deliverability](http://resources.sendgrid.com/deliverability-guide-v2/?mc=SendGrid%20Documentation).
+SendGrid offers many [best practices]({{root_url}}/Classroom/Deliver/index.html) to help ensure your message lands appropriately in the inbox. Keep your emails out of the Junk folder by learning more about [Email Deliverability](http://resources.sendgrid.com/deliverability-guide-v2/?mc=SendGrid%20Documentation).
diff --git a/source/Glossary/email_harvesting.md b/source/Glossary/email_harvesting.md
@@ -17,4 +17,4 @@ Spammers may use bots to find valid email addresses on the Internet by spidering
 
 The email addresses of your customers are valuable, so SendGrid takes the security of your send lists very seriously.  
 
-For tips on getting your messages to the Inbox, please see our [email deliverability page]({{root_url}}/User_Guide/Email_Deliverability/index.html).
+For tips on getting your messages to the Inbox, please see our [email deliverability page]({{root_url}}/Classroom/Deliver/index.html).
diff --git a/source/Glossary/subscriber_list_management.md b/source/Glossary/subscriber_list_management.md
@@ -16,4 +16,4 @@ Make sure to check your list stats. You can do this in the [marketing app]({{roo
 
 Make sure you are sending mail to people who actually want your mail. Otherwise, you will get lots of [spam reports]({{root_url}}/Glossary/spam_reports.html), [blocks]({{root_url}}/Glossary/blocks.html) and [bounces]({{root_url}}/Glossary/bounces.html).
 
-Finally, make sure you do not buy email lists or engaging in [Email Harvesting]({{root_url}}/Glossary/email_harvesting.html). For tips on getting your messages to the Inbox, please see our [email deliverability]({{root_url}}/User_Guide/Email_Deliverability/index.html) page.
+Finally, make sure you do not buy email lists or engaging in [Email Harvesting]({{root_url}}/Glossary/email_harvesting.html). For tips on getting your messages to the Inbox, please see our [email deliverability]({{root_url}}/Classroom/Deliver/index.html) page.
diff --git a/source/Glossary/undelivered_email.md b/source/Glossary/undelivered_email.md
@@ -14,8 +14,8 @@ Once an email send has been attempted, but failed, a couple things can happen to
 
 * Bounced emails are ones that were rejected by the recipient's server
 * Invalid emails were sent to email addresses that do not exist
-* Emails can be marked as <a href="{{root_url}}/User_Guide/Email_Deliverability/Undelivered_Email/spam.html">spam</a> by the recipient for various reasons
-* An email is <a href="{{root_url}}/User_Guide/Email_Deliverability/Undelivered_Email/drops.html">Dropped</a> when the recipient is on a <a href="{{root_url}}/User_Guide/Email_Deliverability/Subscription_Tracking/index.html">suppression list</a>
+* Emails can be marked as <a href="{{root_url}}/Glossary/spam.html">spam</a> by the recipient for various reasons
+* An email is <a href="{{root_url}}/Glossary/drops.html">Dropped</a> when the recipient is on a <a href="{{root_url}}/User_Guide/Email_Deliverability/Subscription_Tracking/index.html">suppression list</a>
 
 
 
diff --git a/source/Glossary/white_hat_sender.md b/source/Glossary/white_hat_sender.md
@@ -11,7 +11,7 @@ navigation:
 
 A white hat sender is a sender or company who only sends email to those recipients who have given express permission to receive email from the sender. Put simply, white hat senders always strive to “send the right message, to the right person, at the right time, with the right frequency.”
 
-SendGrid has a plethora of resources to help you be a white hat sender, and to get your email to the inbox, and not to the spam folder.  Check out our [email deliverability]({{root_url}}/User_Guide/Email_Deliverability/index.html) tips to help.
+SendGrid has a plethora of resources to help you be a white hat sender, and to get your email to the inbox, and not to the spam folder.  Check out our [email deliverability]({{root_url}}/Classroom/Deliver/index.html) tips to help.
 
 For more information:
 
diff --git a/source/User_Guide/Suppressions/advanced_suppression_manager.md b/source/User_Guide/Suppressions/advanced_suppression_manager.md
diff --git a/source/User_Guide/Suppressions/global_unsubscribes.md b/source/User_Guide/Suppressions/global_unsubscribes.md
diff --git a/source/User_Guide/Suppressions/group_unsubscribes.md b/source/User_Guide/Suppressions/group_unsubscribes.md
diff --git a/source/_redirects.htaccess b/source/_redirects.htaccess
