sendgrid · mbernier · Feb 18, 2015 · Jan 27, 2015 · Jan 27, 2015 · Jan 27, 2015
diff --git 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 <code>activate<code>' '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 <code>deactivate<code>' '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 <code>setup<code>' '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 <code>getsettings</code>' '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
@@ -9,7 +9,7 @@ navigation:
 ---
 
 {% warning %}
-This feature is deprecated, please go to the v2 Customer Subuser API <a href="https://sendgrid.com/docs/API_Reference/Customer_Subuser_API/subuser_unsubscribes.html">Subuser Unsubscribes</a> page.
+This feature is deprecated, please go to the v2 Customer Subuser API <a href="{{root_url}}/API_Reference/Customer_Subuser_API/subuser_unsubscribes.html">Subuser Unsubscribes</a> page.
 {% endwarning %}
 
 {% anchor h2 %}

diff --git a/source/API_Reference/Marketing_Emails_API/index.html b/source/API_Reference/Marketing_Emails_API/index.html
@@ -9,7 +9,7 @@
   show: true
 ---
 
-<p>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 <a href="{{root_url}}/Marketing_Emails/index.html">Marketing Email web interface</a>.</p>
+<p>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 <a href="{{root_url}}/User_Guide/Marketing_Emails/index.html">Marketing Email web interface</a>.</p>
 
 <p>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.</p>
 

diff --git 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
@@ -17,7 +17,7 @@
 </ul>
 {% endinfo %}
 
-<p>For more information on the utility of these apps, please check out the <a href="{{root_url}}/Apps/">Apps</a> section.</p>
+<p>For more information on the utility of these apps, please check out the <a href="{{root_url}}/User_Guide/Apps/">Apps</a> section.</p>
 
 {% 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 @@ <h4>Example X-SMTPAPI Header Value</h4>
 
 <p>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 <a href="{{root_url}}/Apps/dkim.html">details on DKIM.</a></p>
+of your e-mail. For more info, check out these <a href="{{root_url}}/User_Guide/Apps/dkim.html">details on DKIM.</a></p>
 
 <table class="table table-striped table-bordered">
 <tbody>
@@ -187,7 +187,7 @@ <h4>Example X-SMTPAPI Header Value</h4>
 
 <p>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 <a href="{{root_url}}/Apps/domain_keys.html">details on Domain Keys.</a></p>
+e-mail. For more info, check out these <a href="{{root_url}}/User_Guide/Apps/domain_keys.html">details on Domain Keys.</a></p>
 
 <table class="table table-striped table-bordered">
 <tbody>
@@ -482,7 +482,7 @@ <h4>Example X-SMTPAPI Header Value</h4>
 <tr>
 <td>url</td>
 <td><code>url</code></td>
-<td>an optional url to POST the email and a copy of the report to. Refer to the <a href="{{root_url}}/Apps/spam_checker.html#-Parameters">Spam Checker documentation</a> for POST details.</td>
+<td>an optional url to POST the email and a copy of the report to. Refer to the <a href="{{root_url}}/User_Guide/Apps/spam_checker.html#-Parameters">Spam Checker documentation</a> for POST details.</td>
 </tr>
 </tbody>
 </table>

diff --git a/source/API_Reference/SMTP_API/index.html b/source/API_Reference/SMTP_API/index.html
@@ -24,7 +24,7 @@
     ]
 }
 {% endcodeblock %}
-<p>In this case, the header is telling the processing routine to assign this email the <a href="{{root_url}}/Delivery_Metrics/categories.html">category</a> of "newuser".</p>
+<p>In this case, the header is telling the processing routine to assign this email the <a href="{{root_url}}/User_Guide/Delivery_Metrics/categories.html">category</a> of "newuser".</p>
 
 {% 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
@@ -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
@@ -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 %}
 
 <hr />

diff --git 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
@@ -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
@@ -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
@@ -27,23 +27,23 @@
 Email statistics consist of the following metrics:
 
 <ul>
