DOC-5709 Astra upgrade

modules/ROOT/pages/astream-faq.adoc

@@ -100,7 +100,7 @@ The following questions address security and access control in {product}.
 
 === Does {product} support single-sign on?
 
-If your {astra} organization is on a paid {astra} subscription plan, your users can use SSO to sign in to the {astra-ui}.
+If your {astra} organization is on a paid {astra} plan, your users can use SSO to sign in to the {astra-ui}.
 For more information, see xref:astra-db-serverless:administration:configure-sso.adoc[].
 
 === How do {astra} roles and permissions map to {pulsar-short} roles and permissions?

modules/developing/pages/astream-cdc.adoc

@@ -177,7 +177,7 @@ The connected sink consumes messages from the `data-` topic, and then sends them
 
 To enable CDC for {astra-db}, you need the following:
 
-* An active {astra-url}[{astra} account] with access to an organization that has an {product} subscription plan.
+* An active {astra-url}[{astra} account] with access to an organization that has an {product} plan.
 +
 You need a role that grants permission to manage streaming tenants, such as the {organization-administrator-role} role.
 

modules/developing/pages/astream-functions.adoc

@@ -12,7 +12,7 @@ Functions are implemented using https://pulsar.apache.org/docs/en/functions-over
 
 [IMPORTANT]
 ====
-Custom functions require a xref:operations:astream-pricing.adoc[paid {product} subscription plan].
+Custom functions require a xref:operations:astream-pricing.adoc[paid {product} plan].
 ====
 
 [#create-an-archive]
@@ -231,7 +231,7 @@ bin/pulsar-admin functions create --function-config-file **PATH_TO_FUNCTION_CONF
 +
 A response of `Created Successfully!` indicates the function is deployed and ready to accept messages.
 +
-If the response is `402 Payment Required` with `Reason: only qualified organizations can create functions`, then you must upgrade to a xref:operations:astream-pricing.adoc[paid {product} subscription plan].
+If the response is `402 Payment Required` with `Reason: only qualified organizations can create functions`, then you must upgrade to a xref:operations:astream-pricing.adoc[paid {product} plan].
 +
 [TIP]
 ====

modules/operations/pages/astream-pricing.adoc

@@ -2,12 +2,12 @@
 
 {product} is a fully-managed, software-as-a-service (SaaS) offering embedded in {astra}.
 
-== Subscription plans
+== Plans
 
-There are multiple {product} subscription plans.
-An {product} subscription is associated with an {astra} organization, but {product} subscription plans are separate from {astra} organization subscription plans.
+There are multiple {product} plans.
+An {product} plan is associated with an {astra} organization, but {product} plans are separate from {astra} organization plans.
 
-For {astra} plans and pricing details, see https://www.ibm.com/docs/en/astra-streaming?topic=astra-streaming-annual-price-plans[{product} pricing] and xref:astra-db-serverless:administration:subscription-plans.adoc[{astra} subscription plans].
+For more information, see https://www.ibm.com/docs/en/astra-streaming?topic=astra-streaming-annual-price-plans[{product} pricing] and xref:astra-db-serverless:administration:subscription-plans.adoc[{astra} plans].
 
 == Shared clusters
 
@@ -30,15 +30,15 @@ You sign in to {astra} and use {product} in the same way that you would on share
 When you create a tenant, you have the option to deploy to your private cluster.
 This means that you can use both shared clusters and Streaming Capacity Units, depending on your tenants' use cases.
 
-Streaming Capacity Units are an addition to your base {product} subscription plan, and billing for Streaming Capacity Units is unique to each customer.
+Streaming Capacity Units are an addition to your base {product} plan, and billing for Streaming Capacity Units is unique to each customer.
 
 Like shared clusters, all connections for Streaming Capacity Units in {product} are guarded by authentication, authorization, and secure (TLS) communications.
 By default, these connections are over the public internet.
 Additionally, Streaming Capacity Units support xref:operations:private-connectivity.adoc[private connectivity].
 
 == Additional billed charges
 
-Regardless of your subscription plan or cluster type, additional customizations can impact your {product} billed charges.
+Regardless of your plan or cluster type, additional customizations can impact your {product} billed charges.
 These include, but are not limited to, the following:
 
 * Message retention duration
@@ -48,7 +48,7 @@ These include, but are not limited to, the following:
 
 == Limits
 
-Regardless of your subscription plan or cluster type, {product} applies xref:astream-limits.adoc[guardrails and limits] on resource creation to ensure best practices, foster availability, and promote optimal configurations for your databases.
+Regardless of your plan or cluster type, {product} applies xref:astream-limits.adoc[guardrails and limits] on resource creation to ensure best practices, foster availability, and promote optimal configurations for your databases.
 
 Streaming Capacity Units have fewer limits than shared clusters.
 

modules/operations/pages/astream-release-notes.adoc

@@ -62,7 +62,7 @@ For more information, see xref:developing:clients/spring-produce-consume.adoc[Sp
 
 === {new}
 
-* Custom functions require a xref:operations:astream-pricing.adoc[paid {product} subscription plan].
+* Custom functions require a xref:operations:astream-pricing.adoc[paid {product} plan].
 
 == February 27, 2023