Merge branch 'develop' of github.com:sendgrid/docs into develop

Author: kate-porter

source/API_Reference/SMTP_API/apps.html

@@ -523,11 +523,11 @@ <h4>Example X-SMTPAPI Header Value</h4>
 {% endanchor %}
 
 {% info %}
-This setting is our <a href="{{root_url}}/API_Reference/Web_API_v3/Template_Engine/index.html">Template Engine</a>, that supports multiple templates, versioning and more. Previously, we had a Template App, now called the <a href="#template">Legacy Template App</a>.
+This setting refers to SendGrid's <a href="{{root_url}}/API_Reference/Web_API_v3/Transactional_Templates/index.html">transactional templates</a>. SendGrid supports versioning, and the ability to create multiple transactional templates. Previously, we had a Template App, which is now referred to as the <a href="#template">Legacy Template App</a>.
 {% endinfo %}
 
 
-<p>Uses a template created with the <a href="{{root_url}}/API_Reference/Web_API_v3/Template_Engine/index.html">Template Engine</a> when sending an email. More information on usage of the Template Engine with the SMTP API may be found in the <a href="{{root_url}}/API_Reference/Web_API_v3/Template_Engine/smtpapi.html">Template Engine API Reference</a>.
+<p>Uses a <a href="{{root_url}}/API_Reference/Web_API_v3/Transactional_Templates/index.html">transactional template</a> when sending an email. More information on using transactional templates with the SMTP API may be found in the <a href="{{root_url}}/API_Reference/Web_API_v3/Transactional_Templates/smtpapi.html">transactional templates API Reference</a>.
 
 <table class="table table-striped table-bordered">
 <tbody>
@@ -570,7 +570,7 @@ <h4>Example X-SMTPAPI Header Value</h4>
 {% endanchor %}
 
 {% warning %}
-This setting is our original Email Template app, today we have a more full featured <a href="#templates">Template Engine</a>, which supports multiple templates, versioning and more.
+This setting refers to our original Email Template app. We now support more fully featured <a href="#templates">transactional templates</a>. You may create multiple transactional templates that allow for versioning, in addition to several other features.
 {% endwarning %}
 
 

source/API_Reference/SMTP_API/substitution_tags.md

@@ -149,7 +149,7 @@ Example: **substitution1** replaced by **section1** replaced by **substitution2*
 {% anchor h2 %}
 SendGrid Defined Substitution Tags
 {% endanchor %}
