sendgrid-ruby 5.3.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 796596b834ff9725ad09dd290829bd710b88789f
-  data.tar.gz: 1d572c07d391a91a4e3f3c279b3fc9ef74128b83
+  metadata.gz: 2a951fe9149a9c9e1ca5e9c9ce053995bb80810c
+  data.tar.gz: e974acc6b662c335d35ad99702a173a70b656c0c
 SHA512:
-  metadata.gz: 5285bba04ae710a028e424ce7b34676e09a4dbf5b2c20eed61205078d97011a3aadbea65f6562dd84883b6583203f28751834ecde2ad225bdcd7ba5bb8ef71dd
-  data.tar.gz: e5eb5ec7768129a04c65fcc4e5e3f2ab88013f4d6d79eec9252ed20f72fb3120d10527efda11127e80440f10b1e5a3e72c568afa7b094ceac4b1196424b53804
+  metadata.gz: 9f51d4253bd7708337a981c2f196b4e37f3d8b092a469d11b7300815d3faef5bec7c6df32c98c1be8158dd71146d87d4983b560710d4d8715dcf0f1d55f6b62d
+  data.tar.gz: 7beeb7406e6e7b5370d42aa5d35b471bcab706b43bead079a58104cc4f641b19f7fa11ec6f17b95d7e0f371c5dde99832369b8fc2940457a907a64d214c0d0d2

data/.github/PULL_REQUEST_TEMPLATE

@@ -1,6 +1,7 @@
 <!--
 We appreciate the effort for this pull request but before that please make sure you read the contribution guidelines given above, then fill out the blanks below.
 
+**All third-party contributors acknowledge that any contributions they provide will be made under the same open-source license that the open-source project is provided under.**
 
 Please enter each Issue number you are resolving in your PR after one of the following words [Fixes, Closes, Resolves]. This will auto-link these issues and close them when this PR is merged!
 e.g. 
@@ -10,6 +11,7 @@ Closes #2
 # Fixes # 
 
 ### Checklist
+- [ ] I acknowledge that all my contributions will be made under the project's license
 - [ ] I have made a material change to the repo (functionality, testing, spelling, grammar)
 - [ ] I have read the [Contribution Guide] and my PR follows them.
 - [ ] I updated my branch with the master branch.
@@ -21,4 +23,4 @@ Closes #2
 - 
 - 
 
-If you have questions, please send an email to [Sendgrid](mailto:dx@sendgrid.com), or file a Github Issue in this repository.
+If you have questions, please send an email to [Twilio SendGrid](mailto:dx@sendgrid.com), or file a Github Issue in this repository.

data/CHANGELOG.md

