From 15102aa5ad70ef7c06350d8c3288f5e1ba0f101e Mon Sep 17 00:00:00 2001 From: mbernier Date: Tue, 28 Apr 2015 16:27:50 -0600 Subject: [PATCH 1/5] Updated copy Thank you Jillian!!! --- source/User_Guide/SendGrid_for_Mobile/dashboard.md | 5 +++-- source/User_Guide/SendGrid_for_Mobile/email_activity.md | 8 ++++---- source/User_Guide/SendGrid_for_Mobile/index.html | 4 ++-- source/User_Guide/SendGrid_for_Mobile/subusers.md | 6 +++--- source/User_Guide/SendGrid_for_Mobile/suppression.md | 4 ++-- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/source/User_Guide/SendGrid_for_Mobile/dashboard.md b/source/User_Guide/SendGrid_for_Mobile/dashboard.md index acd76bdece..316942b9d2 100644 --- a/source/User_Guide/SendGrid_for_Mobile/dashboard.md +++ b/source/User_Guide/SendGrid_for_Mobile/dashboard.md @@ -18,6 +18,7 @@ navigation:

-The dashboard page will display your account’s statistics for the past day, week, or month. SendGrid offers a number of [Delivery Metrics]({{root_url}}/User_Guide/Delivery_Metrics/index.html) to report what is happening with your messages. +The dashboard page will display your account’s statistics for the past day, week, or month. SendGrid offers a number of [delivery metrics]({{root_url}}/User_Guide/Delivery_Metrics/index.html)to report what is happening with your messages. + +You can also export the statistics for each individual day to a CSV file by tapping the “share” button. -You can also export the statistics for each individual day to a CSV file by tapping the Share button. diff --git a/source/User_Guide/SendGrid_for_Mobile/email_activity.md b/source/User_Guide/SendGrid_for_Mobile/email_activity.md index 5bfba956b4..ef19e22d78 100644 --- a/source/User_Guide/SendGrid_for_Mobile/email_activity.md +++ b/source/User_Guide/SendGrid_for_Mobile/email_activity.md @@ -18,8 +18,8 @@ navigation:

-Here you can view the realtime logs of all emails sent from your account in the last 7 days. You can also narrow down your search by pulling down on the screen and searching for an email address, and/or selecting the "More" button in the top right corner, selecting "Search Options" and selecting only certain events to show. - -Tapping on any event will reveal more information, such as server responses or user-agents. +Here you can view the real-time logs of all emails sent from your account in the last 7 days. You can also narrow down your search by pulling down on the screen and searching for an email address, and/or selecting the “More” button in the top right corner, selecting “Search Options” and selecting only certain events to show. -Finally, you can export your Email Activity by selecting the "More" button in the top right corner and selecting "Export". This will create a CSV that you can open in another app on your device. +Tapping on any event will reveal more information, such as server responses or user agents. + +Finally, you can export your email activity by selecting the “More” button in the top right corner and selecting “Export.” This will create a CSV that you can open in another app on your device. diff --git a/source/User_Guide/SendGrid_for_Mobile/index.html b/source/User_Guide/SendGrid_for_Mobile/index.html index 2aea2fe517..79515d068f 100644 --- a/source/User_Guide/SendGrid_for_Mobile/index.html +++ b/source/User_Guide/SendGrid_for_Mobile/index.html @@ -13,7 +13,7 @@ What is SendGrid for Mobile? {% endanchor %} -

SendGrid for Mobile keeps you connected with your SendGrid account on the go. Keep track of your statistics, manage your suppression lists, view your real-time logs and more.

+

SendGrid for mobile keeps you connected with your SendGrid account on the go. Keep track of your statistics, manage your suppression lists, view your real-time logs and more.

{% anchor h2 %} System Requirements @@ -21,7 +21,7 @@