-  <li><a href="{{root_url}}/Delivery_Metrics/metrics.html#-Blocks">Blocks</a></li>
-  <li><a href="{{root_url}}/Delivery_Metrics/metrics.html#-Bounces-amp-Repeat-Bounces">Bounces</a></li>
+  <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Blocks">Blocks</a></li>
+  <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Bounces-amp-Repeat-Bounces">Bounces</a></li>
   <li><a href="{{root_url}}/User_Guide/Email_Deliverability/Undelivered_Email/drops.html">Bounce Drops</a></li>
-  <li><a href="{{root_url}}/Delivery_Metrics/metrics.html#-Clicks-amp-Unique-Clicks">Clicks</a></li>
-  <li><a href="{{root_url}}/Delivery_Metrics/metrics.html#-Delivered">Delivered</a></li>
-  <li><a href="{{root_url}}/Delivery_Metrics/metrics.html#-Deferrals">Deferrals</a></li>
+  <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Clicks-amp-Unique-Clicks">Clicks</a></li>
+  <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Delivered">Delivered</a></li>
+  <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Deferrals">Deferrals</a></li>
   <li><a href="{{root_url}}/User_Guide/Email_Deliverability/Undelivered_Email/drops.html">Drops</a></li>
-  <li><a href="{{root_url}}/Delivery_Metrics/metrics.html#-Invalid-email">Invalid Emails</a></li>
-  <li><a href="{{root_url}}/Delivery_Metrics/metrics.html#-Opens-amp-Unique-Opens">Processed</a></li>
+  <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Invalid-email">Invalid Emails</a></li>
+  <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Opens-amp-Unique-Opens">Processed</a></li>
   <li><a href="{{root_url}}/API_Reference/Webhooks/parse.html">Received</a></li>
-  <li><a href="{{root_url}}/Delivery_Metrics/metrics.html#-Requests">Requests</a></li>
-  <li><a href="{{root_url}}/Delivery_Metrics/metrics.html#-Spam-reports-amp-repeat-spam-reports">Spam Reports</a></li>
-  <li><a href="{{root_url}}/Delivery_Metrics/metrics.html#-Clicks-amp-Unique-Clicks">Unique Clicks</a></li>
-  <li><a href="{{root_url}}/Delivery_Metrics/metrics.html#-Opens-amp-Unique-Opens">Unique Opens</a></li>
+  <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Requests">Requests</a></li>
+  <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Spam-reports-amp-repeat-spam-reports">Spam Reports</a></li>
+  <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Clicks-amp-Unique-Clicks">Unique Clicks</a></li>
+  <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Opens-amp-Unique-Opens">Unique Opens</a></li>
   <li><a href="{{root_url}}/User_Guide/Email_Deliverability/Undelivered_Email/drops.html">Spam Report Drops</a></li>
   <li><a href="{{root_url}}/User_Guide/Email_Deliverability/Undelivered_Email/drops.html">Unsubscribe Drops</a></li>
-  <li><a href="{{root_url}}/Delivery_Metrics/metrics.html#-Unsubscribes">Unsubscribes</a></li>
+  <li><a href="{{root_url}}/User_Guide/Delivery_Metrics/metrics.html#-Unsubscribes">Unsubscribes</a></li>
 </ul>
 
 
diff --git 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 %}
+{% 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
@@ -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
@@ -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
@@ -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
@@ -141,7 +141,7 @@ [email protected]&amp;event=open&amp;userid=1123&amp;template=welc
 Categories 
 
 {% endanchor %}
-<p>If a <a href="{{root_url}}/Delivery_Metrics/categories.html">category</a> is used over the SMTP API to get detailed statistics for <em>user signups</em> 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:</p>
+<p>If a <a href="{{root_url}}/User_Guide/Delivery_Metrics/categories.html">category</a> is used over the SMTP API to get detailed statistics for <em>user signups</em> 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:</p>
 
 {% codeblock lang:json %}
 {