Daily release/sep 8 2023 10 27

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

@@ -413,21 +413,18 @@ For setting up alerts related to data ingest limits and query limits, see [Set a
 
 To see changes made to your account (for example, changes related to managing users), you can query [`NrAuditEvent`](/docs/insights/insights-data-sources/default-data/nrauditevent-event-data-query-examples).
 
-## Usage-related data types [#data-types]
+## Usage-related events and attributes [#data-types]
 
 <Callout variant="tip">
   For an advanced deep dive into managing data ingest in a complex organization, see [Data ingest governance](/docs/new-relic-solutions/observability-maturity/operational-efficiency/dg-intro/).
 </Callout>
 
-Usage data is attached to the following events. For more detail on which event to use for querying users, see [Query users](#user-queries).
+These are the primary events to query for understanding your usage:
 
-* `NrUsage` records usage every hour and is used to see the types of data being reported (for example, <InlinePopover type="apm" /> data or browser monitoring data).
 * `NrConsumption` records usage every hour, and is the equivalent of "real-time" usage. Use this event to observe usage trends over time.
 * `NrMTDConsumption` generates aggregate values from the `NrConsumption` event. Use this event to see usage by monthly billing period. This is the best event for querying user count.
 
-## Data ingest attributes [#data-ingest-attributes]
-
-Below are some of the most important attributes attached to usage-related events.
+Here are some of the most important attributes attached to usage-related events.
 
 <table>
   <thead>

src/content/docs/licenses/license-information/usage-plans/new-relic-usage-plan.mdx

@@ -29,7 +29,7 @@ Undefined terms used in this Usage Plan or Order shall have the meaning set fort
     title="Pay As You Go, or PAYG"
   >
     * Customer commits to paying for the New Relic Products on a consumption basis. A PAYG Order has a rolling one-day term ("Commitment Term").
-    * Customer's usage of the Products in excess of the [Free Tier](/docs/accounts/accounts-billing/new-relic-one-pricing-billing/new-relic-one-pricing-billing) each month shall be billed in arrears on the first business day of the following month based on the Customer's Per Unit usage of each Product each month multiplied by the corresponding rates set forth in an Order or this Usage Plan and summed (“Monthly Product Usage”).
+    * Customer's usage of the Products in excess of the [Free Edition](/docs/accounts/accounts-billing/new-relic-one-pricing-billing/new-relic-one-pricing-billing) each month shall be billed in arrears on the first business day of the following month based on the Customer's Per Unit usage of each Product each month multiplied by the corresponding rates set forth in an Order or this Usage Plan and summed (“Monthly Product Usage”).
     * Customer may request termination of its PAYG Buying Programs at any time with written notice to New Relic at [email protected] with fees being payable up until the effective date of such termination.
   </Collapser>
 
@@ -516,7 +516,7 @@ Details:
 
   <Collapser
     id="free-tier"
-    title="Free tier, 'lite', no-charge, preview access, New Relic - Data, New Relic - Standard edition"
+    title="Free edition, 'lite', no-charge, preview access, New Relic - Data, New Relic - Standard edition"
   >
 
     If you're on the Pay As You Go buying program, then your usage of the Products is covered by the [Paid Terms of Service](https://newrelic.com/termsandconditions/paid) for any paid months. Otherwise, unpaid months usage of the Products are covered by the [Unpaid Terms of Service](https://newrelic.com/termsandconditions/unpaid).

src/content/docs/new-relic-solutions/observability-maturity/operational-efficiency/data-governance-baseline-ingest-guide.mdx

@@ -317,7 +317,7 @@ In a [pay-as-you-go plan](/docs/accounts/accounts-billing/new-relic-one-pricing-
 
 Not sure of your data cost? See [Ingested data](/docs/accounts/accounts-billing/new-relic-one-pricing-billing/data-ingest-billing#data-prices). 
 
-### Free tier [#free-tier]
+### Free edition [#free-tier]
 
 With all [our editions](/docs/accounts/accounts-billing/new-relic-one-pricing-billing/new-relic-one-pricing-billing#editions), you get 100GB data ingest per month for free. For details on data ingest prices above the free amount, see [the list price table](/docs/licenses/license-information/usage-plans/new-relic-usage-plan/#list-price).
 

src/content/docs/release-notes/agent-release-notes/java-release-notes/java-agent-860.mdx

@@ -3,7 +3,7 @@ subject:  Java agent
 releaseDate:  '2023-09-07'
 version:  8.6.0
 downloadLink: 'https://download.newrelic.com/newrelic/java-agent/newrelic-agent/8.6.0/'
-features: ["Support latest Wildfly", "Support JBoss EAP 7.4", "Support Spring Cache", "Support GraphQL 19.7+", "Support Spring Cache", "Kafka client node metrics", "Kafka client config events", "Improved Struts 2 instrumentation", "Improved code-level metrics for Servlets"]
+features: ["Support latest Wildfly", "Support JBoss EAP 7.4", "Support Spring Cache", "Support Spring Cache", "Kafka client node metrics", "Kafka client config events", "Improved Struts 2 instrumentation", "Improved code-level metrics for Servlets"]
 bugs: ["Fixed a bug in the Spring instrumentation when OpenFeign was used.", "Fixed a bug where utility classes were not weaved.",
 "Fixed a bug where the agent would not properly send its dependencies."]
 security: []
@@ -23,8 +23,6 @@ security: []
 
 - Support latest JBoss EAP [#1336](https://github.com/newrelic/newrelic-java-agent/issues/1336)
 
-- Support GraphQL 19.7+ [#1469](https://github.com/newrelic/newrelic-java-agent/pull/1469)
-
 - Spring Cache instrumentation [#1458](https://github.com/newrelic/newrelic-java-agent/issues/1458)
 
 This new instrumentation module allows you to see how your caches are performing. It provides hit/miss metrics as well as clear and evict.

src/content/docs/style-guide/word-choice/pricing-language-guidelines.mdx

@@ -44,7 +44,7 @@ Some notes on style and formatting for pricing-related language:
   * When referencing a model, it's good practice to point to either the doc for that model, or else the [doc explaining the differences between the models](/docs/accounts/original-accounts-billing/original-product-based-pricing/overview-changes-pricing-user-model/#pricing-user-table), whichever makes more sense.
 * "usage-based." Our newer pricing model can be referred to as “usage-based” or “consumption-based,” but “usage-based” is the most commonly used and more preferred term.
 * Editions:
-  * Our [pricing editions](/docs/accounts/accounts-billing/new-relic-one-pricing-billing/new-relic-one-pricing-billing/#editions) are not "plans" or "models" or "tiers"; they are "editions". One exception is that it's acceptable to refer to the Free edition as the "free tier" simply because we have used that label in the past. 
+  * Our [pricing editions](/docs/accounts/accounts-billing/new-relic-one-pricing-billing/new-relic-one-pricing-billing/#editions) are not "plans" or "models" or "tiers"; they are "editions." One exception is that it's acceptable to refer to the Free edition as the "free tier" simply because we have used that in the past. 
   * Our pricing editions are formatted with title case: Free, Standard, Pro, and Enterprise. Example use: _If your organization is on the [Pro edition](/docs/accounts/accounts-billing/new-relic-one-pricing-billing/new-relic-one-pricing-billing/#editions)..._
   * A New Relic organization can have only a single edition.
   * Avoid referring to users by their edition (e.g., _your Pro users_ or _Enterprise users_). The cost of billable users does differ depending on edition, but we should attempt to keep these two dimensions separate. Example wording: _an organization with Pro edition and 10 full platform users_.

src/content/docs/synthetics/synthetic-monitoring/getting-started/monitor-limits.mdx

@@ -21,10 +21,10 @@ Your [pricing edition](/docs/accounts/accounts-billing/new-relic-one-pricing-bil
 
 The following are the synthetic checks included for free on each pricing edition: 
 
-* Free tier: 500 per month
-* Standard edition: 10K per month
-* Pro edition: 1M per month
-* Enterprise edition: 10M per month
+* Free: 500 per month
+* Standard: 10K per month
+* Pro: 1M per month
+* Enterprise: 10M per month
 
 ## Exceeding free amount [#exceeding-free]