docs: cleanup support/help/contact information

Author: Sam Harrison

CONTRIBUTING.md

@@ -239,8 +239,6 @@ Please run your code through:
 7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
     with a clear title and description against the `master` branch. All tests must be passing before we will review the PR.
 
-If you have any additional questions, please feel free to [email](mailto:dx@sendgrid.com) us or create an issue in this repo.
-
 <a name="code-reviews"></a>
 ## Code Reviews
 If you can, please look at open PRs and review them. Give feedback and help us merge these PRs much faster! If you don't know how, GitHub has some great [information on how to review a Pull Request](https://help.github.com/articles/about-pull-request-reviews/).

FIRST_TIMERS.md

@@ -65,11 +65,9 @@ Step 2: Get familiar with Twilio SendGrid Service
   **Step 7:** Push the topic branch up to your fork using `git push origin <topic-branch-name>`
 
   **Step 8:** Open a Pull Request with clear title and description against the master branch.
-  
-  In case, you have additional questions, feel free to drop a [mail](dx@sendgrid.com) or open an issue.
-  
+
   <a name="reviews"></a>
   ## Be Patient & Wait for Reviews
-  Kindly be patient & follow the suggestions as provided by the peer reviewers. Make required ammendments & changes to the PR as asked.
+  Kindly be patient & follow the suggestions as provided by the peer reviewers. Make required amendments & changes to the PR as asked.
 
-## [Explore New Issues to work upon](https://github.com/sendgrid/sendgrid-python/labels/difficulty%3A%20easy)
+## [Explore New Issues to work upon](https://github.com/sendgrid/sendgrid-python/labels/difficulty%3A%20easy)

README.md

