Merge pull request #1924 from sendgrid/develop

6/13/16 Docs Updates

source/API_Reference/Web_API_v3/alerts.apiblueprint

@@ -0,0 +1,148 @@
+---
+layout: page
+title: Alerts API
+weight: 100
+navigation:
+  show: true
+---
+
+Alerts allow you to specify an email address to receive notifications regarding your email usage or statistics.
+<br>
+<ul>
+  <li>Usage alerts allow you to set the threshold at which an alert will be sent. For example, if you want to be notified when you've used 90% of your current package's allotted emails, you would set the "percentage" parameter to 90.</li>
+  <li>Stats notifications allow you to set how frequently you would like to receive email statistics reports. For example, if you want to receive your stats notifications every day, simply set the "frequency" parameter to "daily". Stats notifications include data such as how many emails you sent each day, in addition to other email events such as bounces, drops, unsubscribes, etc.</li>
+</ul>
+<br>
+For more information about alerts, please visit our <a href="{{root_url}}/User_Guide/Settings/alerts.html">User Guide</a>.
+
+
+FORMAT: 1A
+
+## Alerts Collection [/alerts]
+
+### Get All Alerts [GET]
+
+Retrieve all alerts.
+
++ Response 200 (application/json)
+    + Body
+
+            [
+                {
+                    "created_at": 1451498784,
+                    "email_to": "[email protected]",
+                    "id": 46,
+                    "percentage": 90,
+                    "type": "usage_limit",
+                    "updated_at": 1451498784
+                },
+                {
+                    "created_at": 1451498812,
+                    "email_to": "[email protected]",
+                    "frequency": "monthly",
+                    "id": 47,
+                    "type": "stats_notification",
+                    "updated_at": 1451498812
+                },
+                {
+                    "created_at": 1451520930,
+                    "email_to": "[email protected]",
+                    "frequency": "daily",
+                    "id": 48,
+                    "type": "stats_notification",
+                    "updated_at": 1451520930
+                }
+            ]
+
+### Create a New Alert [POST]
+
+Create a new alert. You can create the same alert multiple times, but with different email addresses specified in the "email_to" parameter. This is useful if you have multiple users on the same account who would like to receive the same alerts.
+<br>
+<br>
+
++ Attributes (object)
+    + type usage_alert (required, string) - The type of alert you want to create. Can be either usage_alert or stats_notification.
+    + email_to [email protected] (required, string) - The email address the alert will be sent to.
+    + percentage 90 (optional, number) - Required for usage_alert. When this usage threshold is reached, the alert will be sent.
+    + frequency daily (optional, string) - Required for stats_notification. How frequently the alert will be sent.
+
+
++ Request (application/json)
+
+    + Body
+
+            {
+                "type": "stats_notification",
+                "email_to": "[email protected]",
+                "frequency": "daily"
+            }
+
++ Response 201 (application/json)
+
+    + Body
+
+            {
+                "created_at": 1451520930,
+                "email_to": "[email protected]",
+                "frequency": "daily",
+                "id": 48,
+                "type": "stats_notification",
+                "updated_at": 1451520930
+            }
+
+## Alerts Collection [/alerts/{alert_id}]
+
+### Get an Alert [GET]
+
+Retrieve a specific alert.
+
++ Response 200 (application/json)
+
+    + Body
+
+            {
+                "created_at": 1451520930,
+                "email_to": "[email protected]",
+                "frequency": "daily",
+                "id": 48,
+                "type": "stats_notification",
+                "updated_at": 1451520930
+            }
+
+### Delete an Alert [DELETE]
+
+Delete an alert.
+
++ Response 204
+
+### Update an Alert [PATCH]
+
+Update an alert.
+<br>
+<br>
+
++ Attributes
+    + email_to [email protected] (optional, string) - The new email address you want your alert to be sent to.
+    + frequency monthly (optional, string) - The new frequency at which to send the stats_notification alert.
+    + percentage 90 (optional, number) - The new percentage threshold at which the usage_limit alert will be sent.
+
++ Request (application/json)
+
+    + Body
+
+            {
+                "email_to": "[email protected]"
+            }
+
++ Response 200
+
+    + Body
+
+            {
+                "created_at": 1451520930,
+                "email_to": "[email protected]",
+                "frequency": "daily",
+                "id": 48,
+                "type": "stats_notification",
+                "updated_at": 1451522691
+            }

