sendgrid · mbernier · Jun 2, 2015 · May 29, 2015 · Jun 1, 2015 · Jun 2, 2015
diff --git a/source/API_Reference/Customer_Subuser_API/automatic_login.md b/source/API_Reference/Customer_Subuser_API/automatic_login.md
diff --git a/source/API_Reference/Customer_Subuser_API/index.html b/source/API_Reference/Customer_Subuser_API/index.html
@@ -9,47 +9,47 @@
 <p>Following are brief descriptions of the various API calls needed to manage your subusers, click the API call name for further details:</p>
 
 {% anchor h2 %}
-<a title="Subuser Management" href="subusers.html">Subuser Management</a> 
+<a title="Subuser Management" href="subusers.html">Subuser Management</a>
 {% endanchor %}
 <p>Retrieve/Create/Enable/Disable your subusers. Change a subuser email address and username</p>
 
 {% anchor h2 %}
-<a title="Account Limits" href="account_limits.html">Account Limits</a> 
+<a title="Account Limits" href="account_limits.html">Account Limits</a>
 {% endanchor %}
 <p>Manage the rate of emails your subusers are able to send</p>
 
 {% anchor h2 %}
-<a title="Filter / Apps" href="apps.html">Filter / Apps</a> 
+<a title="Filter / Apps" href="apps.html">Filter / Apps</a>
 {% endanchor %}
 <p>Setup subusers app settings</p>
 
 {% anchor h2 %}
-<a title="IP Management" href="ip_management.html">IP Management</a> 
+<a title="IP Management" href="ip_management.html">IP Management</a>
 {% endanchor %}
 <p>List all IP addresses you have under your account and retrieve details about them</p>
 
 {% anchor h2 %}
-<a title="Whitelabel" href="whitelabel.html">Whitelabel</a> 
+<a title="Whitelabel" href="whitelabel.html">Whitelabel</a>
 {% endanchor %}
 <p>Manage whitelabel settings for your subusers</p>
 
 {% anchor h2 %}
-<a title="Monitor Records" href="monitor_records.html">Monitor Records</a> 
+<a title="Monitor Records" href="monitor_records.html">Monitor Records</a>
 {% endanchor %}
 <p>Make sure your subusers aren't sending out spam by getting a sample of their outgoing messages</p>
 
 {% anchor h2 %}
-<a title="Statistics" href="statistics.html">Statistics</a> 
+<a title="Statistics" href="statistics.html">Statistics</a>
 {% endanchor %}
 <p>Statistics regarding your subusers</p>
 
 {% anchor h2 %}
-<a title="Subuser Bounces" href="subuser_bounces.html">Bounces</a> 
+<a title="Subuser Bounces" href="subuser_bounces.html">Bounces</a>
 {% endanchor %}
 <p>Manage bounce records of your subusers</p>
 
 {% anchor h2 %}
-<a title="Subuser Invalid Emails" href="invalid_emails.html">Invalid Emails</a> 
+<a title="Subuser Invalid Emails" href="invalid_emails.html">Invalid Emails</a>
 {% endanchor %}
 <p>Manage invalid emails of your subusers</p>
 
@@ -73,9 +73,4 @@
 {% endanchor %}
 <p>Check subusers password with our system to see if its valid</p>
 
-{% anchor h2 %}
-<a title="Automatic iFrame Login" href="{{root_url}}/API_Reference/Customer_Subuser_API/automatic_login.html">Automatic iFrame Login</a>
-{% endanchor %}
-<p>Allow users to manage your subusers via iframe using our site</p>
-
 </dl></p>
diff --git a/source/API_Reference/Customer_Subuser_API/v1_(deprecated)/automatic_login.md b/source/API_Reference/Customer_Subuser_API/v1_(deprecated)/automatic_login.md
diff --git a/source/API_Reference/Web_API/mail.md b/source/API_Reference/Web_API/mail.md
@@ -35,7 +35,7 @@ SendGrid's [API Keys]({{root_url}}/User_Guide/Account/api_keys.html) should be u
 Send email.
 
 {% parameters mail %}
