-
- {% anchor h2 %}
- Email Deliverability
- {% endanchor %}
-
Email Deliverability represents your emails being delivered to your recipients as intended. It is business critical for every company to ensure that they have strong deliverability because email is the primary method for communicating to customers.
-
Learn more about Email Deliverability
-
-
-
- {% anchor h2 %}
- Transactional Email
- {% endanchor %}
-
Transactional emails represent the triggered email communication between a business and their customers that directly follows a customer action. These emails typically contain information a user wants or needs and consequently have the highest open rates across all categories of email.
-
Learn more about Transactional Email
-
-
-
- {% anchor h2 %}
- Email Marketing
- {% endanchor %}
-
Email marketing is one of the most effective ways to communicate with your customers. As defined by the CAN-SPAM Act, email marketing is any message with the primary purpose to advertise or promote a commercial product or service. SendGrid provides reliable email marketing deliverability to make sure your emails reach the inbox.
-
Learn more about Email Marketing
-
+There are a lot of things to know about email. So, we wanted to help you know as much as you could possibly want to know! These are some of the more common terms that we use elsewhere in our documentation.
+
+We have organized these alphabetically, but you can also check out our [subject list of Email Terms]({{root_url}}/Glossary/subjects.html).
+
+
+
+ {% anchor h2 %}A{% endanchor %}
+
+
+
+ {% anchor h2 %}B{% endanchor %}
+
+
+
+ {% anchor h2 %}C{% endanchor %}
+
+
+
+
+
+ {% anchor h2 %}D{% endanchor %}
+
+
+
+ {% anchor h2 %}E{% endanchor %}
+
+
+
+ {% anchor h2 %}F{% endanchor %}
+
+
+
+
+
+ {% anchor h2 %}H{% endanchor %}
+
+
+
+ {% anchor h2 %}I{% endanchor %}
+
+
+
+ {% anchor h2 %}M{% endanchor %}
+
+
+
+
+
+ {% anchor h2 %}O{% endanchor %}
+
+
+
+ {% anchor h2 %}P{% endanchor %}
+
+
+
+ {% anchor h2 %}R{% endanchor %}
+
+
+
+
+
+ {% anchor h2 %}S{% endanchor %}
+
+
+
+ {% anchor h2 %}T{% endanchor %}
+
+
+
+ {% anchor h2 %}W{% endanchor %}
+
\ No newline at end of file
diff --git a/source/Glossary/ip_address.md b/source/Glossary/ip_address.md
index 553ebdfccc..c27becc149 100644
--- a/source/Glossary/ip_address.md
+++ b/source/Glossary/ip_address.md
@@ -4,7 +4,7 @@ seo:
description: A unique numerical address that defines an internet location.
keywords:
title: IP Address
-weight: 100
+weight: 0
layout: page
navigation:
show: true
diff --git a/source/Glossary/ip_warmup.md b/source/Glossary/ip_warmup.md
index 8fa0c21d1c..3cb6ac836f 100644
--- a/source/Glossary/ip_warmup.md
+++ b/source/Glossary/ip_warmup.md
@@ -12,6 +12,6 @@ seo:
When you place your IP in warmup mode, this means we will split up the requests that you send to us and only send a minimal amount of messages from your dedicated IP. The rest will be sent from a already warmed up IP pool. Each day we will increase the amount that we send directly from your IP. You can see the IP warmup schedule here .
-[IP warming]({{root_url}}/User_Guide/Setting_Up_Your_Server/warming_up.html) is a gradual process that happens over time, with the goal of establishing a reputation as a legitimate email sender in the eyes of ISPs (Internet Service Providers). When an ISP observes email suddenly coming from a new or “cold” (ie, recently dormant) IP address, they will take notice of it and immediately begin evaluating the traffic coming from that IP. Since volume is perhaps the most telling factor in the eyes of ISP SPAM filters, it is best to begin sending low to moderate volume (e.g., up to 1 million emails/month), eventually working your way up to larger volumes (e.g., over 1 million emails/month). This gives the receiving email providers a chance to closely observe your sending habits and the way your customers treat the emails they receive from you. Click here to read more about this.
+[IP warming]({{root_url}}/User_Guide/Setting_Up_Your_Server/warming_up_ips.html) is a gradual process that happens over time, with the goal of establishing a reputation as a legitimate email sender in the eyes of ISPs (Internet Service Providers). When an ISP observes email suddenly coming from a new or “cold” (ie, recently dormant) IP address, they will take notice of it and immediately begin evaluating the traffic coming from that IP. Since volume is perhaps the most telling factor in the eyes of ISP SPAM filters, it is best to begin sending low to moderate volume (e.g., up to 1 million emails/month), eventually working your way up to larger volumes (e.g., over 1 million emails/month). This gives the receiving email providers a chance to closely observe your sending habits and the way your customers treat the emails they receive from you. Click here to read more about this.
Now you can also warmup your IP using our [IP Warmup API]({{root_url}}/API_Reference/Web_API_v3/IP_Management/ip_warmup.html).
diff --git a/source/Glossary/mta.md b/source/Glossary/mta.md
index cd0a26f0d5..c0e2674e4c 100644
--- a/source/Glossary/mta.md
+++ b/source/Glossary/mta.md
@@ -9,7 +9,7 @@ layout: page
navigation:
show: true
---
-MTA stands for Mail Transfer Agent or Message Transfer Agent. MTA is software that transfers electronic mail messages from one computer to another using a client–server application architecture.
+Mail Transfer Agent or Message Transfer Agent (MTA) is software that transfers electronic mail messages from one computer to another using a client–server application architecture.
An MTA implements both the client (sending) and server (receiving) portions of the [Simple Mail Transfer Protocol]({{root_url}}/Glossary/smtp.html).
diff --git a/source/Glossary/request.md b/source/Glossary/request.md
index 3966a41468..66a156540f 100644
--- a/source/Glossary/request.md
+++ b/source/Glossary/request.md
@@ -10,6 +10,6 @@ navigation:
show: true
---
-Whenever your application or server attempts to send an email to one of your customers via SendGrid, we will record that as a request to your SendGrid dashboard. In simple terms, each time you contact SendGrid with an email and say, "Hey could you deliver this message for me?", that is a request.
+Whenever your application or server attempts to send an email to one of your customers via SendGrid, we will record that as a request to your SendGrid dashboard. In other words, when you send emails through SendGrid, you are essentially requesting, "Hey could you deliver this message for me?".
Visit [Delivery Metrics]({{root_url}}/Delivery_Metrics/index.html) to find more information about all the statistics SendGrid provides.
diff --git a/source/Glossary/spam_traps.md b/source/Glossary/spam_traps.md
index 4aed4f9c51..e825d5ee3a 100644
--- a/source/Glossary/spam_traps.md
+++ b/source/Glossary/spam_traps.md
@@ -10,7 +10,7 @@ navigation:
show: true
---
-**Spam traps**, also called a “honeypots”, are email addresses created (or re-activated) by ISPs specifically to lure spammers. In many cases, the only way to acquire the address is through an automated email address harvesting process.
+Spam traps, also called a “honeypots”, are email addresses created (or re-activated) by ISPs specifically to lure spammers. In many cases, the only way to acquire the address is through an automated email address harvesting process.
Spam traps are important because so many large ISPs, spam filter providers and Domain Name System [blacklists]({{root_url}}/Glossary/blacklists.html) use them. In short, sending an email to a spam trap can lead directly to being blacklisted by the organization that set up the trap. Remember that blacklisting can ruin a business’s reputation and halt further email deliverability.
diff --git a/source/Glossary/spf.md b/source/Glossary/spf.md
index b873f762d1..0d2cc8e2e4 100644
--- a/source/Glossary/spf.md
+++ b/source/Glossary/spf.md
@@ -9,15 +9,17 @@ layout: page
navigation:
show: true
---
-**SPF** stands for Sender Policy Framework. It is an email authentication standard developed by AOL that compares the email sender’s actual IP address to a list of IP addresses authorized to send mail from that domain. The IP list is published in the domain’s DNS record.
+Sender Policy Framework (SPF) is an email authentication standard developed by AOL that compares the email sender’s actual IP address to a list of IP addresses authorized to send mail from that domain. The IP list is published in the domain’s DNS record.
The DNS record should look like this:
-`yourdomain.com. | TXT | v=spf1 a mx include:sendgrid.net ~all`
+{% codeblock %}
+yourdomain.com. | TXT | v=spf1 a mx include:sendgrid.net ~all
+{% endcodeblock %}
If SendGrid is not included in your SPF record then we will not be able to send on your behalf and you will probably receive bounces pertaining to authentication issues. If you already have an existing SPF record for your domain then you will just need to append “include:sendgrid.net” to that current record at the end, but before the “all” mechanism.
Please note: We recommend configuring your “all” mechanism to be a soft fail, which is expressed as “~all” at the end of your SPF record.
-[This article in our Support Help Center offers even more detail.](https://sendgrid.zendesk.com/hc/en-us/articles/202517236)
+For more in depth information about implementing SPF records, pleas check out our [Whitelabeling > SPF documentation]({{root_url}}/User_Guide/Setting_Up_Your_Server/Whitelabeling/spf.html)
-[To get even more information please check out our Email Infrastructure Guide.](http://resources.sendgrid.com/email-infrastructure-guide/?mc=SendGrid%20Documentation)
+To get more information around email infrastructure check out our [Email Infrastructure Guide.](http://resources.sendgrid.com/email-infrastructure-guide/?mc=SendGrid%20Documentation)
diff --git a/source/Glossary/subjects.md b/source/Glossary/subjects.md
new file mode 100644
index 0000000000..bc5754200e
--- /dev/null
+++ b/source/Glossary/subjects.md
@@ -0,0 +1,109 @@
+---
+seo:
+ title: Email Terms By Subject
+ description: Learn why more developers choose SendGrid for their email deliverability service to send transactional emails triggered by web apps. Get started for free
+ keywords: email glossary, email terms
+title: Email Terms By Subject
+weight: 100
+layout: page
+navigation:
+ show: true
+---
+There are a quite a few things to know about email. So, we wanted to help you know as much as you could possibly want to know! These are some of the more common terms that we use elsewhere in our documentation.
+
+We have organized these by subject, but you can also look at our [alphabetical list of Email Terms]({{root_url}}/Glossary/index.html).
+
+
+
+ {% anchor h2 %}Domains & Servers{% endanchor %}
+
+
+
+ {% anchor h2 %}Deliverability{% endanchor %}
+
+
+
+ {% anchor h2 %}Email{% endanchor %}
+
+
+
+
+
+ {% anchor h2 %}Senders, Spam, & Spammers{% endanchor %}
+
+
+
+ {% anchor h2 %}SendGrid Services{% endanchor %}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/source/Glossary/tls.md b/source/Glossary/tls.md
index 8617c8b026..327bf2a52b 100644
--- a/source/Glossary/tls.md
+++ b/source/Glossary/tls.md
@@ -9,9 +9,7 @@ seo:
override: true
description: Protect transmission of email information with TLS and SendGrid
---
-Transport Layer Security (TLS)
-
-TLS is an encryption protocol that’s used to encrypt information in transit over the Internet. TLS uses certificates to encrypt sessions to maintain confidentiality of information. SendGrid uses TLS to encrypt sessions with its application via HTTPS and API.
+Transport Layer Security (TLS) is an encryption protocol that’s used to encrypt information in transit over the Internet. TLS uses certificates to encrypt sessions to maintain confidentiality of information. SendGrid uses TLS to encrypt sessions with its application via HTTPS and API.
SendGrid also utilizes “opportunistic TLS” for [sending email via SMTP]({{root_url}}/Getting_Started/Sending_Emails_With_SendGrid/index.html) or our [Web API]({{root_url}}/API_Reference/Web_API/index.html). Opportunistic TLS means that we will encrypt your email sending from your end point all the way to the recipient, providing that the recipient’s mail server is configured to support TLS.
diff --git a/source/User_Guide/Email_Deliverability/Subscription_Tracking/advanced_suppression_manager.md b/source/User_Guide/Email_Deliverability/Subscription_Tracking/advanced_suppression_manager.md
new file mode 100644
index 0000000000..f27b648c61
--- /dev/null
+++ b/source/User_Guide/Email_Deliverability/Subscription_Tracking/advanced_suppression_manager.md
@@ -0,0 +1,44 @@
+---
+seo:
+ title: Advanced Suppression Manager
+title: Advanced Suppression Manager
+weight: 0
+layout: page
+navigation:
+ show: true
+---
+
+{% info %}
+Advanced Suppression Manager (ASM) is in Beta and is not currently available for use with our [Marketing Email]({{root_url}}/Marketing_Emails/index.html) tool.
+{% endinfo %}
+
+{% anchor h2 %}
+ASM Defined
+{% endanchor %}
+
+When a user unsubscribes from a type of email being sent to them at the sender account level, SendGrid will suppress all attemps at sending this type of email to that user. This means that the contact information
+is still in your contact database or you can send this contact's email via the API. Regardless, emails will not be sent to this contact's email.
+
+For example, if you had an outdated email list and sent an email to that list, but a user on that list had previously unsubscribed from that type of email from you, they would not get the email because the email
+would never leave SendGrid. It would be suppressed from being sent. A contact's emails will only be suppressed if they unsubscribe from that sender's emails, unsubscribing from one sender's list will have no effect
+on suppression lists owned by other senders.
+
+{% anchor h2 %}
+Overview
+{% endanchor %}
+
+ASM gives you the ability to create
+groups that represent types of email that you regularly send to your
+recipients, for example _receipts_, _social notifications_, and _account
+alerts_. You can then give your recipients more control over the types of
+emails they want to receive by letting them opt out of messages from a
+certain group. This means getting the right messages to your recipient's inbox, resulting in a stronger relationship with your recipients and a better sending reputation.
+
+{% info %}
+All of your groups will be visible on the Email Preferences page, along
+with the descriptions.
+{% endinfo %}
+
+And of course there's [Advanced Suppression Manager API endpoints]({{root_url}}/API_Reference/Web_API_v3/Advanced_Suppression_Manager/index.html) for managing your groups and suppressions.
+
+
diff --git a/source/User_Guide/Email_Deliverability/Subscription_Tracking/defining_asm_groups.md b/source/User_Guide/Email_Deliverability/Subscription_Tracking/defining_asm_groups.md
new file mode 100644
index 0000000000..c8c9ba960f
--- /dev/null
+++ b/source/User_Guide/Email_Deliverability/Subscription_Tracking/defining_asm_groups.md
@@ -0,0 +1,50 @@
+---
+seo:
+ title: Defining Unsubscribe Groups
+title: Defining ASM Groups
+weight: 0
+layout: page
+navigation:
+ show: true
+---
+
+{% anchor h2 %}
+To Create ASM Groups
+{% endanchor %}
+
+After logging in to your SendGrid account, click on the beta invitation banner at the top of the page. Once in the beta SendGrid Customer Portal, click on the clipboard icon on the left navigation bar and select "Advanced Suppression Manager."
+
+From here you can begin creating suppression groups to define the types of emails for which you would like your recipients to be able to opt out.
+
+You can also create ASM groups via the [API V3 > ASM Endpoint]({{root_url}}/API_Reference/Web_API_v3/Advanced_Suppression_Manager/groups.html#-POST).
+
+
+{% anchor h2 %}
+Active and Inactive Groups
+{% endanchor %}
+
+A group is active if email has been sent using that suppression group in the last 60 days. Active groups may not be deleted.
+
+
+{% anchor h2 %}
+Defining an ASM Group When Sending
+{% endanchor %}
+
+To specify a group when sending an email, add the group's ID to the X-SMTPAPI header of an SMTP message, or in the x-smtpapi parameter of a [mail.send API
+call]({{root_url}}/API_Reference/Web_API/mail.html).
+
+{% warning %}
+You may only specify one group per send, and you should wait one minute after creating the group before sending with it.
+{% endwarning %}
+
+{% codeblock lang:json %}
+{
+ "asm_group_id": 1
+}
+{% endcodeblock %}
+
+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.
+
+{% info %}
+You can create ASM groups via the [API V3 > ASM Endpoint]({{root_url}}/API_Reference/Web_API_v3/Advanced_Suppression_Manager/groups.html#-POST).
+{% endinfo %}
diff --git a/source/User_Guide/Email_Deliverability/Subscription_Tracking/recipient_subscription_preferences.md b/source/User_Guide/Email_Deliverability/Subscription_Tracking/recipient_subscription_preferences.md
new file mode 100644
index 0000000000..3f5d4f9013
--- /dev/null
+++ b/source/User_Guide/Email_Deliverability/Subscription_Tracking/recipient_subscription_preferences.md
@@ -0,0 +1,33 @@
+---
+seo:
+ title: Recipient Subscription Preferences
+title: Recipient Subscription Preferences
+weight: 0
+layout: page
+navigation:
+ show: true
+---
+
+Emails that are sent with an ASM group specified with will have two links at
+the bottom of the email: an "Email Preferences" link, and an "Unsubscribe" link.
+
+If you do not specify a suppression group when sending an email, the unsubscribe link will act as a global unsubscribe. This
+means that the recipient will no longer get any emails at all, including potentially important emails like password resets. To
+avoid this, [create suppression groups]({{root_url}}/User_Guide/Email_Deliverability/Subscription_Tracking/defining_asm_groups.html).
+
+{% anchor h2 %}
+The Unsubscribe Link
+{% endanchor %}
+When a recipient clicks the Unsubscribe link, they will be asked to confirm their choice and then will be added to the Global Suppression list.
+
+{% anchor h2 %}
+The Email Preferences Link
+{% endanchor %}
+
+Via the Email Preferences link, recipients will see the Email Preferences page. From here, recipients will be able to see all of your
+ASM groups and their descriptions. They will then be able to choose whether or not they want to receive those types of emails.
+
+The Email Preferences page looks like this:
+
+
+
diff --git a/source/User_Guide/Email_Deliverability/Subscription_Tracking/suppressions_vs_unsubscribes.md b/source/User_Guide/Email_Deliverability/Subscription_Tracking/suppressions_vs_unsubscribes.md
new file mode 100644
index 0000000000..aa39c7e410
--- /dev/null
+++ b/source/User_Guide/Email_Deliverability/Subscription_Tracking/suppressions_vs_unsubscribes.md
@@ -0,0 +1,21 @@
+---
+seo:
+ title: Group Unsubscribes vs Global Unsubscribes
+title: Group Suppressions vs Global Unsubscribes
+weight: 0
+layout: page
+navigation:
+ show: true
+---
+
+{% info %}
+If you are not using ASM, it is the default functionality to unsubscribe a user at the global level when they click unsubscribe links
+{% endinfo %}
+
+When using ASM, a recipient clicking an unsubscribe link can choose which groups to unsubscribe from, called a "group suppression", or may choose to opt out of all emails, called a "global unsubscribe".
+
+You can manage your global unsubscribes via [Email Reports > Unsubscribes](https://sendgrid.com/unsubscribes) in the SendGrid portal.
+
+{% info %}
+Group Suppressions do not currently trigger [Event Webhook]({{root_url}}/API_Reference/Webhooks/event.html) events.
+{% endinfo %}
\ No newline at end of file
diff --git a/source/User_Guide/Email_Deliverability/Subscription_Tracking/using_suppression_groups.md b/source/User_Guide/Email_Deliverability/Subscription_Tracking/using_suppression_groups.md
new file mode 100644
index 0000000000..fc606b9f4c
--- /dev/null
+++ b/source/User_Guide/Email_Deliverability/Subscription_Tracking/using_suppression_groups.md
@@ -0,0 +1,38 @@
+---
+seo:
+ title: Using Unsubscribe Groups
+title: Using Suppression Groups
+weight: 0
+layout: page
+navigation:
+ show: true
+---
+
+{% anchor h2 %}
+Suppression Groups and Categories
+{% endanchor %}
+
+While both suppression groups and [categories]({{root_url}}/API_Reference/SMTP_API/categories.html) can represent types
+of email, they are used for different but complementary purposes. Categories are used to organize emails together for
+analytics, while suppression groups organize emails together for the purpose of allowing recipients to opt out of receiving
+those types of emails.
+
+{% anchor h2 %}
+Uploading a CSV
+{% endanchor %}
+
+You can upload a CSV of email addresses that you would like to add to a suppression group.
+
+{% warning %}
+This CSV should be a list of emails, this is not names, addresses, or other information. This is also not emails formatted like so: `FName LName
`
+{% endwarning %}
+
+The CSV must meet the following criteria:
+
+* Email addresses, and only email addresses, must be in the first column of the CSV
+
+* The first row may be an optional header row
+
+* If there is more than one column in the CSV, the extra columns are ignored
+
+* Columns must be comma-separated, without any formatting (e.g. quotation marks) around each of the cells.
diff --git a/source/User_Guide/Email_Deliverability/Undelivered_Email/index.html b/source/User_Guide/Email_Deliverability/Undelivered_Email/index.html
index 9dd3c0ed5c..3fd40c3ffd 100644
--- a/source/User_Guide/Email_Deliverability/Undelivered_Email/index.html
+++ b/source/User_Guide/Email_Deliverability/Undelivered_Email/index.html
@@ -15,7 +15,7 @@
* 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 spam by the recipient foir various reasons
-* An email is Dropped when the recipient is on a suppression list
+* An email is Dropped when the recipient is on a suppression list
diff --git a/source/User_Guide/Setting_Up_Your_Server/warming_up.md b/source/User_Guide/Setting_Up_Your_Server/warming_up_ips.md
similarity index 100%
rename from source/User_Guide/Setting_Up_Your_Server/warming_up.md
rename to source/User_Guide/Setting_Up_Your_Server/warming_up_ips.md
diff --git a/source/User_Guide/advanced_suppression_manager.md b/source/User_Guide/advanced_suppression_manager.md
deleted file mode 100644
index d18dacbbdb..0000000000
--- a/source/User_Guide/advanced_suppression_manager.md
+++ /dev/null
@@ -1,131 +0,0 @@
----
-seo:
- title: Advanced Suppression Manager
-title: Advanced Suppression Manager
-weight: 0
-layout: page
-navigation:
- show: true
----
-
-{% info %}
-ASM is in Beta and is not currently available for use with our [Marketing Email]({{root_url}}/Marketing_Emails/index.html) tool.
-{% endinfo %}
-
-{% anchor h2 %}
-Overview
-{% endanchor %}
-
-Advanced Suppression Manager (ASM) gives you the ability to create
-groups that represent types of email that you regularly send to your
-recipients, for example _receipts_, _social notifications_, and _account
-alerts_. You can then give your recipients more control over the types of
-emails they want to receive by letting them opt out of messages from a
-certain group. This means getting the right messages to your recipient's inbox, resulting in a stronger relationship with your recipients and a better sending reputation.
-
-{% anchor h2 %}
-Getting Started
-{% endanchor %}
-
-After logging in to your SendGrid account, click on the beta invitation banner at the top of the page. Once in the beta SendGrid Customer Portal, click on the clipboard icon on the left navigation bar and select "Advanced Suppression Manager."
-
-From here you can begin creating suppression groups to define the types
-of emails for which you would like your recipients to be able to opt
-out.
-
-{% info %}
-All of your groups will be visible on the Email Preferences page, along
-with the descriptions.
-{% endinfo %}
-
-And of course there's [Advanced Suppression Manager API endpoints]({{root_url}}/API_Reference/Web_API_v3/Advanced_Suppression_Manager/index.html) for managing your groups and suppressions.
-
-{% anchor h2 %}
-Defining an ASM Group When Sending
-{% endanchor %}
-
-To specify a group when sending an email, add the group's ID to the X-SMTPAPI header of an SMTP message, or in the x-smtpapi parameter of a [mail.send API
-call]({{root_url}}/API_Reference/Web_API/mail.html). You may only
-specify one group per send, and you should wait one minute after
-creating the group before sending with it.
-
-{% codeblock lang:json %}
-{
- "asm_group_id": 1
-}
-{% endcodeblock %}
-
-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.
-
-{% anchor h2 %}
-Active and Inactive Groups
-{% endanchor %}
-
-A group is active if email has been sent using that suppression group in
-the last 60 days. Active groups may not be deleted.
-
-{% anchor h2 %}
-Unsubscribe and Email Preferences Links
-{% endanchor %}
-
-Emails that are sent with an ASM group specified with will have two links at
-the bottom of the email: an "Email Preferences" link, and an
-"Unsubscribe" link.
-
-Via Email Preferences, recipients can select which groups of email they
-would like to receive. With the Unsubscribe link, recipients will be added to
-the Global Suppression list once they've confirmed their choice.
-
-{% anchor h2 %}
-Email Preferences
-{% endanchor %}
-
-From the Email Preferences page, recipients will be able to see all your
-groups and their descriptions, and choose whether or not they want to
-receive those types of emails. The Email Preferences page looks like
-this:
-
-
-
-{% anchor h2 %}
-Group Suppressions vs. Global Unsubscribes
-{% endanchor %}
-
-Before ASM, when a recipient unsubscribed from emails, it was a global
-unsubscribe, meaning that recipient would no longer get any emails at
-all, including potentially important emails like password resets. This
-is still the default behavior if you do not specify a suppression group
-when sending an email.
-
-When using ASM, a recipient clicking an unsubscribe link can choose which groups to unsubscribe from (group suppression) or may choose to opt out of all emails (global unsubscribe).
-
-You can manage your global unsubscribes via the UI under "Global Unsubscribes."
-
-{% info %}
-Group Suppressions do not currently trigger [Event Webhook]({{root_url}}/API_Reference/Webhooks/event.html) events.
-{% endinfo %}
-
-{% anchor h2 %}
-Uploading a CSV
-{% endanchor %}
-
-You can upload a CSV of email addresses that you would like to add to a
-suppression group.
-
-The CSV must meet the following criteria:
-
-* Email addresses must be in the first column of the CSV
-
-* The first row may be an optional header row
-
-* If there is more than one column in the CSV, the extra columns are ignored
-
-* Columns must comma-separated, without any formatting (e.g. quotation marks) around each of the cells.
-
-{% anchor h2 %}
-Suppression Groups and Categories
-{% endanchor %}
-
-While both suppression groups and [categories]({{root_url}}/API_Reference/SMTP_API/categories.html) can represent types of email, they are used for different but complementary purposes. Categories are used to organize emails together for analytics, while suppression groups organize emails together for the purpose of allowing recipients to opt out of receiving those types of emails.
-
-
diff --git a/source/User_Guide/sending_practices.md b/source/User_Guide/sending_practices.md
index b88247e3d2..22a46ae1fe 100644
--- a/source/User_Guide/sending_practices.md
+++ b/source/User_Guide/sending_practices.md
@@ -13,7 +13,7 @@ As you begin to use your SendGrid account there are some important things to rem
Additionally, there are limitations to delivery rates imposed by recipient mail servers. Exceeding these limitations results in a practice referred to as throttling. Throttling in terms of email means that a recipient mail server has accepted all the mail it is willing to accept from your IP for a certain period of time.
-If you have a Silver or higher package, you may want to [read how to warm up your IP address to avoid having your outbound messaging throttled]({{root_url}}/User_Guide/Setting_Up_Your_Server/warming_up.html).
+If you have a Silver or higher package, you may want to [read how to warm up your IP address to avoid having your outbound messaging throttled]({{root_url}}/User_Guide/Setting_Up_Your_Server/warming_up_ips.html).
{% anchor h2 %}
Lite Plan Volume Restrictions
diff --git a/source/User_Guide/throttling.md b/source/User_Guide/throttling.md
index b8a872ee87..b5aea3bd0c 100644
--- a/source/User_Guide/throttling.md
+++ b/source/User_Guide/throttling.md
@@ -18,7 +18,7 @@ But what is throttling? Well, it's when a receiving server refuses a message, bu
What can cause a deferral?
{% endanchor %}
-- The receiving server doesn't recognize your IP, and is afraid you're sending spam. *This is why [warming up]({{root_url}}/User_Guide/Setting_Up_Your_Server/warming_up.html) is so important, so they know who you are.*
+- The receiving server doesn't recognize your IP, and is afraid you're sending spam. *This is why [warming up]({{root_url}}/User_Guide/Setting_Up_Your_Server/warming_up_ips.html) is so important, so they know who you are.*
- The receiving server doesn't have any open ports to receive email.