Glossary update and ASM pages 🐙

source/API_Reference/Web_API_v3/Advanced_Suppression_Manager/index.md

@@ -10,7 +10,7 @@ Advanced Suppression Managers gives your recipients more control over the types
 certain group.
 
 Learn more in the:[Advanced Suppression Manager User
-Guide]({{root_url}}/User_Guide/advanced_suppression_manager.html), or
+Guide]({{root_url}}/User_Guide/Email_Deliverability/Subscription_Tracking/index.html), or
 check out the following API resources:
 
 -[Suppression

source/API_Reference/Web_API_v3/IP_Management/ip_warmup.md

@@ -13,24 +13,7 @@ If you have existing warm IPs as well as new IPs that need warming, any mail bey
 
 If there are no existing warm IPs, any requests made above the hourly maximum limit will overflow to our Shared IP Warmup clusters for sending. If your sending reputation is below 85, you will not be able to use these Shared IP Warmup clusters. 
 
-An IP in warmup will always follow SendGrid’s Warmup Schedule. Please consider a measured approach when sending on a new IP to allow for proper IP warmup. You can read more on [the importance of warming up a new IP]({{root_url}}/User_Guide/Setting_Up_Your_Server/warming_up.html) and consider your sending volume for best deliverability.
-
-* * * * *
-
-{% anchor h2 %}
-POST
-{% endanchor %}
-Add an IP to warmup.
-
-{% parameters post %}
-  {% parameter ip Yes 'Valid IP address' 'IP address to warmup' %}
-{% endparameters %}
-
-{% apiv3example post POST https://api.sendgrid.com/v3/ips/warmup ip=000.000.000.000 %}
-{% v3response %}
-_
-{% endv3response %}
-{% endapiv3example %}
+An IP in warmup will always follow SendGrid’s Warmup Schedule. Please consider a measured approach when sending on a new IP to allow for proper IP warmup. You can read more on [the importance of warming up a new IP]({{root_url}}/User_Guide/Setting_Up_Your_Server/warming_up_ips.html) and consider your sending volume for best deliverability.
 
 * * * * *
 

source/Code_Examples/ruby.md

@@ -22,7 +22,7 @@ email = SendGrid::Mail.new do |m|
   m.html    = 'and easy to do anywhere, even with Ruby'
 end
 
-sendgrid.send(email)
+client.send(email)
 {% endcodeblock %}
 
 This example shows how to send email plain text and HTML email using Ruby. The gem [Mail](https://github.com/mikel/mail) is required.

source/Glossary/dmarc.md

@@ -8,6 +8,10 @@ seo:
   title: DMARC 
   override: true
 ---
+
 Domain-based Message Authentication Reporting and Conformance (DMARC) is an additional layer of email authentication that builds on the two previous authentication methods [Sender Policy Framework (SPF)]({{root_url}}/Glossary/spf.html) and [DomainKeys Identified Mail (DKIM)]({{root_url}}/Glossary/dkim.html). First and foremost, both SPF and DKIM must be implemented before a DMARC policy can be put into place.
-DMARC came about in an effort to standardize what happens to your sent mail in the event of failed authentications. Conceptually, it’s helpful to think of DMARC in the context of "if this then that” reasoning. If SPF and DKIM both fail, then DMARC takes action on its defined policy. Both DKIM and SPF must fail before any action on a DMARC policy is taken. This layer of defense provides consistency and defined results to legitimate senders. 
+
+DMARC came about in an effort to standardize what happens to your sent mail in the event of failed authentications. Conceptually, it’s helpful to think of DMARC in the context of "if this then that” reasoning. If SPF and DKIM both fail, then DMARC takes action on its defined policy. Both DKIM and SPF must fail before any action on a DMARC policy is taken. This layer of defense provides consistency and defined results to legitimate senders.
+
 Without DMARC, [ESPs]({{root_url}}/Glossary/email_service_provider.html) decide whether to deliver or block mail based on the authentication results of SPF and DKIM. DMARC allows the legitimate senders to tell ESPs who have implemented DMARC exactly what to do with the unauthenticated mail.  This becomes absolutely vital for those senders who are concerned with their domain being spoofed. Check out our article on [implementing DMARC](https://support.sendgrid.com/hc/en-us/articles/200182958) which goes into the specifics of DMARC policies.
+

source/Glossary/domain.md

@@ -14,8 +14,4 @@ A domain is a named Internet address that resolves to the numbered Internet Prot
 
 If you are on a Silver or above plan you will have your very own dedicated IP address which we encourage you to [whitelabel your server for sending with SendGrid]({{root_url}}/User_Guide/Setting_Up_Your_Server/Whitelabeling/index.html)
 
-{% anchor h3 %}
-Related Links
-{% endanchor %}
-
-* [Email Infrastructure Guide](http://resources.sendgrid.com/email-infrastructure-guide/?mc=SendGrid%20Documentation)
+For more information, please download our [Email Infrastructure Guide](http://resources.sendgrid.com/email-infrastructure-guide/?mc=SendGrid%20Documentation)

source/Glossary/email_marketing.md

@@ -23,12 +23,12 @@ Following email best practices in your marketing emails can yield great rewards
 
 SendGrid can help you achieve your email marketing goals with our [Marketing Email Service](https://sendgrid.com/email-marketing). This service provides the following and much more:
 
-* Pre-designed email templates
-* Drag and drop editor
-* Ability to use your own HTML
-* Scheduled email campaign delivery
-* Powerful analytics (track email sends, deliveries, bounces, spam reports, clicks, opens, ...unsubscribes, category use, and more in real-time)
-* A/B testing
-* Simple list management
+* [Pre-designed email templates]({{root_url}}/Marketing_Emails/create_manage.html#-STEP-3-Design)
+* [Drag and drop editor]({{root_url}}/VidGrid/Marketing_Emails/Design/drag_and_drop.html)
+* [Ability to use your own HTML]({{root_url}}/Marketing_Emails/create_manage.html)
+* [Scheduled email campaign delivery]({{root_url}}/API_Reference/Marketing_Emails_API/schedule.html)
+* [Powerful analytics]({{root_url}}/Delivery_Metrics/index.html)
+* [A/B testing]({{root_url}}/API_Reference/Marketing_Emails_API/variations.html)
+* [Simple list management]({{root_url}}/Marketing_Emails/recipients.html)
 
 This level of visibility into your email marketing performance is invaluable when it comes to determining what resonates best with your audience. Overall, the key to a successful email marketing is that it drives an action. You should strive to provide relevant content by using segmentation strategies to tailor your communications. This is best achieved by testing your design, content, and offers to determine what resonates best with your subscribers.

source/Glossary/feedback_loop.md

@@ -10,6 +10,6 @@ navigation:
   show: true
 ---
 
-A feedback loop is the process by which an ISP forwards emails reported as spam (see complaint) for immediate removal by the sender.
+A feedback loop is the process by which an ISP forwards emails reported as spam (see [complaint]({{root_url}}/Glossary/complaint.html)) for immediate removal by the sender.
 
 [To get more information please check out our Email Infrastructure Guide](http://resources.sendgrid.com/email-infrastructure-guide/?mc=SendGrid%20Documentation)

source/Glossary/index.html

@@ -1,6 +1,6 @@
 ---
 seo:
-  title: Email Glossary
+  title: Email Terms Glossary
   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 Glossary
@@ -10,32 +10,154 @@
   show: true
 ---
 
-<div id="featured-library-pages">
-    <div class="featured-library-page js-link">
-        <div class="text-wrapper">
-            {% anchor h2 %}
-            Email Deliverability
-            {% endanchor %}
-            <p>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.</p>
-            <a href="{{root_url}}/Glossary/email_deliverability.html" class="learn-more">Learn more about Email Deliverability</a>
-        </div>
-    </div>
-    <div class="featured-library-page js-link">
-        <div class="text-wrapper">
-            {% anchor h2 %}
-            Transactional Email
-            {% endanchor %}
-            <p>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.</p>
-            <a href="{{root_url}}/Glossary/transactional_email.html" class="learn-more">Learn more about Transactional Email</a>
-        </div>
-    </div>
-    <div class="featured-library-page js-link">
-        <div class="text-wrapper">
-            {% anchor h2 %}
-            Email Marketing
-            {% endanchor %}
-            <p>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.</p>
-            <a href="{{root_url}}/Glossary/email_marketing.html" class="learn-more">Learn more about Email Marketing</a>
-        </div>
+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).
+
+<div class="row">
+    <div class="col-md-4">
+        {% anchor h2 %}A{% endanchor %}
+        <ul>
+            <li><a href="{{root_url}}/Glossary/a_record.html">A Record</a></li>
+        </ul>
+    </div>
+    <div class="col-md-4">
+        {% anchor h2 %}B{% endanchor %}
+        <ul>
+            <li><a href="{{root_url}}/Glossary/black_hat_sender.html">Black Hat Sender</a></li>
+            <li><a href="{{root_url}}/Glossary/blacklists.html">BlackLists</a></li>
+            <li><a href="{{root_url}}/Glossary/blocks.html">Blocks</a></li>
+            <li><a href="{{root_url}}/Glossary/bounces.html">Bounces</a></li>
+            <li><a href="{{root_url}}/Glossary/bulk_email_service.html">Bulk Email Service</a></li>
+            <li><a href="{{root_url}}/Glossary/bulk_mail_folder.html">Bulk Mail Folder</a></li>
+            <li><a href="{{root_url}}/Glossary/bulk_sender_notification.html">Bulk Sender Notification</a></li>
+        </ul>
+    </div>
+    <div class="col-md-4">
+        {% anchor h2 %}C{% endanchor %}
+        <ul>
+            <li><a href="{{root_url}}/Glossary/challenge_response.html">Challenge Response</a></li>
+            <li><a href="{{root_url}}/Glossary/clicks.html">Clicks</a></li>
+            <li><a href="{{root_url}}/Glossary/cname.html">CNAME</a></li>
+            <li><a href="{{root_url}}/Glossary/complaint.html">Complaint</a></li>
+        </ul>
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-4">
+        {% anchor h2 %}D{% endanchor %}
+        <ul>
+            <li><a href="{{root_url}}/Glossary/deliveries.html">Deliveries</a></li>
+            <li><a href="{{root_url}}/Glossary/dkim.html">DKIM</a></li>
+            <li><a href="{{root_url}}/Glossary/dmarc.html">DMARC</a></li>
+            <li><a href="{{root_url}}/Glossary/domain.html">Domain</a></li>
+        </ul>
+    </div>
+    <div class="col-md-4">
+        {% anchor h2 %}E{% endanchor %}
+        <ul>
+            <li><a href="{{root_url}}/Glossary/email_api_integration.html">Email API Integration</a></li>
+            <li><a href="{{root_url}}/Glossary/email_authentication.html">Email Authentication</a></li>
+            <li><a href="{{root_url}}/Glossary/email_deliverability.html">Email Deliverability</a></li>
+            <li><a href="{{root_url}}/Glossary/email_harvesting.html">Email Harvesting</a></li>
+            <li><a href="{{root_url}}/Glossary/email_marketing.html">Email Marketing</a></li>
+            <li><a href="{{root_url}}/Glossary/email_service_provider.html">Email Service Provider</a></li>
+            <li><a href="{{root_url}}/Glossary/event_webhook.html">Event Webhook</a></li>
+        </ul>
+    </div>
+    <div class="col-md-4">
+        {% anchor h2 %}F{% endanchor %}
+        <ul>
+            <li><a href="{{root_url}}/Glossary/feedback_loop.html">Feedback Loop</a></li>
+        </ul>
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-4">
+        {% anchor h2 %}H{% endanchor %}
+        <ul>
+            <li><a href="{{root_url}}/Glossary/header.html">Header</a></li>
+        </ul>
+    </div>
+    <div class="col-md-4">
+        {% anchor h2 %}I{% endanchor %}
+        <ul>
+            <li><a href="{{root_url}}/Glossary/imap.html">IMAP</a></li>
+            <li><a href="{{root_url}}/Glossary/ip_address.html">IP Address</a></li>
+            <li><a href="{{root_url}}/Glossary/ip_warmup.html">IP Warmup</a></li>
+            <li><a href="{{root_url}}/Glossary/ip_whitelabeling.html">IP Whitelabeling</a></li>
+        </ul>
+    </div>
+    <div class="col-md-4">
+        {% anchor h2 %}M{% endanchor %}
+        <ul>
+            <li><a href="{{root_url}}/Glossary/mail_merge.html">Mail Merge</a></li>
+            <li><a href="{{root_url}}/Glossary/mta.html">MTA</a></li>
+            <li><a href="{{root_url}}/Glossary/mx_record.html">MX Record</a></li>
+        </ul>
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-4">
+        {% anchor h2 %}O{% endanchor %}
+        <ul>
+            <li><a href="{{root_url}}/Glossary/open_rate.html">Open Rate</a></li>
+            <li><a href="{{root_url}}/Glossary/openrelay.html">Open Relay</a></li>
+            <li><a href="{{root_url}}/Glossary/opens.html">Opens</a></li>
+        </ul>
+    </div>
+    <div class="col-md-4">
+        {% anchor h2 %}P{% endanchor %}
+        <ul>
+            <li><a href="{{root_url}}/Glossary/phishing.html">Phishing</a></li>
+            <li><a href="{{root_url}}/Glossary/provisioning.html">Provisioning</a></li>
+        </ul>
+    </div>
+    <div class="col-md-4">
+        {% anchor h2 %}R{% endanchor %}
+        <ul>
+            <li><a href="{{root_url}}/Glossary/reputation_monitoring.html">Reputation Monitoring</a></li>
+            <li><a href="{{root_url}}/Glossary/request.html">Request</a></li>
+            <li><a href="{{root_url}}/Glossary/reseller_email_account.html">Reseller Email Account</a></li>
+            <li><a href="{{root_url}}/Glossary/reverse_dns.html">Reverse DNS</a></li>
+        </ul>
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-4">
+        {% anchor h2 %}S{% endanchor %}
+        <ul>
+            <li><a href="{{root_url}}/Glossary/scheduled_emails.html">Scheduled Emails</a></li>
+            <li><a href="{{root_url}}/Glossary/sender_id.html">Sender ID</a></li>
+            <li><a href="{{root_url}}/Glossary/sender_reputation.html">Sender Reputation</a></li>
+            <li><a href="{{root_url}}/Glossary/smtp.html">SMTP</a></li>
+            <li><a href="{{root_url}}/Glossary/smtp_api.html">SMTP API</a></li>
+            <li><a href="{{root_url}}/Glossary/smtp_provider.html">SMTP Provider</a></li>
+            <li><a href="{{root_url}}/Glossary/smtp_relay.html">SMTP Relay</a></li>
+            <li><a href="{{root_url}}/Glossary/smtp_server.html">SMTP Server</a></li>
+            <li><a href="{{root_url}}/Glossary/smtp_service.html">SMTP Service</a></li>
+            <li><a href="{{root_url}}/Glossary/spam_filter.html">Spam Filter</a></li>
+            <li><a href="{{root_url}}/Glossary/spam_reports.html">Spam Reports</a></li>
+            <li><a href="{{root_url}}/Glossary/spam_traps.html">Spam Traps</a></li>
+            <li><a href="{{root_url}}/Glossary/spf.html">SPF</a></li>
+            <li><a href="{{root_url}}/Glossary/spoofing.html">Spoofing</a></li>
+            <li><a href="{{root_url}}/Glossary/subscriber_list_management.html">Subscriber List Management</a></li>
+        </ul>
+    </div>
+    <div class="col-md-4">
+        {% anchor h2 %}T{% endanchor %}
+        <ul>
+            <li><a href="{{root_url}}/Glossary/tls.html">TLS</a></li>
+            <li><a href="{{root_url}}/Glossary/transactional_email.html">Transactional Email</a></li>
+            <li><a href="{{root_url}}/Glossary/transactional_email_templates.html">Transactional Email Templates</a></li>
+            <li><a href="{{root_url}}/Glossary/two_factor_authentication.html">Two Factor Authentication</a></li>
+        </ul>
+    </div>
+    <div class="col-md-4">
+        {% anchor h2 %}W{% endanchor %}
+        <ul>
+            <li><a href="{{root_url}}/Glossary/web_api.html">Web API</a></li>
+            <li><a href="{{root_url}}/Glossary/white_hat_sender.html">White Hat Sender</a></li>
+        </ul>
     </div>
 </div>

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

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

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