From ad8e1f7afd842d140576f0ffeb2e3bdc33b3e70f Mon Sep 17 00:00:00 2001 From: Matt Bernier Date: Fri, 8 Apr 2016 15:49:53 -0600 Subject: [PATCH 1/8] order of the tags The tags were out of order, causing a rendering issue --- source/API_Reference/Web_API_v3/IP_Management/ip_pools.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/API_Reference/Web_API_v3/IP_Management/ip_pools.md b/source/API_Reference/Web_API_v3/IP_Management/ip_pools.md index f6374f5991..acf15e2f07 100644 --- a/source/API_Reference/Web_API_v3/IP_Management/ip_pools.md +++ b/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 From 509c926a340f7d1e134e835dd281c393c342489d Mon Sep 17 00:00:00 2001 From: Eric Schallock Date: Mon, 11 Apr 2016 10:28:28 -0600 Subject: [PATCH 2/8] Fixed typo in Classroom redirect --- source/_redirects.htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/_redirects.htaccess b/source/_redirects.htaccess index 0eceec43b8..a1c132f089 100644 --- a/source/_redirects.htaccess +++ b/source/_redirects.htaccess @@ -399,7 +399,7 @@ Redirect 301 /Classroom/Troubleshooting/your_sendgrid_account_is_at_risk_for_sus 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/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 From e6939e846e81c57a0738bb707fd5f56171d159df Mon Sep 17 00:00:00 2001 From: Eric Schallock Date: Mon, 11 Apr 2016 11:12:21 -0600 Subject: [PATCH 3/8] Fixed two redirects to Classroom article --- source/_redirects.htaccess | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/_redirects.htaccess b/source/_redirects.htaccess index a1c132f089..c967ab5d93 100644 --- a/source/_redirects.htaccess +++ b/source/_redirects.htaccess @@ -394,7 +394,8 @@ 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/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 From b297f04a624eb2e17693885071b0054c3e15071f Mon Sep 17 00:00:00 2001 From: Eric Schallock Date: Mon, 11 Apr 2016 11:32:48 -0600 Subject: [PATCH 4/8] added redirect for removed Classroom page --- source/_redirects.htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/source/_redirects.htaccess b/source/_redirects.htaccess index c967ab5d93..8aa294fca6 100644 --- a/source/_redirects.htaccess +++ b/source/_redirects.htaccess @@ -398,6 +398,7 @@ Redirect 301 /Classroom/Troubleshooting/your_account_is_still_being_provisioned_ 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_using_telnet.html From 469e617ac846936a90d203cbdaba030585394cb0 Mon Sep 17 00:00:00 2001 From: Eric Schallock Date: Mon, 11 Apr 2016 13:31:05 -0600 Subject: [PATCH 5/8] capitalized Segment Tutorials folder --- .../Integrate/Tutorials/{segment => Segment}/sendgrid_source.md | 0 source/_redirects.htaccess | 1 + 2 files changed, 1 insertion(+) rename source/Integrate/Tutorials/{segment => Segment}/sendgrid_source.md (100%) diff --git a/source/Integrate/Tutorials/segment/sendgrid_source.md b/source/Integrate/Tutorials/Segment/sendgrid_source.md similarity index 100% rename from source/Integrate/Tutorials/segment/sendgrid_source.md rename to source/Integrate/Tutorials/Segment/sendgrid_source.md diff --git a/source/_redirects.htaccess b/source/_redirects.htaccess index 8aa294fca6..2cc638e08a 100644 --- a/source/_redirects.htaccess +++ b/source/_redirects.htaccess @@ -436,6 +436,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 ####### # From eded3af9b660f385675247784143ef648d0224d2 Mon Sep 17 00:00:00 2001 From: Eric Schallock Date: Mon, 11 Apr 2016 14:36:32 -0600 Subject: [PATCH 6/8] added redirect /Classroom/Deliver/enabling_custom_dkim.html should go to /Classroom/Deliver/Sender_Authentication/dkim_settings_for_whitelabel_pro100k_and_higher.html --- source/_redirects.htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/source/_redirects.htaccess b/source/_redirects.htaccess index 8aa294fca6..6d6b5879a4 100644 --- a/source/_redirects.htaccess +++ b/source/_redirects.htaccess @@ -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 ####### # From 7b59150557786da128ab32404d0a99cff740a6f4 Mon Sep 17 00:00:00 2001 From: Eric Schallock Date: Mon, 11 Apr 2016 15:33:30 -0600 Subject: [PATCH 7/8] Added warning about IPAM and static IPs --- source/User_Guide/Settings/ip_access_management.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/User_Guide/Settings/ip_access_management.md b/source/User_Guide/Settings/ip_access_management.md index 30a5c7bfa1..6d528ada84 100644 --- a/source/User_Guide/Settings/ip_access_management.md +++ b/source/User_Guide/Settings/ip_access_management.md @@ -26,6 +26,10 @@ It is possible to remove your own IP address from your whitelist, thus [blocking 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 %} From 01abdffe77dd13ddfab96e5d1f92a6135da96bc8 Mon Sep 17 00:00:00 2001 From: Eric Schallock Date: Mon, 11 Apr 2016 16:27:58 -0600 Subject: [PATCH 8/8] changed link to KB to point to Classroom --- source/User_Guide/Settings/ip_access_management.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/User_Guide/Settings/ip_access_management.md b/source/User_Guide/Settings/ip_access_management.md index 6d528ada84..7551c9786b 100644 --- a/source/User_Guide/Settings/ip_access_management.md +++ b/source/User_Guide/Settings/ip_access_management.md @@ -21,7 +21,7 @@ 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 %}