qa general

colleenmcginnis · colleenmcginnis · commit bfa6532a9b5e · 2024-10-30T12:44:16.000-05:00
diff --git a/serverless/index.asciidoc b/serverless/index.asciidoc
@@ -14,6 +14,7 @@ include::{asciidoc-dir}/../../shared/attributes.asciidoc[]
 :obs-badge: <<what-is-observability-serverless,image:images/obs-badge.svg[Observability]>>
 :sec-badge: <<what-is-security-serverless,image:images/sec-badge.svg[Security]>>
 
+// These are only available in serverless
 :es3: Elasticsearch Serverless
 :project-settings: Project settings
 :manage-app: Management
@@ -31,6 +32,14 @@ include::{asciidoc-dir}/../../shared/attributes.asciidoc[]
 :alerts-app: Alerts
 :serverlessCustomRoles: true
 
+// The values of these attributes are different in stateful vs serverless
+:serverless-full: Elastic Cloud Serverless
+:serverless-short: Serverless
+:es: Elasticsearch Serverless
+:es-serverless: Elasticsearch Serverless
+:observability: Elastic Observability Serverless
+:security: Elastic Security Serverless
+
 = Serverless
 
 [[intro]]
diff --git a/serverless/pages/elasticsearch/search-your-data-semantic-search-elser.asciidoc b/serverless/pages/elasticsearch/search-your-data-semantic-search-elser.asciidoc
@@ -1,5 +1,5 @@
 [[elasticsearch-reference-semantic-search-elser]]
-= "Tutorial: Semantic search with ELSER"
+= Tutorial: Semantic search with ELSER
 
 :description: Perform semantic search using ELSER, an NLP model trained by Elastic.
 :keywords: elasticsearch, elser, semantic search
