diff --git a/source/API_Reference/Customer_Subuser_API/apps.md b/source/API_Reference/Customer_Subuser_API/apps.md index 0ff9ecbda3..052bb34b19 100644 --- a/source/API_Reference/Customer_Subuser_API/apps.md +++ b/source/API_Reference/Customer_Subuser_API/apps.md @@ -77,7 +77,7 @@ Activate an app on a subuser. {% parameters activate %} {% parameter task Yes 'Must be set to activate' 'Task to activate an app' %} {% parameter user Yes 'Subuser must be under your account' 'The subuser to activate the app on' %} - {% parameter name Yes 'Must be a [supported app](https://sendgrid.com/docs/API_Reference/Web_API/filter_settings.html)' 'The app to activate' %} + {% parameter name Yes 'Must be a [supported app]({{root_url}}/API_Reference/Web_API/filter_settings.html)' 'The app to activate' %} {% endparameters %} {% apiexample activate POST https://api.sendgrid.com/apiv2/customer.apps api_user=your_sendgrid_username&api_key=your_sendgrid_password&name=clicktrack&task=activate&user=subuser_username %} @@ -104,7 +104,7 @@ Deactivate an app on a subuser. {% parameters deactivate %} {% parameter task Yes 'Must be set to deactivate' 'Deactivate an app' %} {% parameter user Yes 'Subuser must be under your account' 'The subuser to deactivate the app on' %} - {% parameter name Yes 'Must be a [supported app](https://sendgrid.com/docs/API_Reference/Web_API/filter_settings.html)' 'The app to deactivate' %} + {% parameter name Yes 'Must be a [supported app]({{root_url}}/API_Reference/Web_API/filter_settings.html)' 'The app to deactivate' %} {% endparameters %} {% apiexample deactivate POST https://api.sendgrid.com/apiv2/customer.apps api_user=your_sendgrid_username&api_key=your_sendgrid_password&name=clicktrack&task=deactivate&user=subuser_username %} @@ -135,7 +135,7 @@ Refer to [Filter Settings]({{root_url}}/API_Reference/Web_API/filter_settings.ht {% parameters setup %} {% parameter task Yes 'Must be set to setup' 'Task to setup an app' %} {% parameter user Yes 'Subuser must be under your account' 'The subuser to setup the app on' %} - {% parameter name Yes 'Must be a [supported app](https://sendgrid.com/docs/API_Reference/Web_API/filter_settings.html)' 'The app to setup' %} + {% parameter name Yes 'Must be a [supported app]({{root_url}}/API_Reference/Web_API/filter_settings.html)' 'The app to setup' %} {% endparameters %} {% apiexample setup POST https://api.sendgrid.com/apiv2/customer.apps api_user=your_sendgrid_username&api_key=your_sendgrid_password&user=subuser_username&name=clicktrack&task=setup&enable_text=0 %} @@ -161,7 +161,7 @@ Get the settings for a subuser's app. {% parameters getsettings %} {% parameter task Yes 'Must be set to getsettings' 'Task to retrieve the settings for the app' %} {% parameter user Yes 'Subuser must be under your account' 'The subuser get the app settings for' %} - {% parameter name Yes 'Must be a [supported app](https://sendgrid.com/docs/API_Reference/Web_API/filter_settings.html)' 'The app to retrieve settings of' %} + {% parameter name Yes 'Must be a [supported app]({{root_url}}/API_Reference/Web_API/filter_settings.html)' 'The app to retrieve settings of' %} {% endparameters %} {% apiexample getsettings POST https://api.sendgrid.com/apiv2/customer.apps api_user=your_sendgrid_username&api_key=your_sendgrid_password&name=clicktrack&task=getsettings&user=subuser_username %} diff --git a/source/API_Reference/Customer_Subuser_API/v1_(deprecated)/subuser_unsubscribes.md b/source/API_Reference/Customer_Subuser_API/v1_(deprecated)/subuser_unsubscribes.md index 0931940c42..b117f4454b 100644 --- a/source/API_Reference/Customer_Subuser_API/v1_(deprecated)/subuser_unsubscribes.md +++ b/source/API_Reference/Customer_Subuser_API/v1_(deprecated)/subuser_unsubscribes.md @@ -9,7 +9,7 @@ navigation: --- {% warning %} -This feature is deprecated, please go to the v2 Customer Subuser API Subuser Unsubscribes page. +This feature is deprecated, please go to the v2 Customer Subuser API Subuser Unsubscribes page. {% endwarning %} {% anchor h2 %} diff --git a/source/API_Reference/Marketing_Emails_API/index.html b/source/API_Reference/Marketing_Emails_API/index.html index 774a3bd2d9..deb6f1edeb 100644 --- a/source/API_Reference/Marketing_Emails_API/index.html +++ b/source/API_Reference/Marketing_Emails_API/index.html @@ -9,7 +9,7 @@ show: true --- -

SendGrid has a Marketing Email API that allows users to access data and interact with the Marketing Email functionality of SendGrid website. We also have a Marketing Email web interface.

+

SendGrid has a Marketing Email API that allows users to access data and interact with the Marketing Email functionality of SendGrid website. We also have a Marketing Email web interface.

The Marketing Email API provides developers with the ability to manage marketing emails, lists, identities, and schedule delivery events. This can be very useful in allowing development teams to propagate data in and out of the web based Marketing Email App that can be easily used by members of the company with little or no programming expertise.

diff --git a/source/API_Reference/Marketing_Emails_API/newsletters.md b/source/API_Reference/Marketing_Emails_API/newsletters.md index 83a49cb284..8767f2e9b5 100644 --- a/source/API_Reference/Marketing_Emails_API/newsletters.md +++ b/source/API_Reference/Marketing_Emails_API/newsletters.md @@ -48,6 +48,12 @@ Edit an existing Marketing Email. {% parameters edit %} + {% parameter 'identity' 'Yes' 'Must be an existing Identity' 'The Identity (Sender Address) that will be used for the Marketing Email being created.' %} + {% parameter 'name' 'Yes' 'None' 'The name that will be used for the Marketing Email.' %} + {% parameter 'newname' 'No' 'None' 'The new name that will be used for the Marketing Email.' %} + {% parameter 'subject' 'Yes' 'None' 'The subject that will be used for the Marketing Email.' %} + {% parameter 'text' 'Yes' 'None' 'The text portion of the Marketing Email.' %} + {% parameter 'html' 'Yes' 'None' 'The html portion of the Marketing Email.' %} {% endparameters %} @@ -124,7 +130,7 @@ Retrieve a list of all existing Marketing Email. {% endparameters %} -{% apiexample list POST https://api.sendgrid.com/api/newsletter/list &api_user=your_sendgrid_username&api_key=your_sendgrid_password %} +{% apiexample list POST https://api.sendgrid.com/api/newsletter/list name=SendGrid_Test&api_user=your_sendgrid_username&api_key=your_sendgrid_password %} {% response json %} [ { diff --git a/source/API_Reference/SMTP_API/apps.html b/source/API_Reference/SMTP_API/apps.html index 904411d710..4c7c8b1609 100644 --- a/source/API_Reference/SMTP_API/apps.html +++ b/source/API_Reference/SMTP_API/apps.html @@ -17,7 +17,7 @@ {% endinfo %} -

For more information on the utility of these apps, please check out the Apps section.

+

For more information on the utility of these apps, please check out the Apps section.

{% info %} Some Apps are not listed here, because they cannot be defined on a per-message basis. To update these other Apps, please refer to the @@ -142,7 +142,7 @@

Example X-SMTPAPI Header Value

Allows you to specify the domain to use to sign messages with DKIM certification. This domain should match the domain in the From address -of your e-mail. For more info, check out these details on DKIM.

+of your e-mail. For more info, check out these details on DKIM.

@@ -187,7 +187,7 @@

Example X-SMTPAPI Header Value

Allows you to specify the domain to use to sign messages with Domain Keys. This domain should match the domain in the From address of your -e-mail. For more info, check out these details on Domain Keys.

+e-mail. For more info, check out these details on Domain Keys.

@@ -482,7 +482,7 @@

Example X-SMTPAPI Header Value

- +
url urlan optional url to POST the email and a copy of the report to. Refer to the Spam Checker documentation for POST details.an optional url to POST the email and a copy of the report to. Refer to the Spam Checker documentation for POST details.
diff --git a/source/API_Reference/SMTP_API/index.html b/source/API_Reference/SMTP_API/index.html index 936aaa6fc3..d32e408991 100644 --- a/source/API_Reference/SMTP_API/index.html +++ b/source/API_Reference/SMTP_API/index.html @@ -24,7 +24,7 @@ ] } {% endcodeblock %} -

In this case, the header is telling the processing routine to assign this email the category of "newuser".

+

In this case, the header is telling the processing routine to assign this email the category of "newuser".

