Merge remote-tracking branch 'upstream/a-new-hope-episode-iv' into R2D2

Author: Whatthefoxsays

CONTRIBUTING.md

@@ -309,7 +309,7 @@ seo:
   title: Really Great Documentation - SendGrid Documentation | SendGrid
   override: true
   description: This is some really great documentation! I hope you like it!
-  canonical: http://sendgrid.com/docs/really-great-docs
+  canonical: https://sendgrid.com/docs/really-great-docs
 ---
 ```
 

content/docs/for-developers/parsing-email/setting-up-the-inbound-parse-webhook.md

@@ -514,17 +514,17 @@ Content analysis details:   (0.4 points, 5.0 required)
 
 ## 	Other Inbound Parse Documentation
 
-  - [Parse API]({{root_url}}/API_Reference/Web_API_v3/Webhooks/parse.html) -
+  - [Parse API](https://sendgrid.com/docs/API_Reference/Web_API_v3/Webhooks/parse.html) -
     Manage Inbound Parse Webhook settings using the Parse API (Web API v3).
-  - [Parse Settings Subuser]({{root_url}}/API_Reference/Web_API/Customer_Subuser_API/parse_settings.html) -
+  - [Parse Settings Subuser](https://sendgrid.com/docs/API_Reference/Web_API/Customer_Subuser_API/parse_settings.html) -
     Get current Parse settings and create, edit, and delete entries using the Subuser API (Web API v2).
-  - [Reseller API Parse Settings]({{root_url}}/API_Reference/Web_API/Reseller_API/parse_settings.html) -
+  - [Reseller API Parse Settings](https://sendgrid.com/docs/API_Reference/Web_API/Reseller_API/parse_settings.html) -
     Get current Parse settings and create, edit, and delete entries using the Reseller API (Web API v2).
-  - [Reseller Customer Subuser Parse Settings]({{root_url}}/API_Reference/Web_API/Reseller_API/Reseller_Customer_Subuser_API/customer_subuser_parse_settings.html) -
+  - [Reseller Customer Subuser Parse Settings](https://sendgrid.com/docs/API_Reference/Web_API/Reseller_API/Reseller_Customer_Subuser_API/customer_subuser_parse_settings.html) -
     Get current Parse settings and create, edit, and delete entries using the Reseller Customer Subuser API (Web API v2).
 
 ## 	Statistics
 
 SendGrid provides [statistics](https://app.sendgrid.com/statistics/parse_webhook) of how many emails parsed over time. You can specify what is displayed on the graph by adjusting the statistics filters.
 
-For more information, please see [Parse Webhook Stats]({{root_url}}/API_Reference/Web_API_v3/Stats/parse.html).
+For more information, please see [Parse Webhook Stats](https://sendgrid.com/docs/API_Reference/Web_API_v3/Stats/parse.html).

content/docs/for-developers/partners/azure.md

@@ -229,7 +229,7 @@ completion();
 
 ``` objc
 // Populate the parameters for the SendGrid Web API Call
-// Find more details about the [Web API here]({{root_url}}/API_Reference/Web_API/index.html).
+// Find more details about the [Web API here]({{root_url}}/api-reference/).
 NSString *username = @"<Your SendGrid Username>";
 NSString *apikey = @"<Your SendGrid Password>";
 NSString *to = @"<Email to Playlist Service from Appendix A>";

content/docs/for-developers/partners/magento.md