diff --git a/source/User_Guide/SendGrid_for_Mobile/subusers.md b/source/User_Guide/SendGrid_for_Mobile/subusers.md index 20b7cdf5d7..f958c15855 100644 --- a/source/User_Guide/SendGrid_for_Mobile/subusers.md +++ b/source/User_Guide/SendGrid_for_Mobile/subusers.md @@ -22,10 +22,10 @@ navigation: This view will only be available in the app if you are on a Silver or higher plan and have created one or more subusers. {% endwarning %} -Here you can view your current subusers and also "impersonate" them, allowing you to view the app as though you logged in as that subuser. +Here you can view your current subusers and also “impersonate” them, allowing you to view the app as though you logged in as that subuser. {% info %} -The app currently only displays a maximum of 10 subusers. If you have more than 10 subusers, you can pull down and search for the username of a specific subuser not listed. +The app currently only displays a maximum of 10 subusers. If you have more than 10 subusers, you can pull down and search for the username of a specific subuser that is not listed. {% endinfo %} -Once you tap on a subuser, you'll be presented with a summary of the account's performance. You can then tap the "Impersonate User" button to "log in" as that subuser, and view the app as that subuser. When impersonating a subuser, you'll find a "Logged In As [subuser name]" banner along the top of the app. You'll also notice that the "Subuser Management" option in the side navigation menu changes to "Log Into Parent Account," which you can use to switch back to your main parent account. +Once you tap on a subuser, you’ll be presented with a summary of the account’s performance. You can then tap the “Impersonate User” button to “log in” as that subuser, and view the app as that subuser. When impersonating a subuser, you’ll find a “Logged in as [subuser name]” banner along the top of the app. You’ll also notice that the “Subuser Management” option in the side navigation menu changes to “Log Into Parent Account,” which you can use to switch back to your main parent account. diff --git a/source/User_Guide/SendGrid_for_Mobile/suppression.md b/source/User_Guide/SendGrid_for_Mobile/suppression.md index ea6f876157..8aafb8ca04 100644 --- a/source/User_Guide/SendGrid_for_Mobile/suppression.md +++ b/source/User_Guide/SendGrid_for_Mobile/suppression.md @@ -20,8 +20,8 @@ navigation: The Suppression Lists section will allow you to view and modify your account’s [suppression lists]({{root_url}}/User_Guide/Delivery_Metrics/email_reports.html). -Depending on the list you're viewing, you can tap on an address to get more information (for instance, the bounce reason for addresses listed on the bounce list). You can also swipe left on an address to delete it off a list. +Depending on the list you’re viewing, you can tap on an address to get more information (for instance, the bounce reason for addresses listed on the bounce list). You can also swipe left on an address to delete it off a list. -If you're viewing the Unsubscribe list, you can hit the "+" button to manually add an address to the list. +If you’re viewing the unsubscribe list, you can hit the “+” button to manually add an address to the list. Finally, if you want to search for a specific address, pull downwards on the list and type an address in the search field. From 9bd96b7cf69bded99f5a278e53035c3cd762d4d7 Mon Sep 17 00:00:00 2001 From: Matt Bernier Date: Wed, 29 Apr 2015 08:46:51 -0600 Subject: [PATCH 2/5] Changed wording --- source/Integrate/libraries.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Integrate/libraries.md b/source/Integrate/libraries.md index 977237cce7..21ac98581f 100644 --- a/source/Integrate/libraries.md +++ b/source/Integrate/libraries.md @@ -49,7 +49,7 @@ Community libraries Open source library contributions from the awesome SendGrid community. {% info %} -If you create a library, please let us know, by [adding your library to this page](https://github.com/sendgrid/docs/blob/develop/source/{{page.path}}). +If you create a library, please let us know, by editing this page [in our github repo](https://github.com/sendgrid/docs/blob/develop/source/{{page.path}}). {% endinfo %} {% anchor h2 %} From 0327afe9a0624488d89c4b6b5198976e9592585a Mon Sep 17 00:00:00 2001 From: Matt Bernier Date: Wed, 29 Apr 2015 11:46:41 -0600 Subject: [PATCH 3/5] Update two_factor_authentication.md --- .../Account/Account_Settings/two_factor_authentication.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/User_Guide/Account/Account_Settings/two_factor_authentication.md b/source/User_Guide/Account/Account_Settings/two_factor_authentication.md index 2e71e41a4d..cb7886be39 100644 --- a/source/User_Guide/Account/Account_Settings/two_factor_authentication.md +++ b/source/User_Guide/Account/Account_Settings/two_factor_authentication.md @@ -14,7 +14,7 @@ how credentials are used to send email. {% endinfo %} {% info %} -Two factor authentication does not currently support [Multiple User Credentials]({{root_url}}/User_Guide/Account/multiple_credentials.html). +If you have 2FA on the parent account, any [Multiple User Credentials]({{root_url}}/User_Guide/Account/multiple_credentials.html) logins will trigger a 2FA notification to the parent user. {% endinfo %} {% anchor h2 %} @@ -44,4 +44,4 @@ Set up 2FA * Now, whenever you log in to SendGrid, you’ll be prompted to enter a verification code that is sent to your phone at the time of login. -*To remove 2FA from your SendGrid account, please [contact support](https://support.sendgrid.com)* \ No newline at end of file +*To remove 2FA from your SendGrid account, please [contact support](https://support.sendgrid.com)* From 49a000567ecfde97eabcb91b92431eb1f8e7bab7 Mon Sep 17 00:00:00 2001 From: mbernier Date: Wed, 29 Apr 2015 12:16:35 -0600 Subject: [PATCH 4/5] changed = to == --- plugins/apiv3_example.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/apiv3_example.rb b/plugins/apiv3_example.rb index f7456d8038..052ba203cc 100644 --- a/plugins/apiv3_example.rb +++ b/plugins/apiv3_example.rb @@ -18,7 +18,7 @@ def initialize(tag_name, markup, tokens) #hack it back together now @data = "{"+@data[0].to_s+"}" markup = markup.gsub("{"+@data[0].to_s+"}", "") - if @data = "{}" + if @data == "{}" @data = "" end end From c336f8b9549cbc2a16f4f7a7a76076813e498ca6 Mon Sep 17 00:00:00 2001 From: Matt Bernier Date: Wed, 29 Apr 2015 13:37:08 -0600 Subject: [PATCH 5/5] Content update --- .../Account/Account_Settings/two_factor_authentication.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/User_Guide/Account/Account_Settings/two_factor_authentication.md b/source/User_Guide/Account/Account_Settings/two_factor_authentication.md index cb7886be39..2c95dfc2a5 100644 --- a/source/User_Guide/Account/Account_Settings/two_factor_authentication.md +++ b/source/User_Guide/Account/Account_Settings/two_factor_authentication.md @@ -14,9 +14,11 @@ how credentials are used to send email. {% endinfo %} {% info %} -If you have 2FA on the parent account, any [Multiple User Credentials]({{root_url}}/User_Guide/Account/multiple_credentials.html) logins will trigger a 2FA notification to the parent user. +If you have 2FA enabled on your account, [Multiple User Credentials]({{root_url}}/User_Guide/Account/multiple_credentials.html) logins will trigger a 2FA notification to the main credential's phone number. {% endinfo %} + + {% anchor h2 %} Set up 2FA {% endanchor %}