couchbaselabs · simon-dew · Oct 11, 2023 · Oct 29, 2023 · Oct 30, 2023 · Jan 11, 2024
diff --git a/modules/ROOT/images/capella-logo.svg b/modules/ROOT/images/capella-logo.svg
diff --git a/modules/ROOT/images/couchbase-logo.svg b/modules/ROOT/images/couchbase-logo.svg
diff --git a/modules/ROOT/partials/component-signpost.adoc b/modules/ROOT/partials/component-signpost.adoc
@@ -0,0 +1,7 @@
+[.signpost]
+image:ROOT:couchbase-logo.svg["Couchbase Server", 25.6]
+This page is for Couchbase Server.
+ifdef::flag-devex-escape-hatch[]
+// soft-set flag-devex-escape-hatch so authors can override the escape hatch for individual pages
+For Couchbase Capella, see xref:cloud:{page-module}:{docname}.adoc[].
+endif::flag-devex-escape-hatch[]
diff --git a/modules/develop/pages/intro.adoc b/modules/develop/pages/intro.adoc
@@ -1,8 +1,8 @@
-= Developer's Intro
+= Developer Intro
 :page-role: tiles -toc
 :description: This section contains tutorials, how-to guides, and information about Couchbase Services to help you develop applications.
 :!sectids:
-:page-aliases: concepts:application-development
+:page-aliases: concepts:application-development;guides:intro.adoc
 
 // Pass through HTML styles for this page.
 
@@ -21,57 +21,63 @@ ifdef::basebackend-html[]
 endif::[]
 
 {description}
-It also provides links to the documentation for software development kits and starter kits.
+It also provides links to the documentation for software development kits and other integrations.
 
-include::partial$escape-hatch.adoc[]
+include::ROOT:partial$component-signpost.adoc[]
 
 == Developer Tutorial
 
 This tutorial provides an introductory worked example for developers, showing how to use a software development kit with a simple database.
 
 * xref:tutorials:couchbase-tutorial-student-records.adoc[]
 
-== Developer Guides
+== Connect
 
-These how-to guides walk you through common tasks for Couchbase Server development, such as storing, retrieving, and querying documents.
+Choose how you want to connect your app to Couchbase Server.
 
-* xref:guides:intro.adoc[Developer Guides]
+* xref:guides:connect.adoc[]
 
-== SDKs
+== Data
 
-Couchbase offers numerous software development kits (SDKs) that provide programmatic access to Couchbase Server.
+Use the Data Service for key-value (CRUD) operations and to import or export data.
 
-* xref:home:ROOT:sdk.adoc[]
+* xref:guides:kv-operations.adoc[]
 
-== Query Service Information
+== Query
 
-The Query Service enables you to issue queries to extract data from Couchbase clusters.
-You can also issue queries for defining indexes and data manipulation.
+Use the Query Service and the Index Service to issue {sqlpp} queries to extract and manipulate data.
 
 * xref:n1ql:query.adoc[]
 
-== Search Service Information
+== Search
 
-The Search Service (Full Text Search or FTS) enables you to create and manage full-text indexes, and provides extensive capabilities for natural-language and geospatial queries.
+Use the Search Service for full-text search with natural language processing across multiple data types and languages.
+Use custom text analysis, Geospatial search, and more.
 
-* xref:fts:fts-introduction.adoc[]
+* xref:search:search.adoc[]
 
-== Eventing Service Information
+== Eventing
 
-The Eventing Service provides near real-time handling of changes to data.
-It enables you to execute code either in response to mutations, or as scheduled by timers.
+Use the Eventing Service to respond to changes to your data in near real-time.
+Execute custom code in response to mutations, or as scheduled by timers.
 
 * xref:eventing:eventing-overview.adoc[]
 
-== Analytics Service Information
+== Analytics
 