@@ -14,52 +14,52 @@ navigation:
 This extension allows you to configure Magento 2.0 to send all emails using SendGrid. To get started, [click here](https://marketplace.magento.com/sendgrid-email-delivery-simplified.html)!
 
 ## 	Description
- 	
+
 The official SendGrid extension for Magento 2.0 makes it easy to ensure delivery of your most important transactional emails. Purchase receipts, shipping confirmations, and password reset emails are at the core of how you engage with your customers, helping to fuel your store’s growth. Email delivery is our passion. Entrust our industry-leading email delivery platform, including world-class deliverability tools and expertise to make sure your transactional emails get to the inbox.
 
 Transactional email is an important component of any email communication strategy. SendGrid relieves businesses of the cost and complexity of maintaining custom email systems. SendGrid provides reliable delivery, scalability and real-time analytics along with flexible APIs that make custom integration a breeze. SendGrid for Magento 2.0 allows you to choose between the SMTP relay or the Email API to send outgoing emails from your Magento installation.
 
 ## 	SendGrid Pricing Plans
- 	
+
 Plans start at $9.95/month. Please see our [pricing page](https://sendgrid.com/partners/magento/) for more information.
 
 For a free trial, [click here](https://sendgrid.com/partners/magento/)!
 
 ## 	Main Features
- 	
+
  ### 	Proven Deliverability
- 	
+
 Trusted email deliverability features including email authentication, reputation monitoring, dedicated IP addresses, and more.
 
  ### 	Scale with Confidence
- 	
+
 Our world-class email platform delivers over 30 billion emails per month for our customers.
 
  ### 	Support
- 	
+
 [24/7 support](https://support.sendgrid.com) available to answer your email needs. We also provide a full library of self-support materials here.
 
  ### 	Reporting
- 	
+
 Learn more about your shoppers’ engagement with performance feedback and real-time analytics on requests, deliveries, opens, bounces, unsubscribes, clicks, and more.
 
 ## 	What’s the functionality of your extension?
- 	
+
 * Our extension easily integrates with your SendGrid API key and allows you to send your Magento email with confidence through our world class infrastructure.
 * In addition to reliable delivery and scalability, our extension allows you have access to real-time analytics and insights for quick, well-informed decision making about your customers to grow your e-commerce store.
 * Integrate easily with your SendGrid API key
 
 ## 	What makes your extension unique?
- 	
+
 * SendGrid pioneered the cloud-based email industry, and we are trusted by leading senders like Uber, AirBnB, and Spotify to achieve optimal deliverability at scale.
 * Flexible API and SMTP setup for for easy transactional email Integration.
 * Key email deliverability features including email authentication, reputation monitoring, dedicated IP addresses, and more.
 * Real-time analytics and reporting including opens, clicks, bounces, unsubscribe tracking, and more.
-* Leverage our step-by-step [documentation](https://sendgrid.com/docs) or get quick help from our [24/7 Support Team](https://support.sendgrid.com).
+* Leverage our step-by-step [documentation](https://sendgrid.com/docs/api-reference/) or get quick help from our [24/7 Support Team](https://support.sendgrid.com).
 * This official extension was built for M2 by SendGrid’s dedicated partner-focused teams for continued management and future development.
 
 ## 	Configuration
- 	
+
 First, log in to your **Magento Dashboard**, then click  **System** in the left hand navigation bar. Select **SendGrid** and click **Settings**. Here, you can enter your SendGrid account settings.
 
 1. To get the SendGrid plugin running after activation, navigate to the plugin's settings page and enter your **SendGrid API Key**. Next, choose how your email will be sent (SMTP Relay or Email API).
@@ -72,15 +72,17 @@ First, log in to your **Magento Dashboard**, then click  **System** in the left
 
     ![]({{root_url}}/images/magento_3.jpg)
 
-3. Emails are automatically tracked and tagged to provide you deliverability and engagement statistics viewable from the **SendGrid Dashboard**. You can also add other [categories]({{root_url}}help-support/analytics-and-reporting/categories/) for your emails in the field Categories.
+
+3. Emails are automatically tracked and tagged to provide you deliverability and engagement statistics viewable from the **SendGrid Dashboard**. You can also add other [categories]({{root_url}}/help-support/analytics-and-reporting/categories/) for your emails in the field Categories.
 
     ![]({{root_url}}/images/magento_4.png)
 
 4. Set the **template ID** to be used in all your emails on the settings page.
 
     ![]({{root_url}}/images/magento_5.png)
 
-5. Next, select the [unsubscribe group]({{root_url}}/help-support/sending-email/index-suppressions/).
+
+5. Next, select the [unsubscribe group]({{root_url}}/help-support/sending-email/unsubscribe-groups/).
 
     ![]({{root_url}}/images/magento_6.png)
 
@@ -89,23 +91,23 @@ First, log in to your **Magento Dashboard**, then click  **System** in the left
     ![]({{root_url}}/images/magento_7.png)
 
  ### 	Statistics
- 	
+
 Log into your **Magento Dashboard**, then click **System** in the left hand navigation bar. Select **SendGrid** and click **Statistics** to see your statistics.
 
   ![]({{root_url}}/images/magento_8.jpg)
 
  ### 	Requirements
- 	
+
 * Magento Community Edition 2.x or Magento Enterprise Edition 2.x
 
 ## 	Frequently Asked Questions
- 	
+
  ### 	What credentials do I need to add on settings page?
- 	
+
 [Create a SendGrid account](https://sendgrid.com/partners/magento/) and [generate a new API key](https://app.sendgrid.com/settings/api_keys). For more information about API Keys, [click here]({{root_url}}/help-support/account-and-settings/api-keys/).
 
  ### 	What permissions should my API keys have?
- 	
+
 Your API Key must have  the following permissions:
 
 <table class="table">

content/docs/for-developers/partners/microsoft-azure.md

@@ -15,7 +15,7 @@ If you are using Microsoft’s cloud platform you can easily integrate with Send
 2. [Node.js](http://azure.microsoft.com/en-us/documentation/articles/store-sendgrid-nodejs-how-to-send-email/)
 3. [.NET](http://azure.microsoft.com/en-us/documentation/articles/sendgrid-dotnet-how-to-send-email/)
 4. [Java](http://azure.microsoft.com/en-us/documentation/articles/store-sendgrid-java-how-to-send-email/)
-5. [Java]({{root_url}}/Integrate/Tutorials/WindowsAzure.html) via an Azure webpage
+5. [Java]({{root_url}}/for-developers/partners/azure/) via an Azure webpage
 6. [Mobile Services](http://azure.microsoft.com/en-us/documentation/articles/store-sendgrid-mobile-services-send-email-scripts/)
 
 ## 	Still have questions?

content/docs/for-developers/sending-email/api-getting-started.md

@@ -14,13 +14,13 @@ navigation:
 There are several ways you can get started with the SendGrid API
 
 ## 	Prerequisites
- 	
+
 These instructions describe how to send your first email using cURL calls. This is one of many ways to send email with the SendGrid - we also have [PHP](https://github.com/sendgrid/sendgrid-php), [Python](https://github.com/sendgrid/sendgrid-python), [Node.js](https://github.com/sendgrid/sendgrid-nodejs), [Java](https://github.com/sendgrid/sendgrid-java), [C#](https://github.com/sendgrid/sendgrid-csharp), [Go](https://github.com/sendgrid/sendgrid-go), and [Ruby](https://github.com/sendgrid/sendgrid-ruby) libraries.
 
 Before you can start using the API, you need to do the following:
 
 1. Create a SendGrid [account](https://sendgrid.com/pricing/).
-2. Create an [API Key]({{root_url}}/help-support/account-and-settings/api-keys.html).
+2. Create an [API Key]({{root_url}}/help-support/account-and-settings/api-keys/).
 3. Make sure you have [curl](https://curl.haxx.se/) installed on your machine.
 
 <call-out>
@@ -30,18 +30,18 @@ Curl comes standard on Mac operating systems.
 </call-out>
 
 ## 	How to send an API email
- 	
+
  ### 	Build your API call
- 	
+
 Your API call must have the following components:
 
 * A Host. The host for Web API v3 requests is always https://sendgrid.com/v3/
 * An [Authorization Header](https://sendgrid.api-docs.io/v3.0/how-to-use-the-sendgrid-v3-api/api-authentication#authorization-header)
-* An [API Key]({{root_url}}/help-support/account-and-settings/api-keys.html) within the Authorization Header
+* An [API Key]({{root_url}}/help-support/account-and-settings/api-keys/) within the Authorization Header
 * A Request. When submitting data to a resource via POST or PUT, you must submit your payload in JSON.
 
  ### 	Send your email using the API
- 	
+
 _To Send an email using the SendGrid API:_
 
 ```
@@ -66,13 +66,13 @@ If you have not yet set up [Sender Authentication]({{root_url}}/help-support/sen
 </call-out>
 
  ### 	API Response messages
- 	
+
 All responses are returned in JSON format. We specify this by sending the ``Content-Type`` header. The Web API v3 provides a selection of [response codes](https://sendgrid.api-docs.io/v3.0/how-to-use-the-sendgrid-v3-api/api-responses#status-codes),[content-type headers](https://sendgrid.api-docs.io/v3.0/how-to-use-the-sendgrid-v3-api/api-responses#content-type-header), and [pagination](https://sendgrid.api-docs.io/v3.0/how-to-use-the-sendgrid-v3-api/api-responses#pagination) options to help you interpret the responses to your API requests.
 
 ## 	Next Steps
- 	
+
 For more information on SendGrid and where you can go from here, check out these pages:
 
-- [API Reference]({{root_url}}/API_Reference/api_v3.html)
+- [API Reference]({{root_url}}/api-reference/)
 - [Sender Authentication]({{root_url}}/help-support/sending-email/how-to-set-up-domain-authentication.html)
 - [How to Send Email]({{root_url}}/help-support/sending-email/how-to-send-email.html)

content/docs/for-developers/sending-email/building-an-smtp-email.md

@@ -185,7 +185,7 @@ For more information, see our [unique arguments documentation]({{root_url}}/for-
 
 
 - [How to send email]({{root_url}}/help-support/sending-email/how-to-send-email/)
-- [Getting started with the API]({{root_url}}/API_Reference/api_v3.html)
+- [Getting started with the API]({{root_url}}/api-reference/)
 - [SMTP Service Crash Course](https://sendgrid.com/blog/smtp-service-crash-course/)
 - [Getting Started with the SMTP API]({{root_url}}/for-developers/sending-email/sending-email-smtp/)
 - [Integrating with SMTP]({{root_url}}/for-developers/sending-email/integrating-with-the-smtp-api/)

content/docs/for-developers/sending-email/categories.md

@@ -7,7 +7,7 @@ navigation:
   show: true
 ---
 
-You can add [categories]({{root_url}}/help-support/analytics-and-reporting/categories/) to the X-SMTPAPI header of the emails you send via SendGrid. This will allow you to track emails based on your own categorization system.
+You can add [categories]({{root_url}}/glossary/categories/) to the X-SMTPAPI header of the emails you send via SendGrid. This will allow you to track emails based on your own categorization system.
 
 <call-out type="warning">
 
@@ -29,7 +29,7 @@ Categories should be used to group messages together by broad topic. If you need
 
 ## 	Example
 
-You can use SendGrid's [SMTP API]({{root_url}}/API_Reference/SMTP_API/) to add these categories to your email. The following should be added to the email's header:
+You can use SendGrid's [SMTP API]({{root_url}/for-developers/sending-email/getting-started-smtp/) to add these categories to your email. The following should be added to the email's header:
 
 ### Example Category Header
 ```json

content/docs/for-developers/sending-email/curl-examples.md

@@ -65,7 +65,7 @@ curl --request POST \
 
 ## 	Scheduling and Cancelling an Email
 
-You may schedule an email to be sent up to 72 hours in the future by using the "send_at" parameter. You may cancel this same scheduled email by using the [Cancel Scheduled Sends endpoint]({{root_url}}/API_Reference/Web_API_v3/cancel_schedule_send.html).
+You may schedule an email to be sent up to 72 hours in the future by using the "send_at" parameter. You may cancel this same scheduled email by using the [Cancel Scheduled Sends endpoint](https://sendgrid.com/docs/API_Reference/Web_API_v3/cancel_schedule_send.html).
 
 **Step 1: Generate a batch ID**
 ```bash

content/docs/for-developers/sending-email/getting-started-email-activity-api.md

@@ -270,4 +270,4 @@ This is a full list of basic query types and examples: (replace the data in quot
 ## 	Additional Resources
 
 - [Email Activity Feed API Reference](https://sendgrid.api-docs.io/v3.0/email-activity/filter-all-messages)
-- [Email Activity Feed UI](https://sendgrid.com/docs/help-support/analytics-and-reporting/email-activity-feed.html)
+- [Email Activity Feed UI]({{root_url}}/help-support/analytics-and-reporting/email-activity-feed/)