Merge pull request #1971 from sendgrid/develop

6/28/2016 Docs Updates

Author: eschallock

source/API_Reference/Web_API/mail.md

@@ -12,9 +12,9 @@ navigation:
 
 This endpoint allows you to send email over SendGrid's Web API v2.
 
-{% info %}
-For information about the latest mail send endpoint, please visit our [Web API v3 mail send documentation]({{root_url}}/API_Reference/Web_API_v3/Mail/index.html).
-{% endinfo %}
+{% warning %}
+For information about the latest mail send endpoint, please visit our [Web API v3 Mail Send documentation]({{root_url}}/API_Reference/Web_API_v3/Mail/index.html). To current v2 users: We encourage [migrating]({{root_url}}/Classroom/Send/v3_Mail_Send/how_to_migrate_from_v2_to_v3_mail_send.html) to the new endpoint to take advantage of upcoming features.
+{% endwarning %}
 
 {% info %}
 There are a number of [official SendGrid libraries]({{root_url}}/Integrate/libraries.html) to allow for email sending through the Web API v2. We recommend using these if possible.

source/_data/folder_names.yml

@@ -4,4 +4,3 @@ Marketing Emails: "Legacy Newsletter"
 Marketing Emails API: "Legacy Newsletter"
 Web API: "Web API v2"
 Web API v3: "Web API v3"
-v3 Mail: "v3 Mail Beta"