Merge pull request #1728 from sendgrid/develop

4/11/2016 Docs Updates

Author: eschallock

source/API_Reference/Web_API_v3/IP_Management/ip_pools.md

@@ -109,9 +109,10 @@ Update an IP pool's name.
   {% parameter name Yes 'String. max 64 characters' 'New name of the pool' %}
 {% endparameters %}
 
+{% apiv3example put PUT https://api.sendgrid.com/v3/ips/pools/:pool_name name=new_pool_name %}
+
 {% apiv3requestbody %} {"name":"marketing"} {% endapiv3requestbody %}
 
-{% apiv3example put PUT https://api.sendgrid.com/v3/ips/pools/:pool_name name=new_pool_name %}
 {% v3response %}
 HTTP/1.1 200 OK	
 

source/Integrate/Tutorials/segment/sendgrid_source.md renamed to source/Integrate/Tutorials/Segment/sendgrid_source.md

@@ -21,11 +21,15 @@ There is no limit on how many IP addresses you can whitelist.
 {% endinfo %}
 
 {% warning %}
-It is possible to remove your own IP address from your whitelist, thus [blocking your own access to your account](https://support.sendgrid.com/hc/en-us/articles/217574958). While we are able to restore your access, we do require thorough proof of your identify and ownership of your account. We take the security of your account very seriously, and wish to prevent any "bad actors" from maliciously gaining access to your account.
+It is possible to remove your own IP address from your whitelist, thus [blocking your own access to your account]({{root_url}}/Classroom/Troubleshooting/Account_Administration/ip_access_management_has_locked_me_out_of_my_account.html). While we are able to restore your access, we do require thorough proof of your identify and ownership of your account. We take the security of your account very seriously, and wish to prevent any "bad actors" from maliciously gaining access to your account.
 
 Your current IP is clearly displayed to help prevent you from accidentally removing it from the whitelist.
 {% endwarning %}
 
+{% warning %}
+If you do not access SendGrid via a static IP address (e.g. via VPN or from a business internet service), setting up IP Access Management may result in being locked out of your SendGrid account. If you do discover that you have locked yourself out of your account, please visit our [Classroom]({{root_url}}/Classroom/Troubleshooting/Account_Administration/ip_access_management_has_locked_me_out_of_my_account.html) for suggestions on how to regain access and tips on how to prevent this in the future.
+{% endwarning %}
+
 {% anchor h2 %}
 Whitelisting an IP Address
 {% endanchor %}

source/User_Guide/Settings/ip_access_management.md

@@ -318,6 +318,7 @@ Redirect 301 /Classroom/Deliver/my_emails_are_being_dropped.html https://sendgri
 Redirect 301 /Classroom/Deliver/my_emails_are_going_to_spam.html https://sendgrid.com/docs/Classroom/Deliver/Undeliverable_Email/my_emails_are_going_to_spam.html
 Redirect 301 /Classroom/Deliver/spam_trapped.html https://sendgrid.com/docs/Classroom/Deliver/Undeliverable_Email/spam_trapped.html
 Redirect 301 /Classroom/Deliver/what_do_i_do_if_im_blacklisted.html https://sendgrid.com/docs/Classroom/Deliver/Undeliverable_Email/what_do_i_do_if_im_blacklisted.html
+Redirect 301 /Classroom/Deliver/enabling_custom_dkim.html https://sendgrid.com/docs/Classroom/Deliver/Sender_Authentication/dkim_settings_for_whitelabel_pro100k_and_higher.html
 
 #######
 #
@@ -394,12 +395,14 @@ Redirect 301 /Classroom/Troubleshooting/how_to_change_the_password_for_your_send
 Redirect 301 /Classroom/Troubleshooting/i_didnt_receive_the_password_reset_email.html https://sendgrid.com/docs/Classroom/Troubleshooting/Account_Administration/i_didnt_receive_the_password_reset_email.html
 Redirect 301 /Classroom/Troubleshooting/my_provision_was_declined_what_should_i_do.html https://sendgrid.com/docs/Classroom/Troubleshooting/Account_Administration/my_provision_was_declined_what_should_i_do.html
 Redirect 301 /Classroom/Troubleshooting/you_cannot_change_your_package_at_this_time_because_your_account_is_not_active.html https://sendgrid.com/docs/Classroom/Troubleshooting/Account_Administration/you_cannot_change_your_package_at_this_time_because_your_account_is_not_active.html
-Redirect 301 /Classroom/Troubleshooting/your_account_is_still_being_provisioned_you_may_not_be_able_to_send_out_any_email.html https://sendgrid.com/docs/Classroom/Troubleshooting/Account_Administration/your_account_is_still_being_provisioned_you_may_not_be_able_to_send_out_any_email.html
+Redirect 301 /Classroom/Troubleshooting/your_account_is_still_being_provisioned_you_may_not_be_able_to_send_out_any_email.html https://sendgrid.com/docs/Classroom/Troubleshooting/Account_Administration/your_account_is_still_being_provisioned_you_will_not_be_able_to_send_out_any_email.html
+Redirect 301 /Classroom/Troubleshooting/your_account_is_still_being_provisioned_you_will_not_be_able_to_send_out_any_email.html https://sendgrid.com/docs/Classroom/Troubleshooting/Account_Administration/your_account_is_still_being_provisioned_you_will_not_be_able_to_send_out_any_email.html
 Redirect 301 /Classroom/Troubleshooting/your_sendgrid_account_is_at_risk_for_suspension_what_should_i_do.html https://sendgrid.com/docs/Classroom/Troubleshooting/Account_Administration/your_sendgrid_account_is_at_risk_for_suspension_what_should_i_do.html
 Redirect 301 /Classroom/Troubleshooting/email_was_deferred_due_to_the_following_reasons_ip_deferrals_messages.html https://sendgrid.com/docs/Classroom/Troubleshooting/Delivery_Issues/email_was_deferred_due_to_the_following_reasons_ip_deferrals_messages.html
+Redirect 301 /Classroom/Troubleshooting/emails_are_being_sent_multiple_times.html https://sendgrid.com/docs/Classroom/Troubleshooting/index.html
 Redirect 301 /Classroom/Troubleshooting/my_client_is_complaining_that_they_have_not_received_an_email.html https://sendgrid.com/docs/Classroom/Troubleshooting/Delivery_Issues/my_client_is_complaining_that_they_have_not_received_an_email.html
 Redirect 301 /Classroom/Troubleshooting/safely_test_your_sending_speed.html https://sendgrid.com/docs/Classroom/Troubleshooting/Delivery_Issues/safely_test_your_sending_speed.html
-Redirect 301 /Classroom/Troubleshooting/testing_your_connectivity_to_sendgrids_smtp_relay_usinng_telnet.html https://sendgrid.com/docs/Classroom/Troubleshooting/Delivery_Issues/testing_your_connectivity_to_sendgrids_smtp_relay_usinng_telnet.html
+Redirect 301 /Classroom/Troubleshooting/testing_your_connectivity_to_sendgrids_smtp_relay_usinng_telnet.html https://sendgrid.com/docs/Classroom/Troubleshooting/Delivery_Issues/testing_your_connectivity_to_sendgrids_smtp_relay_using_telnet.html
 Redirect 301 /Classroom/Troubleshooting/troubleshooting_delays_and_latency.html https://sendgrid.com/docs/Classroom/Troubleshooting/Delivery_Issues/troubleshooting_delays_and_latency.html
 Redirect 301 /Classroom/Troubleshooting/a_custom_field_did_not_substitute_during_a_send.html https://sendgrid.com/docs/Classroom/Troubleshooting/Authentication/a_custom_field_did_not_substitute_during_a_send.html
 Redirect 301 /Classroom/Troubleshooting/certificate_verification_failed.html https://sendgrid.com/docs/Classroom/Troubleshooting/Authentication/certificate_verification_failed.html
@@ -434,6 +437,7 @@ Redirect 301 /Integrate/Mail_Clients/outlook_2010.html https://sendgrid.com/docs
 Redirect 301 /Integrate/Partners/Tutorials/EngineYard.html https://sendgrid.com/docs/Integrate/Tutorials/EngineYard.html
 Redirect 301 /Integrate/Partners/Tutorials/OpenShift.html https://sendgrid.com/docs/Integrate/Tutorials/OpenShift.html
 Redirect 301 /Integrate/Partners/Tutorials/WindowsAzure.html https://sendgrid.com/docs/Integrate/Tutorials/WindowsAzure.html
+Redirect 301 /Integrate/Tutorials/segment/sendgrid_source.html https://sendgrid.com/docs/Integrate/Tutorials/Segment/sendgrid_source.html
 
 #######
 #