Merge pull request #2854 from newrelic/Change-master-account-to-paren…

…t---DOC-6953-

Master/sub account language replacements - DOC-6953

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

@@ -32,15 +32,16 @@ User-related settings can impact what features or data you have access to. Poten
 
 ## Account access [#account-access]
 
-If you're logged in to New Relic and don't see the account or data you expect to see, some causes and solutions include: 
+If you're having trouble finding an account, some causes and solutions include: 
 
-* If your organization has multiple accounts, there's an account switcher at the top left of most New Relic UI pages. Check to see if you can use that to switch accounts. 
+* If your organization has multiple accounts, there's an account switcher at the top left of most New Relic UI pages. See if you can use that to switch accounts. 
+* If you're logged into New Relic but can't find an account or its data, you may need to be added to that account. How you do this will depend on your user model: [Original use model](/docs/accounts/original-accounts-billing/original-users-roles/original-account-structure) \| [New Relic One user model](/docs/accounts/accounts-billing/account-structure/new-relic-account-structure/#account-access). 
 * You may have more than one login associated with the same email address. If you think this may be the case, log out and log back in. When you input your email address, the login UI tells you if you have multiple logins and gives you [an option for seeing all accounts associated with that email](/docs/accounts/accounts-billing/account-setup/troubleshoot-new-relics-password-email-address-login-problems/#verify-email). If you're having trouble accessing an older account, see this [Explorers Hub post about multiple account access](https://discuss.newrelic.com/t/relic-solution-so-youve-created-a-new-account-and-cant-seem-to-access-your-old-account/113122).
-* It's possible an admin user in your organization changed [your permissions](#user-permissions) for an account. 
 
 Related docs:
 
-* [Organization and account structure](/docs/accounts/accounts-billing/new-relic-one-pricing-users/account-user-structure)
+* [User permission factors](#user-permissions)
+* [Account structure](/docs/accounts/accounts-billing/new-relic-one-pricing-users/account-user-structure)
 * [Login and password troubleshooting](/docs/accounts/install-new-relic/account-setup/troubleshoot-password-email-address-login-problems)
 * [Delete accounts](/docs/accounts/accounts-billing/account-setup/downgradecancel-account#cancel-single-account)
 

src/content/docs/accounts/accounts-billing/general-account-settings/introduction-account-settings.mdx

@@ -23,7 +23,7 @@ How you access billing-related UI depends on which [pricing plan](/docs/accounts
 View and manage billing information based on your [user model](/docs/accounts/original-accounts-billing/original-product-based-pricing/overview-changes-pricing-user-model/#user-models):
 
 * New Relic One user model: click the [account dropdown](/docs/using-new-relic/welcome-new-relic/get-started/glossary#account-dropdown), click **Administration**, and click **Plan and usage**. From there, you can view your usage data, and view and edit billing information. The ability to manage billing requires the [**Billing user** role](https://docs.newrelic.com/docs/accounts/accounts-billing/new-relic-one-user-management/new-relic-one-user-model-understand-user-structure#roles), which is included in the default **Admin** group. 
-* Original user model: click the [account dropdown](/docs/using-new-relic/welcome-new-relic/get-started/glossary#account-dropdown) and click **Account settings**. Note that if you're in an organization that has a master/sub-account structure and you're in a sub-account, usage data may only display usage from that account and not the broader organization. Billing management requires an [Owner or Admin role](https://docs.newrelic.com/docs/accounts/original-accounts-billing/original-users-roles/users-roles-original-user-model#roles). 
+* Original user model: click the [account dropdown](/docs/using-new-relic/welcome-new-relic/get-started/glossary#account-dropdown) and click **Account settings**. Note that if you're in an organization that has a parent/child account structure and you're in a child account, usage data may only display usage from that account and not the broader organization. Billing management requires an [Owner or Admin role](https://docs.newrelic.com/docs/accounts/original-accounts-billing/original-users-roles/users-roles-original-user-model#roles). 
 
 To learn more about how New Relic One pricing works, see [Pricing](/docs/accounts/accounts-billing/new-relic-one-pricing-billing/new-relic-one-pricing-billing/). 
 

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

@@ -75,13 +75,13 @@ For accounts with [New Relic One pricing](/docs/accounts/accounts-billing/new-re
 
 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).
 
-More user-related billing details:
+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).
+  * Users with duplicate email addresses are only counted once.
   * 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.
-  * For organizations on our original account/user model that have a [master/sub-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 list of users you 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). 
-  * A user can have a maximum of either three concurrent active sessions, or three unique IP addresses in use at any given time.  
+  * 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 account/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 plan includes one free full user. 
-  * Users with duplicate email addresses are only counted once.
   * For organizations on our [original user model](/docs/accounts/original-accounts-billing/original-users-roles/users-roles-original-user-model/#user-type), 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.
 
 For how to query usage data, see [Query and alert on usage](/docs/accounts/accounts-billing/new-relic-one-pricing-users/usage-queries-alerts).

src/content/docs/accounts/accounts/account-maintenance/set-session-timeouts.mdx

@@ -77,11 +77,11 @@ The session configuration options provide an additional level of security to ens
 
     <tr>
       <td>
-        Automatic inheritance for sub-accounts
+        Automatic inheritance for child accounts
       </td>
 
       <td>
-        By default, [sub-accounts](/docs/subscriptions/creating-sub-accounts) inherit the same session configuration as their master account.
+        By default, [child accounts](/docs/subscriptions/creating-sub-accounts) inherit the same session configuration as their parent account.
       </td>
     </tr>
 

src/content/docs/accounts/accounts/saml-single-sign/new-relic-partners-saml-sso.mdx

@@ -5,8 +5,8 @@ tags:
   - Original accounts and billing
   - SAML SSO (original users)
 metaDescription: >-
-  SAML SSO options available to New Relic Partners for their master and
-  sub-account setups.
+  SAML SSO options available to New Relic Partners for their parent and
+  child account setups.
 redirects:
   - /docs/subscriptions/new-relic-partners-and-saml-sso
   - >-
@@ -38,10 +38,10 @@ Your account structure and settings affect whether SAML is available and how it
 ![screen saml hierarchy.png](./images/screen-saml-heirarchy.png "screen saml hierarchy.png")
 
 <figcaption>
-  This example shows the hierarchy for New Relic Partner accounts with master accounts and sub-accounts.
+  This example shows the hierarchy for New Relic Partner accounts with parent accounts and child accounts.
 </figcaption>
 
-Here is an example of how accounts and sub-accounts inherit the SAML SSO configuration.
+Here is an example of how accounts and child accounts inherit the SAML SSO configuration.
 
 <table>
   <thead>
@@ -69,21 +69,21 @@ Here is an example of how accounts and sub-accounts inherit the SAML SSO configu
 
     <tr>
       <td>
-        Master accounts
+        Parent accounts
       </td>
 
       <td>
-        Master accounts have a direct, hierarchical relationship to one or more [sub-accounts](/docs/subscriptions/creating-sub-accounts). Typically the SAML configuration on a master account is inherited automatically by all of its sub-accounts.
+        Parent accounts (also referred to as master accounts) have a direct, hierarchical relationship to one or more [child accounts](/docs/subscriptions/creating-sub-accounts). Typically the SAML configuration on a parent account is inherited automatically by all of its child accounts.
       </td>
     </tr>
 
     <tr>
       <td>
-        Sub-accounts
+        Child accounts
       </td>
 
       <td>
-        Sub-accounts inherit their SAML SSO configuration from their master account when the master account has SAML configured. If the master account does not have SAML configured, each sub-account may have its own configuration. For more information, see [Configuring SAML with multiple accounts](/docs/subscriptions/configuring-saml-with-multiple-accounts).
+        Child accounts (also known as sub-accounts) inherit their SAML SSO configuration from their parent account when the parent account has SAML configured. If the parent account does not have SAML configured, each child account may have its own configuration. For more information, see [Configuring SAML with multiple accounts](/docs/subscriptions/configuring-saml-with-multiple-accounts).
       </td>
     </tr>
   </tbody>

src/content/docs/accounts/accounts/saml-single-sign/set-sso.mdx

@@ -31,9 +31,9 @@ After obtaining your [SAML identity provider certificate](/docs/subscriptions/sa
 
 For requirements, including which New Relic users this feature applies to, see [Requirements](/docs/accounts/accounts/saml-single-sign/saml-service-providers#requirements).
 
-## Master and sub-accounts [#parent]
+## Parent and child accounts [#parent]
 
-If your account has sub-accounts, typically you will set up the SSO configuration on the master level only. The sub-account users will still be able to log in through SSO because they will inherit the master account's SAML SSO configuration. If you need to configure multiple accounts with separate SAML identities (for example, with partnership accounts), use the [custom entity ID feature](/docs/accounts-partnerships/accounts/saml-single-sign/configure-saml-multiple-accounts).
+If your account has child accounts, typically you will set up the SSO configuration on the parent account level only. The child account users will still be able to log in through SSO because they will inherit the parent account's SAML SSO configuration. If you need to configure multiple accounts with separate SAML identities (for example, with partnership accounts), use the [custom entity ID feature](/docs/accounts-partnerships/accounts/saml-single-sign/configure-saml-multiple-accounts).
 
 ## Configure SSO [#configuring]
 

src/content/docs/accounts/new-relic-account-usage/getting-started-usage/apm-cu-based-subscription-usage.mdx

@@ -118,7 +118,7 @@ Here are definitions of the column headers displayed in the UI table and CSV fil
       </td>
 
       <td>
-        The name of the account. This can be a standalone account, a [master account](/docs/accounts/install-new-relic/account-setup/manage-apps-or-users-sub-accounts) or a [customer partnership](/docs/new-relic-partnerships/partner-integration-guide/partner-account-maintenance/partnership-accounts-users-subscriptions).
+        The name of the account. This can be a standalone account, a [parent account](/docs/accounts/install-new-relic/account-setup/manage-apps-or-users-sub-accounts) or a [customer partnership](/docs/new-relic-partnerships/partner-integration-guide/partner-account-maintenance/partnership-accounts-users-subscriptions).
       </td>
     </tr>
 
@@ -166,7 +166,7 @@ Here are definitions of the column headers displayed in the UI table and CSV fil
 
 ## General attributes [#attributes]
 
-The following are general (not APM-specific) account-related [attributes](/docs/using-new-relic/welcome-new-relic/getting-started/glossary#attribute). These attributes can help you understand how your accounts and sub-accounts are using New Relic products.
+The following are general (not APM-specific) account-related [attributes](/docs/using-new-relic/welcome-new-relic/getting-started/glossary#attribute). These attributes can help you understand how your accounts are using New Relic products.
 
 <table>
   <thead>
@@ -208,9 +208,9 @@ The following are general (not APM-specific) account-related [attributes](/docs/
       </td>
 
       <td>
-        The [ID of the master account](/docs/accounts-partnerships/accounts/account-setup/account-id) that is either responsible for stored events or that is the parent of the consuming account. When a master account is the consuming account, `masterAccountId` is the [`consumingAccountId`](#consumingAccountId).
+        The [ID of the parent account](/docs/accounts-partnerships/accounts/account-setup/account-id), also known as the master account. This is the account that's either responsible for stored events or that is the parent of the consuming account. When a parent account is the consuming account, `masterAccountId` is the [`consumingAccountId`](#consumingAccountId).
 
-        This attribute is present even for accounts that do not have a master account. This is to ensure continued reporting if the account is later made a master account.
+        This attribute is present even for accounts that don't have a parent account. This is to ensure continued reporting if the account is later made a parent account.
       </td>
     </tr>
 
@@ -220,9 +220,9 @@ The following are general (not APM-specific) account-related [attributes](/docs/
       </td>
 
       <td>
-        Name of the master account that is either responsible for stored events, or that is the parent of the consuming account. When a master account is the consuming account, `masterAccountName` is the [`consumingAccountName`](#consumingAccountName).
+        Name of the parent account (also known as the master account) that's either responsible for stored events, or that is the parent of the consuming account. When a parent is the consuming account, `masterAccountName` is the [`consumingAccountName`](#consumingAccountName).
 
-        This attribute is present even for accounts that do not have a master account. This is to ensure continued reporting if the account is later made a master account.
+        This attribute is present even for accounts that do not have a parent account. This is to ensure continued reporting if the account is later made a parent account.
       </td>
     </tr>
 
@@ -256,9 +256,9 @@ The following are general (not APM-specific) account-related [attributes](/docs/
       </td>
 
       <td>
-        [ID of the sub-account](/docs/accounts-partnerships/accounts/account-setup/account-id) that is responsible for the stored event. When this attribute is present, `subAccountId` is the [`consumingAccountId`](#consumingAccountId).
+        [ID of the child account](/docs/accounts-partnerships/accounts/account-setup/account-id) that is responsible for the stored event. When this attribute is present, `subAccountId` is the [`consumingAccountId`](#consumingAccountId).
 
-        This attribute is only present if the consuming account is a [sub-account](/docs/accounts/install-new-relic/account-setup/manage-apps-or-users-sub-accounts#hierarchy) (not a master account).
+        This attribute is only present if the consuming account is a [child account](/docs/accounts/install-new-relic/account-setup/manage-apps-or-users-sub-accounts#hierarchy) (not a parent account).
       </td>
     </tr>
 
@@ -268,9 +268,9 @@ The following are general (not APM-specific) account-related [attributes](/docs/
       </td>
 
       <td>
-        Name of the [sub-account](/docs/accounts-partnerships/accounts/account-setup/manage-apps-or-users-sub-accounts) responsible for stored events. When present, this attribute is the same as the [`consumingAccountName`](#consumingAccountName).
+        Name of the [child account](/docs/accounts-partnerships/accounts/account-setup/manage-apps-or-users-sub-accounts) responsible for stored events. When present, this attribute is the same as the [`consumingAccountName`](#consumingAccountName).
 
-        This attribute is only present if the consuming account is a [sub-account](/docs/accounts/install-new-relic/account-setup/manage-apps-or-users-sub-accounts#hierarchy) (not a master account).
+        This attribute is only present if the consuming account is a [child account](/docs/accounts/install-new-relic/account-setup/manage-apps-or-users-sub-accounts#hierarchy) (not a parent account).
       </td>
     </tr>
 
@@ -837,12 +837,12 @@ Here are some examples of NRQL queries you can use with your account usage data.
     id="account-hierarchy-query"
     title="Account hierarchy"
   >
-    This query is useful for seeing the account hierarchy (partnership, master, sub-accounts).
+    This query is useful for seeing the account hierarchy (partnership, parent, child accounts).
 
     ```
     SELECT count(*) 
     FROM NrDailyUsage 
-    FACET partnershipName,masterAccountName,masterAccountId,consumingAccountName,consumingAccountId 
+    FACET partnershipName, masterAccountName, masterAccountId, consumingAccountName, consumingAccountId 
     LIMIT 2000 SINCE 1 day ago
     ```
   </Collapser>