-The Analytics Service is a parallel data management capability for Couchbase Server, designed to run ad-hoc, analytical queries efficiently over many records.
+Use the Analytics Service for online analytical processing (OLAP) for large datasets, with complex analytical or ad hoc queries.
 
 * xref:analytics:introduction.adoc[Introduction to Analytics]
 
+== SDKs
+
+Couchbase offers numerous software development kits (SDKs) that provide programmatic access to Couchbase Server.
+
+* xref:home:ROOT:sdk.adoc[]
+
 == Integrations
 
-Integrations that Couchbase or partners have developed to enhance Couchbase, Capella, and partner services --
+Integrations that Couchbase or partners have developed to enhance Couchbase Server and partner services --
 a vital tool for many larger development projects.
 
-* xref:develop:integrations.adoc[]
+* xref:third-party:integrations.adoc[]
diff --git a/modules/develop/partials/escape-hatch.adoc b/modules/develop/partials/escape-hatch.adoc
diff --git a/modules/develop/partials/nav.adoc b/modules/develop/partials/nav.adoc
@@ -1,2 +1 @@
-* xref:develop:intro.adoc[Developer's Intro]
-* xref:develop:integrations.adoc[Third Party Integrations]
+* xref:develop:intro.adoc[]
diff --git a/modules/guides/pages/intro.adoc → modules/guides/pages/.intro.adoc b/modules/guides/pages/intro.adoc → modules/guides/pages/.intro.adoc
@@ -21,7 +21,7 @@ endif::[]
 
 This section contains _how-to guides_ that walk you through common tasks for Couchbase Server development, such as storing, retrieving, and querying documents.
 
-include::partial$other-guide.adoc[]
+include::ROOT:partial$component-signpost.adoc[]
 
 == Connecting to Couchbase
 

diff --git a/modules/guides/pages/optimize.adoc → modules/guides/pages/.optimize.adoc b/modules/guides/pages/optimize.adoc → modules/guides/pages/.optimize.adoc
@@ -20,14 +20,9 @@ ifdef::basebackend-html[]
 ++++
 endif::[]
 
-{description} +
-include::partial$other-guide.adoc[]
+{description}
 
-== Prepared Statements
-
-include::prep-statements.adoc[tags=intro]
-
-* xref:prep-statements.adoc[]
+include::ROOT:partial$component-signpost.adoc[]
 
 == Index Advisor
 

diff --git a/modules/guides/pages/bulk-operations.adoc b/modules/guides/pages/bulk-operations.adoc
@@ -1,5 +1,5 @@
-= Bulk Operations
-:description: How to perform bulk CRUD operations in Couchbase.
+= Work with Documents in Bulk
+:description: How to perform bulk CRUD operations with a command line tool or an SDK.
 :page-pagination: prev
 :page-topic-type: guide
 :tabs:
@@ -8,10 +8,9 @@
 include::partial$example-attributes.adoc[]
 
 [abstract]
---
-{description} +
-include::partial$other-guide.adoc[]
---
+{description}
+
+include::ROOT:partial$component-signpost.adoc[]
 
 == Introduction
 

diff --git a/modules/guides/pages/call-user-defined-function.adoc b/modules/guides/pages/call-user-defined-function.adoc
@@ -7,10 +7,9 @@
 :flag-devex-escape-hatch!:
 
 [abstract]
---
-{description} +
-include::partial$other-guide.adoc[]
---
+{description}
+
+include::ROOT:partial$component-signpost.adoc[]
 
 == Introduction
 

diff --git a/modules/guides/pages/cbo.adoc b/modules/guides/pages/cbo.adoc
@@ -1,4 +1,4 @@
-= Cost-Based Optimizer
+= Use the Cost-Based Optimizer with Queries
 :page-topic-type: guide
 :page-partial:
 :page-pagination: prev
@@ -7,10 +7,9 @@
 :description: How to use the Cost-Based Optimizer and manage optimizer statistics.
 
 [abstract]
---
-{description} +
-include::partial$other-guide.adoc[]
---
+{description}
+
+include::ROOT:partial$component-signpost.adoc[]
 
 == Introduction
 

diff --git a/modules/guides/pages/connect.adoc b/modules/guides/pages/connect.adoc
@@ -9,10 +9,9 @@
 include::partial$example-attributes.adoc[]
 
 [abstract]
---
-{description} +
-include::partial$other-guide.adoc[]
---
+{description}
+
+include::ROOT:partial$component-signpost.adoc[]
 
 == Introduction
 

diff --git a/modules/guides/pages/create-index.adoc b/modules/guides/pages/create-index.adoc
@@ -1,4 +1,4 @@
-= Creating Indexes
+= Create Indexes
 :page-topic-type: guide
 :imagesdir: ../assets/images
 :page-partial:
@@ -9,10 +9,9 @@
 :description: How to create primary indexes and secondary indexes.
 
 [abstract]
---
-{description} +
-include::partial$other-guide.adoc[]
---
+{description}
+
+include::ROOT:partial$component-signpost.adoc[]
 
 == Introduction
 

diff --git a/modules/guides/pages/create-javascript-library.adoc b/modules/guides/pages/create-javascript-library.adoc
@@ -7,10 +7,9 @@
 :flag-devex-escape-hatch!:
 
 [abstract]
---
-{description} +
-include::partial$other-guide.adoc[]
---
+{description}
+
+include::ROOT:partial$component-signpost.adoc[]
 
 == Introduction
 

diff --git a/modules/guides/pages/create-user-defined-function.adoc b/modules/guides/pages/create-user-defined-function.adoc
@@ -7,10 +7,9 @@
 :flag-devex-escape-hatch!:
 
 [abstract]
---
-{description} +
-include::partial$other-guide.adoc[]
---
+{description}
+
+include::ROOT:partial$component-signpost.adoc[]
 
 [#creating-the-n1ql-udf-function]
 == Creating the {sqlpp} User-Defined Function

diff --git a/modules/guides/pages/creating-data.adoc b/modules/guides/pages/creating-data.adoc
@@ -1,5 +1,5 @@
-= Creating Data
-:description: How to create documents in Couchbase.
+= Create Documents
+:description: How to create documents with a command line tool or an SDK.
 :page-pagination: full 
 :page-topic-type: guide
 :page-toclevels: 2
@@ -9,10 +9,9 @@
 include::partial$example-attributes.adoc[]
 
 [abstract]
---
-{description} +
-include::partial$other-guide.adoc[]
---
+{description}
+
+include::ROOT:partial$component-signpost.adoc[]
 
 == Introduction
 

diff --git a/modules/guides/pages/data.adoc b/modules/guides/pages/data.adoc
@@ -0,0 +1,44 @@
+= Work with Your Data
+:page-role: tiles -toc
+:description: The Data Service offers Couchbase clients the fastest and simplest way to create, retrieve, or mutate data.
+:!sectids:
+
+// Pass through HTML styles for this page.
+
+ifdef::basebackend-html[]
+++++
+<style type="text/css">
+  /* Extend heading across page width */
+  div.page-heading-title,
+  div.contributor-list-box,
+  div#preamble,
+  nav.pagination {
+    flex-basis: 100%;
+  }
+</style>
+++++
+endif::[]
+
+[abstract]
+{description}
+
+include::ROOT:partial$component-signpost.adoc[]
+
+== Key-Value Operations
+
+Use the Couchbase Web Console or an SDK to create, read, update, or delete data.
+
+* xref:kv-operations.adoc[]
+
+== Import and Export
+
+Use the Couchbase Web Console, an SDK, or a command-line tool to import data.
+Use a command-line tool to export data.
+
+* xref:load.adoc[]
+
+== Related Links
+
+Refer to the following for information on the Data Service.
+
+* xref:learn:services-and-indexes/services/data-service.adoc[]