@@ -1,6 +1,31 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [6.0.0] - 2019-06-04 ##
+### BREAKING CHANGE
+- [PR #284](https://github.com/sendgrid/sendgrid-ruby/pull/284): The sinatra gem is no longer specified as a dependency of this gem. If you would like to use the inbound processing, please follow the [upgrade guide](https://github.com/sendgrid/sendgrid-ruby/blob/master/UPGRADE.md). Big thanks to [@jjb](https://github.com/jjb) for the PR!
+
+### Added
+- [PR #271](https://github.com/sendgrid/sendgrid-ruby/pull/271): Add ability to impersonate a subuser. Big thanks to [@danilospa](https://github.com/danilospa) for the PR!
+- [PR #278](https://github.com/sendgrid/sendgrid-ruby/pull/278): Make SendGrid permissions management easy. Big thanks to [@sony-mathew](https://github.com/sony-mathew) for the PR!
+- [PR #343](https://github.com/sendgrid/sendgrid-ruby/pull/343) and [PR #345](https://github.com/sendgrid/sendgrid-ruby/pull/345): Update README.md with examples for dynamic templates and corrections to the old legacy template example. Big thanks to [@kylearoberts](https://github.com/kylearoberts) for the PR!
+- [PR #216](https://github.com/sendgrid/sendgrid-ruby/pull/216): Get unassigned IPs example. Big thanks to [@cristianossd](https://github.com/cristianossd) for the PR!
+- [PR #231](https://github.com/sendgrid/sendgrid-ruby/pull/231): Add support for IO objects set as Attachment content. Big thanks to [@awj](https://github.com/awj) for the PR!
+- [PR #232](https://github.com/sendgrid/sendgrid-ruby/pull/232): Add method to check email content for secret keys. Big thanks to [@jaredsilver](https://github.com/jaredsilver) for the PR!
+- [PR #236](https://github.com/sendgrid/sendgrid-ruby/pull/236): Add an IpManagement helper. Big thanks to [@brokenthumbs](https://github.com/brokenthumbs) for the PR!
+- [PR #264](https://github.com/sendgrid/sendgrid-ruby/pull/264): Add Email Statistics helper example. Big thanks to [@jeremyjung](https://github.com/jeremyjung) for the PR!
+- [PR #246](https://github.com/sendgrid/sendgrid-ruby/pull/246): Modified Mail Class calling examples with SendGrid::Mail. Big thanks to [@rohan-techfreak](https://github.com/rohan-techfreak) for the PR!
+- [PR #268](https://github.com/sendgrid/sendgrid-ruby/pull/268): Added Code Review to CONTRIBUTING.md. Big thanks to [@mptap](https://github.com/mptap) for the PR!
+- [PR #276](https://github.com/sendgrid/sendgrid-ruby/pull/276): Codebase Improvement: Use attr_accessor instead of getters and setters. Big thanks to [@rahul26goyal](https://github.com/rahul26goyal) for the PR!
+- [PR #365](https://github.com/sendgrid/sendgrid-ruby/pull/365): Add our Developer Experience Engineer career opportunity to the README. Big thanks to [@mptap](https://github.com/mptap) for the PR!
+
+### Fixes
+- [PR #262](https://github.com/sendgrid/sendgrid-ruby/pull/262): Fix CONTRIBUTING.md formatting. Big thanks to [@thepriefy](https://github.com/thepriefy) for the PR!
+- [PR #277](https://github.com/sendgrid/sendgrid-ruby/pull/277): Fix travis warning. Big thanks to [@rahul26goyal](https://github.com/rahul26goyal) for the PR!
+- [PR #303](https://github.com/sendgrid/sendgrid-ruby/pull/303): Update readme tags and fix minor test failures. Big thanks to [@af4ro](https://github.com/af4ro) for the PR!
+- [PR #370](https://github.com/sendgrid/sendgrid-ruby/pull/370): Remove references to "Whitelabel". Big thanks to [@crweiner](https://github.com/crweiner) for the PR!
+- [PR #383](https://github.com/sendgrid/sendgrid-ruby/pull/383): Correct endpoint for single spam report requests. Big thanks to [@bermannoah](https://github.com/bermannoah) for the PR!
+
 ## [5.3.0] - 2018-10-12 ##
 ### Added
 - [PR #300](https://github.com/sendgrid/sendgrid-ruby/pull/300): Support for Dynamic Templates. Big thanks to [@nedcampion](https://github.com/nedcampion) for the PR!

data/CODE_OF_CONDUCT.md

@@ -1,15 +1,15 @@
-# SendGrid Community Code of Conduct
+# Twilio SendGrid Community Code of Conduct
 
-The SendGrid open source community is made up of members from around the globe with a diverse set of skills, personalities, and experiences. It is through these differences that our community experiences successes and continued growth. When you're working with members of the community, we encourage you to follow these guidelines, which help steer our interactions and strive to maintain a positive, successful and growing community. 
+The Twilio SendGrid open-source community is made up of members from around the globe with a diverse set of skills, personalities, and experiences. It is through these differences that our community experiences successes and continued growth. When you're working with members of the community, we encourage you to follow these guidelines, which help steer our interactions and strive to maintain a positive, successful and growing community. 
 
 ### Be Open
 Members of the community are open to collaboration, whether it's on pull requests, code reviews, approvals, issues or otherwise. We're receptive to constructive comments and criticism, as the experiences and skill sets of all members contribute to the whole of our efforts. We're accepting of all who wish to take part in our activities, fostering an environment where anyone can participate, and everyone can make a difference.
 
 ### Be Considerate
-Members of the community are considerate of their peers, which include other contributors and users of SendGrid. We're thoughtful when addressing the efforts of others, keeping in mind that often the labor was completed with the intent of the good of the community. We're attentive in our communications, whether in person or online, and we're tactful when approaching differing views.
+Members of the community are considerate of their peers, which include other contributors and users of Twilio SendGrid. We're thoughtful when addressing the efforts of others, keeping in mind that often the labor was completed with the intent of the good of the community. We're attentive in our communications, whether in person or online, and we're tactful when approaching differing views.
 
 ### Be Respectful
-Members of the community are respectful. We're respectful of others, their positions, their skills, their commitments and their efforts. We're respectful of the volunteer efforts that permeate the SendGrid community. We're respectful of the processes outlined in the community, and we work within them. When we disagree, we are courteous in raising our issues.  Overall, we're good to each other. We contribute to this community not because we have to, but because we want to. If we remember that, these guidelines will come naturally.
+Members of the community are respectful. We're respectful of others, their positions, their skills, their commitments and their efforts. We're respectful of the volunteer efforts that permeate the Twilio SendGrid community. We're respectful of the processes outlined in the community, and we work within them. When we disagree, we are courteous in raising our issues.  Overall, we're good to each other. We contribute to this community not because we have to, but because we want to. If we remember that, these guidelines will come naturally.
 
 ## Additional Guidance 
 
@@ -17,25 +17,25 @@ Members of the community are respectful. We're respectful of others, their posit
 Community discussions often involve interested parties. We expect participants to be aware when they are conflicted due to employment or other projects they are involved in and disclose those interests to other project members. When in doubt, over-disclose. Perceived conflicts of interest are important to address so that the community’s decisions are credible even when unpopular, difficult or favorable to the interests of one group over another.
 
 ### Interpretation
-This Code is not exhaustive or complete. It is not a rulebook; it serves to distill our common understanding of a collaborative, shared environment and goals. We expect it to be followed in spirit as much as in the letter.  When in doubt, try to abide by [SendGrid’s cultural values](https://sendgrid.com/blog/employee-engagement-the-4h-way) defined by our “4H’s”: Happy, Hungry, Humble and Honest.  
+This Code is not exhaustive or complete. It is not a rulebook; it serves to distill our common understanding of a collaborative, shared environment and goals. We expect it to be followed in spirit as much as in the letter.  When in doubt, try to abide by [Twilio SendGrid’s cultural values](https://sendgrid.com/blog/employee-engagement-the-4h-way) defined by our “4H’s”: Happy, Hungry, Humble and Honest.  
 
 ### Enforcement
-Most members of the SendGrid community always comply with this Code, not because of the existence of this Code, but because they have long experience participating in open source communities where the conduct described above is normal and expected. However, failure to observe this Code may be grounds for suspension, reporting the user for abuse or changing permissions for outside contributors.
+Most members of the Twilio SendGrid community always comply with this Code, not because of the existence of this Code, but because they have long experience participating in open-source communities where the conduct described above is normal and expected. However, failure to observe this Code may be grounds for suspension, reporting the user for abuse or changing permissions for outside contributors.
 
 ## If you have concerns about someone’s conduct
 **Initiate Direct Contact** - It is always appropriate to email a community member (if contact information is available), mention that you think their behavior was out of line, and (if necessary) point them to this Code.
 
 **Discuss Publicly** - Discussing publicly is always acceptable. Note, though, that approaching the person directly may be better, as it tends to make them less defensive, and it respects the time of other community members, so you probably want to try direct contact first.
 
-**Contact the Moderators** - You can reach the SendGrid moderators by emailing dx@sendgrid.com.
+**Contact the Moderators** - You can reach the Twilio SendGrid moderators by emailing dx@sendgrid.com.
 
-## Submission to SendGrid Repositories
-Finally, just a reminder, changes to the SendGrid repositories will only be accepted upon completion of the [SendGrid Contributor Agreement](https://cla.sendgrid.com). 
+## Submission to Twilio SendGrid Repositories
+Finally, just a reminder, changes to the Twilio SendGrid repositories will only be accepted upon completion of the [Twilio SendGrid Contributor Agreement](https://cla.sendgrid.com). 
 
 ## Attribution
 
-SendGrid thanks the following, on which it draws for content and inspiration:
+Twilio SendGrid thanks the following, on which it draws for content and inspiration:
 
-* [Python Community Code of Conduct](https://www.python.org/psf/codeofconduct/)  
+* [Ruby Community Code of Conduct](https://www.python.org/psf/codeofconduct/)  
 * [Open Source Initiative General Code of Conduct](https://opensource.org/codeofconduct) 
 * [Apache Code of Conduct](https://www.apache.org/foundation/policies/conduct.html) 

data/CONTRIBUTING.md

@@ -1,35 +1,25 @@
-Hello! Thank you for choosing to help contribute to one of the SendGrid open source libraries. There are many ways you can contribute and help is always welcome.  We simply ask that you follow the following contribution policies.
+Hello! Thank you for choosing to help contribute to one of the Twilio SendGrid open-source libraries. There are many ways you can contribute and help is always welcome.  We simply ask that you follow the following contribution policies.
 
-- [CLAs and CCLAs](#clas-and-cclas)
+**All third-party contributors acknowledge that any contributions they provide will be made under the same open-source license that the open-source project is provided under.**
 - [Feature Request](#feature-request)
 - [Submit a Bug Report](#submit-a-bug-report)
-    - [Please use our Bug Report Template](#please-use-our-bug-report-template)
+  - [Please use our Bug Report Template](#please-use-our-bug-report-template)
 - [Improvements to the Codebase](#improvements-to-the-codebase)
-    - [Development Environment](#development-environment)
-        - [Install and Run Locally](#install-and-run-locally)
-            - [Prerequisites](#prerequisites)
-            - [Initial setup:](#initial-setup)
-- [Environment Variables](#environment-variables)
-            - [Execute:](#execute)
+  - [Development Environment](#development-environment)
+    - [Install and Run Locally](#install-and-run-locally)
+      - [Prerequisites](#prerequisites)
+      - [Initial setup:](#initial-setup)
+  - [Environment Variables](#environment-variables)
+      - [Execute:](#execute)
 - [Understanding the Code Base](#understanding-the-code-base)
 - [Testing](#testing)
 - [Style Guidelines & Naming Conventions](#style-guidelines--naming-conventions)
 - [Creating a Pull Request](#creating-a-pull-request)
+- [Code Reviews](#code-reviews)
 
 <a name="roadmap"></a>
 We use [Milestones](https://github.com/sendgrid/sendgrid-ruby/milestones) to help define current roadmaps, please feel free to grab an issue from the current milestone. Please indicate that you have begun work on it to avoid collisions. Once a PR is made, community review, comments, suggestions and additional PRs are welcomed and encouraged.
 
-<a name="cla"></a>
-## CLAs and CCLAs
-
-Before you get started, SendGrid requires that a SendGrid Contributor License Agreement (CLA) be filled out by every contributor to a SendGrid open source project.
-
-Our goal with the CLA is to clarify the rights of our contributors and reduce other risks arising from inappropriate contributions.  The CLA also clarifies the rights SendGrid holds in each contribution and helps to avoid misunderstandings over what rights each contributor is required to grant to SendGrid when making a contribution.  In this way the CLA encourages broad participation by our open source community and helps us build strong open source projects, free from any individual contributor withholding or revoking rights to any contribution.
-
-SendGrid does not merge a pull request made against a SendGrid open source project until that pull request is associated with a signed CLA. Copies of the CLA are available [here](https://gist.github.com/SendGridDX/98b42c0a5d500058357b80278fde3be8#file-sendgrid_cla).
-
-When you create a Pull Request, after a few seconds, a comment will appear with a link to the CLA. Click the link and fill out the brief form and then click the "I agree" button and you are all set. You will not be asked to re-sign the CLA unless we make a change.
-
 There are a few ways to contribute, which we'll enumerate below:
 
 <a name="feature-request"></a>
@@ -89,9 +79,9 @@ We welcome direct contributions to the sendgrid-ruby code base. Thank you!
    bundle install
    ```
 
-## Environment Variables
+### Environment Variables
 
-First, get your free SendGrid account [here](https://sendgrid.com/free?source=sendgrid-ruby).
+First, get your free Twilio SendGrid account [here](https://sendgrid.com/free?source=sendgrid-ruby).
 
 Next, update your environment with your [SENDGRID_API_KEY](https://app.sendgrid.com/settings/api_keys).
 
@@ -217,3 +207,8 @@ Please run your code through:
     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/).

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2018 SendGrid, Inc.
+Copyright (c) 2014-2019 Twilio SendGrid, Inc.
 
 MIT License
 

data/README.md

@@ -1,14 +1,20 @@
-![SendGrid Logo](https://uiux.s3.amazonaws.com/2016-logos/email-logo%402x.png)
+![Twilio SendGrid Logo](https://github.com/sendgrid/sendgrid-python/raw/master/twilio_sendgrid_logo.png)
 
-[![Travis Badge](https://travis-ci.org/sendgrid/sendgrid-ruby.svg?branch=master)](https://travis-ci.org/sendgrid/sendgrid-ruby) [![Gem Version](https://badge.fury.io/rb/sendgrid-ruby.svg)](https://badge.fury.io/rb/sendgrid-ruby)[![Email Notifications Badge](https://dx.sendgrid.com/badge/ruby)](https://dx.sendgrid.com/newsletter/ruby)[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.txt)[![Twitter Follow](https://img.shields.io/twitter/follow/sendgrid.svg?style=social&label=Follow)](https://twitter.com/sendgrid)[![GitHub contributors](https://img.shields.io/github/contributors/sendgrid/sendgrid-ruby.svg)](https://github.com/sendgrid/sendgrid-ruby/graphs/contributors)
+[![Travis Badge](https://travis-ci.org/sendgrid/sendgrid-ruby.svg?branch=master)](https://travis-ci.org/sendgrid/sendgrid-ruby) 
+[![Gem Version](https://badge.fury.io/rb/sendgrid-ruby.svg)](https://badge.fury.io/rb/sendgrid-ruby)
+[![Email Notifications Badge](https://dx.sendgrid.com/badge/ruby)](https://dx.sendgrid.com/newsletter/ruby)
+[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.txt)
+[![Twitter Follow](https://img.shields.io/twitter/follow/sendgrid.svg?style=social&label=Follow)](https://twitter.com/sendgrid)
+[![GitHub contributors](https://img.shields.io/github/contributors/sendgrid/sendgrid-ruby.svg)](https://github.com/sendgrid/sendgrid-ruby/graphs/contributors)
+[![Open Source Helpers](https://www.codetriage.com/sendgrid/sendgrid-ruby/badges/users.svg)](https://www.codetriage.com/sendgrid/sendgrid-ruby)
 
 **NEW:** Subscribe to email [notifications](https://dx.sendgrid.com/newsletter/ruby) for releases and breaking changes.
 
-**This library allows you to quickly and easily use the SendGrid Web API v3 via Ruby.**
+**This library allows you to quickly and easily use the Twilio SendGrid Web API v3 via Ruby.**
 
-Version 3.X.X+ of this library provides full support for all SendGrid [Web API v3](https://sendgrid.com/docs/API_Reference/Web_API_v3/index.html) endpoints, including the new [v3 /mail/send](https://sendgrid.com/blog/introducing-v3mailsend-sendgrids-new-mail-endpoint).
+Version 3.X.X+ of this library provides full support for all Twilio SendGrid [Web API v3](https://sendgrid.com/docs/API_Reference/Web_API_v3/index.html) endpoints, including the new [v3 /mail/send](https://sendgrid.com/blog/introducing-v3mailsend-sendgrids-new-mail-endpoint).
 
-This library represents the beginning of a new path for SendGrid. We want this library to be community driven and SendGrid led. We need your help to realize this goal. To help make sure we are building the right things in the right order, we ask that you create [issues](https://github.com/sendgrid/sendgrid-ruby/issues) and [pull requests](https://github.com/sendgrid/sendgrid-ruby/blob/master/CONTRIBUTING.md) or simply upvote or comment on existing issues or pull requests.
+This library represents the beginning of a new path for Twilio SendGrid. We want this library to be community driven and Twilio SendGrid led. We need your help to realize this goal. To help make sure we are building the right things in the right order, we ask that you create [issues](https://github.com/sendgrid/sendgrid-ruby/issues) and [pull requests](https://github.com/sendgrid/sendgrid-ruby/blob/master/CONTRIBUTING.md) or simply upvote or comment on existing issues or pull requests.
 
 Please browse the rest of this README for further details.
 
@@ -16,6 +22,7 @@ We appreciate your continued support, thank you!
 
 # Table of Contents
 
+* [Announcements](#announcements)
 * [Installation](#installation)
 * [Quick Start](#quick-start)
 * [Processing Inbound Email](#inbound)
@@ -28,13 +35,19 @@ We appreciate your continued support, thank you!
 * [About](#about)
 * [License](#license)
 
+<a name="announcements"></a>
+# Announcements
+
+**NEW:** If you're a software engineer who is passionate about #DeveloperExperience and/or #OpenSource, [this is an incredible opportunity to join our #DX team](https://sendgrid.com/careers/role/1421152/?gh_jid=1421152) as a Developer Experience Engineer and work with [@thinkingserious](https://github.com/thinkingserious) and [@aroach](https://github.com/aroach)! Tell your friends :)
+
+
 <a name="installation"></a>
 # Installation
 
 ## Prerequisites
 
-- Ruby version >= 2.2
-- The SendGrid service, starting at the [free level](https://sendgrid.com/free?source=sendgrid-ruby)
+- Ruby version >= 2.2 (except version [2.6.0](https://github.com/sendgrid/sendgrid-ruby/blob/master/TROUBLESHOOTING.md#ruby-versions))
+- The Twilio SendGrid service, starting at the [free level](https://sendgrid.com/free?source=sendgrid-ruby)
 
 ## Setup Environment Variables
 
@@ -68,7 +81,6 @@ gem install sendgrid-ruby
 ## Dependencies
 
 - [Ruby-HTTP-Client](https://github.com/sendgrid/ruby-http-client)
-- [Sinatra](http://www.sinatrarb.com/) - this is only needed if you plan to process [Inbound Email](#inbound).
 
 <a name="quick-start"></a>
 # Quick Start
@@ -85,7 +97,7 @@ include SendGrid
 
 from = SendGrid::Email.new(email: 'test@example.com')
 to = SendGrid::Email.new(email: 'test@example.com')
-subject = 'Sending with SendGrid is Fun'
+subject = 'Sending with Twilio SendGrid is Fun'
 content = SendGrid::Content.new(type: 'text/plain', value: 'and easy to do anywhere, even with Ruby')
 mail = SendGrid::Mail.new(from, subject, to, content)
 
@@ -115,7 +127,7 @@ data = JSON.parse('{
           "email": "test@example.com"
         }
       ],
-      "subject": "Sending with SendGrid is Fun"
+      "subject": "Sending with Twilio SendGrid is Fun"
     }
   ],
   "from": {
@@ -168,7 +180,7 @@ Please see [our helper](https://github.com/sendgrid/sendgrid-ruby/tree/master/li
 <a name="usage"></a>
 # Usage
 
-- [SendGrid Docs](https://sendgrid.com/docs/API_Reference/index.html)
+- [Twilio SendGrid Docs](https://sendgrid.com/docs/API_Reference/index.html)
 - [Library Usage Docs](https://github.com/sendgrid/sendgrid-ruby/tree/master/USAGE.md)
 - [Example Code](https://github.com/sendgrid/sendgrid-ruby/tree/master/examples)
 - [How-to: Migration from v2 to v3](https://sendgrid.com/docs/Classroom/Send/v3_Mail_Send/how_to_migrate_from_v2_to_v3_mail_send.html)
@@ -201,6 +213,7 @@ We encourage contribution to our libraries (you might even score some nifty swag
 - [Bug Reports](https://github.com/sendgrid/sendgrid-ruby/tree/master/CONTRIBUTING.md#submit_a_bug_report)
 - [Sign the CLA to Create a Pull Request](https://github.com/sendgrid/sendgrid-ruby/tree/master/CONTRIBUTING.md#cla)
 - [Improvements to the Codebase](https://github.com/sendgrid/sendgrid-ruby/tree/master/CONTRIBUTING.md#improvements_to_the_codebase)
+- [Review Pull Requests](https://github.com/sendgrid/sendgrid-ruby/blob/master/CONTRIBUTING.md#code-reviews)
 
 <a name="troubleshooting"></a>
 # Troubleshooting
@@ -210,7 +223,7 @@ Please see our [troubleshooting guide](https://github.com/sendgrid/sendgrid-ruby
 <a name="about"></a>
 # About
 
-sendgrid-ruby is guided and supported by the SendGrid [Developer Experience Team](mailto:dx@sendgrid.com).
+sendgrid-ruby is guided and supported by the [Developer Experience Team](mailto:dx@sendgrid.com).
 
 sendgrid-ruby is maintained and funded by SendGrid, Inc. The names and logos for sendgrid-ruby are trademarks of SendGrid, Inc.
 

data/Rakefile

@@ -4,7 +4,7 @@ require 'rspec/core/rake_task'
 
 Rake::TestTask.new do |t|
   t.libs << 'test'
-  t.test_files = FileList['test/sendgrid/test*.rb', 'test/sendgrid/helpers/mail/test*.rb']
+  t.test_files = FileList['test/sendgrid/test*.rb', 'test/sendgrid/helpers/mail/test*.rb', 'test/sendgrid/helpers/permissions/test*.rb']
   t.verbose = true
 end
 

data/TROUBLESHOOTING.md

@@ -1,19 +1,20 @@
-If you have a non-library SendGrid issue, please contact our [support team](https://support.sendgrid.com).
+If you have a non-library Twilio SendGrid issue, please contact our [support team](https://support.sendgrid.com).
 
 If you can't find a solution below, please open an [issue](https://github.com/sendgrid/sendgrid-ruby/issues).
 
 
 ## Table of Contents
 
-* [Migrating from v2 to v3](#migrating)
-* [Continue Using v2](#v2)
-* [Testing v3 /mail/send Calls Directly](#testing)
-* [Error Messages](#error)
-* [Versions](#versions)
-* [Environment Variables and Your SendGrid API Key](#environment)
-* [Using the Package Manager](#package-manager)
+* [Migrating from v2 to v3](#migrating-from-v2-to-v3)
+* [Continue Using v2](#continue-using-v2)
+* [Testing v3 /mail/send Calls Directly](#testing-v3-mailsend-calls-directly)
+* [Error Messages](#error-messages)
+* [Versioning](#versioning)
+* [Environment Variables and Your Twilio SendGrid API Key](#environment-variables-and-your-twilio-sendgrid-api-key)
+* [Using the Package Manager](#using-the-package-manager)
 * [Rails Specifics](#rails-specifics)
-* [Viewing the Request Body](#request-body)
+* [Ruby Versions](#ruby-versions)
+* [Viewing the Request Body](#viewing-the-request-body)
 
 <a name="migrating"></a>
 ## Migrating from v2 to v3
@@ -67,17 +68,17 @@ rescue Exception => e
 end
 ```
 
-<a name="versions"></a>
-## Versions
+<a name="versioning"></a>
+## Versioning
 
 We follow the MAJOR.MINOR.PATCH versioning scheme as described by [SemVer.org](http://semver.org). Therefore, we recommend that you always pin (or vendor) the particular version you are working with to your code and never auto-update to the latest version. Especially when there is a MAJOR point release, since that is guaranteed to be a breaking change. Changes are documented in the [CHANGELOG](https://github.com/sendgrid/sendgrid-ruby/blob/master/CHANGELOG.md) and [releases](https://github.com/sendgrid/sendgrid-ruby/releases) section.
 
 <a name="environment"></a>
-## Environment Variables and Your SendGrid API Key
+## Environment Variables and Your Twilio SendGrid API Key
 
-All of our examples assume you are using [environment variables](https://github.com/sendgrid/sendgrid-ruby#setup-environment-variables) to hold your SendGrid API key.
+All of our examples assume you are using [environment variables](https://github.com/sendgrid/sendgrid-ruby#setup-environment-variables) to hold your Twilio SendGrid API key.
 
-If you choose to add your SendGrid API key directly (not recommended):
+If you choose to add your Twilio SendGrid API key directly (not recommended):
 
 `sg = SendGrid::API.new(api_key: ENV['SENDGRID_API_KEY'])`
 
@@ -85,7 +86,7 @@ becomes
 
 `sg = SendGrid::API.new(api_key: 'SENDGRID_API_KEY')`
 
-In the first case SENDGRID_API_KEY is in reference to the name of the environment variable, while the second case references the actual SendGrid API Key.
+In the first case SENDGRID_API_KEY is in reference to the name of the environment variable, while the second case references the actual Twilio SendGrid API Key.
 
 <a name="package-manager"></a>
 ## Using the Package Manager
@@ -119,6 +120,11 @@ gem install sendgrid-ruby -v X.X.X
 
 - Possibility of a namespace collision between the sendgrid class `Email` and your own defined `Email` class. To avoid these issues, you can skip the `include SendGrid` line and use the `SendGrid::` prefix for Email. Please see this [SO answer](https://stackoverflow.com/questions/41508464/rails-model-name-conflict-with-included-gem?noredirect=1#comment70223099_41508464) for specifics.
 
+<a name="ruby-versions"></a>
+## Ruby Versions
+
+This SDK [does not work with ruby version 2.6.0](https://github.com/sendgrid/sendgrid-ruby/issues/378) because of [this bug](https://bugs.ruby-lang.org/issues/15468). Please use any other [supported version](https://github.com/sendgrid/sendgrid-ruby#prerequisites).
+
 <a name="request-body"></a>
 ## Viewing the Request Body
 

data/UPGRADE.md

@@ -0,0 +1,5 @@
+# Upgrading from 5.X to 6.X
+
+Note, this is only necessary if you are using inbound processing.
+
+* Add this gem to your Gemfile: `gem 'sinatra', '>= 1.4.7', '< 3'`

data/USAGE.md

@@ -29,13 +29,13 @@ sg = SendGrid::API.new(api_key: ENV['SENDGRID_API_KEY'])
 * [PARTNER SETTINGS](#partner-settings)
 * [SCOPES](#scopes)
 * [SENDERS](#senders)
+* [SENDER AUTHENTICATION](#sender-authentication)
 * [STATS](#stats)
 * [SUBUSERS](#subusers)
 * [SUPPRESSION](#suppression)
 * [TEMPLATES](#templates)
 * [TRACKING SETTINGS](#tracking-settings)
 * [USER](#user)
-* [WHITELABEL](#whitelabel)
 
 
 <a name="access-settings"></a>
@@ -294,7 +294,7 @@ A JSON request body containing a "name" property is required. If number of maxim
 
 There is a limit of 100 API Keys on your account.
 
-The API Keys feature allows customers to be able to generate an API Key credential which can be used for authentication with the SendGrid v3 Web API or the [Mail API Endpoint](https://sendgrid.com/docs/API_Reference/Web_API/mail.html).
+The API Keys feature allows customers to be able to generate an API Key credential which can be used for authentication with the Twilio SendGrid v3 Web API or the [Mail API Endpoint](https://sendgrid.com/docs/API_Reference/Web_API/mail.html).
 
 See the [API Key Permissions List](https://sendgrid.com/docs/API_Reference/Web_API_v3/API_Keys/api_key_permissions_list.html) for a list of all available scopes.
 
@@ -320,7 +320,7 @@ puts response.headers
 
 **This endpoint allows you to retrieve all API Keys that belong to the authenticated user.**
 
-The API Keys feature allows customers to be able to generate an API Key credential which can be used for authentication with the SendGrid v3 Web API or the [Mail API Endpoint](https://sendgrid.com/docs/API_Reference/Web_API/mail.html).
+The API Keys feature allows customers to be able to generate an API Key credential which can be used for authentication with the Twilio SendGrid v3 Web API or the [Mail API Endpoint](https://sendgrid.com/docs/API_Reference/Web_API/mail.html).
 
 ### GET /api_keys
 
@@ -339,7 +339,7 @@ puts response.headers
 A JSON request body with a "name" property is required.
 Most provide the list of all the scopes an api key should have.
 
-The API Keys feature allows customers to be able to generate an API Key credential which can be used for authentication with the SendGrid v3 Web API or the [Mail API Endpoint](https://sendgrid.com/docs/API_Reference/Web_API/mail.html).
+The API Keys feature allows customers to be able to generate an API Key credential which can be used for authentication with the Twilio SendGrid v3 Web API or the [Mail API Endpoint](https://sendgrid.com/docs/API_Reference/Web_API/mail.html).
 
 
 ### PUT /api_keys/{api_key_id}
@@ -365,7 +365,7 @@ puts response.headers
 
 A JSON request body with a "name" property is required.
 
-The API Keys feature allows customers to be able to generate an API Key credential which can be used for authentication with the SendGrid v3 Web API or the [Mail API Endpoint](https://sendgrid.com/docs/API_Reference/Web_API/mail.html).
+The API Keys feature allows customers to be able to generate an API Key credential which can be used for authentication with the Twilio SendGrid v3 Web API or the [Mail API Endpoint](https://sendgrid.com/docs/API_Reference/Web_API/mail.html).
 
 ## URI Parameters
 
@@ -408,7 +408,7 @@ puts response.headers
 
 Authentications using this API Key will fail after this request is made, with some small propagation delay.If the API Key ID does not exist an HTTP 404 will be returned.
 
-The API Keys feature allows customers to be able to generate an API Key credential which can be used for authentication with the SendGrid v3 Web API or the [Mail API Endpoint](https://sendgrid.com/docs/API_Reference/Web_API/mail.html).
+The API Keys feature allows customers to be able to generate an API Key credential which can be used for authentication with the Twilio SendGrid v3 Web API or the [Mail API Endpoint](https://sendgrid.com/docs/API_Reference/Web_API/mail.html).
 
 ## URI Parameters
 
@@ -1094,7 +1094,7 @@ puts response.headers
 
 **This endpoint allows you to create a custom field.**
 
-The contactdb is a database of your contacts for [SendGrid Marketing Campaigns](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/index.html).
+The contactdb is a database of your contacts for [Twilio SendGrid Marketing Campaigns](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/index.html).
 
 ### POST /contactdb/custom_fields
 
@@ -1113,7 +1113,7 @@ puts response.headers
 
 **This endpoint allows you to retrieve all custom fields.**
 
-The contactdb is a database of your contacts for [SendGrid Marketing Campaigns](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/index.html).
+The contactdb is a database of your contacts for [Twilio SendGrid Marketing Campaigns](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/index.html).
 
 ### GET /contactdb/custom_fields
 
@@ -1128,7 +1128,7 @@ puts response.headers
 
 **This endpoint allows you to retrieve a custom field by ID.**
 
-The contactdb is a database of your contacts for [SendGrid Marketing Campaigns](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/index.html).
+The contactdb is a database of your contacts for [Twilio SendGrid Marketing Campaigns](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/index.html).
 
 ### GET /contactdb/custom_fields/{custom_field_id}
 
@@ -1144,7 +1144,7 @@ puts response.headers
 
 **This endpoint allows you to delete a custom field by ID.**
 
-The contactdb is a database of your contacts for [SendGrid Marketing Campaigns](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/index.html).
+The contactdb is a database of your contacts for [Twilio SendGrid Marketing Campaigns](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/index.html).
 
 ### DELETE /contactdb/custom_fields/{custom_field_id}
 
@@ -1345,9 +1345,9 @@ puts response.headers
 
 The body of an API call to this endpoint must include an array of one or more recipient objects.
 
-It is of note that you can add custom field data as parameters on recipient objects. We have provided an example using some of the default custom fields SendGrid provides.
+It is of note that you can add custom field data as parameters on recipient objects. We have provided an example using some of the default custom fields Twilio SendGrid provides.
 
-The contactdb is a database of your contacts for [SendGrid Marketing Campaigns](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/index.html).
+The contactdb is a database of your contacts for [Twilio SendGrid Marketing Campaigns](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/index.html).
 
 ### PATCH /contactdb/recipients
 
@@ -1369,7 +1369,7 @@ puts response.headers
 
 **This endpoint allows you to add a Marketing Campaigns recipient.**
 
-It is of note that you can add custom field data as a parameter on this endpoint. We have provided an example using some of the default custom fields SendGrid provides.
+It is of note that you can add custom field data as a parameter on this endpoint. We have provided an example using some of the default custom fields Twilio SendGrid provides.
 
 The Contacts API helps you manage your [Marketing Campaigns](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/index.html) recipients.
 
@@ -1421,7 +1421,7 @@ puts response.headers
 
 The body of an API call to this endpoint must include an array of recipient IDs of the recipients you want to delete.
 
-The contactdb is a database of your contacts for [SendGrid Marketing Campaigns](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/index.html).
+The contactdb is a database of your contacts for [Twilio SendGrid Marketing Campaigns](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/index.html).
 
 ### DELETE /contactdb/recipients
 
@@ -1457,7 +1457,7 @@ puts response.headers
 
 **This endpoint allows you to retrieve the total number of Marketing Campaigns recipients.**
 
-The contactdb is a database of your contacts for [SendGrid Marketing Campaigns](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/index.html).
+The contactdb is a database of your contacts for [Twilio SendGrid Marketing Campaigns](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/index.html).
 
 ### GET /contactdb/recipients/count
 
@@ -1481,7 +1481,7 @@ your epoch time to a date range encompassing the entire day. For example, an epo
 Mon, 02 Feb 2015 00:06:40 GMT, but internally the system will search from Mon, 02 Feb 2015 00:00:00 GMT through
 Mon, 02 Feb 2015 23:59:59 GMT.
 
-The contactdb is a database of your contacts for [SendGrid Marketing Campaigns](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/index.html).
+The contactdb is a database of your contacts for [Twilio SendGrid Marketing Campaigns](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/index.html).
 
 ### GET /contactdb/recipients/search
 
@@ -1547,7 +1547,7 @@ puts response.headers
 
 **This endpoint allows you to list all fields that are reserved and can't be used for custom field names.**
 
-The contactdb is a database of your contacts for [SendGrid Marketing Campaigns](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/index.html).
+The contactdb is a database of your contacts for [Twilio SendGrid Marketing Campaigns](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/index.html).
 
 ### GET /contactdb/reserved_fields
 
@@ -1782,7 +1782,7 @@ puts response.headers
 
 **This endpoint allows you to retrieve a list of all assigned and unassigned IPs.**
 
-Response includes warm up status, pools, assigned subusers, and whitelabel info. The start_date field corresponds to when warmup started for that IP.
+Response includes warm up status, pools, assigned subusers, and authentica info. The start_date field corresponds to when warmup started for that IP.
 
 A single IP address or a range of IP addresses may be dedicated to an account in order to send email for multiple domains. The reputation of this IP is based on the aggregate performance of all the senders who use it.
 
@@ -1817,9 +1817,9 @@ puts response.headers
 
 **Each user can create up to 10 different IP pools.**
 
-IP Pools allow you to group your dedicated SendGrid IP addresses together. For example, you could create separate pools for your transactional and marketing email. When sending marketing emails, specify that you want to use the marketing IP pool. This allows you to maintain separate reputations for your different email traffic.
+IP Pools allow you to group your dedicated Twilio SendGrid IP addresses together. For example, you could create separate pools for your transactional and marketing email. When sending marketing emails, specify that you want to use the marketing IP pool. This allows you to maintain separate reputations for your different email traffic.
 
-IP pools can only be used with whitelabeled IP addresses.
+IP pools can only be used with authenticated IP addresses.
 
 If an IP pool is NOT specified for an email, it will use any IP available, including ones in pools.
 
@@ -1839,9 +1839,9 @@ puts response.headers
 
 **This endpoint allows you to retrieve all of your IP pools.**
 
-IP Pools allow you to group your dedicated SendGrid IP addresses together. For example, you could create separate pools for your transactional and marketing email. When sending marketing emails, specify that you want to use the marketing IP pool. This allows you to maintain separate reputations for your different email traffic.
+IP Pools allow you to group your dedicated Twilio SendGrid IP addresses together. For example, you could create separate pools for your transactional and marketing email. When sending marketing emails, specify that you want to use the marketing IP pool. This allows you to maintain separate reputations for your different email traffic.
 
-IP pools can only be used with whitelabeled IP addresses.
+IP pools can only be used with authenticated IP addresses.
 
 If an IP pool is NOT specified for an email, it will use any IP available, including ones in pools.
 
@@ -1858,9 +1858,9 @@ puts response.headers
 
 **This endpoint allows you to update the name of an IP pool.**
 
-IP Pools allow you to group your dedicated SendGrid IP addresses together. For example, you could create separate pools for your transactional and marketing email. When sending marketing emails, specify that you want to use the marketing IP pool. This allows you to maintain separate reputations for your different email traffic.
+IP Pools allow you to group your dedicated Twilio SendGrid IP addresses together. For example, you could create separate pools for your transactional and marketing email. When sending marketing emails, specify that you want to use the marketing IP pool. This allows you to maintain separate reputations for your different email traffic.
 
-IP pools can only be used with whitelabeled IP addresses.
+IP pools can only be used with authenticated IP addresses.
 
 If an IP pool is NOT specified for an email, it will use any IP available, including ones in pools.
 
@@ -1881,9 +1881,9 @@ puts response.headers
 
 **This endpoint allows you to list all of the IP addresses that are in a specific IP pool.**
 
-IP Pools allow you to group your dedicated SendGrid IP addresses together. For example, you could create separate pools for your transactional and marketing email. When sending marketing emails, specify that you want to use the marketing IP pool. This allows you to maintain separate reputations for your different email traffic.
+IP Pools allow you to group your dedicated Twilio SendGrid IP addresses together. For example, you could create separate pools for your transactional and marketing email. When sending marketing emails, specify that you want to use the marketing IP pool. This allows you to maintain separate reputations for your different email traffic.
 
-IP pools can only be used with whitelabeled IP addresses.
+IP pools can only be used with authenticated IP addresses.
 
 If an IP pool is NOT specified for an email, it will use any IP available, including ones in pools.
 
@@ -1901,9 +1901,9 @@ puts response.headers
 
 **This endpoint allows you to delete an IP pool.**
 
-IP Pools allow you to group your dedicated SendGrid IP addresses together. For example, you could create separate pools for your transactional and marketing email. When sending marketing emails, specify that you want to use the marketing IP pool. This allows you to maintain separate reputations for your different email traffic.
+IP Pools allow you to group your dedicated Twilio SendGrid IP addresses together. For example, you could create separate pools for your transactional and marketing email. When sending marketing emails, specify that you want to use the marketing IP pool. This allows you to maintain separate reputations for your different email traffic.
 
-IP pools can only be used with whitelabeled IP addresses.
+IP pools can only be used with authenticated IP addresses.
 
 If an IP pool is NOT specified for an email, it will use any IP available, including ones in pools.
 
@@ -1961,7 +1961,7 @@ puts response.headers
 
 **This endpoint allows you to enter an IP address into warmup mode.**
 
-SendGrid can automatically warm up dedicated IP addresses by limiting the amount of mail that can be sent through them per hour, with the limit determined by how long the IP address has been in warmup. See the [warmup schedule](https://sendgrid.com/docs/API_Reference/Web_API_v3/IP_Management/ip_warmup_schedule.html) for more details on how SendGrid limits your email traffic for IPs in warmup.
+Twilio SendGrid can automatically warm up dedicated IP addresses by limiting the amount of mail that can be sent through them per hour, with the limit determined by how long the IP address has been in warmup. See the [warmup schedule](https://sendgrid.com/docs/API_Reference/Web_API_v3/IP_Management/ip_warmup_schedule.html) for more details on how Twilio SendGrid limits your email traffic for IPs in warmup.
 
 For more general information about warming up IPs, please see our [Classroom](https://sendgrid.com/docs/Classroom/Deliver/Delivery_Introduction/warming_up_ips.html).
 
@@ -1981,7 +1981,7 @@ puts response.headers
 
 **This endpoint allows you to retrieve all of your IP addresses that are currently warming up.**
 
-SendGrid can automatically warm up dedicated IP addresses by limiting the amount of mail that can be sent through them per hour, with the limit determined by how long the IP address has been in warmup. See the [warmup schedule](https://sendgrid.com/docs/API_Reference/Web_API_v3/IP_Management/ip_warmup_schedule.html) for more details on how SendGrid limits your email traffic for IPs in warmup.
+Twilio SendGrid can automatically warm up dedicated IP addresses by limiting the amount of mail that can be sent through them per hour, with the limit determined by how long the IP address has been in warmup. See the [warmup schedule](https://sendgrid.com/docs/API_Reference/Web_API_v3/IP_Management/ip_warmup_schedule.html) for more details on how Twilio SendGrid limits your email traffic for IPs in warmup.
 
 For more general information about warming up IPs, please see our [Classroom](https://sendgrid.com/docs/Classroom/Deliver/Delivery_Introduction/warming_up_ips.html).
 
@@ -1998,7 +1998,7 @@ puts response.headers
 
 **This endpoint allows you to retrieve the warmup status for a specific IP address.**
 
-SendGrid can automatically warm up dedicated IP addresses by limiting the amount of mail that can be sent through them per hour, with the limit determined by how long the IP address has been in warmup. See the [warmup schedule](https://sendgrid.com/docs/API_Reference/Web_API_v3/IP_Management/ip_warmup_schedule.html) for more details on how SendGrid limits your email traffic for IPs in warmup.
+Twilio SendGrid can automatically warm up dedicated IP addresses by limiting the amount of mail that can be sent through them per hour, with the limit determined by how long the IP address has been in warmup. See the [warmup schedule](https://sendgrid.com/docs/API_Reference/Web_API_v3/IP_Management/ip_warmup_schedule.html) for more details on how Twilio SendGrid limits your email traffic for IPs in warmup.
 
 For more general information about warming up IPs, please see our [Classroom](https://sendgrid.com/docs/Classroom/Deliver/Delivery_Introduction/warming_up_ips.html).
 
@@ -2016,7 +2016,7 @@ puts response.headers
 
 **This endpoint allows you to remove an IP address from warmup mode.**
 
-SendGrid can automatically warm up dedicated IP addresses by limiting the amount of mail that can be sent through them per hour, with the limit determined by how long the IP address has been in warmup. See the [warmup schedule](https://sendgrid.com/docs/API_Reference/Web_API_v3/IP_Management/ip_warmup_schedule.html) for more details on how SendGrid limits your email traffic for IPs in warmup.
+Twilio SendGrid can automatically warm up dedicated IP addresses by limiting the amount of mail that can be sent through them per hour, with the limit determined by how long the IP address has been in warmup. See the [warmup schedule](https://sendgrid.com/docs/API_Reference/Web_API_v3/IP_Management/ip_warmup_schedule.html) for more details on how Twilio SendGrid limits your email traffic for IPs in warmup.
 
 For more general information about warming up IPs, please see our [Classroom](https://sendgrid.com/docs/Classroom/Deliver/Delivery_Introduction/warming_up_ips.html).
 
@@ -2092,7 +2092,7 @@ puts response.headers
 ```
 ## v3 Mail Send
 
-This endpoint allows you to send email over SendGrids v3 Web API, the most recent version of our API. If you are looking for documentation about the v2 Mail Send endpoint, please see our [v2 API Reference](https://sendgrid.com/docs/API_Reference/Web_API/mail.html).
+This endpoint allows you to send email over Twilio SendGrid's v3 Web API, the most recent version of our API. If you are looking for documentation about the v2 Mail Send endpoint, please see our [v2 API Reference](https://sendgrid.com/docs/API_Reference/Web_API/mail.html).
 
 * Top level parameters are referred to as "global".
 * Individual fields within the personalizations array will override any other global, or message level, parameters that are defined outside of personalizations.
@@ -2157,8 +2157,8 @@ data = JSON.parse('{
     },
     "footer": {
       "enable": true,
-      "html": "<p>Thanks</br>The SendGrid Team</p>",
-      "text": "Thanks,/n The SendGrid Team"
+      "html": "<p>Thanks</br>The Twilio SendGrid Team</p>",
+      "text": "Thanks,/n The Twilio SendGrid Team"
     },
     "sandbox_mode": {
       "enable": false
@@ -2256,7 +2256,7 @@ puts response.headers
 
 **This endpoint allows you to retrieve a list of all mail settings.**
 
-Mail settings allow you to tell SendGrid specific things to do to every email that you send to your recipients over SendGrids [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
+Mail settings allow you to tell Twilio SendGrid specific things to do to every email that you send to your recipients over Twilio SendGrid's [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
 
 ### GET /mail_settings
 
@@ -2274,7 +2274,7 @@ puts response.headers
 
 The address whitelist setting whitelists a specified email address or domain for which mail should never be suppressed. For example, you own the domain example.com, and one or more of your recipients use email@example.com addresses, by placing example.com in the address whitelist setting, all bounces, blocks, and unsubscribes logged for that domain will be ignored and sent as if under normal sending conditions.
 
-Mail settings allow you to tell SendGrid specific things to do to every email that you send to your recipients over SendGrids [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
+Mail settings allow you to tell Twilio SendGrid specific things to do to every email that you send to your recipients over Twilio SendGrid's [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
 
 ### PATCH /mail_settings/address_whitelist
 
@@ -2298,7 +2298,7 @@ puts response.headers
 
 The address whitelist setting whitelists a specified email address or domain for which mail should never be suppressed. For example, you own the domain example.com, and one or more of your recipients use email@example.com addresses, by placing example.com in the address whitelist setting, all bounces, blocks, and unsubscribes logged for that domain will be ignored and sent as if under normal sending conditions.
 
-Mail settings allow you to tell SendGrid specific things to do to every email that you send to your recipients over SendGrids [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
+Mail settings allow you to tell Twilio SendGrid specific things to do to every email that you send to your recipients over Twilio SendGrid's [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
 
 ### GET /mail_settings/address_whitelist
 
@@ -2313,9 +2313,9 @@ puts response.headers
 
 **This endpoint allows you to update your current BCC mail settings.**
 
-When the BCC mail setting is enabled, SendGrid will automatically send a blind carbon copy (BCC) to an address for every email sent without adding that address to the header. Please note that only one email address may be entered in this field, if you wish to distribute BCCs to multiple addresses you will need to create a distribution group or use forwarding rules.
+When the BCC mail setting is enabled, Twilio SendGrid will automatically send a blind carbon copy (BCC) to an address for every email sent without adding that address to the header. Please note that only one email address may be entered in this field, if you wish to distribute BCCs to multiple addresses you will need to create a distribution group or use forwarding rules.
 
-Mail settings allow you to tell SendGrid specific things to do to every email that you send to your recipients over SendGrids [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
+Mail settings allow you to tell Twilio SendGrid specific things to do to every email that you send to your recipients over Twilio SendGrid's [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
 
 ### PATCH /mail_settings/bcc
 
@@ -2334,9 +2334,9 @@ puts response.headers
 
 **This endpoint allows you to retrieve your current BCC mail settings.**
 
-When the BCC mail setting is enabled, SendGrid will automatically send a blind carbon copy (BCC) to an address for every email sent without adding that address to the header. Please note that only one email address may be entered in this field, if you wish to distribute BCCs to multiple addresses you will need to create a distribution group or use forwarding rules.
+When the BCC mail setting is enabled, Twilio SendGrid will automatically send a blind carbon copy (BCC) to an address for every email sent without adding that address to the header. Please note that only one email address may be entered in this field, if you wish to distribute BCCs to multiple addresses you will need to create a distribution group or use forwarding rules.
 
-Mail settings allow you to tell SendGrid specific things to do to every email that you send to your recipients over SendGrids [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
+Mail settings allow you to tell Twilio SendGrid specific things to do to every email that you send to your recipients over Twilio SendGrid's [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
 
 ### GET /mail_settings/bcc
 
@@ -2351,9 +2351,9 @@ puts response.headers
 
 **This endpoint allows you to update your current bounce purge settings.**
 
-This setting allows you to set a schedule for SendGrid to automatically delete contacts from your soft and hard bounce suppression lists.
+This setting allows you to set a schedule for Twilio SendGrid to automatically delete contacts from your soft and hard bounce suppression lists.
 
-Mail settings allow you to tell SendGrid specific things to do to every email that you send to your recipients over SendGrids [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
+Mail settings allow you to tell Twilio SendGrid specific things to do to every email that you send to your recipients over Twilio SendGrid's [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
 
 ### PATCH /mail_settings/bounce_purge
 
@@ -2373,9 +2373,9 @@ puts response.headers
 
 **This endpoint allows you to retrieve your current bounce purge settings.**
 
-This setting allows you to set a schedule for SendGrid to automatically delete contacts from your soft and hard bounce suppression lists.
+This setting allows you to set a schedule for Twilio SendGrid to automatically delete contacts from your soft and hard bounce suppression lists.
 
-Mail settings allow you to tell SendGrid specific things to do to every email that you send to your recipients over SendGrids [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
+Mail settings allow you to tell Twilio SendGrid specific things to do to every email that you send to your recipients over Twilio SendGrid's [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
 
 ### GET /mail_settings/bounce_purge
 
@@ -2392,7 +2392,7 @@ puts response.headers
 
 The footer setting will insert a custom footer at the bottom of the text and HTML bodies. Use the embedded HTML editor and plain text entry fields to create the content of the footers to be inserted into your emails.
 
-Mail settings allow you to tell SendGrid specific things to do to every email that you send to your recipients over SendGrids [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
+Mail settings allow you to tell Twilio SendGrid specific things to do to every email that you send to your recipients over Twilio SendGrid's [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
 
 ### PATCH /mail_settings/footer
 
@@ -2414,7 +2414,7 @@ puts response.headers
 
 The footer setting will insert a custom footer at the bottom of the text and HTML bodies. Use the embedded HTML editor and plain text entry fields to create the content of the footers to be inserted into your emails.
 
-Mail settings allow you to tell SendGrid specific things to do to every email that you send to your recipients over SendGrids [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
+Mail settings allow you to tell Twilio SendGrid specific things to do to every email that you send to your recipients over Twilio SendGrid's [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
 
 ### GET /mail_settings/footer
 
@@ -2431,7 +2431,7 @@ puts response.headers
 
 Activating this setting allows you to specify an email address to which bounce reports are forwarded.
 
-Mail settings allow you to tell SendGrid specific things to do to every email that you send to your recipients over SendGrids [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
+Mail settings allow you to tell Twilio SendGrid specific things to do to every email that you send to your recipients over Twilio SendGrid's [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
 
 ### PATCH /mail_settings/forward_bounce
 
@@ -2452,7 +2452,7 @@ puts response.headers
 
 Activating this setting allows you to specify an email address to which bounce reports are forwarded.
 
-Mail settings allow you to tell SendGrid specific things to do to every email that you send to your recipients over SendGrids [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
+Mail settings allow you to tell Twilio SendGrid specific things to do to every email that you send to your recipients over Twilio SendGrid's [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
 
 ### GET /mail_settings/forward_bounce
 
@@ -2469,7 +2469,7 @@ puts response.headers
 
 Enabling the forward spam setting allows you to specify an email address to which spam reports will be forwarded.
 
-Mail settings allow you to tell SendGrid specific things to do to every email that you send to your recipients over SendGrids [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
+Mail settings allow you to tell Twilio SendGrid specific things to do to every email that you send to your recipients over Twilio SendGrid's [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
 
 ### PATCH /mail_settings/forward_spam
 
@@ -2490,7 +2490,7 @@ puts response.headers
 
 Enabling the forward spam setting allows you to specify an email address to which spam reports will be forwarded.
 
-Mail settings allow you to tell SendGrid specific things to do to every email that you send to your recipients over SendGrids [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
+Mail settings allow you to tell Twilio SendGrid specific things to do to every email that you send to your recipients over Twilio SendGrid's [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
 
 ### GET /mail_settings/forward_spam
 
@@ -2507,7 +2507,7 @@ puts response.headers
 
 The plain content setting will automatically convert any plain text emails that you send to HTML before sending.
 
-Mail settings allow you to tell SendGrid specific things to do to every email that you send to your recipients over SendGrids [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
+Mail settings allow you to tell Twilio SendGrid specific things to do to every email that you send to your recipients over Twilio SendGrid's [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
 
 ### PATCH /mail_settings/plain_content
 
@@ -2527,7 +2527,7 @@ puts response.headers
 
 The plain content setting will automatically convert any plain text emails that you send to HTML before sending.
 
-Mail settings allow you to tell SendGrid specific things to do to every email that you send to your recipients over SendGrids [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
+Mail settings allow you to tell Twilio SendGrid specific things to do to every email that you send to your recipients over Twilio SendGrid's [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
 
 ### GET /mail_settings/plain_content
 
@@ -2544,7 +2544,7 @@ puts response.headers
 
 The spam checker filter notifies you when emails are detected that exceed a predefined spam threshold.
 
-Mail settings allow you to tell SendGrid specific things to do to every email that you send to your recipients over SendGrids [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
+Mail settings allow you to tell Twilio SendGrid specific things to do to every email that you send to your recipients over Twilio SendGrid's [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
 
 ### PATCH /mail_settings/spam_check
 
@@ -2566,7 +2566,7 @@ puts response.headers
 
 The spam checker filter notifies you when emails are detected that exceed a predefined spam threshold.
 
-Mail settings allow you to tell SendGrid specific things to do to every email that you send to your recipients over SendGrids [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
+Mail settings allow you to tell Twilio SendGrid specific things to do to every email that you send to your recipients over Twilio SendGrid's [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
 
 ### GET /mail_settings/spam_check
 
@@ -2585,7 +2585,7 @@ This setting refers to our original email templates. We currently support more f
 
 The legacy email template setting wraps an HTML template around your email content. This can be useful for sending out marketing email and/or other HTML formatted messages.
 
-Mail settings allow you to tell SendGrid specific things to do to every email that you send to your recipients over SendGrids [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
+Mail settings allow you to tell Twilio SendGrid specific things to do to every email that you send to your recipients over Twilio SendGrid's [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
 
 ### PATCH /mail_settings/template
 
@@ -2608,7 +2608,7 @@ This setting refers to our original email templates. We currently support more f
 
 The legacy email template setting wraps an HTML template around your email content. This can be useful for sending out marketing email and/or other HTML formatted messages.
 
-Mail settings allow you to tell SendGrid specific things to do to every email that you send to your recipients over SendGrids [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
+Mail settings allow you to tell Twilio SendGrid specific things to do to every email that you send to your recipients over Twilio SendGrid's [Web API](https://sendgrid.com/docs/API_Reference/Web_API/mail.html) or [SMTP Relay](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html).
 
 ### GET /mail_settings/template
 
@@ -2647,7 +2647,7 @@ puts response.headers
 
 **This endpoint allows you to retrieve a list of all partner settings that you can enable.**
 
-Our partner settings allow you to integrate your SendGrid account with our partners to increase your SendGrid experience and functionality. For more information about our partners, and how you can begin integrating with them, please visit our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/partners.html).
+Our partner settings allow you to integrate your Twilio SendGrid account with our partners to increase your Twilio SendGrid experience and functionality. For more information about our partners, and how you can begin integrating with them, please visit our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/partners.html).
 
 ### GET /partner_settings
 
@@ -2663,9 +2663,9 @@ puts response.headers
 
 **This endpoint allows you to update or change your New Relic partner settings.**
 
-Our partner settings allow you to integrate your SendGrid account with our partners to increase your SendGrid experience and functionality. For more information about our partners, and how you can begin integrating with them, please visit our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/partners.html).
+Our partner settings allow you to integrate your Twilio SendGrid account with our partners to increase your Twilio SendGrid experience and functionality. For more information about our partners, and how you can begin integrating with them, please visit our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/partners.html).
 
-By integrating with New Relic, you can send your SendGrid email statistics to your New Relic Dashboard. If you enable this setting, your stats will be sent to New Relic every 5 minutes. You will need your New Relic License Key to enable this setting. For more information, please see our [Classroom](https://sendgrid.com/docs/Classroom/Track/Collecting_Data/new_relic.html).
+By integrating with New Relic, you can send your Twilio SendGrid email statistics to your New Relic Dashboard. If you enable this setting, your stats will be sent to New Relic every 5 minutes. You will need your New Relic License Key to enable this setting. For more information, please see our [Classroom](https://sendgrid.com/docs/Classroom/Track/Collecting_Data/new_relic.html).
 
 ### PATCH /partner_settings/new_relic
 
@@ -2685,9 +2685,9 @@ puts response.headers
 
 **This endpoint allows you to retrieve your current New Relic partner settings.**
 
-Our partner settings allow you to integrate your SendGrid account with our partners to increase your SendGrid experience and functionality. For more information about our partners, and how you can begin integrating with them, please visit our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/partners.html).
+Our partner settings allow you to integrate your Twilio SendGrid account with our partners to increase your Twilio SendGrid experience and functionality. For more information about our partners, and how you can begin integrating with them, please visit our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/partners.html).
 
-By integrating with New Relic, you can send your SendGrid email statistics to your New Relic Dashboard. If you enable this setting, your stats will be sent to New Relic every 5 minutes. You will need your New Relic License Key to enable this setting. For more information, please see our [Classroom](https://sendgrid.com/docs/Classroom/Track/Collecting_Data/new_relic.html).
+By integrating with New Relic, you can send your Twilio SendGrid email statistics to your New Relic Dashboard. If you enable this setting, your stats will be sent to New Relic every 5 minutes. You will need your New Relic License Key to enable this setting. For more information, please see our [Classroom](https://sendgrid.com/docs/Classroom/Track/Collecting_Data/new_relic.html).
 
 ### GET /partner_settings/new_relic
 
@@ -2705,7 +2705,7 @@ puts response.headers
 
 **This endpoint returns a list of all scopes that this user has access to.**
 
-API Keys can be used to authenticate the use of [SendGrids v3 Web API](https://sendgrid.com/docs/API_Reference/Web_API_v3/index.html), or the [Mail API Endpoint](https://sendgrid.com/docs/API_Reference/Web_API/mail.html). API Keys may be assigned certain permissions, or scopes, that limit which API endpoints they are able to access. For a more detailed explanation of how you can use API Key permissions, please visit our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/api_keys.html#-API-Key-Permissions) or [Classroom](https://sendgrid.com/docs/Classroom/Basics/API/api_key_permissions.html).
+API Keys can be used to authenticate the use of [Twilio SendGrid's v3 Web API](https://sendgrid.com/docs/API_Reference/Web_API_v3/index.html), or the [Mail API Endpoint](https://sendgrid.com/docs/API_Reference/Web_API/mail.html). API Keys may be assigned certain permissions, or scopes, that limit which API endpoints they are able to access. For a more detailed explanation of how you can use API Key permissions, please visit our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/api_keys.html#-API-Key-Permissions) or [Classroom](https://sendgrid.com/docs/Classroom/Basics/API/api_key_permissions.html).
 
 ### GET /scopes
 
@@ -2725,7 +2725,7 @@ puts response.headers
 
 *You may create up to 100 unique sender identities.*
 
-Sender Identities are required to be verified before use. If your domain has been whitelabeled it will auto verify on creation. Otherwise an email will be sent to the `from.email`.
+Sender Identities are required to be verified before use. If your domain has been authenticated, it will auto verify on creation. Otherwise an email will be sent to the `from.email`.
 
 ### POST /senders
 
@@ -2757,7 +2757,7 @@ puts response.headers
 
 **This endpoint allows you to retrieve a list of all sender identities that have been created for your account.**
 
-Sender Identities are required to be verified before use. If your domain has been whitelabeled it will auto verify on creation. Otherwise an email will be sent to the `from.email`.
+Sender Identities are required to be verified before use. If your domain has been authenticated, it will auto verify on creation. Otherwise an email will be sent to the `from.email`.
 
 ### GET /senders
 
@@ -2772,7 +2772,7 @@ puts response.headers
 
 **This endpoint allows you to update a sender identity.**
 
-Updates to `from.email` require re-verification. If your domain has been whitelabeled it will auto verify on creation. Otherwise an email will be sent to the `from.email`.
+Updates to `from.email` require re-verification. If your domain has been authenticated, it will auto verify on creation. Otherwise an email will be sent to the `from.email`.
 
 Partial updates are allowed, but fields that are marked as "required" in the POST (create) endpoint must not be nil if that field is included in the PATCH request.
 
@@ -2807,7 +2807,7 @@ puts response.headers
 
 **This endpoint allows you to retrieve a specific sender identity.**
 
-Sender Identities are required to be verified before use. If your domain has been whitelabeled it will auto verify on creation. Otherwise an email will be sent to the `from.email`.
+Sender Identities are required to be verified before use. If your domain has been authenticated, it will auto verify on creation. Otherwise an email will be sent to the `from.email`.
 
 ### GET /senders/{sender_id}
 
@@ -2823,7 +2823,7 @@ puts response.headers
 
 **This endpoint allows you to delete one of your sender identities.**
 
-Sender Identities are required to be verified before use. If your domain has been whitelabeled it will auto verify on creation. Otherwise an email will be sent to the `from.email`.
+Sender Identities are required to be verified before use. If your domain has been authenticated, it will auto verify on creation. Otherwise an email will be sent to the `from.email`.
 
 ### DELETE /senders/{sender_id}
 
@@ -2839,7 +2839,7 @@ puts response.headers
 
 **This endpoint allows you to resend a sender identity verification email.**
 
-Sender Identities are required to be verified before use. If your domain has been whitelabeled it will auto verify on creation. Otherwise an email will be sent to the `from.email`.
+Sender Identities are required to be verified before use. If your domain has been authenticated, it will auto verify on creation. Otherwise an email will be sent to the `from.email`.
 
 ### POST /senders/{sender_id}/resend_verification
 
@@ -2851,2184 +2851,2186 @@ puts response.status_code
 puts response.body
 puts response.headers
 ```
-<a name="stats"></a>
-# STATS
-
-## Retrieve global email statistics
-
-**This endpoint allows you to retrieve all of your global email statistics between a given date range.**
-
-Parent accounts will see aggregated stats for their account and all subuser accounts. Subuser accounts will only see their own stats.
-
-### GET /stats
 
+<a name="sender-authentication"></a>
+# SENDER AUTHENTICATION
 
-```ruby
-params = JSON.parse('{"aggregated_by": "day", "limit": 1, "start_date": "2016-01-01", "end_date": "2016-04-01", "offset": 1}')
-response = sg.client.stats.get(query_params: params)
-puts response.status_code
-puts response.body
-puts response.headers
-```
-<a name="subusers"></a>
-# SUBUSERS
+## Create an authenticated domain.
 
-## Create Subuser
+**This endpoint allows you to create a domain authentication for one of your domains.**
 
-This endpoint allows you to retrieve a list of all of your subusers. You can choose to retrieve specific subusers as well as limit the results that come back from the API.
+If you are creating a domain authentication that you would like a subuser to use, you have two options:
+1. Use the "username" parameter. This allows you to create am authenticated subuser. This means the subuser is able to see and modify the created authentication.
+2. Use the Association workflow (see Associate Domain section). This allows you to assign a domain authentication created by the parent to a subuser. This means the subuser will default to the assigned domain authentication, but will not be able to see or modify that authentication. However, if the subuser creates their own domain authentication it will overwrite the assigned domain authentication.
 
-For more information about Subusers:
+A domain authentication allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Authenticating a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that Twilio SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, Twilio SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
 
-* [User Guide > Subusers](https://sendgrid.com/docs/User_Guide/Settings/Subusers/index.html)
-* [Classroom > How do I add more subusers to my account?](https://sendgrid.com/docs/Classroom/Basics/Account/how_do_i_add_more_subusers_to_my_account.html)
+For more information on domain authentication, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-domain-authentication/)
 
-### POST /subusers
+### POST /whitelabel/domains
 
 
 ```ruby
 data = JSON.parse('{
-  "email": "John@example.com",
+  "automatic_security": false,
+  "custom_spf": true,
+  "default": true,
+  "domain": "example.com",
   "ips": [
-    "1.1.1.1",
-    "2.2.2.2"
+    "192.168.1.1",
+    "192.168.1.2"
   ],
-  "password": "johns_password",
-  "username": "John@example.com"
+  "subdomain": "news",
+  "username": "john@example.com"
 }')
-response = sg.client.subusers.post(request_body: data)
+response = sg.client.whitelabel.domains.post(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## List all Subusers
-
-This endpoint allows you to retrieve a list of all of your subusers. You can choose to retrieve specific subusers as well as limit the results that come back from the API.
-
-For more information about Subusers:
-
-* [User Guide > Subusers](https://sendgrid.com/docs/User_Guide/Settings/Subusers/index.html)
-* [Classroom > How do I add more subusers to my account?](https://sendgrid.com/docs/Classroom/Basics/Account/how_do_i_add_more_subusers_to_my_account.html)
-
-### GET /subusers
+## List all domain authentications.
 
+**This endpoint allows you to retrieve a list of all domain authentications you have created.**
 
-```ruby
-params = JSON.parse('{"username": "test_string", "limit": 1, "offset": 1}')
-response = sg.client.subusers.get(query_params: params)
-puts response.status_code
-puts response.body
-puts response.headers
-```
-## Retrieve Subuser Reputations
+A domain authentication allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Authenticating a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that Twilio SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, Twilio SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
 
-Subuser sender reputations give a good idea how well a sender is doing with regards to how recipients and recipient servers react to the mail that is being received. When a bounce, spam report, or other negative action happens on a sent email, it will effect your sender rating.
+For more information on domain authentication, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-domain-authentication/)
 
-This endpoint allows you to request the reputations for your subusers.
 
-### GET /subusers/reputations
+### GET /whitelabel/domains
 
 
 ```ruby
-params = JSON.parse('{"usernames": "test_string"}')
-response = sg.client.subusers.reputations.get(query_params: params)
+params = JSON.parse('{"username": "test_string", "domain": "test_string", "exclude_subusers": "true", "limit": 1, "offset": 1}')
+response = sg.client.whitelabel.domains.get(query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve email statistics for your subusers.
+## Get the default domain authentication.
 
-**This endpoint allows you to retrieve the email statistics for the given subusers.**
+**This endpoint allows you to retrieve the default authentication for a domain.**
 
-You may retrieve statistics for up to 10 different subusers by including an additional _subusers_ parameter for each additional subuser.
+A domain authentication allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Authenticating a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that Twilio SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, Twilio SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
 
-While you can always view the statistics for all email activity on your account, subuser statistics enable you to view specific segments of your stats. Emails sent, bounces, and spam reports are always tracked for subusers. Unsubscribes, clicks, and opens are tracked if you have enabled the required settings.
+For more information on domain authentication, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-domain-authentication/)
 
-For more information, see our [User Guide](https://sendgrid.com/docs/User_Guide/Statistics/subuser.html).
+## URI Parameters
+| URI Parameter   | Type   | Description  |
+|---|---|---|
+| domain | string  |The domain to find a default domain whitelabel for. |
 
-### GET /subusers/stats
+### GET /whitelabel/domains/default
 
 
 ```ruby
-params = JSON.parse('{"end_date": "2016-04-01", "aggregated_by": "day", "limit": 1, "offset": 1, "start_date": "2016-01-01", "subusers": "test_string"}')
-response = sg.client.subusers.stats.get(query_params: params)
+response = sg.client.whitelabel.domains.default.get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve monthly stats for all subusers
+## List the domain authentication associated with the given user.
 
-**This endpoint allows you to retrieve the monthly email statistics for all subusers over the given date range.**
+**This endpoint allows you to retrieve all of the domain authentications that have been assigned to a specific subuser.**
 
-While you can always view the statistics for all email activity on your account, subuser statistics enable you to view specific segments of your stats for your subusers. Emails sent, bounces, and spam reports are always tracked for subusers. Unsubscribes, clicks, and opens are tracked if you have enabled the required settings.
+A domain authentication allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Authenticating a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that Twilio SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, Twilio SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
 
-When using the `sort_by_metric` to sort your stats by a specific metric, you can not sort by the following metrics:
-`bounce_drops`, `deferred`, `invalid_emails`, `processed`, `spam_report_drops`, `spam_reports`, or `unsubscribe_drops`.
+Domain authentications can be associated with (i.e. assigned to) subusers from a parent account. This functionality allows subusers to send mail using their parent's authenticated domains. To associate a domain authentication with a subuser, the parent account must first create the domain authentication and validate it. The parent may then associate the domain authentication via the subuser management tools.
 
-For more information, see our [User Guide](https://sendgrid.com/docs/User_Guide/Statistics/subuser.html).
+For more information on domain authentication, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-domain-authentication/)
 
-### GET /subusers/stats/monthly
+## URI Parameters
+| URI Parameter   | Type  | Description  |
+|---|---|---|
+| username | string  | Username of the subuser to find associated whitelabels for. |
+
+### GET /whitelabel/domains/subuser
 
 
 ```ruby
-params = JSON.parse('{"subuser": "test_string", "limit": 1, "sort_by_metric": "test_string", "offset": 1, "date": "test_string", "sort_by_direction": "asc"}')
-response = sg.client.subusers.stats.monthly.get(query_params: params)
+response = sg.client.whitelabel.domains.subuser.get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-##  Retrieve the totals for each email statistic metric for all subusers.
+## Disassociate a domain authentication from a given user.
 
-**This endpoint allows you to retrieve the total sums of each email statistic metric for all subusers over the given date range.**
+**This endpoint allows you to disassociate a specific domain authentication from a subuser.**
 
+A domain authentication allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Authenticating a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that Twilio SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, Twilio SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
 
-While you can always view the statistics for all email activity on your account, subuser statistics enable you to view specific segments of your stats. Emails sent, bounces, and spam reports are always tracked for subusers. Unsubscribes, clicks, and opens are tracked if you have enabled the required settings.
+Domain authentications can be associated with (i.e. assigned to) subusers from a parent account. This functionality allows subusers to send mail using their parent's authenticated domains. To associate a domain authentication with a subuser, the parent account must first create the domain authentication and validate it. The parent may then associate the domain authentication via the subuser management tools.
 
-For more information, see our [User Guide](https://sendgrid.com/docs/User_Guide/Statistics/subuser.html).
+For more information on domain authentication, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-domain-authentication/)
 
-### GET /subusers/stats/sums
+## URI Parameters
+| URI Parameter   | Type  | Required?  | Description  |
+|---|---|---|---|
+| username | string  | required  | Username for the subuser to find associated whitelabels for. |
+
+### DELETE /whitelabel/domains/subuser
 
 
 ```ruby
-params = JSON.parse('{"end_date": "2016-04-01", "aggregated_by": "day", "limit": 1, "sort_by_metric": "test_string", "offset": 1, "start_date": "2016-01-01", "sort_by_direction": "asc"}')
-response = sg.client.subusers.stats.sums.get(query_params: params)
+response = sg.client.whitelabel.domains.subuser.delete()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Enable/disable a subuser
+## Update a domain authentication.
 
-This endpoint allows you to enable or disable a subuser.
+**This endpoint allows you to update the settings for a domain authentication.**
 
-For more information about Subusers:
+A domain authentication allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Authenticating a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that Twilio SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, Twilio SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
 
-* [User Guide > Subusers](https://sendgrid.com/docs/User_Guide/Settings/Subusers/index.html)
-* [Classroom > How do I add more subusers to my account?](https://sendgrid.com/docs/Classroom/Basics/Account/how_do_i_add_more_subusers_to_my_account.html)
+For more information on domain authentication, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-domain-authentication/)
 
-### PATCH /subusers/{subuser_name}
+### PATCH /whitelabel/domains/{domain_id}
 
 
 ```ruby
 data = JSON.parse('{
-  "disabled": false
+  "custom_spf": true,
+  "default": false
 }')
-subuser_name = "test_url_param"
-response = sg.client.subusers._(subuser_name).patch(request_body: data)
+domain_id = "test_url_param"
+response = sg.client.whitelabel.domains._(domain_id).patch(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Delete a subuser
+## Retrieve a domain authentication.
 
-This endpoint allows you to delete a subuser. This is a permanent action, once deleted a subuser cannot be retrieved.
+**This endpoint allows you to retrieve a specific domain authentication.**
 
-For more information about Subusers:
+A domain authentication allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Authenticating a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that Twilio SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, Twilio SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
 
-* [User Guide > Subusers](https://sendgrid.com/docs/User_Guide/Settings/Subusers/index.html)
-* [Classroom > How do I add more subusers to my account?](https://sendgrid.com/docs/Classroom/Basics/Account/how_do_i_add_more_subusers_to_my_account.html)
+For more information on domain authentication, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-domain-authentication/)
 
-### DELETE /subusers/{subuser_name}
+
+### GET /whitelabel/domains/{domain_id}
 
 
 ```ruby
-subuser_name = "test_url_param"
-response = sg.client.subusers._(subuser_name).delete()
+domain_id = "test_url_param"
+response = sg.client.whitelabel.domains._(domain_id).get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Update IPs assigned to a subuser
+## Delete a domain authentication.
 
-Each subuser should be assigned to an IP address, from which all of this subuser's mail will be sent. Often, this is the same IP as the parent account, but each subuser can have their own, or multiple, IP addresses as well.
+**This endpoint allows you to delete a domain authentication.**
 
-More information:
+A domain authentication allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Authenticating a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that Twilio SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, Twilio SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
 
-* [How to request more IPs](https://sendgrid.com/docs/Classroom/Basics/Account/adding_an_additional_dedicated_ip_to_your_account.html)
-* [IPs can be whitelabeled](https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/ips.html)
+For more information on domain authentication, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-domain-authentication/)
 
-### PUT /subusers/{subuser_name}/ips
+### DELETE /whitelabel/domains/{domain_id}
 
 
 ```ruby
-data = JSON.parse('[
-  "127.0.0.1"
-]')
-subuser_name = "test_url_param"
-response = sg.client.subusers._(subuser_name).ips.put(request_body: data)
+domain_id = "test_url_param"
+response = sg.client.whitelabel.domains._(domain_id).delete()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Update Monitor Settings for a subuser
+## Associate a domain authentication with a given user.
 
-Subuser monitor settings allow you to receive a sample of an outgoing message by a specific customer at a specific frequency of emails.
+**This endpoint allows you to associate a specific domain authentication with a subuser.**
 
-### PUT /subusers/{subuser_name}/monitor
+A domain authentication allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Authenticating a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that Twilio SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, Twilio SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
+
+Domain authentications can be associated with (i.e. assigned to) subusers from a parent account. This functionality allows subusers to send mail using their parent's authenticated domains. To associate a domain authentication with a subuser, the parent account must first create the domain authentication and validate it. The parent may then associate the domain authentication via the subuser management tools.
+
+For more information on domain authentication, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-domain-authentication/)
+
+## URI Parameters
+| URI Parameter   | Type   | Description  |
+|---|---|---|
+| domain_id | integer   | ID of the domain whitelabel to associate with the subuser. |
+
+### POST /whitelabel/domains/{domain_id}/subuser
 
 
 ```ruby
 data = JSON.parse('{
-  "email": "example@example.com",
-  "frequency": 500
+  "username": "jane@example.com"
 }')
-subuser_name = "test_url_param"
-response = sg.client.subusers._(subuser_name).monitor.put(request_body: data)
+domain_id = "test_url_param"
+response = sg.client.whitelabel.domains._(domain_id).subuser.post(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Create monitor settings
+## Add an IP to a domain authentication.
 
-Subuser monitor settings allow you to receive a sample of an outgoing message by a specific customer at a specific frequency of emails.
+**This endpoint allows you to add an IP address to a domain authentication.**
 
-### POST /subusers/{subuser_name}/monitor
+A domain authentication allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Authenticating a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that Twilio SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, Twilio SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
+
+For more information on domain authentication, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-domain-authentication/)
+
+## URI Parameters
+| URI Parameter   | Type  |  Description  |
+|---|---|---|
+| id | integer  | ID of the domain to which you are adding an IP |
+
+### POST /whitelabel/domains/{id}/ips
 
 
 ```ruby
 data = JSON.parse('{
-  "email": "example@example.com",
-  "frequency": 50000
+  "ip": "192.168.0.1"
 }')
-subuser_name = "test_url_param"
-response = sg.client.subusers._(subuser_name).monitor.post(request_body: data)
+id = "test_url_param"
+response = sg.client.whitelabel.domains._(id).ips.post(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve monitor settings for a subuser
+## Remove an IP from a domain authenticaiton.
 
-Subuser monitor settings allow you to receive a sample of an outgoing message by a specific customer at a specific frequency of emails.
+**This endpoint allows you to remove a domain's IP address from that domain's authentication.**
 
-### GET /subusers/{subuser_name}/monitor
+A domain authentication allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Authenticating a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that Twilio SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, Twilio SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
+
+For more information on domain authentication, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-domain-authentication/)
+
+## URI Parameters
+| URI Parameter   | Type  | Description  |
+|---|---|---|
+| id | integer  | ID of the domain whitelabel to delete the IP from. |
+| ip | string | IP to remove from the domain whitelabel. |
+
+### DELETE /whitelabel/domains/{id}/ips/{ip}
 
 
 ```ruby
-subuser_name = "test_url_param"
-response = sg.client.subusers._(subuser_name).monitor.get()
+id = "test_url_param"
+ip = "test_url_param"
+response = sg.client.whitelabel.domains._(id).ips._(ip).delete()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Delete monitor settings
+## Validate a domain authentication.
 
-Subuser monitor settings allow you to receive a sample of an outgoing message by a specific customer at a specific frequency of emails.
+**This endpoint allows you to validate a domain authentication. If it fails, it will return an error message describing why the domain could not be validated.**
 
-### DELETE /subusers/{subuser_name}/monitor
+A domain authentication allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Authenticating a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that Twilio SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, Twilio SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
+
+For more information on domain authentication, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-domain-authentication/)
+
+## URI Parameters
+| URI Parameter   | Type   | Description  |
+|---|---|---|
+| id | integer  |ID of the domain whitelabel to validate. |
+
+### POST /whitelabel/domains/{id}/validate
 
 
 ```ruby
-subuser_name = "test_url_param"
-response = sg.client.subusers._(subuser_name).monitor.delete()
+id = "test_url_param"
+response = sg.client.whitelabel.domains._(id).validate.post()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve the monthly email statistics for a single subuser
+## Create reverse DNS record
 
-**This endpoint allows you to retrieve the monthly email statistics for a specific subuser.**
+**This endpoint allows you to create a reverse DNS record.**
 
-While you can always view the statistics for all email activity on your account, subuser statistics enable you to view specific segments of your stats for your subusers. Emails sent, bounces, and spam reports are always tracked for subusers. Unsubscribes, clicks, and opens are tracked if you have enabled the required settings.
+When creating a reverse DNS record, you should use the same subdomain that you used when you created a domain authentication.
 
-When using the `sort_by_metric` to sort your stats by a specific metric, you can not sort by the following metrics:
-`bounce_drops`, `deferred`, `invalid_emails`, `processed`, `spam_report_drops`, `spam_reports`, or `unsubscribe_drops`.
+Reverse DNS consists of a subdomain and domain that will be used to generate a record for a given IP. Once Twilio SendGrid has verified that the appropriate A record for the IP has been created, the appropriate reverse DNS record for the IP is generated.
 
-For more information, see our [User Guide](https://sendgrid.com/docs/User_Guide/Statistics/subuser.html).
+For more information, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-reverse-dns/).
 
-### GET /subusers/{subuser_name}/stats/monthly
+### POST /whitelabel/ips
 
 
 ```ruby
-params = JSON.parse('{"date": "test_string", "sort_by_direction": "asc", "limit": 1, "sort_by_metric": "test_string", "offset": 1}')
-subuser_name = "test_url_param"
-response = sg.client.subusers._(subuser_name).stats.monthly.get(query_params: params)
+data = JSON.parse('{
+  "domain": "example.com",
+  "ip": "192.168.1.1",
+  "subdomain": "email"
+}')
+response = sg.client.whitelabel.ips.post(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-<a name="suppression"></a>
-# SUPPRESSION
+## Retrieve all reverse DNS records
 
-## Retrieve all blocks
+**This endpoint allows you to retrieve all of the reverse DNS records that have been created by this account.**
 
-**This endpoint allows you to retrieve a list of all email addresses that are currently on your blocks list.**
+You may include a search key by using the "ip" parameter. This enables you to perform a prefix search for a given IP segment (e.g. "192.").
 
-[Blocks](https://sendgrid.com/docs/Glossary/blocks.html) happen when your message was rejected for a reason related to the message, not the recipient address. This can happen when your mail server IP address has been added to a blacklist or blocked by an ISP, or if the message content is flagged by a filter on the receiving server.
+Reverse DNS consists of a subdomain and domain that will be used to generate a record for a given IP. Once Twilio SendGrid has verified that the appropriate A record for the IP has been created, the appropriate reverse DNS record for the IP is generated.
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/blocks.html).
+For more information, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-reverse-dns/).
 
-### GET /suppression/blocks
+### GET /whitelabel/ips
 
 
 ```ruby
-params = JSON.parse('{"start_time": 1, "limit": 1, "end_time": 1, "offset": 1}')
-response = sg.client.suppression.blocks.get(query_params: params)
+params = JSON.parse('{"ip": "test_string", "limit": 1, "offset": 1}')
+response = sg.client.whitelabel.ips.get(query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Delete blocks
+## Retrieve an reverse DNS record
 
-**This endpoint allows you to delete all email addresses on your blocks list.**
+**This endpoint allows you to retrieve a reverse DNS record.**
 
-There are two options for deleting blocked emails:
+Reverse DNS consists of a subdomain and domain that will be used to generate a record for a given IP. Once Twilio SendGrid has verified that the appropriate A record for the IP has been created, the appropriate reverse DNS record for the IP is generated.
 
-1. You can delete all blocked emails by setting `delete_all` to true in the request body.
-2. You can delete some blocked emails by specifying the email addresses in an array in the request body.
+For more information, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-reverse-dns/).
 
-[Blocks](https://sendgrid.com/docs/Glossary/blocks.html) happen when your message was rejected for a reason related to the message, not the recipient address. This can happen when your mail server IP address has been added to a blacklist or blocked by an ISP, or if the message content is flagged by a filter on the receiving server.
-
-For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/blocks.html).
-
-### DELETE /suppression/blocks
+### GET /whitelabel/ips/{id}
 
 
 ```ruby
-data = JSON.parse('{
-  "delete_all": false,
-  "emails": [
-    "example1@example.com",
-    "example2@example.com"
-  ]
-}')
-response = sg.client.suppression.blocks.delete(request_body: data)
+id = "test_url_param"
+response = sg.client.whitelabel.ips._(id).get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve a specific block
+## Delete an reverse DNS record
 
-**This endpoint allows you to retrieve a specific email address from your blocks list.**
+**This endpoint allows you to delete a reverse DNS record.**
 
-[Blocks](https://sendgrid.com/docs/Glossary/blocks.html) happen when your message was rejected for a reason related to the message, not the recipient address. This can happen when your mail server IP address has been added to a blacklist or blocked by an ISP, or if the message content is flagged by a filter on the receiving server.
+Reverse DNS consists of a subdomain and domain that will be used to generate a record for a given IP. Once Twilio SendGrid has verified that the appropriate A record for the IP has been created, the appropriate reverse DNS record for the IP is generated.
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/blocks.html).
+For more information, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-reverse-dns/).
 
-### GET /suppression/blocks/{email}
+### DELETE /whitelabel/ips/{id}
 
 
 ```ruby
-email = "test_url_param"
-response = sg.client.suppression.blocks._(email).get()
+id = "test_url_param"
+response = sg.client.whitelabel.ips._(id).delete()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Delete a specific block
+## Validate a reverse DNS record
 
-**This endpoint allows you to delete a specific email address from your blocks list.**
+**This endpoint allows you to validate a reverse DNS record.**
 
-[Blocks](https://sendgrid.com/docs/Glossary/blocks.html) happen when your message was rejected for a reason related to the message, not the recipient address. This can happen when your mail server IP address has been added to a blacklist or blocked by an ISP, or if the message content is flagged by a filter on the receiving server.
+Reverse DNS consists of a subdomain and domain that will be used to generate a record for a given IP. Once Twilio SendGrid has verified that the appropriate A record for the IP has been created, the appropriate reverse DNS record for the IP is generated.
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/blocks.html).
+For more information, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-reverse-dns/).
 
-### DELETE /suppression/blocks/{email}
+### POST /whitelabel/ips/{id}/validate
 
 
 ```ruby
-email = "test_url_param"
-response = sg.client.suppression.blocks._(email).delete()
+id = "test_url_param"
+response = sg.client.whitelabel.ips._(id).validate.post()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve all bounces
-
-**This endpoint allows you to retrieve all of your bounces.**
+## Create a Branded Link
 
-Bounces are messages that are returned to the server that sent it.
+**This endpoint allows you to create a new link branding.**
 
-For more information see:
+Email link branding allow all of the click-tracked links you send in your emails to include the URL of your domain instead of sendgrid.net.
 
-* [User Guide > Bounces](https://sendgrid.com/docs/User_Guide/Suppressions/bounces.html) for more information
-* [Glossary > Bounces](https://sendgrid.com/docs/Glossary/Bounces.html)
+For more information, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-link-branding/).
 
-### GET /suppression/bounces
+### POST /whitelabel/links
 
 
 ```ruby
-params = JSON.parse('{"start_time": 1, "end_time": 1}')
-response = sg.client.suppression.bounces.get(query_params: params)
+data = JSON.parse('{
+  "default": true,
+  "domain": "example.com",
+  "subdomain": "mail"
+}')
+params = JSON.parse('{"limit": 1, "offset": 1}')
+response = sg.client.whitelabel.links.post(request_body: data, query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Delete bounces
-
-**This endpoint allows you to delete all of your bounces. You can also use this endpoint to remove a specific email address from your bounce list.**
-
-Bounces are messages that are returned to the server that sent it.
+## Retrieve all link brandings
 
-For more information see:
+**This endpoint allows you to retrieve all link brandings.**
 
-* [User Guide > Bounces](https://sendgrid.com/docs/User_Guide/Suppressions/bounces.html) for more information
-* [Glossary > Bounces](https://sendgrid.com/docs/Glossary/Bounces.html)
-* [Classroom > List Scrubbing Guide](https://sendgrid.com/docs/Classroom/Deliver/list_scrubbing.html)
+Email link branding allow all of the click-tracked links you send in your emails to include the URL of your domain instead of sendgrid.net.
 
-Note: the `delete_all` and `emails` parameters should be used independently of each other as they have different purposes.
+For more information, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-link-branding/).
 
-### DELETE /suppression/bounces
+### GET /whitelabel/links
 
 
 ```ruby
-data = JSON.parse('{
-  "delete_all": true,
-  "emails": [
-    "example@example.com",
-    "example2@example.com"
-  ]
-}')
-response = sg.client.suppression.bounces.delete(request_body: data)
+params = JSON.parse('{"limit": 1}')
+response = sg.client.whitelabel.links.get(query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve a Bounce
+## Retrieve a Default Link Branding
 
-**This endpoint allows you to retrieve a specific bounce for a given email address.**
+**This endpoint allows you to retrieve the default link branding.**
 
-Bounces are messages that are returned to the server that sent it.
+Default link branding is the actual link branding to be used when sending messages. If there are multiple link brandings, the default is determined by the following order:
+<ul>
+  <li>Validated link branding marked as "default"</li>
+  <li>Legacy link brands (migrated from the whitelabel wizard)</li>
+  <li>Default Twilio SendGrid link whitelabel (i.e. 100.ct.sendgrid.net)</li>
+</ul>
 
-For more information see:
+Email link branding allow all of the click-tracked links you send in your emails to include the URL of your domain instead of sendgrid.net.
 
-* [User Guide > Bounces](https://sendgrid.com/docs/User_Guide/Suppressions/bounces.html) for more information
-* [Glossary > Bounces](https://sendgrid.com/docs/Glossary/Bounces.html)
-* [Classroom > List Scrubbing Guide](https://sendgrid.com/docs/Classroom/Deliver/list_scrubbing.html)
+For more information, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-link-branding/).
 
-### GET /suppression/bounces/{email}
+### GET /whitelabel/links/default
 
 
 ```ruby
-email = "test_url_param"
-response = sg.client.suppression.bounces._(email).get()
+params = JSON.parse('{"domain": "test_string"}')
+response = sg.client.whitelabel.links.default.get(query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Delete a bounce
+## Retrieve Associated Link Branding
 
-**This endpoint allows you to remove an email address from your bounce list.**
+**This endpoint allows you to retrieve the associated link branding for a subuser.**
 
-Bounces are messages that are returned to the server that sent it. This endpoint allows you to delete a single email addresses from your bounce list.
+Link branding can be associated with subusers from the parent account. This functionality allows
+subusers to send mail using their parent's link brands. To associate a link branding, the parent account
+must first create a branded link and validate it. The parent may then associate that branded link with a subuser via the API or the Subuser Management page in the user interface.
 
-For more information see:
+Email link branding allow all of the click-tracked links you send in your emails to include the URL of your domain instead of sendgrid.net.
 
-* [User Guide > Bounces](https://sendgrid.com/docs/User_Guide/Suppressions/bounces.html) for more information
-* [Glossary > Bounces](https://sendgrid.com/docs/Glossary/Bounces.html)
-* [Classroom > List Scrubbing Guide](https://sendgrid.com/docs/Classroom/Deliver/list_scrubbing.html)
+For more information, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-link-branding/).
 
-### DELETE /suppression/bounces/{email}
+### GET /whitelabel/links/subuser
 
 
 ```ruby
-params = JSON.parse('{"email_address": "example@example.com"}')
-email = "test_url_param"
-response = sg.client.suppression.bounces._(email).delete(query_params: params)
+params = JSON.parse('{"username": "test_string"}')
+response = sg.client.whitelabel.links.subuser.get(query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve all invalid emails
+## Disassociate a Link Branding
 
-**This endpoint allows you to retrieve a list of all invalid email addresses.**
+**This endpoint allows you to disassociate a link branding from a subuser.**
 
-An invalid email occurs when you attempt to send email to an address that is formatted in a manner that does not meet internet email format standards or the email does not exist at the recipients mail server.
+Link branding can be associated with subusers from the parent account. This functionality allows
+subusers to send mail using their parent's link brands. To associate a link branding, the parent account
+must first create a branded link and validate it. The parent may then associate that branded link with a subuser via the API or the Subuser Management page in the user interface.
 
-Examples include addresses without the @ sign or addresses that include certain special characters and/or spaces. This response can come from our own server or the recipient mail server.
+Email link branding allow all of the click-tracked links you send in your emails to include the URL of your domain instead of sendgrid.net.
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/invalid_emails.html).
+For more information, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-link-branding/).
 
-### GET /suppression/invalid_emails
+### DELETE /whitelabel/links/subuser
 
 
 ```ruby
-params = JSON.parse('{"start_time": 1, "limit": 1, "end_time": 1, "offset": 1}')
-response = sg.client.suppression.invalid_emails.get(query_params: params)
+params = JSON.parse('{"username": "test_string"}')
+response = sg.client.whitelabel.links.subuser.delete(query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Delete invalid emails
-
-**This endpoint allows you to remove email addresses from your invalid email address list.**
-
-There are two options for deleting invalid email addresses:
-
-1) You can delete all invalid email addresses by setting `delete_all` to true in the request body.
-2) You can delete some invalid email addresses by specifying certain addresses in an array in the request body.
+## Update a Link Branding
 
-An invalid email occurs when you attempt to send email to an address that is formatted in a manner that does not meet internet email format standards or the email does not exist at the recipients mail server.
+**This endpoint allows you to update a specific link branding. You can use this endpoint to change a branded link's default status.**
 
-Examples include addresses without the @ sign or addresses that include certain special characters and/or spaces. This response can come from our own server or the recipient mail server.
+Email link branding allow all of the click-tracked links you send in your emails to include the URL of your domain instead of sendgrid.net.
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/invalid_emails.html).
+For more information, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-link-branding/).
 
-### DELETE /suppression/invalid_emails
+### PATCH /whitelabel/links/{id}
 
 
 ```ruby
 data = JSON.parse('{
-  "delete_all": false,
-  "emails": [
-    "example1@example.com",
-    "example2@example.com"
-  ]
+  "default": true
 }')
-response = sg.client.suppression.invalid_emails.delete(request_body: data)
+id = "test_url_param"
+response = sg.client.whitelabel.links._(id).patch(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve a specific invalid email
-
-**This endpoint allows you to retrieve a specific invalid email addresses.**
+## Retrieve a Link Branding
 
-An invalid email occurs when you attempt to send email to an address that is formatted in a manner that does not meet internet email format standards or the email does not exist at the recipients mail server.
+**This endpoint allows you to retrieve a specific link branding.**
 
-Examples include addresses without the @ sign or addresses that include certain special characters and/or spaces. This response can come from our own server or the recipient mail server.
+Email link branding allow all of the click-tracked links you send in your emails to include the URL of your domain instead of sendgrid.net.
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/invalid_emails.html).
+For more information, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-link-branding/).
 
-### GET /suppression/invalid_emails/{email}
+### GET /whitelabel/links/{id}
 
 
 ```ruby
-email = "test_url_param"
-response = sg.client.suppression.invalid_emails._(email).get()
+id = "test_url_param"
+response = sg.client.whitelabel.links._(id).get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Delete a specific invalid email
-
-**This endpoint allows you to remove a specific email address from the invalid email address list.**
+## Delete a Link Branding
 
-An invalid email occurs when you attempt to send email to an address that is formatted in a manner that does not meet internet email format standards or the email does not exist at the recipients mail server.
+**This endpoint allows you to delete a link branding.**
 
-Examples include addresses without the @ sign or addresses that include certain special characters and/or spaces. This response can come from our own server or the recipient mail server.
+Email link branding allow all of the click-tracked links you send in your emails to include the URL of your domain instead of sendgrid.net.
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/invalid_emails.html).
+For more information, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-link-branding/).
 
-### DELETE /suppression/invalid_emails/{email}
+### DELETE /whitelabel/links/{id}
 
 
 ```ruby
-email = "test_url_param"
-response = sg.client.suppression.invalid_emails._(email).delete()
+id = "test_url_param"
+response = sg.client.whitelabel.links._(id).delete()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve a specific spam report
+## Validate a Link Branding
 
-**This endpoint allows you to retrieve a specific spam report.**
+**This endpoint allows you to validate a link branding.**
 
-[Spam reports](https://sendgrid.com/docs/Glossary/spam_reports.html) happen when a recipient indicates that they think your email is [spam](https://sendgrid.com/docs/Glossary/spam.html) and then their email provider reports this to SendGrid.
+Email link branding allow all of the click-tracked links you send in your emails to include the URL of your domain instead of sendgrid.net.
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/spam_reports.html).
+For more information, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-link-branding/).
 
-### GET /suppression/spam_report/{email}
+### POST /whitelabel/links/{id}/validate
 
 
 ```ruby
-email = "test_url_param"
-response = sg.client.suppression.spam_report._(email).get()
+id = "test_url_param"
+response = sg.client.whitelabel.links._(id).validate.post()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Delete a specific spam report
+## Associate a Link Branding
 
-**This endpoint allows you to delete a specific spam report.**
+**This endpoint allows you to associate a link branding with a subuser account.**
 
-[Spam reports](https://sendgrid.com/docs/Glossary/spam_reports.html) happen when a recipient indicates that they think your email is [spam](https://sendgrid.com/docs/Glossary/spam.html) and then their email provider reports this to SendGrid.
+Link branding can be associated with subusers from the parent account. This functionality allows
+subusers to send mail using their parent's link brands. To associate a link branding, the parent account
+must first create a branded link and validate it. The parent may then associate that branded link with a subuser via the API or the Subuser Management page in the user interface.
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/spam_reports.html).
+Email link branding allow all of the click-tracked links you send in your emails to include the URL of your domain instead of sendgrid.net.
 
-### DELETE /suppression/spam_report/{email}
+For more information, please see our [User Guide](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-link-branding/).
+
+### POST /whitelabel/links/{link_id}/subuser
 
 
 ```ruby
-email = "test_url_param"
-response = sg.client.suppression.spam_report._(email).delete()
+data = JSON.parse('{
+  "username": "jane@example.com"
+}')
+link_id = "test_url_param"
+response = sg.client.whitelabel.links._(link_id).subuser.post(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve all spam reports
 
-**This endpoint allows you to retrieve all spam reports.**
+<a name="stats"></a>
+# STATS
 
-[Spam reports](https://sendgrid.com/docs/Glossary/spam_reports.html) happen when a recipient indicates that they think your email is [spam](https://sendgrid.com/docs/Glossary/spam.html) and then their email provider reports this to SendGrid.
+## Retrieve global email statistics
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/spam_reports.html).
+**This endpoint allows you to retrieve all of your global email statistics between a given date range.**
 
-### GET /suppression/spam_reports
+Parent accounts will see aggregated stats for their account and all subuser accounts. Subuser accounts will only see their own stats.
+
+### GET /stats
 
 
 ```ruby
-params = JSON.parse('{"start_time": 1, "limit": 1, "end_time": 1, "offset": 1}')
-response = sg.client.suppression.spam_reports.get(query_params: params)
+params = JSON.parse('{"aggregated_by": "day", "limit": 1, "start_date": "2016-01-01", "end_date": "2016-04-01", "offset": 1}')
+response = sg.client.stats.get(query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Delete spam reports
-
-**This endpoint allows you to delete your spam reports.**
+<a name="subusers"></a>
+# SUBUSERS
 
-There are two options for deleting spam reports:
+## Create Subuser
 
-1) You can delete all spam reports by setting "delete_all" to true in the request body.
-2) You can delete some spam reports by specifying the email addresses in an array in the request body.
+This endpoint allows you to retrieve a list of all of your subusers. You can choose to retrieve specific subusers as well as limit the results that come back from the API.
 
-[Spam reports](https://sendgrid.com/docs/Glossary/spam_reports.html) happen when a recipient indicates that they think your email is [spam](https://sendgrid.com/docs/Glossary/spam.html) and then their email provider reports this to SendGrid.
+For more information about Subusers:
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/spam_reports.html).
+* [User Guide > Subusers](https://sendgrid.com/docs/User_Guide/Settings/Subusers/index.html)
+* [Classroom > How do I add more subusers to my account?](https://sendgrid.com/docs/Classroom/Basics/Account/how_do_i_add_more_subusers_to_my_account.html)
 
-### DELETE /suppression/spam_reports
+### POST /subusers
 
 
 ```ruby
 data = JSON.parse('{
-  "delete_all": false,
-  "emails": [
-    "example1@example.com",
-    "example2@example.com"
-  ]
+  "email": "John@example.com",
+  "ips": [
+    "1.1.1.1",
+    "2.2.2.2"
+  ],
+  "password": "johns_password",
+  "username": "John@example.com"
 }')
-response = sg.client.suppression.spam_reports.delete(request_body: data)
+response = sg.client.subusers.post(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve all global suppressions
+## List all Subusers
 
-**This endpoint allows you to retrieve a list of all email address that are globally suppressed.**
+This endpoint allows you to retrieve a list of all of your subusers. You can choose to retrieve specific subusers as well as limit the results that come back from the API.
 
-A global suppression (or global unsubscribe) is an email address of a recipient who does not want to receive any of your messages. A globally suppressed recipient will be removed from any email you send. For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/global_unsubscribes.html).
+For more information about Subusers:
 
-### GET /suppression/unsubscribes
+* [User Guide > Subusers](https://sendgrid.com/docs/User_Guide/Settings/Subusers/index.html)
+* [Classroom > How do I add more subusers to my account?](https://sendgrid.com/docs/Classroom/Basics/Account/how_do_i_add_more_subusers_to_my_account.html)
+
+### GET /subusers
 
 
 ```ruby
-params = JSON.parse('{"start_time": 1, "limit": 1, "end_time": 1, "offset": 1}')
-response = sg.client.suppression.unsubscribes.get(query_params: params)
+params = JSON.parse('{"username": "test_string", "limit": 1, "offset": 1}')
+response = sg.client.subusers.get(query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-<a name="templates"></a>
-# TEMPLATES
-
-## Create a transactional template.
+## Retrieve Subuser Reputations
 
-**This endpoint allows you to create a transactional template.**
+Subuser sender reputations give a good idea how well a sender is doing with regards to how recipients and recipient servers react to the mail that is being received. When a bounce, spam report, or other negative action happens on a sent email, it will effect your sender rating.
 
-Each user can create up to 300 different transactional templates. Transactional templates are specific to accounts and subusers. Templates created on a parent account will not be accessible from the subuser accounts.
+This endpoint allows you to request the reputations for your subusers.
 
-Transactional templates are templates created specifically for transactional email and are not to be confused with [Marketing Campaigns templates](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/templates.html). For more information about transactional templates, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Transactional_Templates/index.html).
-
-### POST /templates
+### GET /subusers/reputations
 
 
 ```ruby
-data = JSON.parse('{
-  "name": "example_name"
-}')
-response = sg.client.templates.post(request_body: data)
+params = JSON.parse('{"usernames": "test_string"}')
+response = sg.client.subusers.reputations.get(query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve all transactional templates.
+## Retrieve email statistics for your subusers.
 
-**This endpoint allows you to retrieve all transactional templates.**
+**This endpoint allows you to retrieve the email statistics for the given subusers.**
 
-Each user can create up to 300 different transactional templates. Transactional templates are specific to accounts and subusers. Templates created on a parent account will not be accessible from the subuser accounts.
+You may retrieve statistics for up to 10 different subusers by including an additional _subusers_ parameter for each additional subuser.
 
-Transactional templates are templates created specifically for transactional email and are not to be confused with [Marketing Campaigns templates](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/templates.html). For more information about transactional templates, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Transactional_Templates/index.html).
+While you can always view the statistics for all email activity on your account, subuser statistics enable you to view specific segments of your stats. Emails sent, bounces, and spam reports are always tracked for subusers. Unsubscribes, clicks, and opens are tracked if you have enabled the required settings.
 
-### GET /templates
+For more information, see our [User Guide](https://sendgrid.com/docs/User_Guide/Statistics/subuser.html).
+
+### GET /subusers/stats
 
 
 ```ruby
-response = sg.client.templates.get()
+params = JSON.parse('{"end_date": "2016-04-01", "aggregated_by": "day", "limit": 1, "offset": 1, "start_date": "2016-01-01", "subusers": "test_string"}')
+response = sg.client.subusers.stats.get(query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Edit a transactional template.
+## Retrieve monthly stats for all subusers
 
-**This endpoint allows you to edit a transactional template.**
+**This endpoint allows you to retrieve the monthly email statistics for all subusers over the given date range.**
 
-Each user can create up to 300 different transactional templates. Transactional templates are specific to accounts and subusers. Templates created on a parent account will not be accessible from the subuser accounts.
+While you can always view the statistics for all email activity on your account, subuser statistics enable you to view specific segments of your stats for your subusers. Emails sent, bounces, and spam reports are always tracked for subusers. Unsubscribes, clicks, and opens are tracked if you have enabled the required settings.
 
-Transactional templates are templates created specifically for transactional email and are not to be confused with [Marketing Campaigns templates](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/templates.html). For more information about transactional templates, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Transactional_Templates/index.html).
+When using the `sort_by_metric` to sort your stats by a specific metric, you can not sort by the following metrics:
+`bounce_drops`, `deferred`, `invalid_emails`, `processed`, `spam_report_drops`, `spam_reports`, or `unsubscribe_drops`.
 
+For more information, see our [User Guide](https://sendgrid.com/docs/User_Guide/Statistics/subuser.html).
 
-### PATCH /templates/{template_id}
+### GET /subusers/stats/monthly
 
 
 ```ruby
-data = JSON.parse('{
-  "name": "new_example_name"
-}')
-template_id = "test_url_param"
-response = sg.client.templates._(template_id).patch(request_body: data)
+params = JSON.parse('{"subuser": "test_string", "limit": 1, "sort_by_metric": "test_string", "offset": 1, "date": "test_string", "sort_by_direction": "asc"}')
+response = sg.client.subusers.stats.monthly.get(query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve a single transactional template.
+##  Retrieve the totals for each email statistic metric for all subusers.
 
-**This endpoint allows you to retrieve a single transactional template.**
+**This endpoint allows you to retrieve the total sums of each email statistic metric for all subusers over the given date range.**
 
-Each user can create up to 300 different transactional templates. Transactional templates are specific to accounts and subusers. Templates created on a parent account will not be accessible from the subuser accounts.
 
-Transactional templates are templates created specifically for transactional email and are not to be confused with [Marketing Campaigns templates](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/templates.html). For more information about transactional templates, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Transactional_Templates/index.html).
+While you can always view the statistics for all email activity on your account, subuser statistics enable you to view specific segments of your stats. Emails sent, bounces, and spam reports are always tracked for subusers. Unsubscribes, clicks, and opens are tracked if you have enabled the required settings.
 
+For more information, see our [User Guide](https://sendgrid.com/docs/User_Guide/Statistics/subuser.html).
 
-### GET /templates/{template_id}
+### GET /subusers/stats/sums
 
 
 ```ruby
-template_id = "test_url_param"
-response = sg.client.templates._(template_id).get()
+params = JSON.parse('{"end_date": "2016-04-01", "aggregated_by": "day", "limit": 1, "sort_by_metric": "test_string", "offset": 1, "start_date": "2016-01-01", "sort_by_direction": "asc"}')
+response = sg.client.subusers.stats.sums.get(query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Delete a template.
-
-**This endpoint allows you to delete a transactional template.**
+## Enable/disable a subuser
 
-Each user can create up to 300 different transactional templates. Transactional templates are specific to accounts and subusers. Templates created on a parent account will not be accessible from the subuser accounts.
+This endpoint allows you to enable or disable a subuser.
 
-Transactional templates are templates created specifically for transactional email and are not to be confused with [Marketing Campaigns templates](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/templates.html). For more information about transactional templates, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Transactional_Templates/index.html).
+For more information about Subusers:
 
+* [User Guide > Subusers](https://sendgrid.com/docs/User_Guide/Settings/Subusers/index.html)
+* [Classroom > How do I add more subusers to my account?](https://sendgrid.com/docs/Classroom/Basics/Account/how_do_i_add_more_subusers_to_my_account.html)
 
-### DELETE /templates/{template_id}
+### PATCH /subusers/{subuser_name}
 
 
 ```ruby
-template_id = "test_url_param"
-response = sg.client.templates._(template_id).delete()
+data = JSON.parse('{
+  "disabled": false
+}')
+subuser_name = "test_url_param"
+response = sg.client.subusers._(subuser_name).patch(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Create a new transactional template version.
-
-**This endpoint allows you to create a new version of a template.**
+## Delete a subuser
 
-Each transactional template can have multiple versions, each version with its own subject and content. Each user can have up to 300 versions across all templates.
+This endpoint allows you to delete a subuser. This is a permanent action, once deleted a subuser cannot be retrieved.
 
-For more information about transactional templates, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Transactional_Templates/index.html).
+For more information about Subusers:
 
+* [User Guide > Subusers](https://sendgrid.com/docs/User_Guide/Settings/Subusers/index.html)
+* [Classroom > How do I add more subusers to my account?](https://sendgrid.com/docs/Classroom/Basics/Account/how_do_i_add_more_subusers_to_my_account.html)
 
-### POST /templates/{template_id}/versions
+### DELETE /subusers/{subuser_name}
 
 
 ```ruby
-data = JSON.parse('{
-  "active": 1,
-  "html_content": "<%body%>",
-  "name": "example_version_name",
-  "plain_content": "<%body%>",
-  "subject": "<%subject%>",
-  "template_id": "ddb96bbc-9b92-425e-8979-99464621b543"
-}')
-template_id = "test_url_param"
-response = sg.client.templates._(template_id).versions.post(request_body: data)
+subuser_name = "test_url_param"
+response = sg.client.subusers._(subuser_name).delete()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Edit a transactional template version.
-
-**This endpoint allows you to edit a version of one of your transactional templates.**
+## Update IPs assigned to a subuser
 
-Each transactional template can have multiple versions, each version with its own subject and content. Each user can have up to 300 versions across all templates.
+Each subuser should be assigned to an IP address, from which all of this subuser's mail will be sent. Often, this is the same IP as the parent account, but each subuser can have their own, or multiple, IP addresses as well.
 
-For more information about transactional templates, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Transactional_Templates/index.html).
+More information:
 
-## URI Parameters
-| URI Parameter | Type | Description |
-|---|---|---|
-| template_id | string | The ID of the original template |
-| version_id | string | The ID of the template version |
+* [How to request more IPs](https://sendgrid.com/docs/Classroom/Basics/Account/adding_an_additional_dedicated_ip_to_your_account.html)
+* [How to setup reverse DNS](https://sendgrid.com/docs/ui/account-and-settings/how-to-set-up-reverse-dns/)
 
-### PATCH /templates/{template_id}/versions/{version_id}
+### PUT /subusers/{subuser_name}/ips
 
 
 ```ruby
-data = JSON.parse('{
-  "active": 1,
-  "html_content": "<%body%>",
-  "name": "updated_example_name",
-  "plain_content": "<%body%>",
-  "subject": "<%subject%>"
-}')
-template_id = "test_url_param"
-version_id = "test_url_param"
-response = sg.client.templates._(template_id).versions._(version_id).patch(request_body: data)
+data = JSON.parse('[
+  "127.0.0.1"
+]')
+subuser_name = "test_url_param"
+response = sg.client.subusers._(subuser_name).ips.put(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve a specific transactional template version.
+## Update Monitor Settings for a subuser
 
-**This endpoint allows you to retrieve a specific version of a template.**
+Subuser monitor settings allow you to receive a sample of an outgoing message by a specific customer at a specific frequency of emails.
 
-Each transactional template can have multiple versions, each version with its own subject and content. Each user can have up to 300 versions across all templates.
+### PUT /subusers/{subuser_name}/monitor
 
-For more information about transactional templates, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Transactional_Templates/index.html).
 
-## URI Parameters
-| URI Parameter | Type | Description |
-|---|---|---|
-| template_id | string | The ID of the original template |
-| version_id | string |  The ID of the template version |
+```ruby
+data = JSON.parse('{
+  "email": "example@example.com",
+  "frequency": 500
+}')
+subuser_name = "test_url_param"
+response = sg.client.subusers._(subuser_name).monitor.put(request_body: data)
+puts response.status_code
+puts response.body
+puts response.headers
+```
+## Create monitor settings
 
-### GET /templates/{template_id}/versions/{version_id}
+Subuser monitor settings allow you to receive a sample of an outgoing message by a specific customer at a specific frequency of emails.
+
+### POST /subusers/{subuser_name}/monitor
 
 
 ```ruby
-template_id = "test_url_param"
-version_id = "test_url_param"
-response = sg.client.templates._(template_id).versions._(version_id).get()
+data = JSON.parse('{
+  "email": "example@example.com",
+  "frequency": 50000
+}')
+subuser_name = "test_url_param"
+response = sg.client.subusers._(subuser_name).monitor.post(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Delete a transactional template version.
+## Retrieve monitor settings for a subuser
 
-**This endpoint allows you to delete one of your transactional template versions.**
+Subuser monitor settings allow you to receive a sample of an outgoing message by a specific customer at a specific frequency of emails.
 
-Each transactional template can have multiple versions, each version with its own subject and content. Each user can have up to 300 versions across all templates.
+### GET /subusers/{subuser_name}/monitor
 
-For more information about transactional templates, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Transactional_Templates/index.html).
 
-## URI Parameters
-| URI Parameter | Type | Description |
-|---|---|---|
-| template_id | string | The ID of the original template |
-| version_id | string | The ID of the template version |
+```ruby
+subuser_name = "test_url_param"
+response = sg.client.subusers._(subuser_name).monitor.get()
+puts response.status_code
+puts response.body
+puts response.headers
+```
+## Delete monitor settings
 
-### DELETE /templates/{template_id}/versions/{version_id}
+Subuser monitor settings allow you to receive a sample of an outgoing message by a specific customer at a specific frequency of emails.
+
+### DELETE /subusers/{subuser_name}/monitor
 
 
 ```ruby
-template_id = "test_url_param"
-version_id = "test_url_param"
-response = sg.client.templates._(template_id).versions._(version_id).delete()
+subuser_name = "test_url_param"
+response = sg.client.subusers._(subuser_name).monitor.delete()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Activate a transactional template version.
-
-**This endpoint allows you to activate a version of one of your templates.**
+## Retrieve the monthly email statistics for a single subuser
 
-Each transactional template can have multiple versions, each version with its own subject and content. Each user can have up to 300 versions across all templates.
+**This endpoint allows you to retrieve the monthly email statistics for a specific subuser.**
 
+While you can always view the statistics for all email activity on your account, subuser statistics enable you to view specific segments of your stats for your subusers. Emails sent, bounces, and spam reports are always tracked for subusers. Unsubscribes, clicks, and opens are tracked if you have enabled the required settings.
 
-For more information about transactional templates, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Transactional_Templates/index.html).
+When using the `sort_by_metric` to sort your stats by a specific metric, you can not sort by the following metrics:
+`bounce_drops`, `deferred`, `invalid_emails`, `processed`, `spam_report_drops`, `spam_reports`, or `unsubscribe_drops`.
 
-## URI Parameters
-| URI Parameter | Type | Description |
-|---|---|---|
-| template_id | string | The ID of the original template |
-| version_id | string |  The ID of the template version |
+For more information, see our [User Guide](https://sendgrid.com/docs/User_Guide/Statistics/subuser.html).
 
-### POST /templates/{template_id}/versions/{version_id}/activate
+### GET /subusers/{subuser_name}/stats/monthly
 
 
 ```ruby
-template_id = "test_url_param"
-version_id = "test_url_param"
-response = sg.client.templates._(template_id).versions._(version_id).activate.post()
+params = JSON.parse('{"date": "test_string", "sort_by_direction": "asc", "limit": 1, "sort_by_metric": "test_string", "offset": 1}')
+subuser_name = "test_url_param"
+response = sg.client.subusers._(subuser_name).stats.monthly.get(query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-<a name="tracking-settings"></a>
-# TRACKING SETTINGS
+<a name="suppression"></a>
+# SUPPRESSION
 
-## Retrieve Tracking Settings
+## Retrieve all blocks
 
-**This endpoint allows you to retrieve a list of all tracking settings that you can enable on your account.**
+**This endpoint allows you to retrieve a list of all email addresses that are currently on your blocks list.**
 
-You can track a variety of the actions your recipients may take when interacting with your emails including opening your emails, clicking on links in your emails, and subscribing to (or unsubscribing from) your emails.
+[Blocks](https://sendgrid.com/docs/Glossary/blocks.html) happen when your message was rejected for a reason related to the message, not the recipient address. This can happen when your mail server IP address has been added to a blacklist or blocked by an ISP, or if the message content is flagged by a filter on the receiving server.
 
-For more information about tracking, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/tracking.html).
+For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/blocks.html).
 
-### GET /tracking_settings
+### GET /suppression/blocks
 
 
 ```ruby
-params = JSON.parse('{"limit": 1, "offset": 1}')
-response = sg.client.tracking_settings.get(query_params: params)
+params = JSON.parse('{"start_time": 1, "limit": 1, "end_time": 1, "offset": 1}')
+response = sg.client.suppression.blocks.get(query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Update Click Tracking Settings
+## Delete blocks
 
-**This endpoint allows you to change your current click tracking setting. You can enable, or disable, click tracking using this endpoint.**
+**This endpoint allows you to delete all email addresses on your blocks list.**
 
-You can track a variety of the actions your recipients may take when interacting with your emails including opening your emails, clicking on links in your emails, and subscribing to (or unsubscribing from) your emails.
+There are two options for deleting blocked emails:
 
-For more information about tracking, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/tracking.html).
+1. You can delete all blocked emails by setting `delete_all` to true in the request body.
+2. You can delete some blocked emails by specifying the email addresses in an array in the request body.
 
-### PATCH /tracking_settings/click
+[Blocks](https://sendgrid.com/docs/Glossary/blocks.html) happen when your message was rejected for a reason related to the message, not the recipient address. This can happen when your mail server IP address has been added to a blacklist or blocked by an ISP, or if the message content is flagged by a filter on the receiving server.
+
+For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/blocks.html).
+
+### DELETE /suppression/blocks
 
 
 ```ruby
 data = JSON.parse('{
-  "enabled": true
+  "delete_all": false,
+  "emails": [
+    "example1@example.com",
+    "example2@example.com"
+  ]
 }')
-response = sg.client.tracking_settings.click.patch(request_body: data)
+response = sg.client.suppression.blocks.delete(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve Click Track Settings
+## Retrieve a specific block
 
-**This endpoint allows you to retrieve your current click tracking setting.**
+**This endpoint allows you to retrieve a specific email address from your blocks list.**
 
-You can track a variety of the actions your recipients may take when interacting with your emails including opening your emails, clicking on links in your emails, and subscribing to (or unsubscribing from) your emails.
+[Blocks](https://sendgrid.com/docs/Glossary/blocks.html) happen when your message was rejected for a reason related to the message, not the recipient address. This can happen when your mail server IP address has been added to a blacklist or blocked by an ISP, or if the message content is flagged by a filter on the receiving server.
 
-For more information about tracking, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/tracking.html).
+For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/blocks.html).
 
-### GET /tracking_settings/click
+### GET /suppression/blocks/{email}
 
 
 ```ruby
-response = sg.client.tracking_settings.click.get()
+email = "test_url_param"
+response = sg.client.suppression.blocks._(email).get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Update Google Analytics Settings
-
-**This endpoint allows you to update your current setting for Google Analytics.**
-
-For more information about using Google Analytics, please refer to [Googles URL Builder](https://support.google.com/analytics/answer/1033867?hl=en) and their article on ["Best Practices for Campaign Building"](https://support.google.com/analytics/answer/1037445).
+## Delete a specific block
 
-We default the settings to Googles recommendations. For more information, see [Google Analytics Demystified](https://sendgrid.com/docs/Classroom/Track/Collecting_Data/google_analytics_demystified_ga_statistics_vs_sg_statistics.html).
+**This endpoint allows you to delete a specific email address from your blocks list.**
 
-You can track a variety of the actions your recipients may take when interacting with your emails including opening your emails, clicking on links in your emails, and subscribing to (or unsubscribing from) your emails.
+[Blocks](https://sendgrid.com/docs/Glossary/blocks.html) happen when your message was rejected for a reason related to the message, not the recipient address. This can happen when your mail server IP address has been added to a blacklist or blocked by an ISP, or if the message content is flagged by a filter on the receiving server.
 
-For more information about tracking, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/tracking.html).
+For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/blocks.html).
 
-### PATCH /tracking_settings/google_analytics
+### DELETE /suppression/blocks/{email}
 
 
 ```ruby
-data = JSON.parse('{
-  "enabled": true,
-  "utm_campaign": "website",
-  "utm_content": "",
-  "utm_medium": "email",
-  "utm_source": "sendgrid.com",
-  "utm_term": ""
-}')
-response = sg.client.tracking_settings.google_analytics.patch(request_body: data)
+email = "test_url_param"
+response = sg.client.suppression.blocks._(email).delete()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve Google Analytics Settings
-
-**This endpoint allows you to retrieve your current setting for Google Analytics.**
+## Retrieve all bounces
 
-For more information about using Google Analytics, please refer to [Googles URL Builder](https://support.google.com/analytics/answer/1033867?hl=en) and their article on ["Best Practices for Campaign Building"](https://support.google.com/analytics/answer/1037445).
+**This endpoint allows you to retrieve all of your bounces.**
 
-We default the settings to Googles recommendations. For more information, see [Google Analytics Demystified](https://sendgrid.com/docs/Classroom/Track/Collecting_Data/google_analytics_demystified_ga_statistics_vs_sg_statistics.html).
+Bounces are messages that are returned to the server that sent it.
 
-You can track a variety of the actions your recipients may take when interacting with your emails including opening your emails, clicking on links in your emails, and subscribing to (or unsubscribing from) your emails.
+For more information see:
 
-For more information about tracking, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/tracking.html).
+* [User Guide > Bounces](https://sendgrid.com/docs/User_Guide/Suppressions/bounces.html) for more information
+* [Glossary > Bounces](https://sendgrid.com/docs/Glossary/Bounces.html)
 
-### GET /tracking_settings/google_analytics
+### GET /suppression/bounces
 
 
 ```ruby
-response = sg.client.tracking_settings.google_analytics.get()
+params = JSON.parse('{"start_time": 1, "end_time": 1}')
+response = sg.client.suppression.bounces.get(query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Update Open Tracking Settings
+## Delete bounces
 
-**This endpoint allows you to update your current settings for open tracking.**
+**This endpoint allows you to delete all of your bounces. You can also use this endpoint to remove a specific email address from your bounce list.**
 
-Open Tracking adds an invisible image at the end of the email which can track email opens. If the email recipient has images enabled on their email client, a request to SendGrids server for the invisible image is executed and an open event is logged. These events are logged in the Statistics portal, Email Activity interface, and are reported by the Event Webhook.
+Bounces are messages that are returned to the server that sent it.
 
-You can track a variety of the actions your recipients may take when interacting with your emails including opening your emails, clicking on links in your emails, and subscribing to (or unsubscribing from) your emails.
+For more information see:
 
-For more information about tracking, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/tracking.html).
+* [User Guide > Bounces](https://sendgrid.com/docs/User_Guide/Suppressions/bounces.html) for more information
+* [Glossary > Bounces](https://sendgrid.com/docs/Glossary/Bounces.html)
+* [Classroom > List Scrubbing Guide](https://sendgrid.com/docs/Classroom/Deliver/list_scrubbing.html)
 
-### PATCH /tracking_settings/open
+Note: the `delete_all` and `emails` parameters should be used independently of each other as they have different purposes.
+
+### DELETE /suppression/bounces
 
 
 ```ruby
 data = JSON.parse('{
-  "enabled": true
+  "delete_all": true,
+  "emails": [
+    "example@example.com",
+    "example2@example.com"
+  ]
 }')
-response = sg.client.tracking_settings.open.patch(request_body: data)
+response = sg.client.suppression.bounces.delete(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Get Open Tracking Settings
+## Retrieve a Bounce
 
-**This endpoint allows you to retrieve your current settings for open tracking.**
+**This endpoint allows you to retrieve a specific bounce for a given email address.**
 
-Open Tracking adds an invisible image at the end of the email which can track email opens. If the email recipient has images enabled on their email client, a request to SendGrids server for the invisible image is executed and an open event is logged. These events are logged in the Statistics portal, Email Activity interface, and are reported by the Event Webhook.
+Bounces are messages that are returned to the server that sent it.
 
-You can track a variety of the actions your recipients may take when interacting with your emails including opening your emails, clicking on links in your emails, and subscribing to (or unsubscribing from) your emails.
+For more information see:
 
-For more information about tracking, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/tracking.html).
+* [User Guide > Bounces](https://sendgrid.com/docs/User_Guide/Suppressions/bounces.html) for more information
+* [Glossary > Bounces](https://sendgrid.com/docs/Glossary/Bounces.html)
+* [Classroom > List Scrubbing Guide](https://sendgrid.com/docs/Classroom/Deliver/list_scrubbing.html)
 
-### GET /tracking_settings/open
+### GET /suppression/bounces/{email}
 
 
 ```ruby
-response = sg.client.tracking_settings.open.get()
+email = "test_url_param"
+response = sg.client.suppression.bounces._(email).get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Update Subscription Tracking Settings
+## Delete a bounce
 
-**This endpoint allows you to update your current settings for subscription tracking.**
+**This endpoint allows you to remove an email address from your bounce list.**
 
-Subscription tracking adds links to the bottom of your emails that allows your recipients to subscribe to, or unsubscribe from, your emails.
+Bounces are messages that are returned to the server that sent it. This endpoint allows you to delete a single email addresses from your bounce list.
 
-You can track a variety of the actions your recipients may take when interacting with your emails including opening your emails, clicking on links in your emails, and subscribing to (or unsubscribing from) your emails.
+For more information see:
 
-For more information about tracking, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/tracking.html).
+* [User Guide > Bounces](https://sendgrid.com/docs/User_Guide/Suppressions/bounces.html) for more information
+* [Glossary > Bounces](https://sendgrid.com/docs/Glossary/Bounces.html)
+* [Classroom > List Scrubbing Guide](https://sendgrid.com/docs/Classroom/Deliver/list_scrubbing.html)
 
-### PATCH /tracking_settings/subscription
+### DELETE /suppression/bounces/{email}
 
 
 ```ruby
-data = JSON.parse('{
-  "enabled": true,
-  "html_content": "html content",
-  "landing": "landing page html",
-  "plain_content": "text content",
-  "replace": "replacement tag",
-  "url": "url"
-}')
-response = sg.client.tracking_settings.subscription.patch(request_body: data)
+params = JSON.parse('{"email_address": "example@example.com"}')
+email = "test_url_param"
+response = sg.client.suppression.bounces._(email).delete(query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve Subscription Tracking Settings
+## Retrieve all invalid emails
 
-**This endpoint allows you to retrieve your current settings for subscription tracking.**
+**This endpoint allows you to retrieve a list of all invalid email addresses.**
 
-Subscription tracking adds links to the bottom of your emails that allows your recipients to subscribe to, or unsubscribe from, your emails.
+An invalid email occurs when you attempt to send email to an address that is formatted in a manner that does not meet internet email format standards or the email does not exist at the recipients mail server.
 
-You can track a variety of the actions your recipients may take when interacting with your emails including opening your emails, clicking on links in your emails, and subscribing to (or unsubscribing from) your emails.
+Examples include addresses without the @ sign or addresses that include certain special characters and/or spaces. This response can come from our own server or the recipient mail server.
 
-For more information about tracking, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/tracking.html).
+For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/invalid_emails.html).
 
-### GET /tracking_settings/subscription
+### GET /suppression/invalid_emails
 
 
 ```ruby
-response = sg.client.tracking_settings.subscription.get()
+params = JSON.parse('{"start_time": 1, "limit": 1, "end_time": 1, "offset": 1}')
+response = sg.client.suppression.invalid_emails.get(query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-<a name="user"></a>
-# USER
+## Delete invalid emails
 
-## Get a user's account information.
+**This endpoint allows you to remove email addresses from your invalid email address list.**
 
-**This endpoint allows you to retrieve your user account details.**
+There are two options for deleting invalid email addresses:
 
-Your user's account information includes the user's account type and reputation.
+1) You can delete all invalid email addresses by setting `delete_all` to true in the request body.
+2) You can delete some invalid email addresses by specifying certain addresses in an array in the request body.
 
-Keeping your user profile up to date is important. This will help SendGrid to verify who you are as well as contact you should we need to.
+An invalid email occurs when you attempt to send email to an address that is formatted in a manner that does not meet internet email format standards or the email does not exist at the recipients mail server.
 
-For more information about your user profile:
+Examples include addresses without the @ sign or addresses that include certain special characters and/or spaces. This response can come from our own server or the recipient mail server.
 
-* [SendGrid Account Settings](https://sendgrid.com/docs/User_Guide/Settings/account.html)
+For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/invalid_emails.html).
 
-### GET /user/account
+### DELETE /suppression/invalid_emails
 
 
 ```ruby
-response = sg.client.user.account.get()
+data = JSON.parse('{
+  "delete_all": false,
+  "emails": [
+    "example1@example.com",
+    "example2@example.com"
+  ]
+}')
+response = sg.client.suppression.invalid_emails.delete(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve your credit balance
+## Retrieve a specific invalid email
 
-**This endpoint allows you to retrieve the current credit balance for your account.**
+**This endpoint allows you to retrieve a specific invalid email addresses.**
 
-Your monthly credit allotment limits the number of emails you may send before incurring overage charges. For more information about credits and billing, please visit our [Classroom](https://sendgrid.com/docs/Classroom/Basics/Billing/billing_info_and_faqs.html).
+An invalid email occurs when you attempt to send email to an address that is formatted in a manner that does not meet internet email format standards or the email does not exist at the recipients mail server.
 
-### GET /user/credits
+Examples include addresses without the @ sign or addresses that include certain special characters and/or spaces. This response can come from our own server or the recipient mail server.
+
+For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/invalid_emails.html).
+
+### GET /suppression/invalid_emails/{email}
 
 
 ```ruby
-response = sg.client.user.credits.get()
+email = "test_url_param"
+response = sg.client.suppression.invalid_emails._(email).get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Update your account email address
+## Delete a specific invalid email
 
-**This endpoint allows you to update the email address currently on file for your account.**
+**This endpoint allows you to remove a specific email address from the invalid email address list.**
 
-Keeping your user profile up to date is important. This will help SendGrid to verify who you are as well as contact you should we need to.
+An invalid email occurs when you attempt to send email to an address that is formatted in a manner that does not meet internet email format standards or the email does not exist at the recipients mail server.
 
-For more information about your user profile:
+Examples include addresses without the @ sign or addresses that include certain special characters and/or spaces. This response can come from our own server or the recipient mail server.
 
-* [SendGrid Account Settings](https://sendgrid.com/docs/User_Guide/Settings/account.html)
+For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/invalid_emails.html).
 
-### PUT /user/email
+### DELETE /suppression/invalid_emails/{email}
+
+
+```ruby
+email = "test_url_param"
+response = sg.client.suppression.invalid_emails._(email).delete()
+puts response.status_code
+puts response.body
+puts response.headers
+```
+## Retrieve a specific spam report
+
+**This endpoint allows you to retrieve a specific spam report.**
+
+[Spam reports](https://sendgrid.com/docs/Glossary/spam_reports.html) happen when a recipient indicates that they think your email is [spam](https://sendgrid.com/docs/Glossary/spam.html) and then their email provider reports this to SendGrid.
+
+For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/spam_reports.html).
+
+### GET /suppression/spam_report/{email}
 
 
 ```ruby
-data = JSON.parse('{
-  "email": "example@example.com"
-}')
-response = sg.client.user.email.put(request_body: data)
+email = "test_url_param"
+response = sg.client.suppression.spam_reports._(email).get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve your account email address
-
-**This endpoint allows you to retrieve the email address currently on file for your account.**
+## Delete a specific spam report
 
-Keeping your user profile up to date is important. This will help SendGrid to verify who you are as well as contact you should we need to.
+**This endpoint allows you to delete a specific spam report.**
 
-For more information about your user profile:
+[Spam reports](https://sendgrid.com/docs/Glossary/spam_reports.html) happen when a recipient indicates that they think your email is [spam](https://sendgrid.com/docs/Glossary/spam.html) and then their email provider reports this to SendGrid.
 
-* [SendGrid Account Settings](https://sendgrid.com/docs/User_Guide/Settings/account.html)
+For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/spam_reports.html).
 
-### GET /user/email
+### DELETE /suppression/spam_report/{email}
 
 
 ```ruby
-response = sg.client.user.email.get()
+email = "test_url_param"
+response = sg.client.suppression.spam_reports._(email).delete()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Update your password
-
-**This endpoint allows you to update your password.**
+## Retrieve all spam reports
 
-Keeping your user profile up to date is important. This will help SendGrid to verify who you are as well as contact you should we need to.
+**This endpoint allows you to retrieve all spam reports.**
 
-For more information about your user profile:
+[Spam reports](https://sendgrid.com/docs/Glossary/spam_reports.html) happen when a recipient indicates that they think your email is [spam](https://sendgrid.com/docs/Glossary/spam.html) and then their email provider reports this to SendGrid.
 
-* [SendGrid Account Settings](https://sendgrid.com/docs/User_Guide/Settings/account.html)
+For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/spam_reports.html).
 
-### PUT /user/password
+### GET /suppression/spam_reports
 
 
 ```ruby
-data = JSON.parse('{
-  "new_password": "new_password",
-  "old_password": "old_password"
-}')
-response = sg.client.user.password.put(request_body: data)
+params = JSON.parse('{"start_time": 1, "limit": 1, "end_time": 1, "offset": 1}')
+response = sg.client.suppression.spam_reports.get(query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Update a user's profile
+## Delete spam reports
 
-**This endpoint allows you to update your current profile details.**
+**This endpoint allows you to delete your spam reports.**
 
-Keeping your user profile up to date is important. This will help SendGrid to verify who you are as well as contact you should we need to.
+There are two options for deleting spam reports:
 
-For more information about your user profile:
+1) You can delete all spam reports by setting "delete_all" to true in the request body.
+2) You can delete some spam reports by specifying the email addresses in an array in the request body.
 
-* [SendGrid Account Settings](https://sendgrid.com/docs/User_Guide/Settings/account.html)
+[Spam reports](https://sendgrid.com/docs/Glossary/spam_reports.html) happen when a recipient indicates that they think your email is [spam](https://sendgrid.com/docs/Glossary/spam.html) and then their email provider reports this to SendGrid.
 
-It should be noted that any one or more of the parameters can be updated via the PATCH /user/profile endpoint. The only requirement is that you include at least one when you PATCH.
+For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/spam_reports.html).
 
-### PATCH /user/profile
+### DELETE /suppression/spam_reports
 
 
 ```ruby
 data = JSON.parse('{
-  "city": "Orange",
-  "first_name": "Example",
-  "last_name": "User"
+  "delete_all": false,
+  "emails": [
+    "example1@example.com",
+    "example2@example.com"
+  ]
 }')
-response = sg.client.user.profile.patch(request_body: data)
+response = sg.client.suppression.spam_reports.delete(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Get a user's profile
-
-Keeping your user profile up to date is important. This will help SendGrid to verify who you are as well as contact you should we need to.
+## Retrieve all global suppressions
 
-For more information about your user profile:
+**This endpoint allows you to retrieve a list of all email address that are globally suppressed.**
 
-* [SendGrid Account Settings](https://sendgrid.com/docs/User_Guide/Settings/account.html)
+A global suppression (or global unsubscribe) is an email address of a recipient who does not want to receive any of your messages. A globally suppressed recipient will be removed from any email you send. For more information, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Suppressions/global_unsubscribes.html).
 
-### GET /user/profile
+### GET /suppression/unsubscribes
 
 
 ```ruby
-response = sg.client.user.profile.get()
+params = JSON.parse('{"start_time": 1, "limit": 1, "end_time": 1, "offset": 1}')
+response = sg.client.suppression.unsubscribes.get(query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Cancel or pause a scheduled send
+<a name="templates"></a>
+# TEMPLATES
 
-**This endpoint allows you to cancel or pause an email that has been scheduled to be sent.**
+## Create a transactional template.
 
-If the maximum number of cancellations/pauses are added, HTTP 400 will
-be returned.
+**This endpoint allows you to create a transactional template.**
 
-The Cancel Scheduled Sends feature allows the customer to cancel a scheduled send based on a Batch ID included in the SMTPAPI header.Scheduled sends cancelled less than 10 minutes before the scheduled time are not guaranteed to be cancelled.
+Each user can create up to 300 different transactional templates. Transactional templates are specific to accounts and subusers. Templates created on a parent account will not be accessible from the subuser accounts.
 
-### POST /user/scheduled_sends
+Transactional templates are templates created specifically for transactional email and are not to be confused with [Marketing Campaigns templates](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/templates.html). For more information about transactional templates, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Transactional_Templates/index.html).
+
+### POST /templates
 
 
 ```ruby
 data = JSON.parse('{
-  "batch_id": "YOUR_BATCH_ID",
-  "status": "pause"
+  "name": "example_name"
 }')
-response = sg.client.user.scheduled_sends.post(request_body: data)
+response = sg.client.templates.post(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve all scheduled sends
+## Retrieve all transactional templates.
 
-**This endpoint allows you to retrieve all cancel/paused scheduled send information.**
+**This endpoint allows you to retrieve all transactional templates.**
 
-The Cancel Scheduled Sends feature allows the customer to cancel a scheduled send based on a Batch ID included in the SMTPAPI header.Scheduled sends cancelled less than 10 minutes before the scheduled time are not guaranteed to be cancelled.
+Each user can create up to 300 different transactional templates. Transactional templates are specific to accounts and subusers. Templates created on a parent account will not be accessible from the subuser accounts.
 
-### GET /user/scheduled_sends
+Transactional templates are templates created specifically for transactional email and are not to be confused with [Marketing Campaigns templates](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/templates.html). For more information about transactional templates, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Transactional_Templates/index.html).
+
+### GET /templates
 
 
 ```ruby
-response = sg.client.user.scheduled_sends.get()
+response = sg.client.templates.get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Update user scheduled send information
+## Edit a transactional template.
 
-**This endpoint allows you to update the status of a scheduled send for the given `batch_id`.**
+**This endpoint allows you to edit a transactional template.**
 
-The Cancel Scheduled Sends feature allows the customer to cancel a scheduled send based on a Batch ID included in the SMTPAPI header.Scheduled sends cancelled less than 10 minutes before the scheduled time are not guaranteed to be cancelled.
+Each user can create up to 300 different transactional templates. Transactional templates are specific to accounts and subusers. Templates created on a parent account will not be accessible from the subuser accounts.
+
+Transactional templates are templates created specifically for transactional email and are not to be confused with [Marketing Campaigns templates](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/templates.html). For more information about transactional templates, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Transactional_Templates/index.html).
 
-### PATCH /user/scheduled_sends/{batch_id}
+
+### PATCH /templates/{template_id}
 
 
 ```ruby
 data = JSON.parse('{
-  "status": "pause"
+  "name": "new_example_name"
 }')
-batch_id = "test_url_param"
-response = sg.client.user.scheduled_sends._(batch_id).patch(request_body: data)
+template_id = "test_url_param"
+response = sg.client.templates._(template_id).patch(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve scheduled send
-
-**This endpoint allows you to retrieve the cancel/paused scheduled send information for a specific `batch_id`.**
-
-The Cancel Scheduled Sends feature allows the customer to cancel a scheduled send based on a Batch ID included in the SMTPAPI header.Scheduled sends cancelled less than 10 minutes before the scheduled time are not guaranteed to be cancelled.
-
-### GET /user/scheduled_sends/{batch_id}
+## Retrieve a single transactional template.
 
+**This endpoint allows you to retrieve a single transactional template.**
 
-```ruby
-batch_id = "test_url_param"
-response = sg.client.user.scheduled_sends._(batch_id).get()
-puts response.status_code
-puts response.body
-puts response.headers
-```
-## Delete a cancellation or pause of a scheduled send
+Each user can create up to 300 different transactional templates. Transactional templates are specific to accounts and subusers. Templates created on a parent account will not be accessible from the subuser accounts.
 
-**This endpoint allows you to delete the cancellation/pause of a scheduled send.**
+Transactional templates are templates created specifically for transactional email and are not to be confused with [Marketing Campaigns templates](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/templates.html). For more information about transactional templates, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Transactional_Templates/index.html).
 
-The Cancel Scheduled Sends feature allows the customer to cancel a scheduled send based on a Batch ID included in the SMTPAPI header.Scheduled sends cancelled less than 10 minutes before the scheduled time are not guaranteed to be cancelled.
 
-### DELETE /user/scheduled_sends/{batch_id}
+### GET /templates/{template_id}
 
 
 ```ruby
-batch_id = "test_url_param"
-response = sg.client.user.scheduled_sends._(batch_id).delete()
+template_id = "test_url_param"
+response = sg.client.templates._(template_id).get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Update Enforced TLS settings
+## Delete a template.
 
-**This endpoint allows you to update your current Enforced TLS settings.**
+**This endpoint allows you to delete a transactional template.**
 
-The Enforced TLS settings specify whether or not the recipient is required to support TLS or have a valid certificate. See the [SMTP Ports User Guide](https://sendgrid.com/docs/Classroom/Basics/Email_Infrastructure/smtp_ports.html) for more information on opportunistic TLS.
+Each user can create up to 300 different transactional templates. Transactional templates are specific to accounts and subusers. Templates created on a parent account will not be accessible from the subuser accounts.
 
-**Note:** If either setting is enabled and the recipient does not support TLS or have a valid certificate, we drop the message and send a block event with TLS required but not supported as the description.
+Transactional templates are templates created specifically for transactional email and are not to be confused with [Marketing Campaigns templates](https://sendgrid.com/docs/User_Guide/Marketing_Campaigns/templates.html). For more information about transactional templates, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Transactional_Templates/index.html).
 
-### PATCH /user/settings/enforced_tls
+
+### DELETE /templates/{template_id}
 
 
 ```ruby
-data = JSON.parse('{
-  "require_tls": true,
-  "require_valid_cert": false
-}')
-response = sg.client.user.settings.enforced_tls.patch(request_body: data)
+template_id = "test_url_param"
+response = sg.client.templates._(template_id).delete()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve current Enforced TLS settings.
+## Create a new transactional template version.
 
-**This endpoint allows you to retrieve your current Enforced TLS settings.**
+**This endpoint allows you to create a new version of a template.**
 
-The Enforced TLS settings specify whether or not the recipient is required to support TLS or have a valid certificate. See the [SMTP Ports User Guide](https://sendgrid.com/docs/Classroom/Basics/Email_Infrastructure/smtp_ports.html) for more information on opportunistic TLS.
+Each transactional template can have multiple versions, each version with its own subject and content. Each user can have up to 300 versions across all templates.
 
-**Note:** If either setting is enabled and the recipient does not support TLS or have a valid certificate, we drop the message and send a block event with TLS required but not supported as the description.
+For more information about transactional templates, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Transactional_Templates/index.html).
 
-### GET /user/settings/enforced_tls
+
+### POST /templates/{template_id}/versions
 
 
 ```ruby
-response = sg.client.user.settings.enforced_tls.get()
+data = JSON.parse('{
+  "active": 1,
+  "html_content": "<%body%>",
+  "name": "example_version_name",
+  "plain_content": "<%body%>",
+  "subject": "<%subject%>",
+  "template_id": "ddb96bbc-9b92-425e-8979-99464621b543"
+}')
+template_id = "test_url_param"
+response = sg.client.templates._(template_id).versions.post(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Update your username
+## Edit a transactional template version.
 
-**This endpoint allows you to update the username for your account.**
+**This endpoint allows you to edit a version of one of your transactional templates.**
 
-Keeping your user profile up to date is important. This will help SendGrid to verify who you are as well as contact you should we need to.
+Each transactional template can have multiple versions, each version with its own subject and content. Each user can have up to 300 versions across all templates.
 
-For more information about your user profile:
+For more information about transactional templates, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Transactional_Templates/index.html).
 
-* [SendGrid Account Settings](https://sendgrid.com/docs/User_Guide/Settings/account.html)
+## URI Parameters
+| URI Parameter | Type | Description |
+|---|---|---|
+| template_id | string | The ID of the original template |
+| version_id | string | The ID of the template version |
 
-### PUT /user/username
+### PATCH /templates/{template_id}/versions/{version_id}
 
 
 ```ruby
 data = JSON.parse('{
-  "username": "test_username"
+  "active": 1,
+  "html_content": "<%body%>",
+  "name": "updated_example_name",
+  "plain_content": "<%body%>",
+  "subject": "<%subject%>"
 }')
-response = sg.client.user.username.put(request_body: data)
+template_id = "test_url_param"
+version_id = "test_url_param"
+response = sg.client.templates._(template_id).versions._(version_id).patch(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve your username
+## Retrieve a specific transactional template version.
 
-**This endpoint allows you to retrieve your current account username.**
+**This endpoint allows you to retrieve a specific version of a template.**
 
-Keeping your user profile up to date is important. This will help SendGrid to verify who you are as well as contact you should we need to.
+Each transactional template can have multiple versions, each version with its own subject and content. Each user can have up to 300 versions across all templates.
 
-For more information about your user profile:
+For more information about transactional templates, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Transactional_Templates/index.html).
 
-* [SendGrid Account Settings](https://sendgrid.com/docs/User_Guide/Settings/account.html)
+## URI Parameters
+| URI Parameter | Type | Description |
+|---|---|---|
+| template_id | string | The ID of the original template |
+| version_id | string |  The ID of the template version |
 
-### GET /user/username
+### GET /templates/{template_id}/versions/{version_id}
 
 
 ```ruby
-response = sg.client.user.username.get()
+template_id = "test_url_param"
+version_id = "test_url_param"
+response = sg.client.templates._(template_id).versions._(version_id).get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Update Event Notification Settings
+## Delete a transactional template version.
 
-**This endpoint allows you to update your current event webhook settings.**
+**This endpoint allows you to delete one of your transactional template versions.**
 
-If an event type is marked as `true`, then the event webhook will include information about that event.
+Each transactional template can have multiple versions, each version with its own subject and content. Each user can have up to 300 versions across all templates.
 
-SendGrids Event Webhook will notify a URL of your choice via HTTP POST with information about events that occur as SendGrid processes your email.
+For more information about transactional templates, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Transactional_Templates/index.html).
 
-Common uses of this data are to remove unsubscribes, react to spam reports, determine unengaged recipients, identify bounced email addresses, or create advanced analytics of your email program.
+## URI Parameters
+| URI Parameter | Type | Description |
+|---|---|---|
+| template_id | string | The ID of the original template |
+| version_id | string | The ID of the template version |
 
-### PATCH /user/webhooks/event/settings
+### DELETE /templates/{template_id}/versions/{version_id}
 
 
 ```ruby
-data = JSON.parse('{
-  "bounce": true,
-  "click": true,
-  "deferred": true,
-  "delivered": true,
-  "dropped": true,
-  "enabled": true,
-  "group_resubscribe": true,
-  "group_unsubscribe": true,
-  "open": true,
-  "processed": true,
-  "spam_report": true,
-  "unsubscribe": true,
-  "url": "url"
-}')
-response = sg.client.user.webhooks.event.settings.patch(request_body: data)
+template_id = "test_url_param"
+version_id = "test_url_param"
+response = sg.client.templates._(template_id).versions._(version_id).delete()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve Event Webhook settings
+## Activate a transactional template version.
 
-**This endpoint allows you to retrieve your current event webhook settings.**
+**This endpoint allows you to activate a version of one of your templates.**
 
-If an event type is marked as `true`, then the event webhook will include information about that event.
+Each transactional template can have multiple versions, each version with its own subject and content. Each user can have up to 300 versions across all templates.
 
-SendGrids Event Webhook will notify a URL of your choice via HTTP POST with information about events that occur as SendGrid processes your email.
 
-Common uses of this data are to remove unsubscribes, react to spam reports, determine unengaged recipients, identify bounced email addresses, or create advanced analytics of your email program.
+For more information about transactional templates, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Transactional_Templates/index.html).
 
-### GET /user/webhooks/event/settings
+## URI Parameters
+| URI Parameter | Type | Description |
+|---|---|---|
+| template_id | string | The ID of the original template |
+| version_id | string |  The ID of the template version |
+
+### POST /templates/{template_id}/versions/{version_id}/activate
 
 
 ```ruby
-response = sg.client.user.webhooks.event.settings.get()
+template_id = "test_url_param"
+version_id = "test_url_param"
+response = sg.client.templates._(template_id).versions._(version_id).activate.post()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Test Event Notification Settings
+<a name="tracking-settings"></a>
+# TRACKING SETTINGS
 
-**This endpoint allows you to test your event webhook by sending a fake event notification post to the provided URL.**
+## Retrieve Tracking Settings
 
-SendGrids Event Webhook will notify a URL of your choice via HTTP POST with information about events that occur as SendGrid processes your email.
+**This endpoint allows you to retrieve a list of all tracking settings that you can enable on your account.**
 
-Common uses of this data are to remove unsubscribes, react to spam reports, determine unengaged recipients, identify bounced email addresses, or create advanced analytics of your email program.
+You can track a variety of the actions your recipients may take when interacting with your emails including opening your emails, clicking on links in your emails, and subscribing to (or unsubscribing from) your emails.
 
-### POST /user/webhooks/event/test
+For more information about tracking, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/tracking.html).
+
+### GET /tracking_settings
 
 
 ```ruby
-data = JSON.parse('{
-  "url": "url"
-}')
-response = sg.client.user.webhooks.event.test.post(request_body: data)
+params = JSON.parse('{"limit": 1, "offset": 1}')
+response = sg.client.tracking_settings.get(query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Create a parse setting
+## Update Click Tracking Settings
 
-**This endpoint allows you to create a new inbound parse setting.**
+**This endpoint allows you to change your current click tracking setting. You can enable, or disable, click tracking using this endpoint.**
 
-The inbound parse webhook allows you to have incoming emails parsed, extracting some or all of the content, and then have that content POSTed by SendGrid to a URL of your choosing. For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Webhooks/parse.html).
+You can track a variety of the actions your recipients may take when interacting with your emails including opening your emails, clicking on links in your emails, and subscribing to (or unsubscribing from) your emails.
 
-### POST /user/webhooks/parse/settings
+For more information about tracking, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/tracking.html).
+
+### PATCH /tracking_settings/click
 
 
 ```ruby
 data = JSON.parse('{
-  "hostname": "myhostname.com",
-  "send_raw": false,
-  "spam_check": true,
-  "url": "http://email.myhosthame.com"
+  "enabled": true
 }')
-response = sg.client.user.webhooks.parse.settings.post(request_body: data)
+response = sg.client.tracking_settings.click.patch(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve all parse settings
+## Retrieve Click Track Settings
 
-**This endpoint allows you to retrieve all of your current inbound parse settings.**
+**This endpoint allows you to retrieve your current click tracking setting.**
 
-The inbound parse webhook allows you to have incoming emails parsed, extracting some or all of the content, and then have that content POSTed by SendGrid to a URL of your choosing. For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Webhooks/parse.html).
+You can track a variety of the actions your recipients may take when interacting with your emails including opening your emails, clicking on links in your emails, and subscribing to (or unsubscribing from) your emails.
 
-### GET /user/webhooks/parse/settings
+For more information about tracking, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/tracking.html).
+
+### GET /tracking_settings/click
 
 
 ```ruby
-response = sg.client.user.webhooks.parse.settings.get()
+response = sg.client.tracking_settings.click.get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Update a parse setting
+## Update Google Analytics Settings
 
-**This endpoint allows you to update a specific inbound parse setting.**
+**This endpoint allows you to update your current setting for Google Analytics.**
 
-The inbound parse webhook allows you to have incoming emails parsed, extracting some or all of the content, and then have that content POSTed by SendGrid to a URL of your choosing. For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Webhooks/parse.html).
+For more information about using Google Analytics, please refer to [Googles URL Builder](https://support.google.com/analytics/answer/1033867?hl=en) and their article on ["Best Practices for Campaign Building"](https://support.google.com/analytics/answer/1037445).
 
-### PATCH /user/webhooks/parse/settings/{hostname}
+We default the settings to Googles recommendations. For more information, see [Google Analytics Demystified](https://sendgrid.com/docs/Classroom/Track/Collecting_Data/google_analytics_demystified_ga_statistics_vs_sg_statistics.html).
+
+You can track a variety of the actions your recipients may take when interacting with your emails including opening your emails, clicking on links in your emails, and subscribing to (or unsubscribing from) your emails.
+
+For more information about tracking, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/tracking.html).
+
+### PATCH /tracking_settings/google_analytics
 
 
 ```ruby
 data = JSON.parse('{
-  "send_raw": true,
-  "spam_check": false,
-  "url": "http://newdomain.com/parse"
+  "enabled": true,
+  "utm_campaign": "website",
+  "utm_content": "",
+  "utm_medium": "email",
+  "utm_source": "sendgrid.com",
+  "utm_term": ""
 }')
-hostname = "test_url_param"
-response = sg.client.user.webhooks.parse.settings._(hostname).patch(request_body: data)
+response = sg.client.tracking_settings.google_analytics.patch(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve a specific parse setting
-
-**This endpoint allows you to retrieve a specific inbound parse setting.**
-
-The inbound parse webhook allows you to have incoming emails parsed, extracting some or all of the content, and then have that content POSTed by SendGrid to a URL of your choosing. For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Webhooks/parse.html).
+## Retrieve Google Analytics Settings
 
-### GET /user/webhooks/parse/settings/{hostname}
+**This endpoint allows you to retrieve your current setting for Google Analytics.**
 
+For more information about using Google Analytics, please refer to [Googles URL Builder](https://support.google.com/analytics/answer/1033867?hl=en) and their article on ["Best Practices for Campaign Building"](https://support.google.com/analytics/answer/1037445).
 
-```ruby
-hostname = "test_url_param"
-response = sg.client.user.webhooks.parse.settings._(hostname).get()
-puts response.status_code
-puts response.body
-puts response.headers
-```
-## Delete a parse setting
+We default the settings to Googles recommendations. For more information, see [Google Analytics Demystified](https://sendgrid.com/docs/Classroom/Track/Collecting_Data/google_analytics_demystified_ga_statistics_vs_sg_statistics.html).
 
-**This endpoint allows you to delete a specific inbound parse setting.**
+You can track a variety of the actions your recipients may take when interacting with your emails including opening your emails, clicking on links in your emails, and subscribing to (or unsubscribing from) your emails.
 
-The inbound parse webhook allows you to have incoming emails parsed, extracting some or all of the content, and then have that content POSTed by SendGrid to a URL of your choosing. For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Webhooks/parse.html).
+For more information about tracking, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/tracking.html).
 
-### DELETE /user/webhooks/parse/settings/{hostname}
+### GET /tracking_settings/google_analytics
 
 
 ```ruby
-hostname = "test_url_param"
-response = sg.client.user.webhooks.parse.settings._(hostname).delete()
+response = sg.client.tracking_settings.google_analytics.get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieves Inbound Parse Webhook statistics.
+## Update Open Tracking Settings
 
-**This endpoint allows you to retrieve the statistics for your Parse Webhook usage.**
+**This endpoint allows you to update your current settings for open tracking.**
 
-SendGrid's Inbound Parse Webhook allows you to parse the contents and attachments of incoming emails. The Parse API can then POST the parsed emails to a URL that you specify. The Inbound Parse Webhook cannot parse messages greater than 20MB in size, including all attachments.
+Open Tracking adds an invisible image at the end of the email which can track email opens. If the email recipient has images enabled on their email client, a request to Twilio SendGrid's server for the invisible image is executed and an open event is logged. These events are logged in the Statistics portal, Email Activity interface, and are reported by the Event Webhook.
+
+You can track a variety of the actions your recipients may take when interacting with your emails including opening your emails, clicking on links in your emails, and subscribing to (or unsubscribing from) your emails.
 
-There are a number of pre-made integrations for the SendGrid Parse Webhook which make processing events easy. You can find these integrations in the [Library Index](https://sendgrid.com/docs/Integrate/libraries.html#-Webhook-Libraries).
+For more information about tracking, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/tracking.html).
 
-### GET /user/webhooks/parse/stats
+### PATCH /tracking_settings/open
 
 
 ```ruby
-params = JSON.parse('{"aggregated_by": "day", "limit": "test_string", "start_date": "2016-01-01", "end_date": "2016-04-01", "offset": "test_string"}')
-response = sg.client.user.webhooks.parse.stats.get(query_params: params)
+data = JSON.parse('{
+  "enabled": true
+}')
+response = sg.client.tracking_settings.open.patch(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-<a name="whitelabel"></a>
-# WHITELABEL
-
-## Create a domain whitelabel.
+## Get Open Tracking Settings
 
-**This endpoint allows you to create a whitelabel for one of your domains.**
+**This endpoint allows you to retrieve your current settings for open tracking.**
 
-If you are creating a domain whitelabel that you would like a subuser to use, you have two options:
-1. Use the "username" parameter. This allows you to create a whitelabel on behalf of your subuser. This means the subuser is able to see and modify the created whitelabel.
-2. Use the Association workflow (see Associate Domain section). This allows you to assign a whitelabel created by the parent to a subuser. This means the subuser will default to the assigned whitelabel, but will not be able to see or modify that whitelabel. However, if the subuser creates their own whitelabel it will overwrite the assigned whitelabel.
+Open Tracking adds an invisible image at the end of the email which can track email opens. If the email recipient has images enabled on their email client, a request to Twilio SendGrid's server for the invisible image is executed and an open event is logged. These events are logged in the Statistics portal, Email Activity interface, and are reported by the Event Webhook.
 
-A domain whitelabel allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Whitelabeling a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
+You can track a variety of the actions your recipients may take when interacting with your emails including opening your emails, clicking on links in your emails, and subscribing to (or unsubscribing from) your emails.
 
-For more information on whitelabeling, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html)
+For more information about tracking, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/tracking.html).
 
-### POST /whitelabel/domains
+### GET /tracking_settings/open
 
 
 ```ruby
-data = JSON.parse('{
-  "automatic_security": false,
-  "custom_spf": true,
-  "default": true,
-  "domain": "example.com",
-  "ips": [
-    "192.168.1.1",
-    "192.168.1.2"
-  ],
-  "subdomain": "news",
-  "username": "john@example.com"
-}')
-response = sg.client.whitelabel.domains.post(request_body: data)
+response = sg.client.tracking_settings.open.get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## List all domain whitelabels.
+## Update Subscription Tracking Settings
 
-**This endpoint allows you to retrieve a list of all domain whitelabels you have created.**
+**This endpoint allows you to update your current settings for subscription tracking.**
 
-A domain whitelabel allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Whitelabeling a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
+Subscription tracking adds links to the bottom of your emails that allows your recipients to subscribe to, or unsubscribe from, your emails.
 
-For more information on whitelabeling, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html)
+You can track a variety of the actions your recipients may take when interacting with your emails including opening your emails, clicking on links in your emails, and subscribing to (or unsubscribing from) your emails.
 
+For more information about tracking, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/tracking.html).
 
-### GET /whitelabel/domains
+### PATCH /tracking_settings/subscription
 
 
 ```ruby
-params = JSON.parse('{"username": "test_string", "domain": "test_string", "exclude_subusers": "true", "limit": 1, "offset": 1}')
-response = sg.client.whitelabel.domains.get(query_params: params)
+data = JSON.parse('{
+  "enabled": true,
+  "html_content": "html content",
+  "landing": "landing page html",
+  "plain_content": "text content",
+  "replace": "replacement tag",
+  "url": "url"
+}')
+response = sg.client.tracking_settings.subscription.patch(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Get the default domain whitelabel.
+## Retrieve Subscription Tracking Settings
 
-**This endpoint allows you to retrieve the default whitelabel for a domain.**
+**This endpoint allows you to retrieve your current settings for subscription tracking.**
 
-A domain whitelabel allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Whitelabeling a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
+Subscription tracking adds links to the bottom of your emails that allows your recipients to subscribe to, or unsubscribe from, your emails.
 
-For more information on whitelabeling, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html)
+You can track a variety of the actions your recipients may take when interacting with your emails including opening your emails, clicking on links in your emails, and subscribing to (or unsubscribing from) your emails.
 
-## URI Parameters
-| URI Parameter   | Type   | Description  |
-|---|---|---|
-| domain | string  |The domain to find a default domain whitelabel for. |
+For more information about tracking, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/tracking.html).
 
-### GET /whitelabel/domains/default
+### GET /tracking_settings/subscription
 
 
 ```ruby
-response = sg.client.whitelabel.domains.default.get()
+response = sg.client.tracking_settings.subscription.get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## List the domain whitelabel associated with the given user.
+<a name="user"></a>
+# USER
 
-**This endpoint allows you to retrieve all of the whitelabels that have been assigned to a specific subuser.**
+## Get a user's account information.
 
-A domain whitelabel allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Whitelabeling a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
+**This endpoint allows you to retrieve your user account details.**
 
-Domain whitelabels can be associated with (i.e. assigned to) subusers from a parent account. This functionality allows subusers to send mail using their parent's whitelabels. To associate a whitelabel with a subuser, the parent account must first create the whitelabel and validate it. The parent may then associate the whitelabel via the subuser management tools.
+Your user's account information includes the user's account type and reputation.
 
-For more information on whitelabeling, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html)
+Keeping your user profile up to date is important. This will help Twilio SendGrid to verify who you are as well as contact you should we need to.
 
-## URI Parameters
-| URI Parameter   | Type  | Description  |
-|---|---|---|
-| username | string  | Username of the subuser to find associated whitelabels for. |
+For more information about your user profile:
 
-### GET /whitelabel/domains/subuser
+* [Twilio SendGrid Account Settings](https://sendgrid.com/docs/User_Guide/Settings/account.html)
+
+### GET /user/account
 
 
 ```ruby
-response = sg.client.whitelabel.domains.subuser.get()
+response = sg.client.user.account.get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Disassociate a domain whitelabel from a given user.
-
-**This endpoint allows you to disassociate a specific whitelabel from a subuser.**
-
-A domain whitelabel allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Whitelabeling a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
-
-Domain whitelabels can be associated with (i.e. assigned to) subusers from a parent account. This functionality allows subusers to send mail using their parent's whitelabels. To associate a whitelabel with a subuser, the parent account must first create the whitelabel and validate it. The parent may then associate the whitelabel via the subuser management tools.
+## Retrieve your credit balance
 
-For more information on whitelabeling, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html)
+**This endpoint allows you to retrieve the current credit balance for your account.**
 
-## URI Parameters
-| URI Parameter   | Type  | Required?  | Description  |
-|---|---|---|---|
-| username | string  | required  | Username for the subuser to find associated whitelabels for. |
+Your monthly credit allotment limits the number of emails you may send before incurring overage charges. For more information about credits and billing, please visit our [Classroom](https://sendgrid.com/docs/Classroom/Basics/Billing/billing_info_and_faqs.html).
 
-### DELETE /whitelabel/domains/subuser
+### GET /user/credits
 
 
 ```ruby
-response = sg.client.whitelabel.domains.subuser.delete()
+response = sg.client.user.credits.get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Update a domain whitelabel.
+## Update your account email address
 
-**This endpoint allows you to update the settings for a domain whitelabel.**
+**This endpoint allows you to update the email address currently on file for your account.**
+
+Keeping your user profile up to date is important. This will help Twilio SendGrid to verify who you are as well as contact you should we need to.
 
-A domain whitelabel allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Whitelabeling a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
+For more information about your user profile:
 
-For more information on whitelabeling, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html)
+* [Twilio SendGrid Account Settings](https://sendgrid.com/docs/User_Guide/Settings/account.html)
 
-### PATCH /whitelabel/domains/{domain_id}
+### PUT /user/email
 
 
 ```ruby
 data = JSON.parse('{
-  "custom_spf": true,
-  "default": false
+  "email": "example@example.com"
 }')
-domain_id = "test_url_param"
-response = sg.client.whitelabel.domains._(domain_id).patch(request_body: data)
+response = sg.client.user.email.put(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve a domain whitelabel.
+## Retrieve your account email address
 
-**This endpoint allows you to retrieve a specific domain whitelabel.**
+**This endpoint allows you to retrieve the email address currently on file for your account.**
 
-A domain whitelabel allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Whitelabeling a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
+Keeping your user profile up to date is important. This will help Twilio SendGrid to verify who you are as well as contact you should we need to.
 
-For more information on whitelabeling, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html)
+For more information about your user profile:
 
+* [Twilio SendGrid Account Settings](https://sendgrid.com/docs/User_Guide/Settings/account.html)
 
-### GET /whitelabel/domains/{domain_id}
+### GET /user/email
 
 
 ```ruby
-domain_id = "test_url_param"
-response = sg.client.whitelabel.domains._(domain_id).get()
+response = sg.client.user.email.get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Delete a domain whitelabel.
+## Update your password
 
-**This endpoint allows you to delete a domain whitelabel.**
+**This endpoint allows you to update your password.**
+
+Keeping your user profile up to date is important. This will help Twilio SendGrid to verify who you are as well as contact you should we need to.
 
-A domain whitelabel allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Whitelabeling a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
+For more information about your user profile:
 
-For more information on whitelabeling, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html)
+* [Twilio SendGrid Account Settings](https://sendgrid.com/docs/User_Guide/Settings/account.html)
 
-### DELETE /whitelabel/domains/{domain_id}
+### PUT /user/password
 
 
 ```ruby
-domain_id = "test_url_param"
-response = sg.client.whitelabel.domains._(domain_id).delete()
+data = JSON.parse('{
+  "new_password": "new_password",
+  "old_password": "old_password"
+}')
+response = sg.client.user.password.put(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Associate a domain whitelabel with a given user.
+## Update a user's profile
 
-**This endpoint allows you to associate a specific domain whitelabel with a subuser.**
+**This endpoint allows you to update your current profile details.**
 
-A domain whitelabel allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Whitelabeling a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
+Keeping your user profile up to date is important. This will help Twilio SendGrid to verify who you are as well as contact you should we need to.
 
-Domain whitelabels can be associated with (i.e. assigned to) subusers from a parent account. This functionality allows subusers to send mail using their parent's whitelabels. To associate a whitelabel with a subuser, the parent account must first create the whitelabel and validate it. The parent may then associate the whitelabel via the subuser management tools.
+For more information about your user profile:
 
-For more information on whitelabeling, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html)
+* [Twilio SendGrid Account Settings](https://sendgrid.com/docs/User_Guide/Settings/account.html)
 
-## URI Parameters
-| URI Parameter   | Type   | Description  |
-|---|---|---|
-| domain_id | integer   | ID of the domain whitelabel to associate with the subuser. |
+It should be noted that any one or more of the parameters can be updated via the PATCH /user/profile endpoint. The only requirement is that you include at least one when you PATCH.
 
-### POST /whitelabel/domains/{domain_id}/subuser
+### PATCH /user/profile
 
 
 ```ruby
 data = JSON.parse('{
-  "username": "jane@example.com"
+  "city": "Orange",
+  "first_name": "Example",
+  "last_name": "User"
 }')
-domain_id = "test_url_param"
-response = sg.client.whitelabel.domains._(domain_id).subuser.post(request_body: data)
+response = sg.client.user.profile.patch(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Add an IP to a domain whitelabel.
-
-**This endpoint allows you to add an IP address to a domain whitelabel.**
+## Get a user's profile
 
-A domain whitelabel allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Whitelabeling a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
+Keeping your user profile up to date is important. This will help Twilio SendGrid to verify who you are as well as contact you should we need to.
 
-For more information on whitelabeling, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html)
+For more information about your user profile:
 
-## URI Parameters
-| URI Parameter   | Type  |  Description  |
-|---|---|---|
-| id | integer  | ID of the domain to which you are adding an IP |
+* [Twilio SendGrid Account Settings](https://sendgrid.com/docs/User_Guide/Settings/account.html)
 
-### POST /whitelabel/domains/{id}/ips
+### GET /user/profile
 
 
 ```ruby
-data = JSON.parse('{
-  "ip": "192.168.0.1"
-}')
-id = "test_url_param"
-response = sg.client.whitelabel.domains._(id).ips.post(request_body: data)
+response = sg.client.user.profile.get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Remove an IP from a domain whitelabel.
-
-**This endpoint allows you to remove a domain's IP address from that domain's whitelabel.**
+## Cancel or pause a scheduled send
 
-A domain whitelabel allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Whitelabeling a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
+**This endpoint allows you to cancel or pause an email that has been scheduled to be sent.**
 
-For more information on whitelabeling, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html)
+If the maximum number of cancellations/pauses are added, HTTP 400 will
+be returned.
 
-## URI Parameters
-| URI Parameter   | Type  | Description  |
-|---|---|---|
-| id | integer  | ID of the domain whitelabel to delete the IP from. |
-| ip | string | IP to remove from the domain whitelabel. |
+The Cancel Scheduled Sends feature allows the customer to cancel a scheduled send based on a Batch ID included in the SMTPAPI header.Scheduled sends cancelled less than 10 minutes before the scheduled time are not guaranteed to be cancelled.
 
-### DELETE /whitelabel/domains/{id}/ips/{ip}
+### POST /user/scheduled_sends
 
 
 ```ruby
-id = "test_url_param"
-ip = "test_url_param"
-response = sg.client.whitelabel.domains._(id).ips._(ip).delete()
+data = JSON.parse('{
+  "batch_id": "YOUR_BATCH_ID",
+  "status": "pause"
+}')
+response = sg.client.user.scheduled_sends.post(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Validate a domain whitelabel.
-
-**This endpoint allows you to validate a domain whitelabel. If it fails, it will return an error message describing why the whitelabel could not be validated.**
-
-A domain whitelabel allows you to remove the via or sent on behalf of message that your recipients see when they read your emails. Whitelabeling a domain allows you to replace sendgrid.net with your personal sending domain. You will be required to create a subdomain so that SendGrid can generate the DNS records which you must give to your host provider. If you choose to use Automated Security, SendGrid will provide you with 3 CNAME records. If you turn Automated Security off, you will be given 2 TXT records and 1 MX record.
+## Retrieve all scheduled sends
 
-For more information on whitelabeling, please see our [User Guide](https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html)
+**This endpoint allows you to retrieve all cancel/paused scheduled send information.**
 
-## URI Parameters
-| URI Parameter   | Type   | Description  |
-|---|---|---|
-| id | integer  |ID of the domain whitelabel to validate. |
+The Cancel Scheduled Sends feature allows the customer to cancel a scheduled send based on a Batch ID included in the SMTPAPI header.Scheduled sends cancelled less than 10 minutes before the scheduled time are not guaranteed to be cancelled.
 
-### POST /whitelabel/domains/{id}/validate
+### GET /user/scheduled_sends
 
 
 ```ruby
-id = "test_url_param"
-response = sg.client.whitelabel.domains._(id).validate.post()
+response = sg.client.user.scheduled_sends.get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Create an IP whitelabel
-
-**This endpoint allows you to create an IP whitelabel.**
-
-When creating an IP whitelable, you should use the same subdomain that you used when you created a domain whitelabel.
+## Update user scheduled send information
 
-A IP whitelabel consists of a subdomain and domain that will be used to generate a reverse DNS record for a given IP. Once SendGrid has verified that the appropriate A record for the IP has been created, the appropriate reverse DNS record for the IP is generated.
+**This endpoint allows you to update the status of a scheduled send for the given `batch_id`.**
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Web_API_v3/Whitelabel/ips.html).
+The Cancel Scheduled Sends feature allows the customer to cancel a scheduled send based on a Batch ID included in the SMTPAPI header.Scheduled sends cancelled less than 10 minutes before the scheduled time are not guaranteed to be cancelled.
 
-### POST /whitelabel/ips
+### PATCH /user/scheduled_sends/{batch_id}
 
 
 ```ruby
 data = JSON.parse('{
-  "domain": "example.com",
-  "ip": "192.168.1.1",
-  "subdomain": "email"
+  "status": "pause"
 }')
-response = sg.client.whitelabel.ips.post(request_body: data)
+batch_id = "test_url_param"
+response = sg.client.user.scheduled_sends._(batch_id).patch(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve all IP whitelabels
-
-**This endpoint allows you to retrieve all of the IP whitelabels that have been created by this account.**
-
-You may include a search key by using the "ip" parameter. This enables you to perform a prefix search for a given IP segment (e.g. "192.").
+## Retrieve scheduled send
 
-A IP whitelabel consists of a subdomain and domain that will be used to generate a reverse DNS record for a given IP. Once SendGrid has verified that the appropriate A record for the IP has been created, the appropriate reverse DNS record for the IP is generated.
+**This endpoint allows you to retrieve the cancel/paused scheduled send information for a specific `batch_id`.**
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Web_API_v3/Whitelabel/ips.html).
+The Cancel Scheduled Sends feature allows the customer to cancel a scheduled send based on a Batch ID included in the SMTPAPI header.Scheduled sends cancelled less than 10 minutes before the scheduled time are not guaranteed to be cancelled.
 
-### GET /whitelabel/ips
+### GET /user/scheduled_sends/{batch_id}
 
 
 ```ruby
-params = JSON.parse('{"ip": "test_string", "limit": 1, "offset": 1}')
-response = sg.client.whitelabel.ips.get(query_params: params)
+batch_id = "test_url_param"
+response = sg.client.user.scheduled_sends._(batch_id).get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve an IP whitelabel
-
-**This endpoint allows you to retrieve an IP whitelabel.**
+## Delete a cancellation or pause of a scheduled send
 
-A IP whitelabel consists of a subdomain and domain that will be used to generate a reverse DNS record for a given IP. Once SendGrid has verified that the appropriate A record for the IP has been created, the appropriate reverse DNS record for the IP is generated.
+**This endpoint allows you to delete the cancellation/pause of a scheduled send.**
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Web_API_v3/Whitelabel/ips.html).
+The Cancel Scheduled Sends feature allows the customer to cancel a scheduled send based on a Batch ID included in the SMTPAPI header.Scheduled sends cancelled less than 10 minutes before the scheduled time are not guaranteed to be cancelled.
 
-### GET /whitelabel/ips/{id}
+### DELETE /user/scheduled_sends/{batch_id}
 
 
 ```ruby
-id = "test_url_param"
-response = sg.client.whitelabel.ips._(id).get()
+batch_id = "test_url_param"
+response = sg.client.user.scheduled_sends._(batch_id).delete()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Delete an IP whitelabel
+## Update Enforced TLS settings
 
-**This endpoint allows you to delete an IP whitelabel.**
+**This endpoint allows you to update your current Enforced TLS settings.**
 
-A IP whitelabel consists of a subdomain and domain that will be used to generate a reverse DNS record for a given IP. Once SendGrid has verified that the appropriate A record for the IP has been created, the appropriate reverse DNS record for the IP is generated.
+The Enforced TLS settings specify whether or not the recipient is required to support TLS or have a valid certificate. See the [SMTP Ports User Guide](https://sendgrid.com/docs/Classroom/Basics/Email_Infrastructure/smtp_ports.html) for more information on opportunistic TLS.
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Web_API_v3/Whitelabel/ips.html).
+**Note:** If either setting is enabled and the recipient does not support TLS or have a valid certificate, we drop the message and send a block event with TLS required but not supported as the description.
 
-### DELETE /whitelabel/ips/{id}
+### PATCH /user/settings/enforced_tls
 
 
 ```ruby
-id = "test_url_param"
-response = sg.client.whitelabel.ips._(id).delete()
+data = JSON.parse('{
+  "require_tls": true,
+  "require_valid_cert": false
+}')
+response = sg.client.user.settings.enforced_tls.patch(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Validate an IP whitelabel
+## Retrieve current Enforced TLS settings.
 
-**This endpoint allows you to validate an IP whitelabel.**
+**This endpoint allows you to retrieve your current Enforced TLS settings.**
 
-A IP whitelabel consists of a subdomain and domain that will be used to generate a reverse DNS record for a given IP. Once SendGrid has verified that the appropriate A record for the IP has been created, the appropriate reverse DNS record for the IP is generated.
+The Enforced TLS settings specify whether or not the recipient is required to support TLS or have a valid certificate. See the [SMTP Ports User Guide](https://sendgrid.com/docs/Classroom/Basics/Email_Infrastructure/smtp_ports.html) for more information on opportunistic TLS.
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Web_API_v3/Whitelabel/ips.html).
+**Note:** If either setting is enabled and the recipient does not support TLS or have a valid certificate, we drop the message and send a block event with TLS required but not supported as the description.
 
-### POST /whitelabel/ips/{id}/validate
+### GET /user/settings/enforced_tls
 
 
 ```ruby
-id = "test_url_param"
-response = sg.client.whitelabel.ips._(id).validate.post()
+response = sg.client.user.settings.enforced_tls.get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Create a Link Whitelabel
+## Update your username
+
+**This endpoint allows you to update the username for your account.**
 
-**This endpoint allows you to create a new link whitelabel.**
+Keeping your user profile up to date is important. This will help Twilio SendGrid to verify who you are as well as contact you should we need to.
 
-Email link whitelabels allow all of the click-tracked links you send in your emails to include the URL of your domain instead of sendgrid.net.
+For more information about your user profile:
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Web_API_v3/Whitelabel/links.html).
+* [Twilio SendGrid Account Settings](https://sendgrid.com/docs/User_Guide/Settings/account.html)
 
-### POST /whitelabel/links
+### PUT /user/username
 
 
 ```ruby
 data = JSON.parse('{
-  "default": true,
-  "domain": "example.com",
-  "subdomain": "mail"
+  "username": "test_username"
 }')
-params = JSON.parse('{"limit": 1, "offset": 1}')
-response = sg.client.whitelabel.links.post(request_body: data, query_params: params)
+response = sg.client.user.username.put(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve all link whitelabels
+## Retrieve your username
+
+**This endpoint allows you to retrieve your current account username.**
 
-**This endpoint allows you to retrieve all link whitelabels.**
+Keeping your user profile up to date is important. This will help Twilio SendGrid to verify who you are as well as contact you should we need to.
 
-Email link whitelabels allow all of the click-tracked links you send in your emails to include the URL of your domain instead of sendgrid.net.
+For more information about your user profile:
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Web_API_v3/Whitelabel/links.html).
+* [Twilio SendGrid Account Settings](https://sendgrid.com/docs/User_Guide/Settings/account.html)
 
-### GET /whitelabel/links
+### GET /user/username
 
 
 ```ruby
-params = JSON.parse('{"limit": 1}')
-response = sg.client.whitelabel.links.get(query_params: params)
+response = sg.client.user.username.get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve a Default Link Whitelabel
+## Update Event Notification Settings
 
-**This endpoint allows you to retrieve the default link whitelabel.**
+**This endpoint allows you to update your current event webhook settings.**
 
-Default link whitelabel is the actual link whitelabel to be used when sending messages. If there are multiple link whitelabels, the default is determined by the following order:
-<ul>
-  <li>Validated link whitelabels marked as "default"</li>
-  <li>Legacy link whitelabels (migrated from the whitelabel wizard)</li>
-  <li>Default SendGrid link whitelabel (i.e. 100.ct.sendgrid.net)</li>
-</ul>
+If an event type is marked as `true`, then the event webhook will include information about that event.
 
-Email link whitelabels allow all of the click-tracked links you send in your emails to include the URL of your domain instead of sendgrid.net.
+Twilio SendGrid's Event Webhook will notify a URL of your choice via HTTP POST with information about events that occur as Twilio SendGrid processes your email.
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Web_API_v3/Whitelabel/links.html).
+Common uses of this data are to remove unsubscribes, react to spam reports, determine unengaged recipients, identify bounced email addresses, or create advanced analytics of your email program.
 
-### GET /whitelabel/links/default
+### PATCH /user/webhooks/event/settings
 
 
 ```ruby
-params = JSON.parse('{"domain": "test_string"}')
-response = sg.client.whitelabel.links.default.get(query_params: params)
+data = JSON.parse('{
+  "bounce": true,
+  "click": true,
+  "deferred": true,
+  "delivered": true,
+  "dropped": true,
+  "enabled": true,
+  "group_resubscribe": true,
+  "group_unsubscribe": true,
+  "open": true,
+  "processed": true,
+  "spam_report": true,
+  "unsubscribe": true,
+  "url": "url"
+}')
+response = sg.client.user.webhooks.event.settings.patch(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve Associated Link Whitelabel
+## Retrieve Event Webhook settings
 
-**This endpoint allows you to retrieve the associated link whitelabel for a subuser.**
+**This endpoint allows you to retrieve your current event webhook settings.**
 
-Link whitelables can be associated with subusers from the parent account. This functionality allows
-subusers to send mail using their parent's link whitelabels. To associate a link whitelabel, the parent account
-must first create a whitelabel and validate it. The parent may then associate that whitelabel with a subuser via the API or the Subuser Management page in the user interface.
+If an event type is marked as `true`, then the event webhook will include information about that event.
 
-Email link whitelabels allow all of the click-tracked links you send in your emails to include the URL of your domain instead of sendgrid.net.
+Twilio SendGrid's Event Webhook will notify a URL of your choice via HTTP POST with information about events that occur as Twilio SendGrid processes your email.
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Web_API_v3/Whitelabel/links.html).
+Common uses of this data are to remove unsubscribes, react to spam reports, determine unengaged recipients, identify bounced email addresses, or create advanced analytics of your email program.
 
-### GET /whitelabel/links/subuser
+### GET /user/webhooks/event/settings
 
 
 ```ruby
-params = JSON.parse('{"username": "test_string"}')
-response = sg.client.whitelabel.links.subuser.get(query_params: params)
+response = sg.client.user.webhooks.event.settings.get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Disassociate a Link Whitelabel
-
-**This endpoint allows you to disassociate a link whitelabel from a subuser.**
+## Test Event Notification Settings
 
-Link whitelables can be associated with subusers from the parent account. This functionality allows
-subusers to send mail using their parent's link whitelabels. To associate a link whitelabel, the parent account
-must first create a whitelabel and validate it. The parent may then associate that whitelabel with a subuser via the API or the Subuser Management page in the user interface.
+**This endpoint allows you to test your event webhook by sending a fake event notification post to the provided URL.**
 
-Email link whitelabels allow all of the click-tracked links you send in your emails to include the URL of your domain instead of sendgrid.net.
+Twilio SendGrid's Event Webhook will notify a URL of your choice via HTTP POST with information about events that occur as Twilio SendGrid processes your email.
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Web_API_v3/Whitelabel/links.html).
+Common uses of this data are to remove unsubscribes, react to spam reports, determine unengaged recipients, identify bounced email addresses, or create advanced analytics of your email program.
 
-### DELETE /whitelabel/links/subuser
+### POST /user/webhooks/event/test
 
 
 ```ruby
-params = JSON.parse('{"username": "test_string"}')
-response = sg.client.whitelabel.links.subuser.delete(query_params: params)
+data = JSON.parse('{
+  "url": "url"
+}')
+response = sg.client.user.webhooks.event.test.post(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Update a Link Whitelabel
-
-**This endpoint allows you to update a specific link whitelabel. You can use this endpoint to change a link whitelabel's default status.**
+## Create a parse setting
 
-Email link whitelabels allow all of the click-tracked links you send in your emails to include the URL of your domain instead of sendgrid.net.
+**This endpoint allows you to create a new inbound parse setting.**
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Web_API_v3/Whitelabel/links.html).
+The inbound parse webhook allows you to have incoming emails parsed, extracting some or all of the content, and then have that content POSTed by Twilio SendGrid to a URL of your choosing. For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Webhooks/parse.html).
 
-### PATCH /whitelabel/links/{id}
+### POST /user/webhooks/parse/settings
 
 
 ```ruby
 data = JSON.parse('{
-  "default": true
+  "hostname": "myhostname.com",
+  "send_raw": false,
+  "spam_check": true,
+  "url": "http://email.myhosthame.com"
 }')
-id = "test_url_param"
-response = sg.client.whitelabel.links._(id).patch(request_body: data)
+response = sg.client.user.webhooks.parse.settings.post(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Retrieve a Link Whitelabel
-
-**This endpoint allows you to retrieve a specific link whitelabel.**
+## Retrieve all parse settings
 
-Email link whitelabels allow all of the click-tracked links you send in your emails to include the URL of your domain instead of sendgrid.net.
+**This endpoint allows you to retrieve all of your current inbound parse settings.**
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Web_API_v3/Whitelabel/links.html).
+The inbound parse webhook allows you to have incoming emails parsed, extracting some or all of the content, and then have that content POSTed by Twilio SendGrid to a URL of your choosing. For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Webhooks/parse.html).
 
-### GET /whitelabel/links/{id}
+### GET /user/webhooks/parse/settings
 
 
 ```ruby
-id = "test_url_param"
-response = sg.client.whitelabel.links._(id).get()
+response = sg.client.user.webhooks.parse.settings.get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Delete a Link Whitelabel
-
-**This endpoint allows you to delete a link whitelabel.**
+## Update a parse setting
 
-Email link whitelabels allow all of the click-tracked links you send in your emails to include the URL of your domain instead of sendgrid.net.
+**This endpoint allows you to update a specific inbound parse setting.**
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Web_API_v3/Whitelabel/links.html).
+The inbound parse webhook allows you to have incoming emails parsed, extracting some or all of the content, and then have that content POSTed by Twilio SendGrid to a URL of your choosing. For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Webhooks/parse.html).
 
-### DELETE /whitelabel/links/{id}
+### PATCH /user/webhooks/parse/settings/{hostname}
 
 
 ```ruby
-id = "test_url_param"
-response = sg.client.whitelabel.links._(id).delete()
+data = JSON.parse('{
+  "send_raw": true,
+  "spam_check": false,
+  "url": "http://newdomain.com/parse"
+}')
+hostname = "test_url_param"
+response = sg.client.user.webhooks.parse.settings._(hostname).patch(request_body: data)
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Validate a Link Whitelabel
-
-**This endpoint allows you to validate a link whitelabel.**
+## Retrieve a specific parse setting
 
-Email link whitelabels allow all of the click-tracked links you send in your emails to include the URL of your domain instead of sendgrid.net.
+**This endpoint allows you to retrieve a specific inbound parse setting.**
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Web_API_v3/Whitelabel/links.html).
+The inbound parse webhook allows you to have incoming emails parsed, extracting some or all of the content, and then have that content POSTed by Twilio SendGrid to a URL of your choosing. For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Webhooks/parse.html).
 
-### POST /whitelabel/links/{id}/validate
+### GET /user/webhooks/parse/settings/{hostname}
 
 
 ```ruby
-id = "test_url_param"
-response = sg.client.whitelabel.links._(id).validate.post()
+hostname = "test_url_param"
+response = sg.client.user.webhooks.parse.settings._(hostname).get()
 puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Associate a Link Whitelabel
+## Delete a parse setting
 
-**This endpoint allows you to associate a link whitelabel with a subuser account.**
+**This endpoint allows you to delete a specific inbound parse setting.**
 
-Link whitelables can be associated with subusers from the parent account. This functionality allows
-subusers to send mail using their parent's link whitelabels. To associate a link whitelabel, the parent account
-must first create a whitelabel and validate it. The parent may then associate that whitelabel with a subuser via the API or the Subuser Management page in the user interface.
+The inbound parse webhook allows you to have incoming emails parsed, extracting some or all of the content, and then have that content POSTed by Twilio SendGrid to a URL of your choosing. For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Webhooks/parse.html).
 
-Email link whitelabels allow all of the click-tracked links you send in your emails to include the URL of your domain instead of sendgrid.net.
+### DELETE /user/webhooks/parse/settings/{hostname}
 
-For more information, please see our [User Guide](https://sendgrid.com/docs/API_Reference/Web_API_v3/Whitelabel/links.html).
 
-### POST /whitelabel/links/{link_id}/subuser
+```ruby
+hostname = "test_url_param"
+response = sg.client.user.webhooks.parse.settings._(hostname).delete()
+puts response.status_code
+puts response.body
+puts response.headers
+```
+## Retrieves Inbound Parse Webhook statistics.
+
+**This endpoint allows you to retrieve the statistics for your Parse Webhook usage.**
+
+SendGrid's Inbound Parse Webhook allows you to parse the contents and attachments of incoming emails. The Parse API can then POST the parsed emails to a URL that you specify. The Inbound Parse Webhook cannot parse messages greater than 20MB in size, including all attachments.
+
+There are a number of pre-made integrations for the Twilio SendGrid Parse Webhook which make processing events easy. You can find these integrations in the [Library Index](https://sendgrid.com/docs/Integrate/libraries.html#-Webhook-Libraries).
+
+### GET /user/webhooks/parse/stats
 
 
 ```ruby
-data = JSON.parse('{
-  "username": "jane@example.com"
-}')
-link_id = "test_url_param"
-response = sg.client.whitelabel.links._(link_id).subuser.post(request_body: data)
+params = JSON.parse('{"aggregated_by": "day", "limit": "test_string", "start_date": "2016-01-01", "end_date": "2016-04-01", "offset": "test_string"}')
+response = sg.client.user.webhooks.parse.stats.get(query_params: params)
 puts response.status_code
 puts response.body
 puts response.headers