Clarified that bots don't count as active users

source/about/self-hosted-subscriptions.rst

@@ -146,7 +146,7 @@ If you haven't upgraded to v5.32, contact Mattermost Support at support@mattermo
 
 If you're a reseller, have a non-standard contract, or want to adjust the number of active users on your license during the license period, please contact Mattermost Sales at sales@mattermost.com.
 
-System Admins will be alerted 60 days prior to license expiry via a banner in Mattermost. Select **Renew license now** to start the renewal process in the Customer Portal. You can also dismiss the banner and renew your license at a later date via **System Console > Edition and License**.
+System admins will be alerted 60 days prior to license expiry via a banner in Mattermost. Select **Renew license now** to start the renewal process in the Customer Portal. You can also dismiss the banner and renew your license at a later date via **System Console > Edition and License**.
 
 When you select **Renew license now**, you're taken to the renewal page in the Customer Portal, which lists your license information and account details. This is pre-populated based on the email address associated with your existing license subscription.
 

source/about/subscription.rst

@@ -100,7 +100,11 @@ In this case, the "physical address" is the location where the individual, who w
 How is a user defined for subscriptions?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-For the purpose of billing, a “user” is any account created in Mattermost that has not been deactivated by the System Administrator. You can see your user count for billing purposes from the System Console on the **Site Statistics** page under “Total Active Users”. Guests are also defined as users. 
+For the purpose of billing, a “user” is any account created in Mattermost that does not show as **Inactive** in **System Console > User Management > Users**. Guests are also defined as users.
+
+Bots, deactivated users, and synthetic users in `Microsoft Teams integrations </collaborate/collaborate-using-mattermost-for-microsoft-teams.html>`__ and `shared channels users </onboard/shared-channels.html>`__, aren't counted towards the total number of active users.
+
+You can review your user count, for billing purposes, by going to ** System Console > Site Statistics**, under **Total Active Users**.
 
 Do I need to pay for deactivated users?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

source/collaborate/learn-about-roles.rst

@@ -22,7 +22,7 @@ The first user added to a newly-installed Mattermost system is assigned the syst
 - Ability to deactivate user accounts and to reactivate them.
 - Access to private channels, but only if given the link to the private channel.
 
-A system admin can view and manage users in **System Console > User Management > Users**. They can search users by name, filter users by teams, and filter to view other system admins, guests, as well as active and inactive users. Only a system admin can make changes to another system admin user account in Mattermost.
+A system admin can view and manage users in **System Console > User Management > Users**. Search users by name, filter users by teams, and filter to view other system admins, guests, as well as active and inactive users. Only a system admin can make changes to another system admin user account in Mattermost.
 
 Grant personal access tokens
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~

source/configure/reporting-configuration-settings.rst

@@ -22,7 +22,7 @@ Site statistics
 | sessions, commands, webhooks, active users, connections,      | - ``config.json setting``: N/A                              |
 | and playbooks.                                                | - Environment variable: N/A                                 |
 +---------------------------------------------------------------+-------------------------------------------------------------+
-| **Note**: Deactivated users as well as synthetic users in                                                                   |
+| **Note**: Bots, deactivated users, and synthetic users in                                                                   |
 | `Microsoft Teams integrations </collaborate/collaborate-using-mattermost-for-microsoft-teams.html>`__                       |
 | and `shared channels users </onboard/shared-channels.html>`__, aren't counted towards the total number of active users.     |
 +---------------------------------------------------------------+-------------------------------------------------------------+
@@ -39,7 +39,9 @@ Team statistics
 | number of public and private channels, total post count, and  | - ``config.json`` setting: N/A                                |
 | count of paid users (self-hosted only).                       | - Environment variable: N/A                                   |
 +---------------------------------------------------------------+---------------------------------------------------------------+
-| **Note**: Deactivated users are not counted towards the total number of active users.                                         |
+| **Note**: Bots, deactivated users, and synthetic users in                                                                     |
+| `Microsoft Teams integrations </collaborate/collaborate-using-mattermost-for-microsoft-teams.html>`__                         |
+| and `shared channels users </onboard/shared-channels.html>`__, aren't counted towards the total number of active users.       |
 +---------------------------------------------------------------+---------------------------------------------------------------+
 
 ----

source/manage/self-hosted-billing.rst

@@ -3,7 +3,7 @@ Self-hosted billing
 
 Mattermost Professional and Enterprise plans are offered as an annual subscription service. With your purchase you're provided with a license key. Depending on which version of Mattermost you're on, you may have to download and apply this license manually via the System Console.
 
-When you upgrade to a Professional or Enterprise plan, you can enter the number of users (also referred to as "seats") before you complete your purchase and the license key is generated. The number you enterhas to be equal to or greater than your current number of activated users (formerly called active users).
+When you upgrade to a Professional or Enterprise plan, you can enter the number of users (also referred to as "seats") before you complete your purchase and the license key is generated. The number you enter has to be equal to or greater than your current number of activated users (formerly called active users).
 
 You can add new users to your deployment at any time. Every quarter, during the true-up review (section 3.5 License True-up Review of Software License Agreement, also referenced in docs), we check the license license seat count relative to number of activated users. If there's a difference, we'll provide you with a new invoice which is payable immediately.