-While the tags above are tags that you define at the time of your send in the SMTPAPI headers, SendGrid also offers [Unsubscribe Groups tags]({{root_url}}/User_Guide/Templates/create_edit.html#-Unsubscribe-Substitution-Tags) that have been pre-defined for you. You can use these tags within the content of your email and you do not have to, and should not, define them.
+While the tags above are tags that you define at the time of your send in the SMTPAPI headers, SendGrid also offers [Unsubscribe Groups tags]({{root_url}}/User_Guide/Transactional_Templates/create_edit.html#-Unsubscribe-Substitution-Tags) that have been pre-defined for you. You can use these tags within the content of your email and you do not have to, and should not, define them.
 
 
 

source/API_Reference/Web_API/filter_settings.md

@@ -15,16 +15,16 @@ For a more detailed description of each of the Filters below, please visit the [
 All calls to change filter settings are made to the [filter.setup endpoint.]({{root_url}}/API_Reference/Web_API/filter_commands.html#-Setup-App)
 
 {% anchor h2 %}
-Address Whitelist 
+Address Whitelist
 {% endanchor %}
 
 *Name - `addresswhitelist`*
 
 {% info %}
-When using this call, you must define all emails & domains here. Using this call will overwrite any current settings for this filter. This would also be how you remove an entry, by excluding if from the call. 
+When using this call, you must define all emails & domains here. Using this call will overwrite any current settings for this filter. This would also be how you remove an entry, by excluding if from the call.
 {% endinfo %}
-{% parameters addresswhitelist %} 
-  
+{% parameters addresswhitelist %}
+
   {% parameter name yes 'addresswhitelist' 'The name of the setting.' %}  
   {% parameter list yes 'A list of email addresses or domains.' 'list[]=[email protected]&list[]=[email protected]' %}
 {% endparameters %}
@@ -46,13 +46,13 @@ When using this call, you must define all emails & domains here. Using this call
 * * * * *
 
 {% anchor h2 %}
-BCC "Blind Carbon Copy" 
+BCC "Blind Carbon Copy"
 {% endanchor %}
 
 *Name - `bcc`*
 
-{% parameters bcc %} 
-  
+{% parameters bcc %}
+
   {% parameter name yes 'bcc' 'The name of the setting.' %}  
   {% parameter email yes 'An email address to be the BCC recipient.' '[email protected]' %}
 {% endparameters %}
@@ -74,13 +74,13 @@ BCC "Blind Carbon Copy"
 * * * * *
 
 {% anchor h2 %}
-Click Tracking 
+Click Tracking
 {% endanchor %}
 
 *Name - `clicktrack`*
 
-{% parameters clicktrack %} 
-  
+{% parameters clicktrack %}
+
   {% parameter name yes 'clicktrack' 'The name of the setting.' %}  
   {% parameter enable_text yes 'Enable click tracking in plain text emails.' '0 or 1' %}
 {% endparameters %}
@@ -102,13 +102,13 @@ Click Tracking
 * * * * *
 
 {% anchor h2 %}
-DKIM 
+DKIM
 {% endanchor %}
 
 *Name - `dkim`*
 
-{% parameters dkim %} 
-  
+{% parameters dkim %}
+
   {% parameter name yes 'dkim' 'The name of the setting.' %}  
   {% parameter domain yes 'The domain to sign messages as.' 'example.com' %}  
   {% parameter use_from no 'If enabled, the domain in the From: header of the email will be used to sign your DKIM.' '0 or 1' %}
@@ -131,16 +131,16 @@ DKIM
 * * * * *
 
 {% anchor h2 -Email-Templates %}
-Legacy Email Templates 
+Legacy Email Templates
 {% endanchor %}
 
 *Name - `template`*
 
 {% warning %}
-This setting is our original Email Template app, today we have a more full featured [Template Engine]({{root_url}}/API_Reference/Web_API_v3/Template_Engine/index.html), which supports multiple templates, versioning and more. Its settings, however, are controlled using a [separate API]({{root_url}}/API_Reference/Web_API_v3/Template_Engine/index.html). 
+This setting is our original Email Template app, today we have more full featured [transactional templates]({{root_url}}/API_Reference/Web_API_v3/Transactional_Templates/index.html), with support for multiple templates, and versioning, and many other helpful features. Its settings, however, are controlled using a [separate API]({{root_url}}/API_Reference/Web_API_v3/Transactional_Templates/index.html).
 {% endwarning %}
-{% parameters template %} 
-  
+{% parameters template %}
+
   {% parameter name yes 'template' 'The name of the setting.' %}  
   {% parameter text/html yes 'A string that holds the template html body.' '\<html\>\<head\>\</head\>\<body bgcolor='pink'\>\<div style='width:200px' bgcolor='\#FFF'\>\<% body %\>\</div\>\</body\>\</html\>' %}
 {% endparameters %}
@@ -162,13 +162,13 @@ This setting is our original Email Template app, today we have a more full featu
 * * * * *
 
 {% anchor h2 %}
-Event Notification 
+Event Notification
 {% endanchor %}
 
 *Name - `eventnotify`*
 
 {% info %}
-All fields except version are required for each call. 
+All fields except version are required for each call.
 {% endinfo %}
 
 
@@ -209,7 +209,7 @@ All fields except version are required for each call.
 * * * * *
 
 {% anchor h2 %}
-Footer 
+Footer
 {% endanchor %}
 
 *Name - `footer`*
@@ -240,7 +240,7 @@ You must provide either text/html or text/plain, or both, to avoid receiving a "
 * * * * *
 
 {% anchor h2 %}
-Google Analytics 
+Google Analytics
 {% endanchor %}
 
 *Name - `ganalytics`*
@@ -274,7 +274,7 @@ At least one of the optional parameters needs to be passed to avoid a "missing p
 * * * * *
 
 {% anchor h2 %}
-SPAM Filter Checker 
+SPAM Filter Checker
 {% endanchor %}
 
 *Name - `spamcheck`*
@@ -304,7 +304,7 @@ SPAM Filter Checker
 * * * * *
 
 {% anchor h2 %}
-Subscription Tracking 
+Subscription Tracking
 {% endanchor %}
 
 *Name - `subscriptiontrack`*
@@ -338,7 +338,7 @@ You must pass at least one of the optional params in order to avoid the "missing
 * * * * *
 
 {% anchor h2 %}
-SendGrid for New Relic 
+SendGrid for New Relic
 {% endanchor %}
 
 *Name - `newrelic`*
@@ -366,7 +366,7 @@ SendGrid for New Relic
 * * * * *
 
 {% anchor h2 %}
-Sendwithus 
+Sendwithus
 {% endanchor %}
 
 *Name - `sendwithus`*

source/API_Reference/Web_API_v3/Template_Engine/index.md

@@ -0,0 +1,23 @@
+---
+layout: page
+title: Transactional Templates Overview
+weight: 100
+alias: /API_Reference/Web_API_v3/Transactional_Templates/index.html
+navigation:
+  show: true
+---
+
+The transactional templates API lets you programmatically [create and manage
+templates]({{ root_url }}/API_Reference/Web_API_v3/Transactional_Templates/templates.html) for your transactional email. You may [version these templates]({{ root_url }}/API_Reference/Web_API_v3/Transactional_Templates/versions.html), then [send them through the existing SendGrid API]({{ root_url }}/API_Reference/Web_API_v3/Transactional_Templates/smtpapi.html).
+
+**[Templates]({{ root_url }}/API_Reference/Web_API_v3/Transactional_Templates/templates.html)**
+
+Templates are re-usable email layouts, that may be created and interacted with through the API. These are intended to be a specific type of message, such as 'Weekly Product Update'.
+
+**[Versions]({{ root_url }}/API_Reference/Web_API_v3/Transactional_Templates/versions.html)**
+
+Templates may have multiple versions with different content, these may be changed and activated through the API. These allow split testing, multiple languages of the same template, etc.
+
+**[Sending Transactional Templates]({{ root_url }}/API_Reference/Web_API_v3/Transactional_Templates/smtpapi.html)**
+
+The [SMTP API]({{ root_url }}/API_Reference/SMTP_API/index.html) is used to send templated email through SendGrid. The Web API with the [x-smtpapi parameter]({{ root_url }}/API_Reference/Web_API/mail.html#-send) can also be used.

source/API_Reference/Web_API_v3/Transactional_Templates/index.md

@@ -1,7 +1,7 @@
 ---
 layout: page
-title: Using Template Engine with SMTP API
-alias: /API_Reference/Web_API_v3/Template_Engine/smtpapi.html
+title: Using Transactional Templates With The SMTP API
+alias: /API_Reference/Web_API_v3/Transactional_Templates/smtpapi.html
 navigation:
   show: true
 ---
@@ -10,8 +10,8 @@ navigation:
 Enabling a Template
 {% endanchor %}
 
-To use a Template Engine template when you send, enable the `templates`
-filter and set the `template_id` to one of your Template Engine templates.
+To use a transactional template when you send, enable the `templates`
+filter and set the `template_id` to one of your transactional templates.
 
 Example
 {% codeblock lang:json %}
@@ -33,7 +33,7 @@ call]({{root_url}}/API_Reference/Web_API/mail.html#-send).
 
 {% info %}
 Make sure that the version of the template you want to use is set to active
-by using the [activate endpoint]({{ root_url }}/API_Reference/Web_API_v3/Template_Engine/versions.html#-POST) or by activating it in the
+by using the [activate endpoint]({{ root_url }}/API_Reference/Web_API_v3/Transactional_Templates/versions.html#-POST) or by activating it in the
 UI.
 {% endinfo %}
 
@@ -43,8 +43,8 @@ UI.
 Body and Subject Tags
 {% endanchor %}
 
-Enabling a Template Engine template means that the `subject` and `body`
-content of your message will behave differently. 
+Enabling a transactional template means that the `subject` and `body`
+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.

source/API_Reference/Web_API_v3/Template_Engine/smtpapi.md source/API_Reference/Web_API_v3/Transactional_Templates/smtpapi.md

@@ -2,19 +2,19 @@
 layout: page
 title: Templates
 weight: 100
-alias: /API_Reference/Web_API_v3/Template_Engine/templates.html
+alias: /API_Reference/Web_API_v3/Transactional_Templates/templates.html
 navigation:
   show: true
 ---
 
-The Template Engine API lets you programmatically create and manage templates for your transactional email.
+The transactional templates API lets you programmatically create and manage templates for your transactional email.
 
 {% info %}
 Each user can have up to 300 templates.
 {% endinfo %}
 
 {% 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.
+Transactional templates are account and subuser specific. Templates created on a parent account will not be accessible from the subuser accounts.
 {% endinfo %}
 
 * * * * *

source/API_Reference/Web_API_v3/Template_Engine/templates.md source/API_Reference/Web_API_v3/Transactional_Templates/templates.md

@@ -2,20 +2,20 @@
 layout: page
 title: Versions
 weight: 90
-alias: /API_Reference/Web_API_v3/Template_Engine/versions.html
+alias: /API_Reference/Web_API_v3/Transactional_Templates/versions.html
 navigation:
   show: true
 ---
 
-Each template can have multiple versions, with different subjects and 
+Each template can have multiple versions, with different subjects and
 content for each version.
 
 To retrieve all versions of a template, call the [template
-GET]({{root_url}}/API_Reference/Web_API_v3/Template_Engine/templates.html#-GET)
+GET]({{root_url}}/API_Reference/Web_API_v3/Transactional_Templates/templates.html#-GET)
 method. Versions are returned as nested resources of the template
 resource.
 
-To set which version is active, use the [version PATCH]({{root_url}}/API_Reference/Web_API_v3/Template_Engine/versions.html#-PATCH) method to set the
+To set which version is active, use the [version PATCH]({{root_url}}/API_Reference/Web_API_v3/Transactional_Templates/versions.html#-PATCH) method to set the
 active field to 1.
 
 {% info %}

source/API_Reference/Web_API_v3/Template_Engine/versions.md source/API_Reference/Web_API_v3/Transactional_Templates/versions.md

@@ -19,7 +19,7 @@ <h3>Web API</h3>
 <p>If SMTP is not used, we also offer a simple <a href="{{root_url}}/API_Reference/Web_API/mail.html">Web API mail method</a> to send email. </p>
 
 <h3>Web API V3</h3>
-<p>Our V3 Web API provides functionality for <a href="{{root_url}}/API_Reference/Web_API_v3/Suppression_Management/index.html">managing user unsubscribes</a>, <a href="{{root_url}}/API_Reference/Web_API_v3/Template_Engine/index.html">templating emails</a>, <a href="{{root_url}}/API_Reference/Web_API_v3/IP_Management/index.html">managing IP addresses</a>, and <a href="{{root_url}}/API_Reference/Web_API_v3/Settings/enforced_tls.html">enforcing TLS</a>.</p>
+<p>Our V3 Web API provides functionality for <a href="{{root_url}}/API_Reference/Web_API_v3/Suppression_Management/index.html">managing user unsubscribes</a>, <a href="{{root_url}}/API_Reference/Web_API_v3/Transactional_Templates/index.html">templating emails</a>, <a href="{{root_url}}/API_Reference/Web_API_v3/IP_Management/index.html">managing IP addresses</a>, and <a href="{{root_url}}/API_Reference/Web_API_v3/Settings/enforced_tls.html">enforcing TLS</a>.</p>
 
 <h3>Marketing Campaigns API</h3>
 <p>The SendGrid Marketing Email API provides developers with the ability to <a href="{{root_url}}/API_Reference/Web_API_v3/Marketing_Campaigns/campaigns.html">manage marketing emails</a>, <a href="{{root_url}}/API_Reference/Web_API_v3/Marketing_Campaigns/contactdb.html">lists</a>, <a href="{{root_url}}/API_Reference/Web_API_v3/Marketing_Campaigns/contactdb.html">identities</a>, and <a href="{{root_url}}/API_Reference/Web_API_v3/Marketing_Campaigns/campaigns.html">schedule delivery events</a></p>

source/API_Reference/index.html

@@ -17,7 +17,7 @@ There are many different ways to use SendGrid’s email services so it all
 
 - [SMTP](http://support.sendgrid.com/hc/en-us/articles/202821898-What-is-SMTP-) - Send using a desktop mail client, or existing program/service with [your smtp credentials](http://support.sendgrid.com/hc/en-us/articles/200328026-What-are-my-settings-for-SMTP-integration-). 
 - [Web API](https://sendgrid.com/docs/API_Reference/Web_API/index.html) - Send from your app using  [your api key](http://support.sendgrid.com/hc/en-us/articles/200181818-What-is-my-API-key-). Check out our [API Guide](http://go.sendgrid.com/rs/sendgrid/images/SendGrid_API_Guide-101.pdf) for more info.
-- [Email Marketing App and API](https://sendgrid.com/docs/Marketing_Emails/index.html) - Send from our content creation UI and manage your lists via the website. 
+- [Email Marketing App and API](https://sendgrid.com/docs/User_Guide/Legacy_Features/Marketing_Emails/index.html) - Send from our content creation UI and manage your lists via the website. 
 
  
 

source/Classroom/Basics/API/how_do_i_integrate_with_sendgrid.md

@@ -31,4 +31,4 @@ The SendGrid APIs allow you to interact with our system in a number of different
 
  
 
-**Marketing Email API**  – The Marketing Email API allows you to interact with our Marketing Email app without having to log into sendgrid.com. You can upload and manage recipient lists, Marketing Email content, and manage sender identities. Please visit our  [SendGrid Marketing Email API Documentation](http://sendgrid.com/docs/API_Reference/Marketing_Emails_API/index.html) page for more information or our  [SendGrid Interactive Documentation](http://sendgrid.com/docs/api_workshop.html) for help building Marketing Email API calls.
+**Marketing Email API**  – The Marketing Email API allows you to interact with our Marketing Email app without having to log into sendgrid.com. You can upload and manage recipient lists, Marketing Email content, and manage sender identities. Please visit our  [SendGrid Marketing Email API Documentation](http://sendgrid.com/docs/API_Reference/Web_API/Legacy_Features/Marketing_Emails_API/index.html) page for more information or our  [SendGrid Interactive Documentation](http://sendgrid.com/docs/api_workshop.html) for help building Marketing Email API calls.