{% anchor h2 %} The X-SMTPAPI Header diff --git a/source/API_Reference/SMTP_API/unique_arguments.md b/source/API_Reference/SMTP_API/unique_arguments.md index e84525e783..2190ff2e3e 100644 --- a/source/API_Reference/SMTP_API/unique_arguments.md +++ b/source/API_Reference/SMTP_API/unique_arguments.md @@ -6,7 +6,7 @@ navigation: show: true --- -The SMTP API JSON string allows you to attach an unlimited number of unique arguments to your email. The arguments are used only for tracking. They can be retrieved through the [Event API]({{root_url}}/API_Reference/Webhooks/event.html) or the [Email Activity]({{root_url}}/Delivery_Metrics/email_activity.html) page. +The SMTP API JSON string allows you to attach an unlimited number of unique arguments to your email. The arguments are used only for tracking. They can be retrieved through the [Event API]({{root_url}}/API_Reference/Webhooks/event.html) or the [Email Activity]({{root_url}}/User_Guide/Delivery_Metrics/email_activity.html) page. These arguments can be added using a JSON string like this: diff --git a/source/API_Reference/Web_API/Statistics/index.html b/source/API_Reference/Web_API/Statistics/index.html index cb57cd6b7b..1b391579b9 100644 --- a/source/API_Reference/Web_API/Statistics/index.html +++ b/source/API_Reference/Web_API/Statistics/index.html @@ -114,7 +114,7 @@ {% endapiexample %} {% info %} -To better understand the terms used in the response, please refer to the [Delivery Metrics]({{root_url}}/Delivery_Metrics/index.html#-Metrics) documentation. +To better understand the terms used in the response, please refer to the [Delivery Metrics]({{root_url}}/User_Guide/Delivery_Metrics/index.html#-Metrics) documentation. {% endinfo %}
diff --git a/source/API_Reference/Web_API/filter_settings.md b/source/API_Reference/Web_API/filter_settings.md index d5c89965ea..77f8a669be 100644 --- a/source/API_Reference/Web_API/filter_settings.md +++ b/source/API_Reference/Web_API/filter_settings.md @@ -10,7 +10,7 @@ navigation: These API requests are Account Wide settings, unlike the SMTP API which will change the status at the individual email message level. {% endinfo %} -For a more detailed description of each of the Apps below, please visit the [Apps]({{root_url}}/Apps/) page. +For a more detailed description of each of the Apps below, please visit the [Apps]({{root_url}}/User_Guide/Apps/) page. All calls to change filter settings are made to the [filter.setup endpoint.]({{root_url}}/API_Reference/Web_API/filter_commands.html#-Setup-App) diff --git a/source/API_Reference/Web_API_v3/IP_Management/ip_addresses.md b/source/API_Reference/Web_API_v3/IP_Management/ip_addresses.md index 72a7701ab8..9970472772 100644 --- a/source/API_Reference/Web_API_v3/IP_Management/ip_addresses.md +++ b/source/API_Reference/Web_API_v3/IP_Management/ip_addresses.md @@ -40,7 +40,8 @@ HTTP/1.1 201 OK {% anchor h2 %} GET {% endanchor %} -See a list of all IPs, including warm up status and pools. +See a list of all assigned and unassigned IPs. Response includes warm up status, pools, assigned subusers, and whitelabel info. +The start_date field corresponds to when warmup started for that IP. {% apiv3example get GET https://api.sendgrid.com/v3/ips %} {% v3response %} @@ -51,7 +52,32 @@ HTTP/1.1 200 OK "ip":"000.00.00.0", "pools":["new_test5"], "warmup":true, - "start_date":1409616000 + "start_date":1409616000, + "subusers": ["username1", "username2"], + "rdns": "01.email.test.com", + "pools": ["pool1", "pool2"] + } +] +{% endv3response %} +{% endapiv3example %} + +* * * * * + +{% anchor h2 %} +GET +{% endanchor %} +See only *assigned* IPs. + +{% apiv3example get GET https://api.sendgrid.com/v3/ips/assigned %} +{% v3response %} +HTTP/1.1 200 OK + +[ + { + "ip":"167.89.21.3", + "pools":["new_test5"], + "warmup":true, + "start_date":1409616000, } ] {% endv3response %} diff --git a/source/API_Reference/Web_API_v3/Stats/advanced.md b/source/API_Reference/Web_API_v3/Stats/advanced.md index 7fb84d3aed..6cc08ed374 100644 --- a/source/API_Reference/Web_API_v3/Stats/advanced.md +++ b/source/API_Reference/Web_API_v3/Stats/advanced.md @@ -6,7 +6,7 @@ navigation: show: true --- -Advanced Stats provide a more in-depth view of your statistics and the actions of the recipients segmented by geography, browser type, and more. You can read more about them in the [Advanced Delivery Metrics]({{root_url}}/Delivery_Metrics/advanced_statistics.html) section. +Advanced Stats provide a more in-depth view of your statistics and the actions of the recipients segmented by geography, browser type, and more. You can read more about them in the [Advanced Delivery Metrics]({{root_url}}/User_Guide/Delivery_Metrics/advanced_statistics.html) section. {% anchor h2 %} GET diff --git a/source/API_Reference/Web_API_v3/Stats/index.html b/source/API_Reference/Web_API_v3/Stats/index.html index 8412384881..52b04f7ee1 100644 --- a/source/API_Reference/Web_API_v3/Stats/index.html +++ b/source/API_Reference/Web_API_v3/Stats/index.html @@ -27,23 +27,23 @@ Email statistics consist of the following metrics: diff --git a/source/API_Reference/Web_API_v3/Stats/parse.md b/source/API_Reference/Web_API_v3/Stats/parse.md index b8bca08ed7..ccda2f5ad8 100644 --- a/source/API_Reference/Web_API_v3/Stats/parse.md +++ b/source/API_Reference/Web_API_v3/Stats/parse.md @@ -1,18 +1,18 @@ --- layout: page -title: Parse API Stats +title: Parse Webhook Stats weight: 95 navigation: show: true --- -Parse API Stats provide statistics on your [Parse API]({{root_url}}/API_Reference/Webhooks/parse.html) usage. +Parse Webhook Stats provide statistics on your [Parse Webhook]({{root_url}}/API_Reference/Webhooks/parse.html) usage. {% anchor h2 %} GET {% endanchor %} -Gets statistics for Parse API usage. +Gets statistics for Parse Webhook usage. {% parameters get %} {% parameter start_date Yes 'Date formatted as YYYY-MM-DD' 'The starting date of the statistics to retrieve' %} @@ -45,4 +45,4 @@ Gets statistics for Parse API usage. } ] {% endv3response %} -{% endapiv3example %} \ No newline at end of file +{% endapiv3example %} diff --git a/source/API_Reference/Web_API_v3/Template_Engine/smtpapi.md b/source/API_Reference/Web_API_v3/Template_Engine/smtpapi.md index 094965f868..37b8182aca 100644 --- a/source/API_Reference/Web_API_v3/Template_Engine/smtpapi.md +++ b/source/API_Reference/Web_API_v3/Template_Engine/smtpapi.md @@ -49,11 +49,16 @@ content of your message will behave differently. If you want only the message's content to be displayed, populate only the token in the template's field. If you want only the template's content to be displayed, leave the message field (subject or body) empty, and the template will populate. +{% anchor h3 %} +Text or HTML Templates? +{% endanchor %} + {% info %} -Make sure that you set values for html and subject data when you post. -These are used to replace the `<%body%>` and `<%subject%>` fields in your template. +It is best practice to provide content for both the ```html``` and the ```text``` properties in all of your emails. {% endinfo %} +The ```text``` property is substituted into the `<%body%>` of the text template and ```html``` is substituted into the `<%body%>` of the HTML template. If the ```text``` property is present, but not ```html```, then the resulting email will only contain the text version of the template, not the HTML version. The `<%subject%>` property is used for both Text and HTML templates. + * * * * * {% anchor h2 %} diff --git a/source/API_Reference/Webhooks/debug.md b/source/API_Reference/Webhooks/debug.md index 72896d2691..9d3cfd9bef 100644 --- a/source/API_Reference/Webhooks/debug.md +++ b/source/API_Reference/Webhooks/debug.md @@ -31,7 +31,7 @@ http://requestb.in/19e3ycm1 Receive Event Notifications Data {% endanchor %} -To have all your event notifications posted to this URL first turn on the [Event Notification app]({{root_url}}/Apps/event_notification.html) in your dashboard. +To have all your event notifications posted to this URL first turn on the [Event Notification app]({{root_url}}/User_Guide/Apps/event_notification.html) in your dashboard. Next, select which notifications you would like to have sent to RequestBin (if in doubt, tick all the checkboxes to turn them all on) and enter the unique URL generated by RequestBin as your Post Event URL at the bottom of the page. Once you've saved the changes, all event notifications will be sent to RequestBin for you to check. diff --git a/source/API_Reference/Webhooks/event.md b/source/API_Reference/Webhooks/event.md index 273bc63f07..785e23e055 100644 --- a/source/API_Reference/Webhooks/event.md +++ b/source/API_Reference/Webhooks/event.md @@ -277,7 +277,7 @@ The resulting webhook call Categories {% endanchor %} -If [categories]({{root_url}}/Delivery_Metrics/categories.html) are used over the SMTP API they will be returned by the Event Webhook as such: +If [categories]({{root_url}}/User_Guide/Delivery_Metrics/categories.html) are used over the SMTP API they will be returned by the Event Webhook as such: {% codeblock lang:json %} [ @@ -783,4 +783,4 @@ curl -X POST -H "Content-Type: application/json" -d '[{"email":"john.doe@sendgri {% anchor h2 %} Version Differences {% endanchor %} -The primary difference between v2 (no longer available) and v3 of the Event Webhook is that Version 3 delivers events as JSON arrays, whereas the previous version delivered batched JSON as JSON documents separated by line breaks. Furthermore, v3 provides more data with certain events. The [previous version of the webhook's documentation](https://sendgrid.com/docs/API_Reference/Webhooks/event_deprecated.html) is still provided so you can compare them. +The primary difference between v2 (no longer available) and v3 of the Event Webhook is that Version 3 delivers events as JSON arrays, whereas the previous version delivered batched JSON as JSON documents separated by line breaks. Furthermore, v3 provides more data with certain events. The [previous version of the webhook's documentation]({{root_url}}/API_Reference/Webhooks/event_deprecated.html) is still provided so you can compare them. diff --git a/source/API_Reference/Webhooks/event_deprecated.md b/source/API_Reference/Webhooks/event_deprecated.md index 48a4f64fff..6fc73bf5db 100644 --- a/source/API_Reference/Webhooks/event_deprecated.md +++ b/source/API_Reference/Webhooks/event_deprecated.md @@ -141,7 +141,7 @@ email=emailrecipient@domain.com&event=open&userid=1123&template=welc Categories {% endanchor %} -

If a category is used over the SMTP API to get detailed statistics for user signups in addition to custom parameter, include the following in your SMTP headers as X-SMTPAPI or as the xsmtpapi parameter of your Web API call:

+

If a category is used over the SMTP API to get detailed statistics for user signups in addition to custom parameter, include the following in your SMTP headers as X-SMTPAPI or as the xsmtpapi parameter of your Web API call:

{% codeblock lang:json %} { diff --git a/source/Code_Examples/ios.md b/source/Code_Examples/ios.md deleted file mode 100644 index b9a316cd23..0000000000 --- a/source/Code_Examples/ios.md +++ /dev/null @@ -1,28 +0,0 @@ ---- -layout: page -weight: 0 -title: iOS (Objective-C) -navigation: - show: true ---- - -{% github sendgrid/sendgrid-objc#usage Objective-C %} -We recommend using SendGrid Objective-C, our client library, available on Github, with full documentation. -{% endgithub %} - -{% anchor h2 %}Using SendGrid's Objective-C Library{% endanchor %} -{% codeblock lang:objc %} -// using SendGrid's Objective-C Library - https://github.com/sendgrid/sendgrid-objc -#import -#import - -SendGrid *sendgrid = [SendGrid apiUser:api_user apiKey:api_key]; - -SendGridEmail *email = [[SendGridEmail alloc] init]; -email.to = @"you@youreamil.com"; -email.from = @"test@sendgrid.com"; -email.subject = @"Sending with SendGrid is Fun"; -email.html = @"and easy to do anywhere, even with Objective-C"; - -[sendgrid sendWithWeb:email]; -{% endcodeblock %} diff --git a/source/Delivery_Metrics/index.html b/source/Delivery_Metrics/index.html deleted file mode 100644 index 092d78d859..0000000000 --- a/source/Delivery_Metrics/index.html +++ /dev/null @@ -1,19 +0,0 @@ ---- -layout: page -weight: 100 -title: Delivery Metrics Index -navigation: - show: true ---- - -

SendGrid offers statistics on a number of different metrics to report on what is happening with your messages.

- -
    -
  • Alerts: SendGrid will trigger an alert to send you based on triggers you set within SendGrid.
  • -
  • Categories: SendGrid will allow you to filter email statistics based on specific categories you add to your emails.
  • -
  • Email Activity: A page within your account that allows you to see recent stats on your sent emails.
  • -
  • Email Error Messages: All of the Error messages that you can expect from SendGrid.
  • -
  • Email Reports: View and export reports about your email activity.
  • -
- -

diff --git a/source/Glossary/blacklists.md b/source/Glossary/blacklists.md index 8e10950583..8531e9058f 100644 --- a/source/Glossary/blacklists.md +++ b/source/Glossary/blacklists.md @@ -14,7 +14,7 @@ A Blacklist is a list of IP addresses that are known to send unsolicited and/or You may have found in your Block List or Bounce list that your sending IP address and or domain have been blacklisted by an ISP. What this means is that this ISP has determined they have an issue with what you are sending or how often you are sending mail. This ISP will most likely not accept mail from you anymore until you request to be de-listed. If you are sending mail you will want to try your best to stay off of blacklists because certain ones can affect your deliverability. Our Compliance and Support Teams keep a close eye on which of our IP’s end up on a blacklist and we try as quickly as possible to resolve the issue however more often then not it will require the user sending the mail to contact the ISP. -A good practice is to make sure you are are not sending spam. You can check your spareness score here mail-tester.com and try to fix any issue that comes up in your score. Secondly, if you are on are a Silver or above account you have a dedicated IP address. We like to always recommend IP warmup when you are starting out. We have an [IP warmup process](https://sendgrid.com/docs/API_Reference/Web_API_v3/IP_Management/ip_warmup_schedule.html) we can implement for you or you can limit your sending in the beginning to about 1000 per day and then just double your requests every other day. +A good practice is to make sure you are are not sending spam. You can check your spareness score here mail-tester.com and try to fix any issue that comes up in your score. Secondly, if you are on are a Silver or above account you have a dedicated IP address. We like to always recommend IP warmup when you are starting out. We have an [IP warmup process]({{root_url}}/API_Reference/Web_API_v3/IP_Management/ip_warmup_schedule.html) we can implement for you or you can limit your sending in the beginning to about 1000 per day and then just double your requests every other day. Ending up on a [blacklist](https://support.sendgrid.com/hc/en-us/articles/200181968) can be detrimental to your domain’s email deliverability.  All major ISPs use some form of blacklisting service in order to protect their customers from malicious emails, although not all blacklisting services are actively being used. If a listing service ever asks you pay a fee for a delisting request, or if they say that they do not accept delisting requests, then you should not waste your time trying to get your domain/IP delisted because these services are rarely, if ever, used. However, if you find that your IP address has been blacklisted by one of the many legitimate services, then submitting a delisting request is the top priority.  Depending on the level of your account, you should approach a blacklisting in one of two ways: diff --git a/source/Glossary/clicks.md b/source/Glossary/clicks.md index 784976ce6d..c3d5ea5f29 100644 --- a/source/Glossary/clicks.md +++ b/source/Glossary/clicks.md @@ -11,11 +11,11 @@ seo: --- {% info %} -In order to track clicks, you must have the [Click Tracking App]({{root_url}}/Apps/click_tracking.html) enabled. +In order to track clicks, you must have the [Click Tracking App]({{root_url}}/User_Guide/Apps/click_tracking.html) enabled. {% endinfo %} SendGrid can replace the links in your email templates with a custom link that when clicked, will redirect your customers to the original link from your template. When the user clicks, SendGrid will record the click event. -In [Delivery Metrics]({{root_url}}/Delivery_Metrics/email_activity.html), “clicks percentage" is the total number of times your users have clicked on the various links within your emails, divided by the total number of Delivered messages. The “Unique clicks” percentage is the number of unique individuals that have clicked the links in your emails, divided by the total number of delivered messages. +In [Delivery Metrics]({{root_url}}/User_Guide/Delivery_Metrics/email_activity.html), “clicks percentage" is the total number of times your users have clicked on the various links within your emails, divided by the total number of Delivered messages. The “Unique clicks” percentage is the number of unique individuals that have clicked the links in your emails, divided by the total number of delivered messages. Users clicking a SendGrid Unsubscribe link will not count as a Click. However, if you use a third-party unsubscribe link, it will be tracked as a click. diff --git a/source/Glossary/complaint.md b/source/Glossary/complaint.md index 96becc18b1..f9ff5631da 100644 --- a/source/Glossary/complaint.md +++ b/source/Glossary/complaint.md @@ -14,6 +14,6 @@ A complaint is when an email recipient identifies an email message as spam or ju A sender’s complaint rate is calculated by dividing the total number of emails received by the ISP by the number of complaints reported by that ISP’s customers. -Higher numbers of complaints can negatively impact your [email deliverability](https://sendgrid.com/docs/Glossary/email_deliverability.html). +Higher numbers of complaints can negatively impact your [email deliverability]({{root_url}}/Glossary/email_deliverability.html). To get more information please check out our [Email Infrastructure Guide.](http://resources.sendgrid.com/email-infrastructure-guide/?mc=SendGrid%20Documentation) diff --git a/source/Glossary/deliveries.md b/source/Glossary/deliveries.md index 1a5e18b5ae..db88ca3992 100644 --- a/source/Glossary/deliveries.md +++ b/source/Glossary/deliveries.md @@ -14,5 +14,5 @@ A delivery is recorded when a request to send an email results in the email bein If an email is indicated as delivered you can be certain that it was not deferred by the ISP. -Visit [Delivery Metrics]({{root_url}}/Delivery_Metrics/index.html) to find more information about all the statistics SendGrid provides. +Visit [Delivery Metrics]({{root_url}}/User_Guide/Delivery_Metrics/index.html) to find more information about all the statistics SendGrid provides. diff --git a/source/Glossary/email_marketing.md b/source/Glossary/email_marketing.md index 0fdbdc58b3..667ed922a6 100644 --- a/source/Glossary/email_marketing.md +++ b/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]({{root_url}}/Marketing_Emails/create_manage.html#-STEP-3-Design) +* [Pre-designed email templates]({{root_url}}/User_Guide/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) +* [Ability to use your own HTML]({{root_url}}/User_Guide/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) +* [Powerful analytics]({{root_url}}/User_Guide/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) +* [Simple list management]({{root_url}}/User_Guide/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. \ No newline at end of file diff --git a/source/Glossary/email_service_provider.md b/source/Glossary/email_service_provider.md index a91576c36a..90929a3c15 100644 --- a/source/Glossary/email_service_provider.md +++ b/source/Glossary/email_service_provider.md @@ -20,10 +20,10 @@ Most ESPs include features that allow customers to: * Improve email deliverability * Monitor statistics of your email campaigns -ESPs like SendGrid also provide expertise on increasing your [email deliverability](https://sendgrid.com/docs/Glossary/email_deliverability.html), preserving your sending reputation. They may utilize features and tools to accomplish this, such as: +ESPs like SendGrid also provide expertise on increasing your [email deliverability]({{root_url}}/Glossary/email_deliverability.html), preserving your sending reputation. They may utilize features and tools to accomplish this, such as: -* [IP Whitelabeling](https://sendgrid.com/docs/Glossary/ip_whitelabeling.html) -* [Dedicated IPs](https://sendgrid.com/docs/API_Reference/Web_API_v3/IP_Management/index.html) -* [IP warming](https://sendgrid.com/docs/User_Guide/warming_up.html) +* [IP Whitelabeling]({{root_url}}/Glossary/ip_whitelabeling.html) +* [Dedicated IPs]({{root_url}}/API_Reference/Web_API_v3/IP_Management/index.html) +* [IP warming]({{root_url}}/User_Guide/Setting_Up_Your_Server/warming_up_ips.html) -An ESP may provide email services via a user interface (UI), or may also be an [SMTP provider](https://sendgrid.com/docs/Glossary/smtp_provider.html). SendGrid provides both services. +An ESP may provide email services via a user interface (UI), or may also be an [SMTP provider]({{root_url}}/Glossary/smtp_provider.html). SendGrid provides both services. diff --git a/source/Glossary/header.md b/source/Glossary/header.md index d2b3481eff..9c937741d6 100644 --- a/source/Glossary/header.md +++ b/source/Glossary/header.md @@ -16,5 +16,5 @@ More information: * [Managing headers with SMTPAPI]({{root_url}}/API_Reference/SMTP_API/index.html) * [Managing headers with the Web API]({{root_url}}/API_Reference/Web_API/mail.html#-send) -* [Marketing Email Templates]({{root_url}}/Marketing_Emails/create_manage.html) -* [Transactional Email Templating]({{root_url}}/Transactional_Email/Template_Engine/index.html) +* [Marketing Email Templates]({{root_url}}/User_Guide/Marketing_Emails/create_manage.html) +* [Transactional Email Templating]({{root_url}}/User_Guide/Transactional_Email/Template_Engine/index.html) diff --git a/source/Glossary/mail_merge.md b/source/Glossary/mail_merge.md index 8f05b199de..93534a360f 100644 --- a/source/Glossary/mail_merge.md +++ b/source/Glossary/mail_merge.md @@ -12,4 +12,4 @@ seo: Mail Merge is a process to create customized emails, letters, and documents from a generic form or template. The original document contains static text with placeholders for substitutions for elements like names, addresses, emails, or other individualized or unique information. Typically the data used to populate these placeholders is held in a database, spreadsheet, or csv file. A column in a spreadsheet could contain a list of names that correspond with a list of email addresses. These would then be populated into the template, creating a customized email per email address. -This functionality can be replicated using SendGrid's [SMTPAPI](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html), using [Substitution Tags](https://sendgrid.com/docs/API_Reference/SMTP_API/substitution_tags.html) and [Section Tags](https://sendgrid.com/docs/API_Reference/SMTP_API/section_tags.html) in our [Marketing Email App](https://sendgrid.com/docs/Marketing_Emails/recipients.html) for marketing emails and our [Template Engine](https://sendgrid.com/docs/API_Reference/Template_Engine_API/smtpapi.html) for transactional emails. +This functionality can be replicated using SendGrid's [SMTPAPI]({{root_url}}/API_Reference/SMTP_API/index.html), using [Substitution Tags]({{root_url}}/API_Reference/SMTP_API/substitution_tags.html) and [Section Tags]({{root_url}}/API_Reference/SMTP_API/section_tags.html) in our [Marketing Email App]({{root_url}}/User_Guide/Marketing_Emails/recipients.html) for marketing emails and our [Template Engine]({{root_url}}/API_Reference/Web_API_v3/Template_Engine/smtpapi.html) for transactional emails. diff --git a/source/Glossary/open_rate.md b/source/Glossary/open_rate.md index 2be6a4765e..a803e0dc40 100644 --- a/source/Glossary/open_rate.md +++ b/source/Glossary/open_rate.md @@ -18,4 +18,4 @@ The “Opens” percentage is the total number of times your users opened your e The “Unique opens” percentage is the number of unique individuals that have opened your emails, divided by the total number of Delivered messages. -For more information visit our [Delivery Metrics](https://sendgrid.com/docs/Delivery_Metrics/index.html) page. +For more information visit our [Delivery Metrics]({{root_url}}/User_Guide/Delivery_Metrics/index.html) page. diff --git a/source/Glossary/opens.md b/source/Glossary/opens.md index aff547d2cb..3ff519c39b 100644 --- a/source/Glossary/opens.md +++ b/source/Glossary/opens.md @@ -11,7 +11,7 @@ seo: --- {% info %} -In order to track opens, you must have the [Open Tracking app]({{root_url}}/Apps/open_tracking.html) enabled. +In order to track opens, you must have the [Open Tracking app]({{root_url}}/User_Guide/Apps/open_tracking.html) enabled. {% endinfo %} @@ -19,6 +19,6 @@ SendGrid inserts a small, transparent image into all emails that will be tracked Not all email clients load images by default. Microsoft’s Outlook, Apple’s Mail.app, Mozilla’s Thunderbird, and Google’s Gmail do not load images. As such, there may be many occasions where recipients will have received a message, opened it, and it will never be counted as opened because there is no way to track the event. -In [Delivery Metrics]({{root_url}}/Delivery_Metrics/email_activity.html) the "opens percentage" is the total number of times your users opened your emails, divided by the total number of Delivered messages. +In [Delivery Metrics]({{root_url}}/User_Guide/Delivery_Metrics/email_activity.html) the "opens percentage" is the total number of times your users opened your emails, divided by the total number of Delivered messages. The “Unique opens” percentage is the number of unique individuals that have opened your emails, divided by the total number of Delivered messages. diff --git a/source/Glossary/request.md b/source/Glossary/request.md index 66a156540f..0514ace706 100644 --- a/source/Glossary/request.md +++ b/source/Glossary/request.md @@ -12,4 +12,4 @@ navigation: 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. +Visit [Delivery Metrics]({{root_url}}/User_Guide/Delivery_Metrics/index.html) to find more information about all the statistics SendGrid provides. diff --git a/source/Glossary/smtp_provider.md b/source/Glossary/smtp_provider.md index 78508ad071..0aadab2313 100644 --- a/source/Glossary/smtp_provider.md +++ b/source/Glossary/smtp_provider.md @@ -22,6 +22,6 @@ SendGrid is an SMTP provider for both [transactional email](https://sendgrid.com When you become a SendGrid customer, we give you access to our [SMTP servers](https://sendgrid.com/blog/what-is-an-smtp-server/) so that you can send as many emails as you want. As you scale your company, we’ll monitor your sending reputation and inform you of any ISP policy changes to make sure your email is delivered. Some of the tools we provide you to take your company to the next level include: -* [Custom Apps](/Apps/index.html) and [Webhooks]({{root_url}}/API_Reference/Webhooks/event.html) – No matter what you want to track, we have the ability to show you who is opening your email, where your email is most successful, and who is reporting you as spam or unsubscribing from your recipient list. +* [Custom Apps](/User_Guide/Apps/index.html) and [Webhooks]({{root_url}}/API_Reference/Webhooks/event.html) – No matter what you want to track, we have the ability to show you who is opening your email, where your email is most successful, and who is reporting you as spam or unsubscribing from your recipient list. * [Industry Leading Customer Service](https://support.sendgrid.com/hc/en-us) – Our customer service team is capable of answering all your questions and helping you solve any problems that may arise with your email program. * [Dedicated IPs](https://sendgrid.com/blog/shared-and-dedicated-ips-which-should-you-choose/) – SendGrid allows you to take charge of your own sending reputation by giving you access to your very own IP. This means you won’t be affected by the actions of other companies’ sending habits. \ No newline at end of file diff --git a/source/Glossary/subscriber_list_management.md b/source/Glossary/subscriber_list_management.md index 860a8d33af..b2091cfa08 100644 --- a/source/Glossary/subscriber_list_management.md +++ b/source/Glossary/subscriber_list_management.md @@ -12,7 +12,7 @@ navigation: Maintaining good list management is a key element in keeping your users happy. Sending email to someone who has unsubscribed or never signed up in the 1st place is a big no-no in the email game. -Make sure to check your list stats. You can do this in the [marketing app]({{root_url}}/Marketing_Emails/index.html) by clicking on the stats button next to your recipient list name. You can also [manage your unsubscribes]({{root_url}}/Marketing_Emails/unsubscribes.html) by clicking the manage unsubscribes button next to your recipient list name. +Make sure to check your list stats. You can do this in the [marketing app]({{root_url}}/User_Guide/Marketing_Emails/index.html) by clicking on the stats button next to your recipient list name. You can also [manage your unsubscribes]({{root_url}}/User_Guide/Marketing_Emails/unsubscribes.html) by clicking the manage unsubscribes button next to your recipient list name. Make sure you are sending mail to people who actually want your mail. Otherwise, you will get lots of [spam reports]({{root_url}}/Glossary/spam_reports.html), [blocks]({{root_url}}/Glossary/blocks.html) and [bounces]({{root_url}}/Glossary/bounces.html). diff --git a/source/Glossary/transactional_email.md b/source/Glossary/transactional_email.md index 63f7261298..a9116bc767 100644 --- a/source/Glossary/transactional_email.md +++ b/source/Glossary/transactional_email.md @@ -35,6 +35,6 @@ Transactional email is an incredibly effective communication tool that can help To make sure you're sending the most effective Transactional email, make sure you are building a good email with a good visual, concise content, and appropriate headers. Here are a few good "tools" you can use to get the most out of your Transactional email sending: -A good visual email means the email shows up in a clear and appealing manner to the consumer. Conscise content means the email is formatted clearly and there is a good ratio of text, hyperlinks, and pictures. To check your code for these Transactional emails, use our [Code Workshop](https://sendgrid.com/docs/Utilities/code_workshop.html) or [API Reference Index](https://sendgrid.com/docs/API_Reference/index.html). The [SMTPAPI header](https://sendgrid.com/docs/API_Reference/SMTP_API/smtpapi_validator.html) will validate the header you've used for SMTP API, and the [SendGrid List Assist](https://sendgrid.com/blog/introducing-sendgrid-list-assist/) will help you update your email list to get the best deliverability. +A good visual email means the email shows up in a clear and appealing manner to the consumer. Conscise content means the email is formatted clearly and there is a good ratio of text, hyperlinks, and pictures. To check your code for these Transactional emails, use our [Code Workshop]({{root_url}}/Utilities/code_workshop.html) or [API Reference Index]({{root_url}}/API_Reference/index.html). The [SMTPAPI header]({{root_url}}/Utilities/smtpapi_validator.html) will validate the header you've used for SMTP API, and the [SendGrid List Assist](https://sendgrid.com/blog/introducing-sendgrid-list-assist/) will help you update your email list to get the best deliverability. To learn more about how to maximize your transactional email program, read our free guide [Leveraging Transactional Email for Success](https://sendgrid.com/resources/what-is-transactional-email?mc=Direct&mcd=email_library). diff --git a/source/Glossary/transactional_email_templates.md b/source/Glossary/transactional_email_templates.md index 239bbf824a..08210219a9 100644 --- a/source/Glossary/transactional_email_templates.md +++ b/source/Glossary/transactional_email_templates.md @@ -24,7 +24,7 @@ The SendGrid Template Engine allows users to modify transactional email template The design section of the transactional email template engine allows marketers to easily design a template, without the need for complex coding. Developers can then manage multiple templates created with a RESTful API and integrate them into applications. -To learn more about the SendGrid transactional email templates, you can visit the [technical documentation]({{root_url}}/API_Reference/Web_API_v3/Template_Engine/index.html), watch our [video tutorial](https://sendgrid.com/docs/VidGrid/Template_Engine/template_engine.html) or [online demo webcast](http://go.sendgrid.com/Webcast-SendGrid-Template-Engine-Demo_Registration.html), or read the [Template Engine blog post](https://sendgrid.com/blog/sendgrid-transactional-email-template-engine-announcement/). +To learn more about the SendGrid transactional email templates, you can visit the [technical documentation]({{root_url}}/API_Reference/Web_API_v3/Template_Engine/index.html), watch our [video tutorial]({{root_url}}/VidGrid/template_engine.html) or [online demo webcast](http://go.sendgrid.com/Webcast-SendGrid-Template-Engine-Demo_Registration.html), or read the [Template Engine blog post](https://sendgrid.com/blog/sendgrid-transactional-email-template-engine-announcement/). By using the SendGrid transactional email Template Engine marketers can maintain control of their email design while enjoying the strong [email deliverability]({{root_url}}/Glossary/email_deliverability.html) that SendGrid provides. They can create a vast array of different email templates, all with the confidence of knowing their emails will reach the inbox. diff --git a/source/Code_Examples/SMTP_API_Header_Examples/go.md b/source/Integrate/Code_Examples/SMTP_API_Header_Examples/go.md similarity index 100% rename from source/Code_Examples/SMTP_API_Header_Examples/go.md rename to source/Integrate/Code_Examples/SMTP_API_Header_Examples/go.md diff --git a/source/Code_Examples/SMTP_API_Header_Examples/index.html b/source/Integrate/Code_Examples/SMTP_API_Header_Examples/index.html similarity index 100% rename from source/Code_Examples/SMTP_API_Header_Examples/index.html rename to source/Integrate/Code_Examples/SMTP_API_Header_Examples/index.html diff --git a/source/Code_Examples/SMTP_API_Header_Examples/nodejs.md b/source/Integrate/Code_Examples/SMTP_API_Header_Examples/nodejs.md similarity index 100% rename from source/Code_Examples/SMTP_API_Header_Examples/nodejs.md rename to source/Integrate/Code_Examples/SMTP_API_Header_Examples/nodejs.md diff --git a/source/Code_Examples/SMTP_API_Header_Examples/perl.html b/source/Integrate/Code_Examples/SMTP_API_Header_Examples/perl.html similarity index 100% rename from source/Code_Examples/SMTP_API_Header_Examples/perl.html rename to source/Integrate/Code_Examples/SMTP_API_Header_Examples/perl.html diff --git a/source/Code_Examples/SMTP_API_Header_Examples/php.md b/source/Integrate/Code_Examples/SMTP_API_Header_Examples/php.md similarity index 100% rename from source/Code_Examples/SMTP_API_Header_Examples/php.md rename to source/Integrate/Code_Examples/SMTP_API_Header_Examples/php.md diff --git a/source/Code_Examples/SMTP_API_Header_Examples/python.md b/source/Integrate/Code_Examples/SMTP_API_Header_Examples/python.md similarity index 100% rename from source/Code_Examples/SMTP_API_Header_Examples/python.md rename to source/Integrate/Code_Examples/SMTP_API_Header_Examples/python.md diff --git a/source/Code_Examples/SMTP_API_Header_Examples/ruby.md b/source/Integrate/Code_Examples/SMTP_API_Header_Examples/ruby.md similarity index 100% rename from source/Code_Examples/SMTP_API_Header_Examples/ruby.md rename to source/Integrate/Code_Examples/SMTP_API_Header_Examples/ruby.md diff --git a/source/Code_Examples/Webhook_Examples/csharp.md b/source/Integrate/Code_Examples/Webhook_Examples/csharp.md similarity index 100% rename from source/Code_Examples/Webhook_Examples/csharp.md rename to source/Integrate/Code_Examples/Webhook_Examples/csharp.md diff --git a/source/Code_Examples/Webhook_Examples/go.md b/source/Integrate/Code_Examples/Webhook_Examples/go.md similarity index 100% rename from source/Code_Examples/Webhook_Examples/go.md rename to source/Integrate/Code_Examples/Webhook_Examples/go.md diff --git a/source/Code_Examples/Webhook_Examples/index.html b/source/Integrate/Code_Examples/Webhook_Examples/index.html similarity index 100% rename from source/Code_Examples/Webhook_Examples/index.html rename to source/Integrate/Code_Examples/Webhook_Examples/index.html diff --git a/source/Code_Examples/Webhook_Examples/nodejs.md b/source/Integrate/Code_Examples/Webhook_Examples/nodejs.md similarity index 100% rename from source/Code_Examples/Webhook_Examples/nodejs.md rename to source/Integrate/Code_Examples/Webhook_Examples/nodejs.md diff --git a/source/Code_Examples/Webhook_Examples/php.md b/source/Integrate/Code_Examples/Webhook_Examples/php.md similarity index 100% rename from source/Code_Examples/Webhook_Examples/php.md rename to source/Integrate/Code_Examples/Webhook_Examples/php.md diff --git a/source/Code_Examples/Webhook_Examples/python.md b/source/Integrate/Code_Examples/Webhook_Examples/python.md similarity index 100% rename from source/Code_Examples/Webhook_Examples/python.md rename to source/Integrate/Code_Examples/Webhook_Examples/python.md diff --git a/source/Code_Examples/csharp.md b/source/Integrate/Code_Examples/csharp.md similarity index 100% rename from source/Code_Examples/csharp.md rename to source/Integrate/Code_Examples/csharp.md diff --git a/source/Code_Examples/go.md b/source/Integrate/Code_Examples/go.md similarity index 100% rename from source/Code_Examples/go.md rename to source/Integrate/Code_Examples/go.md diff --git a/source/Code_Examples/index.html b/source/Integrate/Code_Examples/index.html similarity index 88% rename from source/Code_Examples/index.html rename to source/Integrate/Code_Examples/index.html index 75c219dcf7..1e2b938954 100644 --- a/source/Code_Examples/index.html +++ b/source/Integrate/Code_Examples/index.html @@ -19,12 +19,6 @@ Go -
  • - - iOS / Objective-C - - -
  • Java diff --git a/source/Code_Examples/java.md b/source/Integrate/Code_Examples/java.md similarity index 100% rename from source/Code_Examples/java.md rename to source/Integrate/Code_Examples/java.md diff --git a/source/Code_Examples/nodejs.md b/source/Integrate/Code_Examples/nodejs.md similarity index 100% rename from source/Code_Examples/nodejs.md rename to source/Integrate/Code_Examples/nodejs.md diff --git a/source/Code_Examples/perl.html b/source/Integrate/Code_Examples/perl.html similarity index 100% rename from source/Code_Examples/perl.html rename to source/Integrate/Code_Examples/perl.html diff --git a/source/Code_Examples/php.md b/source/Integrate/Code_Examples/php.md similarity index 100% rename from source/Code_Examples/php.md rename to source/Integrate/Code_Examples/php.md diff --git a/source/Code_Examples/python.md b/source/Integrate/Code_Examples/python.md similarity index 100% rename from source/Code_Examples/python.md rename to source/Integrate/Code_Examples/python.md diff --git a/source/Code_Examples/ruby.md b/source/Integrate/Code_Examples/ruby.md similarity index 100% rename from source/Code_Examples/ruby.md rename to source/Integrate/Code_Examples/ruby.md diff --git a/source/Integrate/Mail_Clients/thunderbird.md b/source/Integrate/Mail_Clients/thunderbird.md index 79cf27d20f..cbe0c5f753 100644 --- a/source/Integrate/Mail_Clients/thunderbird.md +++ b/source/Integrate/Mail_Clients/thunderbird.md @@ -6,7 +6,7 @@ navigation: show: true --- -To send email using Thunderbird you will have to modify your outgoing server settings in Thunderbird accordingly. Additionally you can modify settings in Thunderbird that will allow you to include an [SMTP API]({{root_url}}/API_Reference/SMTP_API/index.html) header in your emails if you wish to leverage [categories]({{root_url}}/Delivery_Metrics/categories.html) or other features of the SMTP API when sending mail via the Thunderbird client. +To send email using Thunderbird you will have to modify your outgoing server settings in Thunderbird accordingly. Additionally you can modify settings in Thunderbird that will allow you to include an [SMTP API]({{root_url}}/API_Reference/SMTP_API/index.html) header in your emails if you wish to leverage [categories]({{root_url}}/User_Guide/Delivery_Metrics/categories.html) or other features of the SMTP API when sending mail via the Thunderbird client.

    Start by going to: 'Tools' -\> 'Account Settings' diff --git a/source/Integrate/Partners/Microsoft_Azure.md b/source/Integrate/Partners/Microsoft_Azure.md index 7f5a5fd0ef..2450f3e3d4 100644 --- a/source/Integrate/Partners/Microsoft_Azure.md +++ b/source/Integrate/Partners/Microsoft_Azure.md @@ -16,7 +16,7 @@ Code Examples 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](https://sendgrid.com/docs/Integrate/Partners/Tutorials/WindowsAzure.html) via an Azure webpage +5. [Java]({{root_url}}/Integrate/Partners/Tutorials/WindowsAzure.html) via an Azure webpage 6. [Mobile Services](http://azure.microsoft.com/en-us/documentation/articles/store-sendgrid-mobile-services-send-email-scripts/) {% anchor h2 %} diff --git a/source/Integrate/Partners/Tutorials/EngineYard.md b/source/Integrate/Partners/Tutorials/EngineYard.md index 4c4ab05970..4bbe84ae9b 100644 --- a/source/Integrate/Partners/Tutorials/EngineYard.md +++ b/source/Integrate/Partners/Tutorials/EngineYard.md @@ -17,11 +17,11 @@ Deploying a Ruby App With SendGrid and Engine Yard Create/Modify Your Code for Engine Yard {% endanchor %} -If you are using Ruby without a framework, please utilize [these instructions](https://sendgrid.com/docs/Code_Examples/ruby.html). +If you are using Ruby without a framework, please utilize [these instructions]({{root_url}}/Integrate/Code_Examples/ruby.html). -For email sending only, you can [utilize Action Mailer](https://sendgrid.com/docs/Integrate/Frameworks/rubyonrails.html), or for more advanced functionality, you can use this [Ruby gem](https://github.com/stephenb/sendgrid). +For email sending only, you can [utilize Action Mailer]({{root_url}}/Integrate/Frameworks/rubyonrails.html), or for more advanced functionality, you can use this [Ruby gem](https://github.com/stephenb/sendgrid). -We have a [sample app on Github](https://github.com/sendgrid/sendgrid-engine-yard-ruby) that demonstrates sending an email via SendGrid using ActionMailer and receiving an email using our Inbound Parse webhook. +We have a [sample app on Github](https://github.com/sendgrid/sendgrid-engine-yard-ruby) that demonstrates sending an email via SendGrid using ActionMailer and receiving an email using our Inbound Parse webhook. {% anchor h3 %} Create/Configure Your Engine Yard Instance @@ -66,7 +66,7 @@ config.action_mailer.smtp_settings = { {% endcodeblock %}

  • Now you are ready to start sending emails from your app using SendGrid!
  • -
  • If you are implementing our sample app, which receives emails, you will need to setup your Inbound Parse settings.
  • +
  • If you are implementing our sample app, which receives emails, you will need to setup your Inbound Parse settings.
  • {% anchor h2 %} diff --git a/source/Integrate/Partners/Tutorials/WindowsAzure.md b/source/Integrate/Partners/Tutorials/WindowsAzure.md index d09e699fea..83ce207d1e 100644 --- a/source/Integrate/Partners/Tutorials/WindowsAzure.md +++ b/source/Integrate/Partners/Tutorials/WindowsAzure.md @@ -238,7 +238,7 @@ completion(); 4. Now, go to the file QSToDoListViewController.m, and replace the onAdd function’s contents with: {%codeblock lang:objc%} // Populate the parameters for the SendGrid Web API Call -// Find more details about the [Web API here](https://sendgrid.com/docs/API_Reference/Web_API/index.html). +// Find more details about the [Web API here]({{root_url}}/API_Reference/Web_API/index.html). NSString *username = @""; NSString *apikey = @""; NSString *to = @""; diff --git a/source/Transactional_Email/unsubscribes.md b/source/Transactional_Email/unsubscribes.md deleted file mode 100644 index 18e96d6655..0000000000 --- a/source/Transactional_Email/unsubscribes.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -seo: - title: Transactional Email Unsubscribes -title: Transactional Email Unsubscribes -weight: 0 -layout: page -navigation: - show: true ---- - -If you are sending email through SendGrid and have the [Subscription Tracking app]({{root_url}}/Apps/subscription_tracking.html) turned on an unsubscribe option will be added to the footer of every email that gets sent through your account. A user who clicks the unsubscribe link will be added to your [global unsubscribe list](https://sendgrid.com/unsubscribes) and **any** future attempts to send email to those users will be suppressed unless they’re removed. You can also manage this list manually, adding and removing addresses via the UI or with the use of [API calls]({{root_url}}/API_Reference/Web_API/unsubscribes.html). - -The [Subscription Tracking app]({{root_url}}/Apps/subscription_tracking.html) also has a number of options for customization, such as a replacement tag that allows you to place the unsubscribe text somewhere in the body of the email, the ability to reword the unsubscribe message, and the ability to add a custom landing page. - -See Also: See Also: [Marketing Email Unsubscribes]({{root_url}}/Marketing_Emails/unsubscribes.html) - diff --git a/source/Apps/address_whitelisting.md b/source/User_Guide/Apps/address_whitelisting.md similarity index 100% rename from source/Apps/address_whitelisting.md rename to source/User_Guide/Apps/address_whitelisting.md diff --git a/source/Apps/bcc.md b/source/User_Guide/Apps/bcc.md similarity index 100% rename from source/Apps/bcc.md rename to source/User_Guide/Apps/bcc.md diff --git a/source/Apps/bypass_list_management.md b/source/User_Guide/Apps/bypass_list_management.md similarity index 100% rename from source/Apps/bypass_list_management.md rename to source/User_Guide/Apps/bypass_list_management.md diff --git a/source/Apps/click_tracking.md b/source/User_Guide/Apps/click_tracking.md similarity index 100% rename from source/Apps/click_tracking.md rename to source/User_Guide/Apps/click_tracking.md diff --git a/source/Apps/dkim.md b/source/User_Guide/Apps/dkim.md similarity index 100% rename from source/Apps/dkim.md rename to source/User_Guide/Apps/dkim.md diff --git a/source/Apps/domain_keys.md b/source/User_Guide/Apps/domain_keys.md similarity index 100% rename from source/Apps/domain_keys.md rename to source/User_Guide/Apps/domain_keys.md diff --git a/source/Apps/email_templates.md b/source/User_Guide/Apps/email_templates.md similarity index 100% rename from source/Apps/email_templates.md rename to source/User_Guide/Apps/email_templates.md diff --git a/source/Apps/event_notification.md b/source/User_Guide/Apps/event_notification.md similarity index 100% rename from source/Apps/event_notification.md rename to source/User_Guide/Apps/event_notification.md diff --git a/source/Apps/footer.md b/source/User_Guide/Apps/footer.md similarity index 100% rename from source/Apps/footer.md rename to source/User_Guide/Apps/footer.md diff --git a/source/Apps/forward_spam.md b/source/User_Guide/Apps/forward_spam.md similarity index 100% rename from source/Apps/forward_spam.md rename to source/User_Guide/Apps/forward_spam.md diff --git a/source/Apps/google_analytics.md b/source/User_Guide/Apps/google_analytics.md similarity index 100% rename from source/Apps/google_analytics.md rename to source/User_Guide/Apps/google_analytics.md diff --git a/source/Apps/gravatar.md b/source/User_Guide/Apps/gravatar.md similarity index 100% rename from source/Apps/gravatar.md rename to source/User_Guide/Apps/gravatar.md diff --git a/source/Apps/index.html b/source/User_Guide/Apps/index.html similarity index 100% rename from source/Apps/index.html rename to source/User_Guide/Apps/index.html diff --git a/source/Apps/new_relic.md b/source/User_Guide/Apps/new_relic.md similarity index 100% rename from source/Apps/new_relic.md rename to source/User_Guide/Apps/new_relic.md diff --git a/source/Apps/open_tracking.md b/source/User_Guide/Apps/open_tracking.md similarity index 73% rename from source/Apps/open_tracking.md rename to source/User_Guide/Apps/open_tracking.md index 7b328cb4b0..b74eef5b33 100644 --- a/source/Apps/open_tracking.md +++ b/source/User_Guide/Apps/open_tracking.md @@ -6,7 +6,7 @@ navigation: show: true --- -The Open Tracking app adds an invisible image at the end of the email which can track e-mail opens. If the email recipient has images enabled on the email client, a request to server for the invisible image is executed and an open event is logged. These Events are logged in your [Statistics]({{root_url}}/Delivery_Metrics/) portal, the [Email Activity]({{root_url}}/Delivery_Metrics/email_activity.html) interface, and are reported by the [Event Webhook]({{root_url}}/API_Reference/Webhooks/event.html). You can enable this app through the web interface by navigating to ["Apps"](https://sendgrid.com/app) (from top nav when logged in to your account) \> "Show Disabled Apps" \> "Enable" (button seen below) +The Open Tracking app adds an invisible image at the end of the email which can track e-mail opens. If the email recipient has images enabled on the email client, a request to server for the invisible image is executed and an open event is logged. These Events are logged in your [Statistics]({{root_url}}/User_Guide/Delivery_Metrics/) portal, the [Email Activity]({{root_url}}/User_Guide/Delivery_Metrics/email_activity.html) interface, and are reported by the [Event Webhook]({{root_url}}/API_Reference/Webhooks/event.html). You can enable this app through the web interface by navigating to ["Apps"](https://sendgrid.com/app) (from top nav when logged in to your account) \> "Show Disabled Apps" \> "Enable" (button seen below) ![]({{root_url}}/images/open_tracking.png "open-fixed") diff --git a/source/Apps/sendwithus.md b/source/User_Guide/Apps/sendwithus.md similarity index 100% rename from source/Apps/sendwithus.md rename to source/User_Guide/Apps/sendwithus.md diff --git a/source/Apps/spam_checker.md b/source/User_Guide/Apps/spam_checker.md similarity index 100% rename from source/Apps/spam_checker.md rename to source/User_Guide/Apps/spam_checker.md diff --git a/source/Apps/subscription_tracking.md b/source/User_Guide/Apps/subscription_tracking.md similarity index 100% rename from source/Apps/subscription_tracking.md rename to source/User_Guide/Apps/subscription_tracking.md diff --git a/source/Apps/template_engine.md b/source/User_Guide/Apps/template_engine.md similarity index 69% rename from source/Apps/template_engine.md rename to source/User_Guide/Apps/template_engine.md index ea93fe2fb7..745110ed9c 100644 --- a/source/Apps/template_engine.md +++ b/source/User_Guide/Apps/template_engine.md @@ -10,7 +10,7 @@ navigation: This App is only available to [Silver accounts and higher](https://sendgrid.com/transactional-email/pricing) {% endinfo %} -This app is our new [Template Engine]({{root_url}}/API_Reference/Web_API_v3/Template_Engine/index.html), that supports multiple templates, versioning and more. Previously, we had a Template App, now called the [Legacy Template App]({{root_url}}/Apps/email_templates.html). +Our [Template Engine]({{root_url}}/API_Reference/Web_API_v3/Template_Engine/index.html) supports multiple templates, versioning and more. Previously, we had a Template App, now called the [Legacy Template App]({{root_url}}/User_Guide/Apps/email_templates.html). This app seperates email templates and design from sending, allowing templates to be worked on through the SendGrid UI and then populated during mail sending. @@ -18,7 +18,11 @@ This app seperates email templates and design from sending, allowing templates t There is currently a limit of 100 Templates and 100 Versions that may be created per account. _Please reach out to support if you reach into the limit._ {% endinfo %} -This app is differs from our other apps, and may be found in a [different location](https://sendgrid.com/templates). +This app is not in the same location as our other Apps, you will find it from the dashboard. Just click [Template Engine](https://sendgrid.com/templates) and you will be taken there. + +{% info %} +Templates created in Template Engine are account and subuser specific. Templates created on a parent account will not be accessible from the subuser accounts. +{% endinfo %} More documentation may be found with the [Template Engine API Reference]({{root_url}}/API_Reference/Web_API_v3/Template_Engine/index.html). diff --git a/source/Delivery_Metrics/advanced_statistics.md b/source/User_Guide/Delivery_Metrics/advanced_statistics.md similarity index 96% rename from source/Delivery_Metrics/advanced_statistics.md rename to source/User_Guide/Delivery_Metrics/advanced_statistics.md index 61839b167c..4a8d5ece87 100644 --- a/source/Delivery_Metrics/advanced_statistics.md +++ b/source/User_Guide/Delivery_Metrics/advanced_statistics.md @@ -10,7 +10,7 @@ navigation: --- SendGrid provides customers with advanced statistics about their email delivery. The statistics give deeper information -about customers who are reading your emails. SendGrid also provides more [traditional email statistics]({{root_url}}/Delivery_Metrics/metrics.html). +about customers who are reading your emails. SendGrid also provides more [traditional email statistics]({{root_url}}/User_Guide/Delivery_Metrics/metrics.html). {% info %} These stats are in beta. Data may be delayed by up to 10 hours. The top diff --git a/source/Delivery_Metrics/alerts.md b/source/User_Guide/Delivery_Metrics/alerts.md similarity index 100% rename from source/Delivery_Metrics/alerts.md rename to source/User_Guide/Delivery_Metrics/alerts.md diff --git a/source/Delivery_Metrics/categories.md b/source/User_Guide/Delivery_Metrics/categories.md similarity index 56% rename from source/Delivery_Metrics/categories.md rename to source/User_Guide/Delivery_Metrics/categories.md index 6259da7283..f13a450d48 100644 --- a/source/Delivery_Metrics/categories.md +++ b/source/User_Guide/Delivery_Metrics/categories.md @@ -8,7 +8,7 @@ navigation: Categories can help organize your email analytics by enabling you to "tag" emails by type. -Just as you can view the statistics on all your activity under [Statistics]({{root_url}}/Delivery_Metrics/index.html), you can go a step further and view the statistics broken down to a particular category. +Just as you can view the statistics on all your activity under [Statistics]({{root_url}}/User_Guide/Delivery_Metrics/index.html), you can go a step further and view the statistics broken down to a particular category. The events that can be associated with category include: @@ -19,6 +19,6 @@ The events that can be associated with category include: * [Spam Reports]({{root_url}}/Glossary/spam_reports.html) * [Unsubscribes]({{root_url}}/User_Guide/Email_Deliverability/Subscription_Tracking/index.html) -The actual statistics included vary depending upon the set of enabled [Apps]({{root_url}}/Apps/index.html). Emails sent, bounces and spam reports will always get tracked. [Unsubscribes]({{root_url}}/Apps/subscription_tracking.html), [Clicks]({{root_url}}/Apps/click_tracking.html), and [Opens]({{root_url}}/Apps/open_tracking.html) require that the associated App is enabled. Check out the [Apps tab](https://sendgrid.com/app) to see which apps you have enabled. +The actual statistics included vary depending upon the set of enabled [Apps]({{root_url}}/User_Guide/Apps/index.html). Emails sent, bounces and spam reports will always get tracked. [Unsubscribes]({{root_url}}/User_Guide/Apps/subscription_tracking.html), [Clicks]({{root_url}}/User_Guide/Apps/click_tracking.html), and [Opens]({{root_url}}/User_Guide/Apps/open_tracking.html) require that the associated App is enabled. Check out the [Apps tab](https://sendgrid.com/app) to see which apps you have enabled. [Read more about categories]({{root_url}}/API_Reference/SMTP_API/categories.html) in the SMTP API section. diff --git a/source/Delivery_Metrics/email_activity.md b/source/User_Guide/Delivery_Metrics/email_activity.md similarity index 100% rename from source/Delivery_Metrics/email_activity.md rename to source/User_Guide/Delivery_Metrics/email_activity.md diff --git a/source/Delivery_Metrics/email_error_messages.md b/source/User_Guide/Delivery_Metrics/email_error_messages.md similarity index 100% rename from source/Delivery_Metrics/email_error_messages.md rename to source/User_Guide/Delivery_Metrics/email_error_messages.md diff --git a/source/Delivery_Metrics/email_reports.md b/source/User_Guide/Delivery_Metrics/email_reports.md similarity index 100% rename from source/Delivery_Metrics/email_reports.md rename to source/User_Guide/Delivery_Metrics/email_reports.md diff --git a/source/User_Guide/Delivery_Metrics/index.html b/source/User_Guide/Delivery_Metrics/index.html new file mode 100644 index 0000000000..d5ef30a3b5 --- /dev/null +++ b/source/User_Guide/Delivery_Metrics/index.html @@ -0,0 +1,19 @@ +--- +layout: page +weight: 100 +title: Delivery Metrics Index +navigation: + show: true +--- + +

    SendGrid offers statistics on a number of different metrics to report on what is happening with your messages.

    + +
      +
    • Alerts: SendGrid will trigger an alert to send you based on triggers you set within SendGrid.
    • +
    • Categories: SendGrid will allow you to filter email statistics based on specific categories you add to your emails.
    • +
    • Email Activity: A page within your account that allows you to see recent stats on your sent emails.
    • +
    • Email Error Messages: All of the Error messages that you can expect from SendGrid.
    • +
    • Email Reports: View and export reports about your email activity.
    • +
    + +

    diff --git a/source/Delivery_Metrics/metrics.md b/source/User_Guide/Delivery_Metrics/metrics.md similarity index 97% rename from source/Delivery_Metrics/metrics.md rename to source/User_Guide/Delivery_Metrics/metrics.md index 1a16fa8f39..e044c19e6a 100644 --- a/source/Delivery_Metrics/metrics.md +++ b/source/User_Guide/Delivery_Metrics/metrics.md @@ -16,7 +16,7 @@ adding the new beta statistics. {% endinfo %} {% info %} - For a detailed list of common error messages, please visit our Email Error Messages page. + For a detailed list of common error messages, please visit our Email Error Messages page. {% endinfo %} {% anchor h2 %} @@ -56,7 +56,7 @@ Unsubscribes

    -See Also: [Marketing Email Unsubscribes]({{root_url}}/Marketing_Emails/unsubscribes.html) +See Also: [Marketing Email Unsubscribes]({{root_url}}/User_Guide/Marketing_Emails/unsubscribes.html) {% info %} you can enable Click, Open, and Subscription Tracking in the Apps section of your SendGrid account. 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 index f27b648c61..ca5fcc839f 100644 --- a/source/User_Guide/Email_Deliverability/Subscription_Tracking/advanced_suppression_manager.md +++ b/source/User_Guide/Email_Deliverability/Subscription_Tracking/advanced_suppression_manager.md @@ -9,7 +9,7 @@ navigation: --- {% 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. +Advanced Suppression Manager (ASM) is in Beta and is not currently available for use with our [Marketing Email]({{root_url}}/User_Guide/Marketing_Emails/index.html) tool. {% endinfo %} {% anchor h2 %} diff --git a/source/User_Guide/Email_Deliverability/Subscription_Tracking/index.html b/source/User_Guide/Email_Deliverability/Subscription_Tracking/index.html index 97be9005a8..1247f370ae 100644 --- a/source/User_Guide/Email_Deliverability/Subscription_Tracking/index.html +++ b/source/User_Guide/Email_Deliverability/Subscription_Tracking/index.html @@ -16,9 +16,9 @@

    -If you are sending email through SendGrid and have the Subscription Tracking app turned on, an unsubscribe option will be added to the footer of every email that gets sent through your account. A user who clicks the unsubscribe link will be added to your global unsubscribe list and **any** future attempts to send email to those users will be suppressed unless they’re removed. You can also manage this list manually, adding and removing addresses via the UI or with the use of API calls. +If you are sending email through SendGrid and have the Subscription Tracking app turned on, an unsubscribe option will be added to the footer of every email that gets sent through your account. A user who clicks the unsubscribe link will be added to your global unsubscribe list and **any** future attempts to send email to those users will be suppressed unless they’re removed. You can also manage this list manually, adding and removing addresses via the UI or with the use of API calls.

    -The Subscription Tracking app also has a number of options for customization, such as a replacement tag that allows you to place the unsubscribe text somewhere in the body of the email, the ability to reword the unsubscribe message, and the ability to add a custom landing page. +The Subscription Tracking app also has a number of options for customization, such as a replacement tag that allows you to place the unsubscribe text somewhere in the body of the email, the ability to reword the unsubscribe message, and the ability to add a custom landing page.

    diff --git a/source/User_Guide/Email_Deliverability/sender_reputation.md b/source/User_Guide/Email_Deliverability/sender_reputation.md index 2a17ec31e9..75022a0d29 100644 --- a/source/User_Guide/Email_Deliverability/sender_reputation.md +++ b/source/User_Guide/Email_Deliverability/sender_reputation.md @@ -19,7 +19,7 @@ How is Reputation Computed? Your SendGrid account reputation is computed based on a calculation of: -The percentage of requests that are able to be Delivered. This takes into account [Bounces]({{root_url}}/Glossary/bounces.html), Invalid Emails, and Drops (Repeat bounces, unsubscribes, etc.) Please review our [Delivery Metrics]({{root_url}}/Delivery_Metrics/index.html) documentation for more detail on these terms. +The percentage of requests that are able to be Delivered. This takes into account [Bounces]({{root_url}}/Glossary/bounces.html), Invalid Emails, and Drops (Repeat bounces, unsubscribes, etc.) Please review our [Delivery Metrics]({{root_url}}/User_Guide/Delivery_Metrics/index.html) documentation for more detail on these terms. Spam Reports. Each spam report is a user actively rejecting your mail, and has a strong negative affect {% anchor h2 %} diff --git a/source/User_Guide/Email_Settings/categories.md b/source/User_Guide/Email_Settings/categories.md index 9a56a273ce..a36b3da3b5 100644 --- a/source/User_Guide/Email_Settings/categories.md +++ b/source/User_Guide/Email_Settings/categories.md @@ -12,7 +12,7 @@ seo: Categories help organize your email analytics by enabling you to tag emails you send by topics you define. -Just as you can view the statistics on all your activity under the '[Statistics]({{root_url}}/Delivery_Metrics/)' tab, you can go a step further and view the [statistics broken down to a particular category]({{root_url}}/Delivery_Metrics/categories.html). +Just as you can view the statistics on all your activity under the '[Statistics]({{root_url}}/User_Guide/Delivery_Metrics/)' tab, you can go a step further and view the [statistics broken down to a particular category]({{root_url}}/User_Guide/Delivery_Metrics/categories.html). The events that can be associated with category include: @@ -23,7 +23,7 @@ The events that can be associated with category include: - Spam Reports - Unsubscribes -The actual statistics included vary depending upon the set of enabled [Apps]({{root_url}}/Apps/). Emails sent, bounces and spam reports will always get tracked. [Unsubscribes]({{root_url}}/Apps/subscription_tracking.html), [Clicks]({{root_url}}/Apps/click_tracking.html), and [Opens]({{root_url}}/Apps/open_tracking.html) require that the associated App is enabled. Check out the [Apps tab](https://sendgrid.com/app) to see which apps you have enabled. +The actual statistics included vary depending upon the set of enabled [Apps]({{root_url}}/User_Guide/Apps/). Emails sent, bounces and spam reports will always get tracked. [Unsubscribes]({{root_url}}/User_Guide/Apps/subscription_tracking.html), [Clicks]({{root_url}}/User_Guide/Apps/click_tracking.html), and [Opens]({{root_url}}/User_Guide/Apps/open_tracking.html) require that the associated App is enabled. Check out the [Apps tab](https://sendgrid.com/app) to see which apps you have enabled. In order to add the X-SMTPAPI categories header, please look at our [SMTP API Categories]({{root_url}}/API_Reference/SMTP_API/categories.html) documentation. You can also get a [full category list]({{root_url}}/API_Reference/Web_API/Statistics/index.html#-Category-List) or get [category specific statistics]({{root_url}}/API_Reference/Web_API/Statistics/index.html#-Retrieve-Statistics) from the SendGrid API. diff --git a/source/Marketing_Emails/analytics.md b/source/User_Guide/Marketing_Emails/analytics.md similarity index 97% rename from source/Marketing_Emails/analytics.md rename to source/User_Guide/Marketing_Emails/analytics.md index 6081eeb0ef..874b086cee 100644 --- a/source/Marketing_Emails/analytics.md +++ b/source/User_Guide/Marketing_Emails/analytics.md @@ -26,7 +26,7 @@ Here, you’ll have access to: ![Email Marketing Stats Dashboard]({{root_url}}/images/EmailMarketing_Analytics_2.png) -You can learn more about each of these statistics [here]({{root_url}}/Delivery_Metrics/metrics.html). +You can learn more about each of these statistics [here]({{root_url}}/User_Guide/Delivery_Metrics/metrics.html). You can also view the statistics for your newsletters by going to [Marketing Email > Manage](https://sendgrid.com/newsletter). Here you’ll see a quick preview of many of the metrics that you would look at to see how your newsletter is performing: sent, opens, unique opens, open rate, total clicks, CTR, opt-out/unsubscribe rate, and spam reports. diff --git a/source/Marketing_Emails/create_manage.md b/source/User_Guide/Marketing_Emails/create_manage.md similarity index 100% rename from source/Marketing_Emails/create_manage.md rename to source/User_Guide/Marketing_Emails/create_manage.md diff --git a/source/Marketing_Emails/dashboard.md b/source/User_Guide/Marketing_Emails/dashboard.md similarity index 100% rename from source/Marketing_Emails/dashboard.md rename to source/User_Guide/Marketing_Emails/dashboard.md diff --git a/source/Marketing_Emails/index.html b/source/User_Guide/Marketing_Emails/index.html similarity index 91% rename from source/Marketing_Emails/index.html rename to source/User_Guide/Marketing_Emails/index.html index c62f31087f..bb0a8aa3da 100644 --- a/source/Marketing_Emails/index.html +++ b/source/User_Guide/Marketing_Emails/index.html @@ -18,4 +18,4 @@

    For information on programmatically interfacing with SendGrid marketing emails, check out the Marketing Email API documentation.

    -The Email Marketing Campaigns gives information about different types of marketing email campaigns. Here is more information on managing unsubscribes within the Marketing Application. +The Email Marketing Campaigns gives information about different types of marketing email campaigns. Here is more information on managing unsubscribes within the Marketing Application. diff --git a/source/Marketing_Emails/recipients.md b/source/User_Guide/Marketing_Emails/recipients.md similarity index 100% rename from source/Marketing_Emails/recipients.md rename to source/User_Guide/Marketing_Emails/recipients.md diff --git a/source/Marketing_Emails/sender_address.md b/source/User_Guide/Marketing_Emails/sender_address.md similarity index 100% rename from source/Marketing_Emails/sender_address.md rename to source/User_Guide/Marketing_Emails/sender_address.md diff --git a/source/Marketing_Emails/tags.md b/source/User_Guide/Marketing_Emails/tags.md similarity index 100% rename from source/Marketing_Emails/tags.md rename to source/User_Guide/Marketing_Emails/tags.md diff --git a/source/Marketing_Emails/unsubscribes.md b/source/User_Guide/Marketing_Emails/unsubscribes.md similarity index 50% rename from source/Marketing_Emails/unsubscribes.md rename to source/User_Guide/Marketing_Emails/unsubscribes.md index 93c328e841..b3f00faaa6 100644 --- a/source/Marketing_Emails/unsubscribes.md +++ b/source/User_Guide/Marketing_Emails/unsubscribes.md @@ -8,7 +8,7 @@ navigation: show: true --- -Emails sent through our [Marketing Email tool]({{root_url}}/Marketing_Emails/index.html) will contain an unsubscribe link regardless of whether or not the Subscription Tracking app is turned on. When users unsubscribe from a marketing email they do not end up on a global unsubscribe list. Each Marketing Email recipient list has it’s own unsubscribes. Recipients that unsubscribe from these emails are unsubscribing from future emails sent to that specific list. You can use separate lists to allow your recipients to unsubscribe from certain types of messages while still receiving others. +Emails sent through our [Marketing Email tool]({{root_url}}/User_Guide/Marketing_Emails/index.html) will contain an unsubscribe link regardless of whether or not the Subscription Tracking app is turned on. When users unsubscribe from a marketing email they do not end up on a global unsubscribe list. Each Marketing Email recipient list has it’s own unsubscribes. Recipients that unsubscribe from these emails are unsubscribing from future emails sent to that specific list. You can use separate lists to allow your recipients to unsubscribe from certain types of messages while still receiving others. You can export your unsubscribes from each list by hovering over the recipient list in question, selecting “Export,” and then selecting the “Unsubscribes” checkbox. @@ -16,4 +16,4 @@ To add the exported unsubscribe list to a different recipient list, select “Ma To export the unsubscribes from all of your different lists by selecting the “Download as CSV from all lists” option under “Manage Unsubscribes.” -See Also: [Transactional Email Unsubscribes]({{root_url}}/Transactional_Email/unsubscribes.html) +See Also: [Transactional Email Unsubscribes]({{root_url}}/User_Guide/Transactional_Email/unsubscribes.html) diff --git a/source/User_Guide/SendGrid_for_Mobile/dashboard.md b/source/User_Guide/SendGrid_for_Mobile/dashboard.md index ce799bcda4..e7940c5251 100644 --- a/source/User_Guide/SendGrid_for_Mobile/dashboard.md +++ b/source/User_Guide/SendGrid_for_Mobile/dashboard.md @@ -18,6 +18,6 @@ navigation:

    -The dashboard page will display your account’s statistics for the past day, week, or month. SendGrid offers a number of [Delivery Metrics]({{root_url}}/Delivery_Metrics/index.html) to report what is happening with your messages. +The dashboard page will display your account’s statistics for the past day, week, or month. SendGrid offers a number of [Delivery Metrics]({{root_url}}/User_Guide/Delivery_Metrics/index.html) to report what is happening with your messages. You can also export the statistics for each individual day to a CSV file by tapping the Share button. \ No newline at end of file diff --git a/source/User_Guide/SendGrid_for_Mobile/suppression.md b/source/User_Guide/SendGrid_for_Mobile/suppression.md index 6bf3368686..d0672fc47b 100644 --- a/source/User_Guide/SendGrid_for_Mobile/suppression.md +++ b/source/User_Guide/SendGrid_for_Mobile/suppression.md @@ -18,7 +18,7 @@ navigation:

    -The Suppression Lists section will allow you to view and modify your account’s [suppression lists]({{root_url}}/Delivery_Metrics/email_reports.html). +The Suppression Lists section will allow you to view and modify your account’s [suppression lists]({{root_url}}/User_Guide/Delivery_Metrics/email_reports.html). Depending on the list you're viewing, you can tap on an address to get more information (for instance, the bounce reason for addresses listed on the bounce list). You can also swipe left on an address to delete it off a list. diff --git a/source/User_Guide/Setting_Up_Your_Server/Whitelabeling/spf.md b/source/User_Guide/Setting_Up_Your_Server/Whitelabeling/spf.md index 166eec156f..2afc33d8e6 100644 --- a/source/User_Guide/Setting_Up_Your_Server/Whitelabeling/spf.md +++ b/source/User_Guide/Setting_Up_Your_Server/Whitelabeling/spf.md @@ -16,7 +16,7 @@ navigation: SPF and Whitelabel {% endanchor %} -As part of the [whitelabel]({{root_url}}/User_Guide/Setting_Up_Your_Server/Whitelabeling/index.html) process you must create a subdomain (such as em.example.com) which is used for [click and open tracking]({{root_url}}/Delivery_Metrics/email_activity.html) as well as in the Return-Path email header. SPF uses the domain value in the Return-Path header for the DNS lookup to determine the permitted senders for the domain. +As part of the [whitelabel]({{root_url}}/User_Guide/Setting_Up_Your_Server/Whitelabeling/index.html) process you must create a subdomain (such as em.example.com) which is used for [click and open tracking]({{root_url}}/User_Guide/Delivery_Metrics/email_activity.html) as well as in the Return-Path email header. SPF uses the domain value in the Return-Path header for the DNS lookup to determine the permitted senders for the domain. If you have an SPF record set for your root domain (i.e. yourdomain.com), you must add {% codeblock %}include:sendgrid.net{% endcodeblock %} before the all mechanism of this record. If you do not have an SPF record for your domain you must create a TXT record with the value: diff --git a/source/Transactional_Email/Template_Engine/index.html b/source/User_Guide/Transactional_Email/Template_Engine/index.html similarity index 100% rename from source/Transactional_Email/Template_Engine/index.html rename to source/User_Guide/Transactional_Email/Template_Engine/index.html diff --git a/source/Transactional_Email/Template_Engine/setup_guide.md b/source/User_Guide/Transactional_Email/Template_Engine/setup_guide.md similarity index 100% rename from source/Transactional_Email/Template_Engine/setup_guide.md rename to source/User_Guide/Transactional_Email/Template_Engine/setup_guide.md diff --git a/source/Transactional_Email/index.html b/source/User_Guide/Transactional_Email/index.html similarity index 100% rename from source/Transactional_Email/index.html rename to source/User_Guide/Transactional_Email/index.html diff --git a/source/User_Guide/Transactional_Email/unsubscribes.md b/source/User_Guide/Transactional_Email/unsubscribes.md new file mode 100644 index 0000000000..935e26ed27 --- /dev/null +++ b/source/User_Guide/Transactional_Email/unsubscribes.md @@ -0,0 +1,16 @@ +--- +seo: + title: Transactional Email Unsubscribes +title: Transactional Email Unsubscribes +weight: 0 +layout: page +navigation: + show: true +--- + +If you are sending email through SendGrid and have the [Subscription Tracking app]({{root_url}}/User_Guide/Apps/subscription_tracking.html) turned on an unsubscribe option will be added to the footer of every email that gets sent through your account. A user who clicks the unsubscribe link will be added to your [global unsubscribe list](https://sendgrid.com/unsubscribes) and **any** future attempts to send email to those users will be suppressed unless they’re removed. You can also manage this list manually, adding and removing addresses via the UI or with the use of [API calls]({{root_url}}/API_Reference/Web_API/unsubscribes.html). + +The [Subscription Tracking app]({{root_url}}/User_Guide/Apps/subscription_tracking.html) also has a number of options for customization, such as a replacement tag that allows you to place the unsubscribe text somewhere in the body of the email, the ability to reword the unsubscribe message, and the ability to add a custom landing page. + +See Also: See Also: [Marketing Email Unsubscribes]({{root_url}}/User_Guide/Marketing_Emails/unsubscribes.html) + diff --git a/source/User_Guide/index.html b/source/User_Guide/index.html index 5f3fca3436..5c4a90581e 100644 --- a/source/User_Guide/index.html +++ b/source/User_Guide/index.html @@ -31,12 +31,12 @@

    Once you've got email sending squared away, check out some of the other awesome things you can do with our APIs and apps.

    +href="{{root_url}}/User_Guide/Apps/index.html" title="SendGrid Apps">apps.

    {% anchor h3 %} Marketers {% endanchor %} -

    Our marketing email feature lets you compose and send email campaigns from a powerful web-based tool. We provide list management, delivery scheduling, A/B split testing, and of course we provide analytics on the emails you send. You can take a look at our marketing email documentation to learn more.

    +

    Our marketing email feature lets you compose and send email campaigns from a powerful web-based tool. We provide list management, delivery scheduling, A/B split testing, and of course we provide analytics on the emails you send. You can take a look at our marketing email documentation to learn more.

    We also provide a robust marketing email API if you want to integrate any of these features into your own application.

    diff --git a/source/User_Guide/throttling.md b/source/User_Guide/throttling.md index b5aea3bd0c..6c55a16d5e 100644 --- a/source/User_Guide/throttling.md +++ b/source/User_Guide/throttling.md @@ -8,7 +8,7 @@ navigation: show: true --- -So, you tried to send a bunch of email, and when you checked your [Event webhook]({{root_url}}/API_Reference/Webhooks/event.html) or your [Email Activity]({{root_url}}/Delivery_Metrics/email_activity.html) page, you see a number of messages are marked as "Deferred" instead of "Delivered". Or maybe you're looking at your [Email Reports]({{root_url}}/Delivery_Metrics/email_reports.html), and noticing a lot of addresses in your [Blocks](https://sendgrid.com/blocks), but not many in your Hard Bounces. What? Why aren't your recipients currently in awe at the glory of your amazing message? +So, you tried to send a bunch of email, and when you checked your [Event webhook]({{root_url}}/API_Reference/Webhooks/event.html) or your [Email Activity]({{root_url}}/User_Guide/Delivery_Metrics/email_activity.html) page, you see a number of messages are marked as "Deferred" instead of "Delivered". Or maybe you're looking at your [Email Reports]({{root_url}}/User_Guide/Delivery_Metrics/email_reports.html), and noticing a lot of addresses in your [Blocks](https://sendgrid.com/blocks), but not many in your Hard Bounces. What? Why aren't your recipients currently in awe at the glory of your amazing message? First of all, rest assured that our system is designed with throttling (also known as "deferral" these terms mean the same thing in the email world, and may be used interchangeably) in mind. We continue to attempt to send messages for up to 72 hours until the message is delivered. Normally, it takes between a few minutes to a few hours until the message is delivered. diff --git a/source/VidGrid/Marketing_Emails/Analytics/index.html b/source/VidGrid/Marketing_Emails/Analytics/index.html index 788418c3aa..d423a8b173 100644 --- a/source/VidGrid/Marketing_Emails/Analytics/index.html +++ b/source/VidGrid/Marketing_Emails/Analytics/index.html @@ -13,8 +13,8 @@
    • - - Marketing Email Analytics + + Understanding Marketing Statistics View and interpret your Marketing Email statistics and delivery metrics.
    • diff --git a/source/_assets/javascripts/search.js b/source/_assets/javascripts/search.js index ae68df3a48..37bb196b4f 100644 --- a/source/_assets/javascripts/search.js +++ b/source/_assets/javascripts/search.js @@ -109,13 +109,47 @@ function search(query) {
    ') }); }) + .fail(function(){ + $('div#kb-results').empty(); + $('div#kb-results').append('

    Knowledge Base Search Failed! Please try again.

    '); + }) - .fail(function(){ - $('div#kb-results').empty(); - $('div#kb-results').append('

    Knowledge Base Search Failed! Please try again.

    '); + .always(function(){ + $('#kb-indicator').hide(); + }); + + + $.ajax({ + url: "https://sendgrid.com/blog/?q=" + query, + dataType: "xml" }) - - .always(function(){ - $('#kb-indicator').hide(); - }); + .done(function (data) { + var $xml = $(data); + var items = []; + + var articles = $xml.find("item"); + if(articles.length == 0) { + $('div#blog-results').append('

    No Blog Found

    '); + $('#blog-tab-badge').text('0'); + } else { + $('#blog-tab-badge').text(articles.length); + } + $.each(articles, function (i) { + if (i === 5) return false; + var $this = $(this); + items.push(''); + }) + $("#blog-results").html(items.join('')); + }) + .fail(function(){ + $('div#blog-results').empty(); + $('div#blog-results').append('

    Blog Search Failed! Please try again.

    '); + }) + + .always(function(){ + $('#blog-indicator').hide(); + }); } diff --git a/source/_assets/stylesheets/icomoon.css b/source/_assets/stylesheets/icomoon.css index 2ae936fe83..0e8b35ffda 100755 --- a/source/_assets/stylesheets/icomoon.css +++ b/source/_assets/stylesheets/icomoon.css @@ -193,5 +193,4 @@ } .icon-arrow-down:before { content: "\e637"; -} - +} \ No newline at end of file diff --git a/source/_assets/stylesheets/style.css b/source/_assets/stylesheets/style.css index eb0c730caf..12a114dc4b 100644 --- a/source/_assets/stylesheets/style.css +++ b/source/_assets/stylesheets/style.css @@ -689,7 +689,7 @@ figure.code.expanded { #nav .nav-link { height:auto; } - + #nav .btn { width: 80%; margin: 20px auto; @@ -704,6 +704,109 @@ figure.code.expanded { .container { width: 970px; } - } +@media (max-width: 1024px) { + + .navbar-header { + float: none; + } + + .navbar-left,.navbar-right { + float: none !important; + } + + .navbar-toggle { + display: block; + } + + .navbar-collapse { + border-top: 1px solid transparent; + box-shadow: inset 0 1px 0 rgba(255,255,255,0.1); + } + + .navbar-fixed-top { + top: 0; + border-width: 0 0 1px; + } + + .navbar-collapse.collapse { + display: none!important; + } + + .navbar-nav { + float: none!important; + margin-top: 7.5px; + } + + .navbar-nav>li { + float: none; + } + + .navbar-nav>li>a { + padding-top: 10px; + padding-bottom: 10px; + } + + .collapse.in{ + display:block !important; + } + + #nav #navbar { + background: #1e242f; + } + + #nav .navbar-header { + width: 100%; + } + + #nav .navbar-buttons { + display: none; + } + + #nav .navbar-collapse { + width: 100%; + overflow: scroll !important; + } + + #nav #nav-links .nav-link.visible-xs { + display: block !important; + } + + #nav .nav-link { + height: auto; + text-align: center; + } + + #nav .nav-link a { + height: 44px; + padding: 12px 15px; + font-size: 16px; + line-height: 20px; + } + + #nav .btn { + width: 80%; + margin: 20px auto; + } + + #sidebar-header.visible-xs { + display: block !important; + } + + #sidebar-header.col-md-3 { + width: 100%; + } + + #content .col-md-3, + #content .col-sm-3, + #content .col-md-9, + #content .col-sm-9 { + width: 100%; + } + + #content article { + margin: 0 auto; + } + +} \ No newline at end of file diff --git a/source/_data/folder_weights.yml b/source/_data/folder_weights.yml index 463a0d69b3..04d68ca2f6 100644 --- a/source/_data/folder_weights.yml +++ b/source/_data/folder_weights.yml @@ -1,12 +1,12 @@ --- /API_Reference: 80 -/Apps: 40 -/Code_Examples: 80 -/Delivery_Metrics: 40 +#/Apps: 40 +#/Code_Examples: 80 +#/Delivery_Metrics: 40 /Glossary: 20 /Integrate: 80 -/Marketing_Emails: 40 -/Transactional_Email: 40 +#/Marketing_Emails: 40 +#/Transactional_Email: 40 /User_Guide: 90 /Utilities: 80 /VidGrid: 20 diff --git a/source/_includes/navigation.html b/source/_includes/navigation.html index ceb515c574..2d305171dc 100644 --- a/source/_includes/navigation.html +++ b/source/_includes/navigation.html @@ -9,30 +9,32 @@ - diff --git a/source/images/image_libarary_icon.png b/source/images/image_libarary_icon.png new file mode 100644 index 0000000000..6a0f74e3a8 Binary files /dev/null and b/source/images/image_libarary_icon.png differ diff --git a/source/index.html b/source/index.html index da4738242a..d21db65d88 100644 --- a/source/index.html +++ b/source/index.html @@ -14,51 +14,58 @@ ---