Merge branch 'russell/change-active-users-to-billable-users' into 'master'

Replace phrase active users with billable users in all docs

See merge request gitlab-org/gitlab!48309

doc/api/license.md

@@ -7,7 +7,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 # License **(CORE ONLY)**
 
 To interact with license endpoints, you need to authenticate yourself as an
-admin.
+administrator.
 
 ## Retrieve information about the current license
 
@@ -86,11 +86,11 @@ GET /licenses
 ]
 ```
 
-Overage is the difference between the number of active users and the licensed number of users.
+Overage is the difference between the number of billable users and the licensed number of users.
 This is calculated differently depending on whether the license has expired or not.
 
-- If the license has expired, it uses the historical maximum active user count (`historical_max`).
-- If the license has not expired, it uses the current active users count.
+- If the license has expired, it uses the historical maximum billable user count (`historical_max`).
+- If the license has not expired, it uses the current billable users count.
 
 Returns:
 

doc/api/users.md

@@ -54,7 +54,7 @@ GET /users?username=jack_smith
 ```
 
 In addition, you can filter users based on the states `blocked` and `active`.
-It does not support `active=false` or `blocked=false`. The list of active users
+It does not support `active=false` or `blocked=false`. The list of billable users
 is the total number of users minus the blocked users.
 
 ```plaintext

doc/install/requirements.md

@@ -221,8 +221,8 @@ Redis stores all user sessions and the background task queue.
 The storage requirements for Redis are minimal, about 25kB per user.
 Sidekiq processes the background jobs with a multithreaded process.
 This process starts with the entire Rails stack (200MB+) but it can grow over time due to memory leaks.
-On a very active server (10,000 active users) the Sidekiq process can use 1GB+ of memory.
-
+On a very active server (10,000 billable users) the Sidekiq process can use 1GB+ of memory.
+                                    
 ## Prometheus and its exporters
 
 As of Omnibus GitLab 9.0, [Prometheus](https://prometheus.io) and its related

doc/raketasks/user_management.md

@@ -58,9 +58,9 @@ sudo gitlab-rake gitlab:import:all_users_to_all_groups
 bundle exec rake gitlab:import:all_users_to_all_groups RAILS_ENV=production
 ```
 
-Admin users are added as owners so they can add additional users to the group.
+Administrators are added as owners so they can add additional users to the group.
 
-## Control the number of active users
+## Control the number of billable users
 
 Enable this setting to keep new users blocked until they have been cleared by the administrator.
 Defaults to `false`:

doc/subscriptions/self_managed/index.md

@@ -161,7 +161,7 @@ We recommend following these steps during renewal:
    TIP: **Tip:**
    If you need to change your [GitLab tier](https://about.gitlab.com/pricing/), contact our sales team via `renewals@gitlab.com` for assistance as this can't be done in the Customers Portal.
 
-1. In the first box, enter the total number of user licenses you’ll need for the upcoming year. Be sure this number is at least **equal to, or greater than** the number of active users in the system at the time of performing the renewal.
+1. In the first box, enter the total number of user licenses you’ll need for the upcoming year. Be sure this number is at least **equal to, or greater than** the number of billable users in the system at the time of performing the renewal.
 1. Enter the number of [users over license](#users-over-license) in the second box for the user overage incurred in your previous subscription term.
 
    TIP: **Tip:**
@@ -172,8 +172,8 @@ We recommend following these steps during renewal:
    | Field | Description |
    |:------|:------------|
    | Users in License | The number of users you've paid for in the current license loaded on the system. This does not include the amount you've paid for `Users over license` during renewal. |
-   | Active users | The daily count of active users on your system. |
-   | Maximum users | The highest number of active users on your system during the term of the loaded license. If this number exceeds your users in license count at any point, you incur users over license. |
+   | Billable users | The daily count of billable users on your system. |
+   | Maximum users | The highest number of billable users on your system during the term of the loaded license. If this number exceeds your users in license count at any point, you incur users over license. |
    | Users over license | The number of users that exceed the `Users in License` for the current license term. Charges for this number of users are incurred at the next renewal. |
 
 1. Review your renewal details and complete the payment process.
@@ -195,7 +195,7 @@ Seat Link provides **only** the following information to GitLab:
 - Date
 - License key
 - Historical maximum user count
-- Active users count
+- Billable users count
 
 For offline or closed network customers, the existing [true-up model](#users-over-license) is used. Prorated charges are not possible without user count data.
 

doc/user/admin_area/analytics/dev_ops_report.md

@@ -21,7 +21,7 @@ To see DevOps Report, go to **Admin Area > Analytics > DevOps Report**.
 ## DevOps Score
 
 DevOps Score displays the usage of GitLab's major features on your instance over
-the last 30 days, averaged over the number of active users in that time period. It also
+the last 30 days, averaged over the number of billable users in that time period. It also
 provides a Lead score per feature, which is calculated based on GitLab's analysis
 of top-performing instances based on [usage ping data](../settings/usage_statistics.md#usage-ping) that GitLab has
 collected. Your score is compared to the lead score of each feature and then expressed as a percentage at the bottom of said feature.