Merge pull request #4957 from newrelic/Fix-some-user-mgmt-problems

Change 'full user' to 'full platform user'

src/content/docs/accounts/accounts-billing/account-setup/create-your-new-relic-account.mdx

@@ -13,7 +13,7 @@ redirects:
   - /docs/accounts/install-new-relic/account-setup/create-your-new-relic-account
 ---
 
-At New Relic, our mission is to help you create more perfect software. So we give you **free access** to our observability platform, **forever**. Our [free tier](/docs/accounts/accounts-billing/new-relic-one-pricing-billing/new-relic-one-pricing-billing/#free) lets you ingest up to 100 GBs per month, and have one [full user](/docs/accounts/accounts-billing/new-relic-one-user-management/new-relic-one-user-model-understand-user-structure/#user-type) and **unlimited** basic users.
+At New Relic, our mission is to help you create more perfect software. So we give you **free access** to our observability platform, **forever**. For [free](/docs/accounts/accounts-billing/new-relic-one-pricing-billing/new-relic-one-pricing-billing/#free), you can ingest up to 100 GBs per month, and have one [full platform user](/docs/accounts/accounts-billing/new-relic-one-user-management/new-relic-one-user-model-understand-user-structure/#user-type) and **unlimited** basic users.
 
 Ready to get started? 
 

src/content/docs/accounts/accounts-billing/account-structure/factors-affecting-access-features-data.mdx

@@ -27,7 +27,7 @@ There are several factors that can affect your access to a New Relic feature, or
 
 User-related settings can impact what features or data you have access to. Potential impacts include: 
 
-* Your [user type](/docs/accounts/accounts-billing/new-relic-one-user-management/new-relic-one-user-model-understand-user-structure/#user-type) (basic user or full user). 
+* Your [user type](/docs/accounts/accounts-billing/new-relic-one-user-management/new-relic-one-user-model-understand-user-structure/#user-type) (basic user or full platform user). 
 * Your assigned roles. How your user roles and permissions work depends on which [user model](/docs/accounts/original-accounts-billing/original-product-based-pricing/overview-changes-pricing-user-model/#user-models) you're on: 
   * [Original user model roles](/docs/accounts/original-accounts-billing/original-users-roles/users-roles-original-user-model/#roles) 
   * [New Relic One user model roles](/docs/accounts/accounts-billing/new-relic-one-user-management/new-relic-one-user-model-understand-user-structure/#roles) 

src/content/docs/accounts/accounts-billing/account-structure/new-relic-account-structure.mdx

@@ -32,7 +32,7 @@ Our [Standard edition](https://newrelic.com/pricing) allows for a single account
 
 ### How users access accounts [#account-access]
 
-In your organization, your New Relic users are granted access to specific accounts that are relevant to their duties and responsibilities. To manage users’ access to accounts, you create [access grants](/docs/accounts/accounts-billing/new-relic-one-user-management/add-manage-users-groups-roles/#understand-concepts), which assign a group of users to a specific role on a specific account. For example, you may assign a user group the ability to manage billing on some accounts with the [**Billing manager** role](/docs/accounts/accounts-billing/new-relic-one-user-management/new-relic-one-user-model-understand-user-structure/#standard-roles), and assign some users as non-admin full users on some accounts, and assign some users as basic users on some accounts. Our user management system allows you to create the user access you need, whether that’s a relatively simple setup with just a few roles across a few accounts, or a complex one with many roles across many accounts. [Learn more about user management.](/docs/accounts/accounts-billing/new-relic-one-user-management/)
+In your organization, your New Relic users are granted access to specific accounts that are relevant to their duties and responsibilities. To manage users’ access to accounts, you create [access grants](/docs/accounts/accounts-billing/new-relic-one-user-management/add-manage-users-groups-roles/#understand-concepts), which assign a group of users to a specific role on a specific account. For example, you may assign a user group the ability to manage billing on some accounts with the [**Billing manager** role](/docs/accounts/accounts-billing/new-relic-one-user-management/new-relic-one-user-model-understand-user-structure/#standard-roles), and assign some users as non-admin full platform users on some accounts, and assign some users as basic users on some accounts. Our user management system allows you to create the user access you need, whether that’s a relatively simple setup with just a few roles across a few accounts, or a complex one with many roles across many accounts. [Learn more about user management.](/docs/accounts/accounts-billing/new-relic-one-user-management/)
 
 Note that some features, like dashboards and workloads, can display data from across different accounts in an organization. This means that if a user isn’t granted access to all relevant accounts, they may experience missing data. 
 

src/content/docs/accounts/accounts-billing/new-relic-one-pricing-billing/new-relic-one-pricing-billing.mdx

@@ -26,8 +26,8 @@ Starting July 30, 2020, all of our new customers are on a pricing model that we
 For New Relic One pricing, billing is based on these factors:
 
 * The amount of data [ingested](/docs/telemetry-data-platform/get-started/introduction-new-relic-data-ingest-apis-sdks/). 100 GBs per month is free. $0.25 per GB ingested above that.
-* The number of provisioned [full users](/docs/accounts/accounts-billing/new-relic-one-pricing-users/users-roles#user-type), who have access to our [more curated UI experiences](/docs/accounts/accounts-billing/new-relic-one-user-management/new-relic-one-user-model-understand-user-structure/#user-capabilities). [Basic users](/docs/accounts/accounts-billing/new-relic-one-pricing-users/users-roles#user-type) are free. 
-  * The cost of each full user depends on your edition: [Standard, Pro, or Enterprise](https://newrelic.com/pricing). Standard edition includes one full user for free, and a max of five. Pro and Enterprise give access to more account and user management features, more support, longer data retention, and [other features](https://newrelic.com/pricing). 
+* The number of provisioned [full platform users](/docs/accounts/accounts-billing/new-relic-one-pricing-users/users-roles#user-type), who have access to our [more curated UI experiences](/docs/accounts/accounts-billing/new-relic-one-user-management/new-relic-one-user-model-understand-user-structure/#user-capabilities). [Basic users](/docs/accounts/accounts-billing/new-relic-one-pricing-users/users-roles#user-type) are free. 
+  * The cost of each full platform user depends on your edition: [Standard, Pro, or Enterprise](https://newrelic.com/pricing). Standard edition includes one full platform user for free, and a max of five. Pro and Enterprise give access to more account and user management features, more support, longer data retention, and [other features](https://newrelic.com/pricing). 
 
 For a summary of what's included for free, see [Free edition](#free).
 
@@ -64,20 +64,20 @@ For accounts on New Relic One pricing, some high-level billing information is di
 
   <Collapser
     id="user-count"
-    title="Full user count billing details"
+    title="Full platform user count billing details"
   >
-For accounts with [New Relic One pricing](/docs/accounts/accounts-billing/new-relic-one-pricing-users/pricing-billing), the monthly count of provisioned [full users](/docs/accounts/accounts-billing/new-relic-one-pricing-users/users-roles#user-type) is one billing factor. To give an example: if you're on the Pro pricing edition and your organization has 100 full users during the month of January, you'd be billed for 100 full users for that month. A full user counts as a billable user the moment they're added to a New Relic organization (provisioned), whether or not that user has logged into or used New Relic yet. 
+For accounts with [New Relic One pricing](/docs/accounts/accounts-billing/new-relic-one-pricing-users/pricing-billing), the monthly count of provisioned [full platform users](/docs/accounts/accounts-billing/new-relic-one-pricing-users/users-roles#user-type) is one billing factor. To give an example: if you're on the Pro pricing edition and your organization has 100 full platform users during the month of January, you'd be billed for 100 full platform users for that month. A full platform user counts as a billable user the moment they're added to a New Relic organization (provisioned), whether or not that user has logged into or used New Relic yet. 
 
-A user's [user type](/docs/accounts/accounts-billing/new-relic-one-user-management/new-relic-one-user-model-understand-user-structure/#user-type) is meant to be long-term setting determined by a user's expected New Relic duties and responsibilities. Because user type is a billing factor, we have restrictions around how often a full user can be downgraded to a basic user: **a full user can downgrade to a basic user a maximum of two times in a rolling 12-month period.** If a full user has been changed to a basic user two times in that 12-month period, that user won't be able to return to being a basic user until the start of the next 12-month period. To learn reasons for assigning one user type or another, see [Tips on assigning user type](/docs/accounts/accounts-billing/new-relic-one-user-management/new-relic-one-user-model-understand-user-structure/#decide-user-type).
+A user's [user type](/docs/accounts/accounts-billing/new-relic-one-user-management/new-relic-one-user-model-understand-user-structure/#user-type) is meant to be long-term setting determined by a user's expected New Relic duties and responsibilities. Because user type is a billing factor, we have restrictions around how often a full platform user can be downgraded to a basic user: **a full platform user can downgrade to a basic user a maximum of two times in a rolling 12-month period.** If a full platform user has been changed to a basic user two times in that 12-month period, that user won't be able to return to being a basic user until the start of the next 12-month period. To learn reasons for assigning one user type or another, see [Tips on assigning user type](/docs/accounts/accounts-billing/new-relic-one-user-management/new-relic-one-user-model-understand-user-structure/#decide-user-type).
 
 Here are more user-related billing details and caveats:
-  * You can see your full user count [in the UI](/docs/accounts/accounts-billing/general-account-settings/introduction-account-settings/#pricing).
+  * You can see your full platform user count [in the UI](/docs/accounts/accounts-billing/general-account-settings/introduction-account-settings/#pricing).
   * We de-duplicate users based on email address. If there are multiple users in an organization that have the same email address, those user records count as a single user for billing purposes.
-  * The count of full users is prorated based on the start of a New Relic subscription, or based on when a user is created as a full user or converted to a full user.
+  * The count of full platform users is prorated based on the start of a New Relic subscription, or based on when a user is created as a full platform user or converted to a full platform user.
   * A New Relic user can have a maximum of either three concurrent active sessions, or three unique IP addresses in use at any given time.  
   * For organizations on our original user model that have a [parent/child account structure](/docs/accounts/original-accounts-billing/original-users-roles/mastersub-account-structure), the count of billable users in the UI may differ from the users you can see. For more on this, see [User count discrepancy](/docs/accounts/original-accounts-billing/original-users-roles/users-roles-original-user-model#full-user-count). 
-  * The [Standard edition](https://newrelic.com/pricing) of the New Relic One pricing model includes one free full user. 
-  * For organizations on our [original user model](/docs/accounts/original-accounts-billing/original-users-roles/users-roles-original-user-model/#user-type), because the organization-related settings aren't as robust as on our newer model, a user may be set as a basic user in one account and as a full user in another account. In such cases, the full user status takes precedence and that user is considered a full user.
+  * The [Standard edition](https://newrelic.com/pricing) of the New Relic One pricing model includes one free full platform user. 
+  * For organizations on our [original user model](/docs/accounts/original-accounts-billing/original-users-roles/users-roles-original-user-model/#user-type), because the organization-related settings aren't as robust as on our newer model, a user may be set as a basic user in one account and as a full platform user in another account. In such cases, the full platform user status takes precedence and that user is considered a full platform user.
 
 For how to query usage data, see [Query and alert on usage](/docs/accounts/accounts-billing/new-relic-one-pricing-users/usage-queries-alerts).
 
@@ -124,7 +124,7 @@ If your organization is on [New Relic One pricing](#how-pricing-works) and on th
 
 * A single account (Pro and Enterprise editions can have multiple accounts per organization).
 * Up to 100 GBs of ingested data per month.
-* One [full user](/docs/accounts/accounts-billing/new-relic-one-user-management/new-relic-one-user-model-understand-user-structure/#user-type), and unlimited [basic users](/docs/accounts/accounts-billing/new-relic-one-user-management/new-relic-one-user-model-understand-user-structure/#user-type).
+* One [full platform user](/docs/accounts/accounts-billing/new-relic-one-user-management/new-relic-one-user-model-understand-user-structure/#user-type), and unlimited [basic users](/docs/accounts/accounts-billing/new-relic-one-user-management/new-relic-one-user-model-understand-user-structure/#user-type).
 
 To upgrade to Pro or Enterprise, or to learn more about pricing, see [New Relic pricing](https://newrelic.com/pricing).
 

src/content/docs/accounts/accounts-billing/new-relic-one-pricing-billing/usage-queries-alerts.mdx

@@ -82,7 +82,7 @@ This query breaks down [Metric data](/docs/telemetry-data-platform/understand-da
     id="month-gb"
     title="Month-to-date data usage"
   >
-    This query shows the current full user count. In other words, it shows how much you'd be billed for your data for that month if you were billed right now.
+    This query shows the current full platform user count. In other words, it shows how much you'd be billed for your data for that month if you were billed right now.
 
     ```
     FROM NrMTDConsumption SELECT latest(GigabytesIngested) 
@@ -110,16 +110,16 @@ Here are some user-related query examples. For details on how users are counted,
 <CollapserGroup>
   <Collapser
     id="month-users"
-    title="Month-to-date full users"
+    title="Month-to-date full platform users"
   >
-    This query shows the billable full users for the month. In other words, it shows how much you'd be billed for your users for that month if you were billed right now.
+    This query shows the billable full platform users for the month. In other words, it shows how much you'd be billed for your users for that month if you were billed right now.
 
     ```
     FROM NrMTDConsumption SELECT latest(usersBillable) 
       SINCE this month
     ```
 
-    This query shows how many full users were counted by hour. This is useful for seeing how the full user count changed over time.
+    This query shows how many full platform users were counted by hour. This is useful for seeing how the full platform user count changed over time.
 
     ```
     from NrConsumption SELECT max(FullUsers) 
@@ -129,7 +129,7 @@ Here are some user-related query examples. For details on how users are counted,
 
   <Collapser
     id="projected-month-users"
-    title="Projected monthly full user count"
+    title="Projected monthly full platform user count"
   >
     This query shows a projected count of monthly users. This query would not be good for using in a dashboard; it requires values based on a) the days remaining in the month, b) the start of the month. Here's an example querying the projected end-of-month count with 10 days left in that month:
 
@@ -141,9 +141,9 @@ Here are some user-related query examples. For details on how users are counted,
 
   <Collapser
     id="full-basic-users"
-    title="Count full users and basic users"
+    title="Count full platform users and basic users"
   >
-    The [usage UI](/docs/accounts/accounts-billing/new-relic-one-pricing-users/pricing-billing#billing-usage-ui) shows the count of full users and basic users. The query used is:
+    The [usage UI](/docs/accounts/accounts-billing/new-relic-one-pricing-users/pricing-billing#billing-usage-ui) shows the count of full platform users and basic users. The query used is:
 
     ```
     FROM NrUsage SELECT max(usage) SINCE 10 days ago

src/content/docs/accounts/accounts-billing/new-relic-one-user-management/add-manage-users-groups-roles.mdx

@@ -38,7 +38,7 @@ To see if you can access these user management features, go to the [user managem
 
 For users on the [New Relic One user model](/docs/accounts/original-accounts-billing/original-product-based-pricing/overview-changes-pricing-user-model/#user-models), to find your user management options: From the [account dropdown](/docs/using-new-relic/welcome-new-relic/get-started/glossary#account-dropdown), select **Administration**. There are two user management UI pages there: 
 
-* **User management**: Use this to add users, [update user type](#edit-user-type) (basic versus full user) and other information, and approve [user type upgrade requests](/docs/accounts/accounts-billing/new-relic-one-user-management/authentication-domains-saml-sso-scim-more/#session-mgmt).
+* **User management**: Use this to add users, [update user type](#edit-user-type) (basic versus full platform) and other information, and approve [user type upgrade requests](/docs/accounts/accounts-billing/new-relic-one-user-management/authentication-domains-saml-sso-scim-more/#session-mgmt).
 * **Organization and access**: Use this page to create and manage groups, roles, and access grants, and to set up [SAML SSO and SCIM provisioning](/docs/accounts/accounts-billing/new-relic-one-user-management/authentication-domains-saml-sso-scim-more).
 
 Want to see videos of the user management UI in action? See our [user management videos](/docs/accounts/accounts-billing/new-relic-one-user-management/user-mgmt-videos).
@@ -98,10 +98,10 @@ See the [user management tutorial](/docs/accounts/accounts-billing/new-relic-one
 
     <Collapser
     id="edit-user-type"
-    title="Edit user type (basic user versus full user)"
+    title="Edit user type (basic and full platform)"
   >
 
-Note that there are [limits around how many times full users can be changed to basic users](/docs/accounts/accounts-billing/new-relic-one-pricing-billing/new-relic-one-pricing-billing/#user-count). 
+Note that there are [limits around how many times full platform users can be changed to basic users](/docs/accounts/accounts-billing/new-relic-one-pricing-billing/new-relic-one-pricing-billing/#user-count). 
 
 <Callout variant="important">
 If you're using [automated user management](/docs/accounts/accounts/automated-user-management/automated-user-provisioning-single-sign) to provision and manage your users, you have [other options for managing user type](/docs/accounts/accounts-billing/new-relic-one-user-management/authentication-domains-saml-sso-scim-more/#user-upgrade). 
@@ -157,7 +157,7 @@ You can also edit the user type and group of a specific user by clicking on that
 
   <Collapser
     id="basic-full-upgrade"
-    title="Control how basic users upgrade to full users"
+    title="Control how basic users upgrade to full platform users"
   >
     See the [authentication domain settings](/docs/accounts/accounts-billing/new-relic-one-user-management/authentication-domains-saml-sso-scim-more/#session-mgmt).
   </Collapser>