source/Classroom/Basics/Account/how_do_i_add_more_emails_to_my_account.md

@@ -11,16 +11,15 @@ navigation:
   show: true
 ---
 
-_"Can I add more email to my account?"_ This is a question I hear often from SendGrid users and I would like to clear it all up today. **You cannot manually add more emails to an account,**  however most plans allow for overages.
+_"Can I add more emails to my account?"_ is a common question from SendGrid users, and the answer is that because of the subscription based model of SendGrid plans, _you cannot manually add more emails to an account_.  **However, all plans except for the Free and Legacy Lite plans allow for overages, which means that you can send beyond your monthly allowance for a small per-email fee.**
 
-If you are on the Free plan and need of more emails, you will need to upgrade plans.
 
-**Free plans** have a limit of 12,000 emails per month. After 12,000 requests have been made we will simply reject your requests. It is very import to keep track of how many emails you are sending and you can see this on your account overview page. We have no way to tell you when emails started becoming rejected. :(
+**Free plans** have a limit of 12,000 emails per month. After 12,000 requests have been made we will simply reject your requests. It is very import to keep track of how many emails you are sending and you can see this on your account overview page. If you are on the Free plan and are in need of more emails, you will need to [upgrade your account]({{root_url}}/Classroom/Basics/Billing/how_do_i_upgrade_or_downgrade_my_account.html).
 
-**Essentials plan's**  have a monthly limit of 40,000/100,000 emails per month but we do allow overages at $1.00 per every 1000 emails.
+**Essentials plans**  have a monthly limit of 40,000/100,000 emails per month, with overages at a rate of $1.00 per every 1000 emails in excess of your plan limit.
 
-**Pro plan's**  have a monthly limit of 100,000, 300,000 and 700,000 emails per month but we do allow overages at $0.85, $0.50 and $0.45 per every 1000 emails.
+**Pro plans**  have a monthly limit of 100,000, 300,000, or 700,000 emails per month, with overages at a rate of $0.85, $0.50 or $0.45 per every 1000 emails in excess of your plan limit.
 
-**[Legacy Lite plans]({{root_url}}/Classroom/Basics/Billing/legacy_lite_plan.html)** start off with a daily limit of 1000 emails per day for 1 week and the more you send constantly with a good IP reputation, SendGrid will increase your credits. Read more [here](https://sendgrid.com/docs/User_Guide/sending_practices.html) . Again, it is very import to keep track of how many emails you are sending and you can see this on your account overview page.
+**[Legacy Lite plans]({{root_url}}/Classroom/Basics/Billing/legacy_lite_plan.html)** start off with a daily limit of 1000 emails per day for 1 week and the more you send constantly with a good IP reputation, SendGrid will increase your credits. Read more [here](https://sendgrid.com/docs/User_Guide/sending_practices.html) . If you are on the Lite plan and are in need of more emails, you will need to [upgrade your account]({{root_url}}/Classroom/Basics/Billing/how_do_i_upgrade_or_downgrade_my_account.html).
 
 ![]({{root_url}}/images/Screen_Shot_2015-05-26_at_12.21.47_PM.png)

source/Classroom/Basics/Account/how_do_i_add_more_subusers_to_my_account.md

@@ -2,7 +2,7 @@
 seo:
   title: How do I add more subusers to my account?
   description: How do I add more subusers to my account?
-  keywords:
+  keywords:  subuser, add, more, need, additional, users
 title: How do I add more subusers to my account?
 weight: 0
 layout: page
@@ -11,7 +11,7 @@ navigation:
   show: true
 ---
 
-By default, we limit the amount of subusers a Pro (or higher) account has to 15. If you find yourself needing more than 15, please contact Support, and we can help you get more added. You'll see the contact Support options at the lower on this page.
+By default, we limit the amount of subusers a Pro (or higher) account has to 15. If you find yourself needing more than 15, please contact [SendGrid Support](https://support.sendgrid.com), and we can help you get more added.
 
 Just so you are aware, the support agent will likely ask a few questions about what you will be using subusers for and the volume you might be sending over them. Don't worry though, we're only asking so we can help you have the best experience possible with new subusers. 
 

source/Classroom/Basics/Billing/billing_info_and_faqs.md

@@ -33,7 +33,7 @@ Credits don't roll over from month to month, any unused credits from the previou
 
 **I missed a payment, what happens next?**
 
-Accounts with outstanding balances over 7 days old will be suspended due to nonpayment. As soon as you can [update your payment info]({{root_url}}/Classroom/Basics/Billing/update_your_credit_card_and_resubmit_payments.html), your account will become active again.
+Accounts with outstanding balances over 4-5 days old will be suspended due to nonpayment. As soon as you can [update your payment info]({{root_url}}/Classroom/Basics/Billing/update_your_credit_card_and_resubmit_payments.html), your account will become active again.
 
 Accounts that have unpaid invoices and are still suspended during the last week of the month will be terminated, and access revoked until the balance is settled. Please contact support to get your account re-activated from a billing terminated state.
 

source/Classroom/Basics/Billing/forgot_to_cancel_or_upgrade.md

@@ -17,4 +17,4 @@ EXAMPLE:
 
 If you request a refund on your $79.95/mo Pro account, and your monthly invoice totals $117.00 due to a combination of overages and contact storage, you are only eligible for a refund of up to 79.95. The remaining 37.05 cannot be refunded in this scenario. 
 
-If you need to request a refund, please email <[email protected]>.
+If you need to request a refund, please email [[email protected]](mailto:[email protected]).

source/Classroom/Basics/Marketing_Campaigns/how_to_remove_unusable_contacts.md

@@ -0,0 +1,39 @@
+---
+seo:
+  title: How to Remove Unusable Contacts
+  description: Learn how you can delete contacts that result in bounces or spam reports.
+  keywords: marketing, campaign, unusable, unwanted, contacts
+title: How to Remove Unusable Contacts
+weight: 0
+layout: page
+navigation:
+  show: true
+---
+
+It is common to have contacts that result in a group unsubscribe, block, bounce, invalid email address, or spam report. Attempting to send email to these contacts can negatively impact your reputation since these contacts do not want to (and will not) receive your marketing emails. By continuing to store these contacts, you are being charged for recipients that will automatically be dropped.
+
+The following steps will show you how to remove all of your unusable Marketing Campaigns contacts so that you won't continue to be charged for their storage.
+
+1. When viewing your dashboard, navigate to the left hand menu and click **Suppressions**.
+
+2. Open a specific group, such as Bounces or Spam Reports, click the settings cog in the upper right corner, then select **Download as CSV**.
+
+    ![]({{root_url}}/images/remove_unusable_contacts_1.png)
+
+3. Repeat step 2 for each of the groups that you want to remove (e.g. unsubscribes, spam reports etc.) and merge each of those lists into a single CSV file.
+
+    * *Alternatively, you can download all of your contacts from Marketing Campaigns (create a segment defined by "created at" "is after" with a date from 1999 to capture all contacts, and then export that segment).*
+    * *Next, upload that CSV of all contacts to our [List Assist](https://sendgrid.com/docs/Utilities/list_assist.html) tool. This will give you a CSV of all of your Marketing Campaigns contacts that exist on any of the Suppression lists.*
+    * *Use that list to follow steps 4-8 below. You can find a video tutorial explaining how to use List Assist [here](https://www.youtube.com/watch?v=FiyDgCl78dk).*
+
+4. Return to your dashboard, navigate to the left hand menu and select **Marketing**, then **Contacts**.
+
+5. In the upper right corner click **Add List or Segment** and select **Upload CSV**.
+
+6. You will be presented with a dialogue box. Select the option to **Create New List** and name it something obvious, like "Remove Invalid Emails."
+
+7. Once uploaded, click the cog to the right of that new list and select **Delete**.
+
+8. Another dialogue box will open asking if you wish to delete "all contacts associated with this list". Make sure that box is checked, and then you're good to go!
+
+![]({{root_url}}/images/remove_unusable_contacts_2.png)

source/Classroom/Basics/Security/what_security_measures_are_available_with_sendgrid_accounts.md

@@ -13,7 +13,7 @@ navigation:
 
  **Encryption options**
 
-All email sent via SendGrid will utilize opportunistic encryption using [TLS](https://sendgrid.com/docs/Glossary/tls.html). This means that if your recipients’ mail servers are configured to support TLS, it will be impossible for someone along the route to intercept and/or modify your messages. With opportunistic TLS if the recipient mail server does not support the encryption then the message will then be sent without.
+All email sent via SendGrid will utilize [Opportunistic TLS encryption]({{root_url}}/Classroom/Basics/Email_Infrastructure/does_sendgrid_support_end_to_end_tls.html). This means that if your recipients’ mail servers are configured to support TLS, it will be impossible for someone along the route to intercept and/or modify your messages. With opportunistic TLS if the recipient mail server does not support the encryption then the message will then be sent without.
 
 You can read more about which mail servers support TLS in [this blog post](https://sendgrid.com/blog/sendgrid-and-the-future-of-email-security/).
 

source/Classroom/Deliver/Sender_Authentication/gmail_dmarc_changes.md

@@ -1,8 +1,11 @@
 ---
+st:
+  published_at: 2016-06-13
+  type: Classroom
 seo:
   title: Gmail DMARC Changes
-  description: Gmail DMARC Changes
-  keywords: dmarc, gmail, from, spf, dkim
+  description: 550 5.7.1 Unauthenticated email from domain.tld is not accepted due...
+  keywords: dmarc, gmail, google, from, spf, dkim
 title: Gmail DMARC Changes
 weight: 0
 layout: page
@@ -13,9 +16,9 @@ navigation:
 
 Gmail has recently decided to embrace  [DMARC](http://sendgrid.com/blog/dmarc-domain-based-message-authentication-reporting-conformance/) more explicitly, much like their email brethren, Yahoo and AOL. You may have started seeing bounce messages with the Reason of:
 
-**<NDR GOES HERE > **
+**550 5.7.1 Unauthenticated email from domain.tld is not accepted due to domain's DMARC policy. Please contact administrator of domain.tld domain if this was a legitimate mail. Please visit [https://support.google.com/mail/answer/2451690](https://support.google.com/mail/answer/2451690) to learn about DMARC initiative. 62si14044909itw.103 - gsmtp **
 
-This is because Gmail will no longer be accepting messages where the From domain is a Gmail address and the message originates from a non-approved Gmail mail domain server/service. This is a security measure they have implemented to help reduce potential address spoofing of their mail domain. 
+This is because Gmail will no longer be accepting messages where the From domain is a Gmail address and the message originates from a non-approved Gmail mail domain server/service. This is a security measure they have implemented to help reduce potential address spoofing of their mail domains. 
 
 
 
@@ -27,4 +30,4 @@ This is because Gmail will no longer be accepting messages where the From domain
 
 
 
-For more extended reading, check out <LINK GOES HERE>, as well as our  [DMARC Knowledgebase article](https://sendgrid.zendesk.com/hc/en-us/articles/200182958-Everything-about-DMARC-).
+For more extended reading, check out [this article on the DMARC changes](http://www.mediapost.com/publications/article/277884/dmarc-changes-coming-soon-to-an-inbox-near-you.html?utm_source=newsletter&utm_medium=email&utm_content=headline&utm_campaign=93744), as well as our  [DMARC Classroom article]({{root_url}}/Classroom/Basics/Email_Infrastructure/everything_about_dmarc.html).

source/Classroom/Deliver/Sender_Authentication/microsoft_dmarc_changes.md

@@ -0,0 +1,39 @@
+---
+st:
+  published_at: 2016-06-13
+  type: Classroom
+seo:
+  title: Microsoft DMARC Changes
+  description: 550 5.7.1 The messages violates the DMARC policy of...
+  keywords: dmarc, microsoft, live, outlook, from, spf, dkim, hotmail, msn
+title: Microsoft DMARC Changes
+weight: 0
+layout: page
+zendesk_id: 202449646
+navigation:
+  show: true
+---
+
+Miscrosoft has recently decided to embrace  [DMARC](http://sendgrid.com/blog/dmarc-domain-based-message-authentication-reporting-conformance/) more explicitly, much like their email brethren, Yahoo, AOL, and GMail. You may have started seeing bounce messages with the following reasons:
+
+Hotmail / Outlook / MSN / Live: 
+
+**550 5.7.1 The messages violates the DMARC policy of domain.tld (1b6c35a4-2c11-11e6-ab23-549f350a57e2)**
+
+**550 5.2.0 54Qa1t0144ZKE95014QaMR Message rejected due to DMARC. Please see http://postmaster.comcast.net/smtp-error-codes.php#DM000001**
+
+**550 5.2.0 54QF1t03z3oQ44H014QGZ3 Message rejected due to DMARC.**
+
+This is because Microsoft will no longer be accepting messages where the From domain is a Microsoft domain address and the message originates from a non-approved Microsoft mail domain server/service. This is a security measure they have implemented to help reduce potential address spoofing of their mail domains. 
+
+
+
+**What this means:**  As of June, 2016, you can no longer send with the From address being anything from a Microsoft address when sending to a domain that checks DMARC before accepting mail. 
+
+**What you can do: ** You will need to change the From address you use in emails to a non-Microsoft address. We recommend using one at your own mail domain, or one you control that is legitimate. You can then set the Reply-To field to be the original Microsoft address that previously was used in the From field. 
+
+**What about these messages, are they lost?** : Yes, any send with this bounce message is discarded and tracked as a  [Block](http://sendgrid.com/blocks). You will need to adjust your From address field settings, and then try resending from your side.
+
+
+
+For more extended reading, check out check out [this article on the DMARC changes](http://www.mediapost.com/publications/article/277884/dmarc-changes-coming-soon-to-an-inbox-near-you.html?utm_source=newsletter&utm_medium=email&utm_content=headline&utm_campaign=93744), as well as our [DMARC Classroom article]({{root_url}}/Classroom/Basics/Email_Infrastructure/everything_about_dmarc.html).

source/Classroom/Send/How_Emails_Are_Sent/how_do_i_send_mail_through_subuser_accounts.md

@@ -11,5 +11,5 @@ navigation:
   show: true
 ---
 
-All you need to do to send mail through a Subuser account is use that account’s SMTP credentials to send mail rather than the parent account credentials. Subusers can also log into [sendgrid.com](http://sendgrid.com/) to take advantage of the [SendGrid Email Marketing App](http://sendgrid.com/newsletter/dashboard). Recipient lists and Newsletter templates are unique to each Subuser account.
+All you need to do to send mail through a Subuser account is to simply **use that subuser account’s credentials to send mail via SMTP or API** rather than the parent account credentials. Subusers can also log into [sendgrid.com](http://sendgrid.com/) to take advantage of the [SendGrid Marketing Campaigns]({{root_url}}/User_Guide/Marketing_Campaigns/index.html) tool to send campaigns to stored lists via the online user interface.