- {% parameter 'to' 'Yes' 'Must be a valid email address' 'This can also be passed in as an array, to send to multiple locations. Example: to[]=a@mail.com[]=b@mail.com. Note that recipients passed in this parameter will be visible as part of the message. If you wish to hide the recipients, use the TO parameter in the [x-smtpapi]({{root_url}}/API_Reference/SMTP_API/index.html) header.' %}
+ {% parameter 'to' 'Yes' 'Must be a valid email address' 'This can also be passed in as an array, to send to multiple locations. Example: to[]=a@mail.com&to[]=b@mail.com. Note that recipients passed in this parameter will be visible as part of the message. If you wish to hide the recipients, use the TO parameter in the [x-smtpapi]({{root_url}}/API_Reference/SMTP_API/index.html) header.' %}
  {% parameter 'toname' 'No' 'Must be a string. If *to* parameter is an array, *toname* must be an array with the exact number of array elements as the *to* field' 'Give a name to the recipient. This can also be passed as an array if the to above is an array. Example: toname[]=Alpha[]=Beta.' %}
  {% parameter 'x-smtpapi' 'No' 'Must be in valid JSON format' 'Please review the [SMTP API]({{root_url}}/API_Reference/SMTP_API/index.html) to view documentation on what you can do with the JSON headers' %}
  {% parameter 'subject' 'Yes' 'Must be a valid string' 'The subject of your email' %}

diff --git a/source/API_Reference/Web_API/unsubscribes.md b/source/API_Reference/Web_API/unsubscribes.md
@@ -50,7 +50,7 @@ Retrieve a list of Unsubscribes with addresses and optionally with dates.
 delete 
 {% endanchor %}
 
-Delete an address from the Unsubscribe list. Please note that if no parameters are provided or if empty parameters are provided the ENTIRE list will be removed.
+Delete an address from the Unsubscribe list. Use `delete_all=1` in order to delete all addresses from your unsubscribe list.
 
 {% parameters delete %}
   {% parameter email No 'Must be a valid user account email.' 'Unsubscribed email address to remove.' %}

diff --git a/source/Integrate/libraries.md b/source/Integrate/libraries.md
@@ -143,7 +143,7 @@ Python
 -   [smtpapi-python](http://github.com/sendgrid/smtpapi-python) *by SendGrid*- Official Python library to create SMTP API headers
 -   [greplin-tornado-sendgrid](https://github.com/Cue/greplin-tornado-sendgrid) *by Daniel Gross* - SendGrid client for Tornado Web Server
 -   [django-sendgrid](https://github.com/RyanBalfanz/django-sendgrid) *by Ryan Balfanz* - SendGrid SMTP API interface for Django
--   [sendgrid-sendgrid](https://github.com/elbuo8/sendgrid-django) *by Yamil Asusta* - SendGrid Web API interface for Django
+-   [sendgrid-django](https://github.com/elbuo8/sendgrid-django) *by Yamil Asusta* - SendGrid Web API interface for Django
 
 {% anchor h3 %}
 Ruby 

diff --git a/source/_redirects.htaccess b/source/_redirects.htaccess
@@ -5,7 +5,9 @@
 #######
 
 #forced a redirect file at /API_Reference/Customer_Subuser_API/event_notification_url.html - the following redirect wouldn't take
+Redirect 301 /API_Reference/Customer_Subuser_API/automatic_login.html https://sendgrid.com/docs/API_Reference/Customer_Subuser_API/index.html
 Redirect 301 /API_Reference/Customer_Subuser_API/event_notification_url.html https://sendgrid.com/docs/API_Reference/Customer_Subuser_API/v1_(deprecated)/event_notification_url.html
+Redirect 301 /API_Reference/Customer_Subuser_API/v1_(deprecated)/automatic_login.html https://sendgrid.com/docs/API_Reference/Customer_Subuser_API/index.html
 Redirect 301 /API_Reference/Reseller_API/billing_retrieving_as_you_go_usage.html https://sendgrid.com/docs/API_Reference/Reseller_API/v1_(deprecated)/billing_retrieving_as_you_go_usage.html
 Redirect 301 /API_Reference/Reseller_API/billing_retrieving_end_users_invoices_usage.html https://sendgrid.com/docs/API_Reference/Reseller_API/v1_(deprecated)/billing_retrieving_end_users_invoices_usage.html
 Redirect 301 /API_Reference/Reseller_API/customer_subuser_account_limits.html https://sendgrid.com/docs/API_Reference/Reseller_API/v1_(deprecated)/customer_account_limits.html