@@ -192,8 +192,6 @@ Please see [our helper](https://github.com/sendgrid/sendgrid-python/tree/master/
 <a name="announcements"></a>
 # Announcements
 
-Join an experienced and passionate team that focuses on making an impact. [Opportunities abound](https://sendgrid.com/careers) to grow the product - and grow your career!
-
 Please see our announcement regarding [breaking changes](https://github.com/sendgrid/sendgrid-python/issues/217). Your support is appreciated!
 
 All updates to this library are documented in our [CHANGELOG](https://github.com/sendgrid/sendgrid-python/blob/master/CHANGELOG.md) and [releases](https://github.com/sendgrid/sendgrid-python/releases). You may also subscribe to email [release notifications](https://dx.sendgrid.com/newsletter/java) for releases and breaking changes.
@@ -224,11 +222,11 @@ Please see our [troubleshooting guide](https://github.com/sendgrid/sendgrid-pyth
 <a name="about"></a>
 # About
 
-sendgrid-python is guided and supported by the SendGrid Developer Experience Team.
+sendgrid-python is maintained and funded by Twilio SendGrid, Inc. The names and logos for sendgrid-python are trademarks of Twilio SendGrid, Inc.
 
-Email the Developer Experience Team [here](mailto:dx@sendgrid.com) in case of any queries.
+If you need help installing or using the library, please check the [Twilio SendGrid Support Help Center](https://support.sendgrid.com).
 
-sendgrid-python is maintained and funded by SendGrid, Inc. The names and logos for sendgrid-python are trademarks of SendGrid, Inc.
+If you've instead found a bug in the library or would like new features added, go ahead and open issues or pull requests against this repo!
 
 <a name="license"></a>
 # License

README.rst

@@ -221,9 +221,6 @@ Use Cases
 Announcements
 =============
 
-Join an experienced and passionate team that focuses on making an impact.
-`Opportunities abound`_ to grow the product - and grow your career!
-
 All updates to this library are documented in our `CHANGELOG`_ and `releases`_.
 You may also subscribe to email `release notifications`_ for releases and breaking changes.
 
@@ -255,10 +252,6 @@ Please see our `troubleshooting guide`_ for common library issues.
 About
 =====
 
-**sendgrid-python** is guided and supported by the Twilio Developer Experience Team.
-
-Email the Developer Experience Team `here <mailto:dx@sendgrid.com>`__ in case of any queries.
-
 **sendgrid-python** is maintained and funded by Twilio SendGrid, Inc.
 The names and logos for **sendgrid-python** are trademarks of Twilio SendGrid, Inc.
 
@@ -290,7 +283,6 @@ License
 .. _v3 Web API Mail Send Helper: https://github.com/sendgrid/sendgrid-python/tree/master/sendgrid/helpers/mail
 .. _Processing Inbound Email: https://github.com/sendgrid/sendgrid-python/tree/master/sendgrid/helpers/inbound
 .. _Examples of common API use cases: https://github.com/sendgrid/sendgrid-python/blob/master/use_cases/README.md
-.. _Opportunities abound: https://sendgrid.com/careers
 .. _breaking changes: https://github.com/sendgrid/sendgrid-python/issues/217
 .. _CHANGELOG: https://github.com/sendgrid/sendgrid-python/blob/master/CHANGELOG.md
 .. _releases: https://github.com/sendgrid/sendgrid-python/releases
@@ -302,7 +294,6 @@ License
 .. _Review Pull Requests: https://github.com/sendgrid/sendgrid-python/blob/master/CONTRIBUTING.md#code-reviews
 .. _Sign the CLA to Create a Pull Request: https://cla.sendgrid.com/sendgrid/sendgrid-python
 .. _troubleshooting guide: https://github.com/sendgrid/sendgrid-python/blob/master/TROUBLESHOOTING.md
-.. _Developer Experience Team: mailto:dx@sendgrid.com
 .. _The MIT License (MIT): https://github.com/sendgrid/sendgrid-python/blob/master/LICENSE.md
 
 .. |Travis Badge| image:: https://travis-ci.org/sendgrid/sendgrid-python.svg?branch=master

docker/README.md

@@ -60,10 +60,4 @@
 
 For more detailed information, see [USAGE.md](https://github.com/sendgrid/sendgrid-python/blob/master/docker/USAGE.md).
 
-# About
-
-sendgrid-python is guided and supported by the Twilio SendGrid [Developer Experience Team](mailto:dx@sendgrid.com).
-
-sendgrid-python is maintained and funded by Twilio SendGrid, Inc. The names and logos for sendgrid-python are trademarks of Twilio SendGrid, Inc.
-
 ![Twilio SendGrid Logo](https://sendgrid.com/brand/sg-twilio/SG_Twilio_Lockup_RGBx1.png)

docker/USAGE.md

@@ -131,11 +131,4 @@ $ docker-compose up -d sendgrid-beta
 # Testing
 Testing is easy!  Run the container, `cd sendgrid`, and run `tox`.
 
-<a name="about"></a>
-# About
-
-sendgrid-python is guided and supported by the SendGrid [Developer Experience Team](mailto:dx@sendgrid.com).
-
-sendgrid-python is maintained and funded by SendGrid, Inc. The names and logos for sendgrid-python are trademarks of SendGrid, Inc.
-
 ![SendGrid Logo](https://uiux.s3.amazonaws.com/2016-logos/email-logo%402x.png)

examples/helpers/mail_example.py

@@ -105,8 +105,8 @@ def build_attachment2():
 def build_kitchen_sink():
     """All settings set"""
     from sendgrid.helpers.mail import (
-        Mail, From, To, Cc, Bcc, Subject, PlainTextContent, 
-        HtmlContent, SendGridException, Substitution, 
+        Mail, From, To, Cc, Bcc, Subject, PlainTextContent,
+        HtmlContent, SendGridException, Substitution,
         Header, CustomArg, SendAt, Content, MimeType, Attachment,
         FileName, FileContent, FileType, Disposition, ContentId,
         TemplateId, Section, ReplyTo, Category, BatchId, Asm,
@@ -123,22 +123,22 @@ def build_kitchen_sink():
 
     message = Mail()
 
-    # Define Personalizations 
+    # Define Personalizations
 
     message.to = To('test1@sendgrid.com', 'Example User1', p=0)
-    message.to = [ 
+    message.to = [
         To('test2@sendgrid.com', 'Example User2', p=0),
         To('test3@sendgrid.com', 'Example User3', p=0)
     ]
 
     message.cc = Cc('test4@example.com', 'Example User4', p=0)
-    message.cc = [ 
+    message.cc = [
         Cc('test5@example.com', 'Example User5', p=0),
         Cc('test6@example.com', 'Example User6', p=0)
     ]
 
     message.bcc = Bcc('test7@example.com', 'Example User7', p=0)
-    message.bcc = [ 
+    message.bcc = [
         Bcc('test8@example.com', 'Example User8', p=0),
         Bcc('test9@example.com', 'Example User9', p=0)
     ]
@@ -169,19 +169,19 @@ def build_kitchen_sink():
     message.send_at = SendAt(1461775051, p=0)
 
     message.to = To('test10@example.com', 'Example User10', p=1)
-    message.to = [ 
+    message.to = [
         To('test11@example.com', 'Example User11', p=1),
         To('test12@example.com', 'Example User12', p=1)
     ]
 
     message.cc = Cc('test13@example.com', 'Example User13', p=1)
-    message.cc = [ 
+    message.cc = [
         Cc('test14@example.com', 'Example User14', p=1),
         Cc('test15@example.com', 'Example User15', p=1)
     ]
 
     message.bcc = Bcc('test16@example.com', 'Example User16', p=1)
-    message.bcc = [ 
+    message.bcc = [
         Bcc('test17@example.com', 'Example User17', p=1),
         Bcc('test18@example.com', 'Example User18', p=1)
     ]
@@ -213,9 +213,9 @@ def build_kitchen_sink():
 
     # The values below this comment are global to entire message
 
-    message.from_email = From('dx@sendgrid.com', 'DX')
+    message.from_email = From('help@twilio.com', 'Twilio SendGrid')
 
-    message.reply_to = ReplyTo('dx_reply@sendgrid.com', 'DX Reply')
+    message.reply_to = ReplyTo('help_reply@twilio.com', 'Twilio SendGrid Reply')
 
     message.subject = Subject('Sending with SendGrid is Fun 2')
 
@@ -249,7 +249,7 @@ def build_kitchen_sink():
     message.section = Section('%section1%', 'Substitution for Section 1 Tag')
     message.section = [
         Section('%section2%', 'Substitution for Section 2 Tag'),
-        Section('%section3%', 'Substitution for Section 3 Tag')    
+        Section('%section3%', 'Substitution for Section 3 Tag')
     ]
 
     message.header = Header('X-Test9', 'Test9')
@@ -293,7 +293,7 @@ def build_kitchen_sink():
     tracking_settings.click_tracking = ClickTracking(True, False)
     tracking_settings.open_tracking = OpenTracking(True, OpenTrackingSubstitutionTag("open_tracking"))
     tracking_settings.subscription_tracking = SubscriptionTracking(
-        True, 
+        True,
         SubscriptionText("Goodbye"),
         SubscriptionHtml("<strong>Goodbye!</strong>"),
         SubscriptionSubstitutionTag("unsubscribe"))

live_test.py

@@ -4,8 +4,8 @@
 from sendgrid import SendGridAPIClient
 from sendgrid.helpers.mail import Mail, From, To, Subject, PlainTextContent, HtmlContent, SendGridException
 
-message = Mail(from_email=From('dx@sendgrid.com', 'DX'),
-               to_emails=To('elmer.thomas@sendgrid.com', 'Elmer Thomas'),
+message = Mail(from_email=From('help@twilio.com', 'Twilio SendGrid'),
+               to_emails=To('ethomas@twilio.com', 'Elmer Thomas'),
                subject=Subject('Sending with SendGrid is Fun'),
                plain_text_content=PlainTextContent('and easy to do anywhere, even with Python'),
                html_content=HtmlContent('<strong>and easy to do anywhere, even with Python</strong>'))
@@ -27,10 +27,10 @@
 from sendgrid.helpers.mail import Mail, From, To, Subject, PlainTextContent, HtmlContent, SendGridException
 
 to_emails = [
-    To('elmer.thomas@sendgrid.com', 'Elmer SendGrid'),
+    To('ethomas@twilio.com', 'Elmer SendGrid'),
     To('elmer.thomas@gmail.com', 'Elmer Thomas')
 ]
-message = Mail(from_email=From('dx@sendgrid.com', 'DX'),
+message = Mail(from_email=From('help@twilio.com', 'Twilio SendGrid'),
                to_emails=to_emails,
                subject=Subject('Sending with SendGrid is Fun'),
                plain_text_content=PlainTextContent('and easy to do anywhere, even with Python'),
@@ -56,10 +56,10 @@
 import datetime
 
 to_emails = [
-    To(email='elmer.thomas@sendgrid.com',
-       name='Elmer SendGrid',
+    To(email='ethomas@twilio.com',
+       name='Elmer Twilio',
        substitutions={
-           Substitution('-name-', 'Elmer SendGrid'),
+           Substitution('-name-', 'Elmer Twilio'),
            Substitution('-github-', 'http://github.com/ethomas'),
        },
        subject=Subject('Override Global Subject')),
@@ -72,7 +72,7 @@
 ]
 ts = time.time()
 global_substitutions = Substitution('-time-', datetime.datetime.fromtimestamp(ts).strftime('%Y-%m-%d %H:%M:%S'))
-message = Mail(from_email=From('dx@sendgrid.com', 'DX'),
+message = Mail(from_email=From('help@twilio.com', 'Twilio SendGrid'),
                to_emails=to_emails,
                subject=Subject('Hi -name-'),
                plain_text_content=PlainTextContent('Hello -name-, your github is -github-, email sent at -time-'),
@@ -96,8 +96,8 @@
 import json
 from sendgrid import SendGridAPIClient
 from sendgrid.helpers.mail import (
-    Mail, From, To, Cc, Bcc, Subject, PlainTextContent, 
-    HtmlContent, SendGridException, Substitution, 
+    Mail, From, To, Cc, Bcc, Subject, PlainTextContent,
+    HtmlContent, SendGridException, Substitution,
     Header, CustomArg, SendAt, Content, MimeType, Attachment,
     FileName, FileContent, FileType, Disposition, ContentId,
     TemplateId, Section, ReplyTo, Category, BatchId, Asm,
@@ -114,22 +114,22 @@
 
 message = Mail()
 
-# Define Personalizations 
+# Define Personalizations
 
 message.to = To('elmer+test1@sendgrid.com', 'Example User1', p=0)
-message.to = [ 
+message.to = [
     To('elmer+test2@sendgrid.com', 'Example User2', p=0),
     To('elmer+test3@sendgrid.com', 'Example User3', p=0)
 ]
 
 message.cc = Cc('test4@example.com', 'Example User4', p=0)
-message.cc = [ 
+message.cc = [
     Cc('test5@example.com', 'Example User5', p=0),
     Cc('test6@example.com', 'Example User6', p=0)
 ]
 
 message.bcc = Bcc('test7@example.com', 'Example User7', p=0)
-message.bcc = [ 
+message.bcc = [
     Bcc('test8@example.com', 'Example User8', p=0),
     Bcc('test9@example.com', 'Example User9', p=0)
 ]
@@ -160,19 +160,19 @@
 message.send_at = SendAt(1461775051, p=0)
 
 message.to = To('test10@example.com', 'Example User10', p=1)
-message.to = [ 
+message.to = [
     To('test11@example.com', 'Example User11', p=1),
     To('test12@example.com', 'Example User12', p=1)
 ]
 
 message.cc = Cc('test13@example.com', 'Example User13', p=1)
-message.cc = [ 
+message.cc = [
     Cc('test14@example.com', 'Example User14', p=1),
     Cc('test15@example.com', 'Example User15', p=1)
 ]
 
 message.bcc = Bcc('test16@example.com', 'Example User16', p=1)
-message.bcc = [ 
+message.bcc = [
     Bcc('test17@example.com', 'Example User17', p=1),
     Bcc('test18@example.com', 'Example User18', p=1)
 ]
@@ -204,9 +204,9 @@
 
 # The values below this comment are global to entire message
 
-message.from_email = From('dx@sendgrid.com', 'DX')
+message.from_email = From('help@twilio.com', 'Twilio SendGrid')
 
-message.reply_to = ReplyTo('dx_reply@sendgrid.com', 'DX Reply')
+message.reply_to = ReplyTo('help_reply@twilio.com', 'Twilio SendGrid Reply')
 
 message.subject = Subject('Sending with SendGrid is Fun 2')
 
@@ -240,7 +240,7 @@
 message.section = Section('%section1%', 'Substitution for Section 1 Tag')
 message.section = [
     Section('%section2%', 'Substitution for Section 2 Tag'),
-    Section('%section3%', 'Substitution for Section 3 Tag')    
+    Section('%section3%', 'Substitution for Section 3 Tag')
 ]
 
 message.header = Header('X-Test9', 'Test9')
@@ -284,7 +284,7 @@
 tracking_settings.click_tracking = ClickTracking(True, False)
 tracking_settings.open_tracking = OpenTracking(True, OpenTrackingSubstitutionTag("open_tracking"))
 tracking_settings.subscription_tracking = SubscriptionTracking(
-    True, 
+    True,
     SubscriptionText("Goodbye"),
     SubscriptionHtml("<strong>Goodbye!</strong>"),
     SubscriptionSubstitutionTag("unsubscribe"))
@@ -313,8 +313,8 @@
 from sendgrid import SendGridAPIClient
 from sendgrid.helpers.mail import Mail, From, To, Subject, PlainTextContent, HtmlContent, SendGridException, DynamicTemplateData
 
-message = Mail(from_email=From('dx@sendgrid.com', 'DX'),
-               to_emails=To('elmer.thomas@sendgrid.com', 'Elmer Thomas'),
+message = Mail(from_email=From('help@twilio.com', 'Twilio SendGrid'),
+               to_emails=To('ethomas@twilio.com', 'Elmer Thomas'),
                subject=Subject('Sending with SendGrid is Fun'),
                plain_text_content=PlainTextContent('and easy to do anywhere, even with Python'),
                html_content=HtmlContent('<strong>and easy to do anywhere, even with Python</strong>'))
@@ -354,4 +354,4 @@
     print(response.body)
     print(response.headers)
 except SendGridException as e:
-    print(e.message)
+    print(e.message)

setup.py

@@ -20,7 +20,7 @@ def getRequires():
     name='sendgrid',
     version=str(__version__),
     author='Elmer Thomas, Yamil Asusta',
-    author_email='dx@sendgrid.com',
+    author_email='help@twilio.com',
     url='https://github.com/sendgrid/sendgrid-python/',
     packages=find_packages(exclude=["temp*.py", "test"]),
     include_package_data=True,