diff --git a/serverless/pages/general/index.asciidoc b/serverless/pages/general/index.asciidoc
diff --git a/serverless/pages/general/manage-access-to-org-user-roles.asciidoc b/serverless/pages/general/manage-access-to-org-user-roles.asciidoc
@@ -36,9 +36,11 @@ For example, you can assign a user the developer role for a specific {es-serverl
 [role="screenshot"]
 image::images/individual-role.png[Individual role]
 
-ifeval::["{serverlessCustomRoles}" == "true"]
-You can also optionally https://www.elastic.co/docs/current/serverless/custom-roles[create custom roles in a project].
+ifdef::serverlessCustomRoles[]
+
+You can also optionally <<custom-roles,create custom roles in a project>>.
 To assign a custom role to users, go to "Instance access roles" and select it from the list under the specific project it was created in.
+
 endif::[]
 
 [discrete]
diff --git a/serverless/pages/general/manage-billing-pricing-model.asciidoc b/serverless/pages/general/manage-billing-pricing-model.asciidoc
@@ -17,9 +17,9 @@ Elastic Cloud serverless billing is based on your usage across these dimensions:
 
 To learn about billing dimensions for specific offerings, refer to:
 
-* https://www.elastic.co/docs/current/serverless/elasticsearch/elasticsearch-billing[]
-* https://www.elastic.co/docs/current/serverless/observability/observability-billing[]
-* https://www.elastic.co/docs/current/serverless/security/security-billing[]
+* <<elasticsearch-billing>>
+* <<observability-billing>>
+* <<security-billing>>
 
 [discrete]
 [[add-ons]]
diff --git a/serverless/pages/general/manage-billing.asciidoc b/serverless/pages/general/manage-billing.asciidoc
@@ -13,7 +13,7 @@ preview:[]
 .Serverless billing starts June 1, 2024
 [IMPORTANT]
 ====
-Until May 31, 2024, your serverless consumption will not incur any charges, but will be visible along with your total Elastic Cloud consumption on the https://cloud.elastic.co/billing/usage?[Billing Usage page]. Unless you are in a trial period, usage on or after June 1, 2024 will be deducted from your existing Elastic Cloud credits or be billed to your active payment method.
+Until May 31, 2024, your serverless consumption will not incur any charges, but will be visible along with your total Elastic Cloud consumption on the https://cloud.elastic.co/billing/usage[Billing Usage page]. Unless you are in a trial period, usage on or after June 1, 2024 will be deducted from your existing Elastic Cloud credits or be billed to your active payment method.
 ====
 
 You can manage the billing details of your organization directly from the Elastic Cloud console.
diff --git a/serverless/pages/general/manage-billing.mdx b/serverless/pages/general/manage-billing.mdx
@@ -8,7 +8,7 @@ tags: [ 'serverless', 'general', 'billing', 'overview' ]
 <DocBadge template="technical preview" />
 
 <DocCallOut color="warning" title="Serverless billing starts June 1, 2024">
-    Until May 31, 2024, your serverless consumption will not incur any charges, but will be visible along with your total Elastic Cloud consumption on the [Billing Usage page](https://cloud.elastic.co/billing/usage?). Unless you are in a trial period, usage on or after June 1, 2024 will be deducted from your existing Elastic Cloud credits or be billed to your active payment method.
+    Until May 31, 2024, your serverless consumption will not incur any charges, but will be visible along with your total Elastic Cloud consumption on the [Billing Usage page](https://cloud.elastic.co/billing/usage). Unless you are in a trial period, usage on or after June 1, 2024 will be deducted from your existing Elastic Cloud credits or be billed to your active payment method.
 </DocCallOut>
 
 You can manage the billing details of your organization directly from the Elastic Cloud console.
diff --git a/serverless/pages/general/manage-org.asciidoc b/serverless/pages/general/manage-org.asciidoc
@@ -10,6 +10,6 @@ When you sign up to Elastic Cloud, you create an **organization**.
 
 This organization is the umbrella for all of your Elastic Cloud resources, users, and account settings. Every organization has a unique identifier. Bills are invoiced according to the billing contact and details that you set for your organization.
 
-* <<general-manage-access-to-organization>>
-* <<general-manage-billing>>
-* <<elasticsearch-manage-project>>
+* <<general-manage-access-to-organization>>: Add members to your organization and projects.
+* <<general-manage-billing>>: Configure the billing details of your organization.
+* <<elasticsearch-manage-project>>: Configure project-wide features and usage.
diff --git a/serverless/pages/general/sign-up.asciidoc b/serverless/pages/general/sign-up.asciidoc
@@ -24,9 +24,9 @@ Each deployment includes Elastic features such as Maps, SIEM, machine learning,
 
 Serverless projects package Elastic Stack features by type of solution:
 
-* https://www.elastic.co/docs/current/serverless/elasticsearch/what-is-elasticsearch-serverless[Elasticsearch]
-* https://www.elastic.co/docs/current/serverless/observability/what-is-observability-serverless[Observability]
-* https://www.elastic.co/docs/current/serverless/security/what-is-security-serverless[Security]
+* <<what-is-elasticsearch-serverless,Elasticsearch>>
+* <<what-is-observability-serverless,Observability>>
+* <<what-is-security-serverless,Security>>
 
 When you create a project, you select the project type applicable to your use case, so only the relevant and impactful applications and features are easily accessible to you.
 
@@ -63,7 +63,7 @@ To remove limitations, subscribe to https://www.elastic.co/guide/en/cloud/curren
 * Third availability zone for your deployments.
 * Access to additional features, such as cross-cluster search and cross-cluster replication.
 
-You can subscribe to Elastic Cloud at any time during your trial. /serverless/general/serverless-billing[Billing] starts when you subscribe. To maximize the benefits of your trial, subscribe at the end of the free period. To monitor charges, anticipate future costs, and adjust your usage, check your https://www.elastic.co/guide/en/cloud/current/ec-account-usage.html[account usage] and https://www.elastic.co/guide/en/cloud/current/ec-billing-history.html[billing history].
+You can subscribe to Elastic Cloud at any time during your trial. <<general-serverless-billing,Billing>> starts when you subscribe. To maximize the benefits of your trial, subscribe at the end of the free period. To monitor charges, anticipate future costs, and adjust your usage, check your https://www.elastic.co/guide/en/cloud/current/ec-account-usage.html[account usage] and https://www.elastic.co/guide/en/cloud/current/ec-billing-history.html[billing history].
 
 [discrete]
 [[general-sign-up-trial-how-do-i-get-started-with-my-trial]]
diff --git a/serverless/pages/general/sign-up.mdx b/serverless/pages/general/sign-up.mdx
@@ -60,7 +60,7 @@ To remove limitations, subscribe to [Elastic Cloud](https://www.elastic.co/guide
 - Third availability zone for your deployments.
 - Access to additional features, such as cross-cluster search and cross-cluster replication.
 
-You can subscribe to Elastic Cloud at any time during your trial. [Billing](/serverless/general/serverless-billing) starts when you subscribe. To maximize the benefits of your trial, subscribe at the end of the free period. To monitor charges, anticipate future costs, and adjust your usage, check your [account usage](https://www.elastic.co/guide/en/cloud/current/ec-account-usage.html) and [billing history](https://www.elastic.co/guide/en/cloud/current/ec-billing-history.html).
+You can subscribe to Elastic Cloud at any time during your trial. <DocLink slug="/serverless/general/serverless-billing">Billing</DocLink> starts when you subscribe. To maximize the benefits of your trial, subscribe at the end of the free period. To monitor charges, anticipate future costs, and adjust your usage, check your [account usage](https://www.elastic.co/guide/en/cloud/current/ec-account-usage.html) and [billing history](https://www.elastic.co/guide/en/cloud/current/ec-billing-history.html).
 
 ## How do I get started with my trial?
 
diff --git a/serverless/pages/general/visualize-library.asciidoc b/serverless/pages/general/visualize-library.asciidoc
@@ -8,7 +8,7 @@
 This content has been removed from the navigation for now because it's not useful in its current state.*/
 ////
 
-This content applies to:
+This content applies to: {es-badge} {obs-badge} {sec-badge}
 
 The **Visualize Library** is a space where you can save visualization panels that you may want to use across multiple dashboards. The **Visualize Library** consists of two pages:
 
@@ -19,7 +19,7 @@ The **Visualize Library** is a space where you can save visualization panels tha
 [[visualize-library-visualizations]]
 == Visualizations
 
-By default the **Visualizations** page opens first. Here you can create new visualizations, or select from a list of previously created visualizations. To learn more, refer to https://www.elastic.co/docs/current/serverless/elasticsearch/explore-your-data-visualizations[save to the Visualize Library].
+By default the **Visualizations** page opens first. Here you can create new visualizations, or select from a list of previously created visualizations. To learn more, refer to <<elasticsearch-explore-your-data-visualizations-save-to-the-visualize-library,save to the Visualize Library>>.
 
 [discrete]
 [[visualize-library-annotation-groups]]
diff --git a/serverless/pages/general/what-is-serverless.asciidoc b/serverless/pages/general/what-is-serverless.asciidoc
@@ -15,7 +15,7 @@ data you ingest, more resources are allocated for that period of time. When the
 on your end.
 
 **Optimized data storage.** Your data is stored in cost-efficient, general storage. A cache layer is available on top of the general storage for recent and frequently queried data that provides faster search speed.
-The size of the cache layer and the volume of data it holds depend on https://www.elastic.co/docs/current/serverless/elasticsearch/manage-project[settings] that you can configure for each project.
+The size of the cache layer and the volume of data it holds depend on <<elasticsearch-manage-project,settings>> that you can configure for each project.
 
 **Dedicated experiences.** All serverless solutions are built on the Elastic Search Platform and include the core capabilities of the Elastic Stack. They also each offer a distinct experience and specific capabilities that help you focus on your data, goals, and use cases.
 
@@ -24,7 +24,7 @@ The size of the cache layer and the volume of data it holds depend on https://ww
 .Serverless billing starts June 1, 2024
 [IMPORTANT]
 ====
-Until May 31, 2024, your serverless consumption will not incur any charges, but will be visible along with your total Elastic Cloud consumption on the https://cloud.elastic.co/billing/usage?[Billing Usage page]. Unless you are in a trial period, usage on or after June 1, 2024 will be deducted from your existing Elastic Cloud credits or be billed to your active payment method.
+Until May 31, 2024, your serverless consumption will not incur any charges, but will be visible along with your total Elastic Cloud consumption on the https://cloud.elastic.co/billing/usage[Billing Usage page]. Unless you are in a trial period, usage on or after June 1, 2024 will be deducted from your existing Elastic Cloud credits or be billed to your active payment method.
 ====
 
 [discrete]
@@ -36,7 +36,7 @@ Control your project data and query performance against your project data.
 **Data.** Choose the data you want to ingest, and the method to ingest it. By default, data is stored indefinitely in your project,
 and you define the retention settings for your data streams.
 
-**Performance.** For granular control over costs and query performance against your project data, serverless projects come with a set of predefined https://www.elastic.co/docs/current/serverless/elasticsearch/manage-project[settings] that you can edit.
+**Performance.** For granular control over costs and query performance against your project data, serverless projects come with a set of predefined <<elasticsearch-manage-project,settings>> that you can edit.
 
 .Some or all of these settings may not be available for all types of serverless projects.
 [NOTE]
@@ -108,7 +108,7 @@ Migration paths between hosted deployments and serverless projects are currently
 
 **How can I move data to or from serverless projects?**
 
-We are working on data migration tools! In the interim, you can https://www.elastic.co/docs/current/serverless/elasticsearch/ingest-data-through-logstash[use Logstash] with Elasticsearch input and output plugins to move data to and from serverless projects.
+We are working on data migration tools! In the interim, you can <<elasticsearch-ingest-data-through-logstash,use Logstash>> with Elasticsearch input and output plugins to move data to and from serverless projects.
 
 **How does serverless ensure compatibility between software versions?**
 
diff --git a/serverless/pages/general/what-is-serverless.mdx b/serverless/pages/general/what-is-serverless.mdx
@@ -23,7 +23,7 @@ The size of the cache layer and the volume of data it holds depend on <DocLink s
 **Pay per usage.** Each serverless project type includes product-specific and usage-based pricing.
 
 <DocCallOut color="warning" title="Serverless billing starts June 1, 2024">
-  Until May 31, 2024, your serverless consumption will not incur any charges, but will be visible along with your total Elastic Cloud consumption on the [Billing Usage page](https://cloud.elastic.co/billing/usage?). Unless you are in a trial period, usage on or after June 1, 2024 will be deducted from your existing Elastic Cloud credits or be billed to your active payment method.
+  Until May 31, 2024, your serverless consumption will not incur any charges, but will be visible along with your total Elastic Cloud consumption on the [Billing Usage page](https://cloud.elastic.co/billing/usage). Unless you are in a trial period, usage on or after June 1, 2024 will be deducted from your existing Elastic Cloud credits or be billed to your active payment method.
 </DocCallOut>
 
 ## Control your data and performance
@@ -66,7 +66,7 @@ Migration paths between hosted deployments and serverless projects are currently
 
 **How can I move data to or from serverless projects?**
 
-We are working on data migration tools! In the interim, you can <DocLink slug="/serverless/elasticsearch/ingest-data-through-logstash" section="migrating-elasticsearch-data-using-logstash">use Logstash</DocLink> with Elasticsearch input and output plugins to move data to and from serverless projects. 
+We are working on data migration tools! In the interim, you can <DocLink slug="/serverless/elasticsearch/ingest-data-through-logstash" section="migrating-elasticsearch-data-using-logstash">use Logstash</DocLink> with Elasticsearch input and output plugins to move data to and from serverless projects.
 
 **How does serverless ensure compatibility between software versions?**
 
@@ -92,4 +92,4 @@ See serverless pricing information for [Search](https://www.elastic.co/pricing/s
 
 **Can I request backups or restores for my projects?**
 
-It is not currently possible to request backups or restores for projects, but we are working on data migration tools to better support this. 
+It is not currently possible to request backups or restores for projects, but we are working on data migration tools to better support this.
diff --git a/serverless/pages/welcome-to-serverless.asciidoc b/serverless/pages/welcome-to-serverless.asciidoc
@@ -10,7 +10,7 @@
 </style>
 ++++
 
-preview::[]
+preview:[]
 
 Elastic serverless products allow you to deploy and use Elastic for your use cases without managing the underlying Elastic cluster,
 such as nodes, data tiers, and scaling. Serverless instances are fully-managed, autoscaled, and automatically upgraded by Elastic so you can
