Merging in 7.6 changes

README.adoc

@@ -11,6 +11,7 @@ endif::[]
 :url-cli: {url-org}/couchbase-cli
 :url-backup: {url-org}/backup
 :url-analytics: https://github.com/couchbaselabs/asterix-opt
+:url-license: https://creativecommons.org/licenses/by-nc-sa/4.0/
 
 This repository hosts the documentation source for Couchbase Server.
 
@@ -42,3 +43,9 @@ The documentation source files are marked up with AsciiDoc.
 Once merged into a version branch, the source files and their assets are aggregated, converted to HTML, and published by Antora to our staging and production sites.
 The docs components and {url-ui}[site UI] are orchestrated by the {url-playbook}[docs site playbook].
 See the contributing guide to learn more.
+
+== License
+
+Couchbase Server Documentation © 2024 by Couchbase Inc. is licensed under Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International.
+
+See the LICENSE file or the {url-license}[Creative Commons CC BY-NC-SA 4.0 license page] for details.

modules/ROOT/nav.adoc

@@ -17,195 +17,19 @@
 include::develop:partial$nav.adoc[]
 include::tutorials:partial$nav.adoc[]
 include::guides:partial$nav.adoc[]
+include::n1ql:partial$nav.adoc[]
+include::vector-search:partial$nav.adoc[]
 include::search:partial$nav.adoc[]
-
+include::eventing:partial$nav.adoc[]
+include::analytics:partial$nav.adoc[]
 * xref:home:ROOT:sdk.adoc[SDKs]
   ** xref:sdk-extensions::distributed-acid-transactions.adoc[Distributed ACID Transactions]
   ** xref:sdk-extensions::field-level-encryption.adoc[Field Level Encryption]
   ** xref:sdk-extensions::response-time-observability.adoc[Response Time Observability]
   ** xref:sdk-extensions::spring-data-couchbase.adoc[Spring Data Couchbase]
   ** xref:getting-started:starter-kits.adoc[Starter Kits]
   ** xref:sdk:sdk-doctor.adoc[Troubleshooting Connections with SDK Doctor]
-
-include::n1ql:partial$nav.adoc[]
-include::vector-search:partial$nav.adoc[]
-* xref:fts:fts-introduction.adoc[Search]
- ** xref:fts:fts-quickstart-guide.adoc[Quickstart Guide]
- ** xref:fts:fts-creating-indexes.adoc[Create Search Indexes]
-  *** xref:fts:fts-creating-index-from-UI-quick-editor.adoc[Quick Editor and Example]
-  *** xref:fts:fts-creating-index-from-UI-classic-editor.adoc[Classic Editor and Examples]
-  **** Collections
-  ***** xref:fts:fts-creating-index-from-UI-classic-editor-onefield.adoc[One Field Index]
-  ***** xref:fts:fts-creating-index-from-UI-classic-editor-geopoint.adoc[Geopoint Index]
-  ***** xref:fts:fts-creating-index-from-UI-classic-editor-dynamic.adoc[Dynamic Index]
-  **** Bucket Compatibility
-  ***** xref:fts:fts-creating-index-from-UI-classic-editor-legacy.adoc[Legacy Index]
-  *** xref:fts:fts-creating-index-with-rest-api.adoc[REST API and Examples]
-  **** Collections
-  ***** xref:fts:fts-creating-index-from-REST-onefield.adoc[One Field Index]
-  ***** xref:fts:fts-creating-index-from-REST-geopoint.adoc[Geopoint Index]
-  ***** xref:fts:fts-creating-index-from-REST-dynamic.adoc[Dynamic Index]
-  ***** xref:fts:fts-creating-index-from-REST-geojson.adoc[GeoJSON Index]
-  **** Bucket Compatibility
-  ***** xref:fts:fts-creating-index-from-REST-legacy.adoc[Legacy Index]
-  *** xref:fts:fts-creating-index-from-UI-difference-between-classic-quick-editor.adoc[Comparing Editors and REST]
-  *** xref:fts:fts-configure-index-options.adoc[Configure Index Options]
-   **** xref:fts:fts-type-identifiers.adoc[Type Indentifiers]
-   **** xref:fts:fts-type-mappings.adoc[Type Mappings]
-   **** xref:fts:fts-index-analyzers.adoc[Index Analyzers]
-   **** xref:fts:fts-custom-filters.adoc[Custom Filters]
-   **** xref:fts:fts-date-time-parsers.adoc[Date Time Parsers]
-   **** xref:fts:fts-default-settings.adoc[Default Settings]
-   **** xref:fts:fts-index-replicas.adoc[Index Replicas]
-   **** xref:fts:fts-index-type.adoc[Index Type]
-   **** xref:fts:fts-index-partitions.adoc[Index Partitioning]
- ** xref:fts:fts-creating-full-text-aliases.adoc[Create Index Alias]
- ** xref:fts:fts-perform-searches.adoc[Perform Searches]
-  *** xref:fts:fts-searching-from-the-UI.adoc[Searching from the UI]
-  *** xref:fts:fts-searching-with-curl-http-requests.adoc[Searching using REST API]
-   **** xref:fts:fts-creating-with-curl-http-requests-json-structure.adoc[Request Structure]
-   **** xref:fts:fts-creating-with-curl-http-requests.adoc[Queries with Curl/HTTP Requests]
-  *** xref:fts:fts-searching-full-text-indexes-aliases.adoc[Searching Full Text Indexes/Aliases]
-  *** xref:fts:fts-multi-collection-behaviour.adoc[Searching Multi Collection Indexes]
-  *** xref:fts:fts-searching-with-sdk.adoc[Searching using SDK]
-  *** xref:fts:fts-secure-fts-queries.adoc[Searching Securely Using SSL]
-  *** xref:fts:fts-searching-from-N1QL.adoc[]
- ** xref:fts:fts-search-request.adoc[Search Request]
- ** xref:fts:fts-search-response.adoc[Search Response]
- ** xref:fts:fts-manage-index-lifecycle.adoc[Manage Index Lifecycle]
- ** xref:fts:fts-high-availability-for-search.adoc[High Availability for Search]
- ** xref:fts:fts-supported-queries.adoc[Supported Queries]
-  *** xref:fts:fts-supported-queries-query-string-query.adoc[Query String Query]
-    **** xref:fts:fts-query-string-syntax.adoc[Query String Syntax]
-     ***** xref:fts:fts-query-string-syntax-boosting.adoc[Boosting]
-     ***** xref:fts:fts-query-string-syntax-date-ranges.adoc[Date Range]
-     ***** xref:fts:fts-query-string-syntax-escaping.adoc[Escaping]
-     ***** xref:fts:fts-query-string-syntax-field-scoping.adoc[Field Scoping]
-     ***** xref:fts:fts-query-string-syntax-match-phrase.adoc[Match Phrase]
-     ***** xref:fts:fts-query-string-syntax-match.adoc[Match  Query Syntax]
-     ***** xref:fts:fts-query-string-syntax-numeric-ranges.adoc[Numeric Range]
-  *** xref:fts:fts-supported-queries-analytic-query.adoc[Analytic Queries]
-   **** xref:fts:fts-supported-queries-match.adoc[Match]
-   **** xref:fts:fts-supported-queries-match-phrase.adoc[Match Phrase]
-  *** xref:fts:fts-supported-queries-non-analytic-query.adoc[Non Analytic Queries]
-   **** xref:fts:fts-supported-queries-term.adoc[Term]
-   **** xref:fts:fts-supported-queries-phrase.adoc[Phrase]
-   **** xref:fts:fts-supported-queries-prefix-query.adoc[Prefix]
-   **** xref:fts:fts-supported-queries-regexp.adoc[Regexp]
-   **** xref:fts:fts-supported-queries-fuzzy.adoc[Fuzzy]
-   **** xref:fts:fts-supported-queries-wildcard.adoc[Wilcard]
-  *** xref:fts:fts-supported-queries-compound-query.adoc[Compound Queries]
-   **** xref:fts:fts-supported-queries-conjuncts-disjuncts.adoc[Conjuncts and Disjuncts]
-   **** xref:fts:fts-supported-queries-boolean-field-query.adoc[Boolean]
-  *** xref:fts:fts-supported-queries-range-query.adoc[Range Queries]
-   **** xref:fts:fts-supported-queries-numeric-range.adoc[Numeric Range]
-   **** xref:fts:fts-supported-queries-date-range.adoc[Date Range]
-   **** xref:fts:fts-supported-queries-term-range.adoc[Term Range]
-  *** xref:fts:fts-supported-queries-geospatial.adoc[Geo Spatial Queries]
-   **** xref:fts:fts-supported-queries-geopoint-spatial.adoc[Geopoint Queries]
-    ***** xref:fts:fts-supported-queries-geo-point-distance.adoc[Geopoint Distance]
-    ***** xref:fts:fts-supported-queries-geo-bounded-rectangle.adoc[Geopoint Bounded Rectangle]
-    ***** xref:fts:fts-supported-queries-geo-bounded-polygon.adoc[Geopoint Bounded Polygon]
-   **** xref:fts:fts-supported-queries-geojson-spatial.adoc[GeoJSON Queries]
-    ***** xref:fts:fts-queryshape-point.adoc[Point Query]
-    ***** xref:fts:fts-queryshape-linestring.adoc[LineString Query]
-    ***** xref:fts:fts-queryshape-polygon.adoc[Polygon Query]
-    ***** xref:fts:fts-queryshape-multipoint.adoc[MultiPoint Query]
-    ***** xref:fts:fts-queryshape-multilinestring.adoc[MultiLineString Query]
-    ***** xref:fts:fts-queryshape-multipolygon.adoc[MultiPolygon Query]
-    ***** xref:fts:fts-queryshape-geometrycollection.adoc[GeometryCollection Query]
-    ***** xref:fts:fts-queryshape-circle.adoc[Circle Query]
-    ***** xref:fts:fts-queryshape-envelope.adoc[Envelope Query]
-  *** xref:fts:fts-supported-queries-special-query.adoc[Special Queries]
-   **** xref:fts:fts-supported-queries-match-all.adoc[Match All]
-   **** xref:fts:fts-supported-queries-match-none.adoc[Match None]
- ** xref:fts:fts-architecture.adoc[Search Service Architecture]
-  *** xref:fts:fts-architecture-scatter-gather.adoc[Scatter Gather]
-  *** xref:fts:fts-architecture-ports-used.adoc[Ports Used By FTS]
-  *** xref:fts:fts-rebalance-failover.adoc[Rebalance/Failover]
- ** xref:fts:fts-cluster-options.adoc[Cluster Level Options]
-  *** xref:fts:fts-advanced-settings-bleveMaxResultWindow.adoc[bleveMaxResultWindow]
-  *** xref:fts:fts-advanced-settings-bleveMaxClauseCount.adoc[bleveMaxClauseCount]
-  *** xref:fts:fts-advanced-settings-maxFeedsPerDCPAgent.adoc[maxFeedsPerDCPAgent]
-  *** xref:fts:fts-advance-settings-maxConcurrentPartitionMovesPerNode.adoc[maxConcurrentPartitionMovesPerNode]
-  *** xref:fts:fts-advanced-settings-enableVerboseLogging.adoc[enableVerboseLogging]
-  *** xref:fts:fts-advanced-settings-ftsMemoryQuota.adoc[ftsMemoryQuota]
-  *** xref:fts:fts-advanced-settings-maxReplicasAllowed.adoc[maxReplicasAllowed]
-  *** xref:fts:fts-advanced-settings-slowQueryLogTimeout.adoc[slowQueryLogTimeout]
-  *** xref:fts:fts-advanced-settings-CBFT-ENV-OPTIONS.adoc[CBFT_ENV_OPTIONS]
- ** xref:fts:fts-monitor.adoc[Statistics and Monitoring]
- ** xref:fts:fts-troubleshooting.adoc[Troubleshooting and FAQs]
-* xref:eventing:eventing-overview.adoc[Eventing]
- ** xref:eventing:eventing-Terminologies.adoc[Terminology]
- ** xref:eventing:eventing-language-constructs.adoc[Language Constructs]
-  *** xref:eventing:eventing-advanced-keyspace-accessors.adoc[Advanced Keyspace Accessors]
-  *** xref:eventing:eventing-timers.adoc[Timers]
-  *** xref:eventing:eventing-curl-spec.adoc[cURL]
- ** xref:eventing:eventing-lifecycle.adoc[Eventing Lifecycle]
- ** xref:eventing:eventing-buckets-to-collections.adoc[Buckets vs Collections]
- ** xref:eventing:eventing-rbac.adoc[Eventing Role-Based Access Control]
- ** xref:eventing:eventing-examples.adoc[Examples: Using the Eventing Service]
-  *** Step-by-Step Examples
-   **** xref:eventing:eventing-example-data-enrichment.adoc[Data Enrichment]
-   **** xref:eventing:eventing-examples-cascade-delete.adoc[Cascade Delete]
-   **** xref:eventing:eventing-examples-docexpiry.adoc[Document Expiry]
-   **** xref:eventing:eventing-examples-delete-v-expiry.adoc[Delete v Expiry]
-   **** xref:eventing:eventing-examples-docarchive.adoc[Document Archival]
-   **** xref:eventing:eventing-examples-cancel-overwrite-timer.adoc[Cancel or Overwrite Timer]
-   **** xref:eventing:eventing-examples-recurring-timer.adoc[Recurring Timer]
-   **** xref:eventing:eventing-examples-rest-via-curl-get.adoc[External REST via cURL GET]
-   **** xref:eventing:eventing-examples-high-risk.adoc[Risk Assessment]
-  *** Basic Accessor Functions
-   **** xref:eventing:eventing-handler-basicBucketOps.adoc[basicBucketOps]
-   **** xref:eventing:eventing-handler-curl-get.adoc[basicCurlGet]
-   **** xref:eventing:eventing-handler-curl-post.adoc[basicCurlPost]
-   **** xref:eventing:eventing-handler-simpleTimer.adoc[simpleTimer]
-   **** xref:eventing:eventing-handler-cascadeKvDeleteWithDoc.adoc[cascadeKvDeleteWithDoc]
-   **** xref:eventing:eventing-handler-redactSharedData.adoc[redactSharedData]
-   **** xref:eventing:eventing-handler-simpleFlatten.adoc[simpleFlatten]
-   **** xref:eventing:eventing-handler-fixEmailDomains.adoc[fixEmailDomains]
-   **** xref:eventing:eventing-handler-keepLastN.adoc[keepLastN]
-   **** xref:eventing:eventing-handler-docControlledSelfExpiry.adoc[docControlledSelfExpiry]
-   **** xref:eventing:eventing-handler-shippingNotifier.adoc[shippingNotifier]
-   **** xref:eventing:eventing-handler-ConvertBucketToCollections.adoc[ConvertBucketToCollections]
-  *** Basic {sqlpp} Functions
-   **** xref:eventing:eventing-handler-basicN1qlSelectStmt.adoc[]
-   **** xref:eventing:eventing-handler-basicN1qlPreparedSelectStmt.adoc[]
-  *** Generic Manipulation Functions
-   **** xref:eventing:eventing-handler-dateToEpochConversion.adoc[dateToEpochConversion]
-   **** xref:eventing:eventing-handler-deepCloneAndModify.adoc[deepCloneAndModify]
-   **** xref:eventing:eventing-handler-removeObjectStubs.adoc[removeObjectStubs]
-   **** xref:eventing:eventing-handler-removeNullsAndEmptys.adoc[removeNullsAndEmptys]
-   **** xref:eventing:eventing-handler-genericRename.adoc[genericRename]
-   **** xref:eventing:eventing-handler-genericFlatten.adoc[genericFlatten]
-   **** xref:eventing:eventing-handler-convertXMLtoJSON.adoc[convertXMLtoJSON]
-   **** xref:eventing:eventing-handler-convertAdvXMLtoJSON.adoc[convertAdvXMLtoJSON]
-  *** Advanced Accessor Functions
-   **** xref:eventing:eventing-handler-advancedGetOp.adoc[advancedGetOp]
-   **** xref:eventing:eventing-handler-advancedGetOpWithCache.adoc[advancedGetOpWithCache]
-   **** xref:eventing:eventing-handler-advancedInsertOp.adoc[advancedInsertOp]
-   **** xref:eventing:eventing-handler-advancedUpsertOp.adoc[advancedUpsertOp]
-   **** xref:eventing:eventing-handler-advancedReplaceOp.adoc[advancedReplaceOp]
-   **** xref:eventing:eventing-handler-advancedDeleteOp.adoc[advancedDeleteOp]
-   **** xref:eventing:eventing-handler-advancedIncrementOp.adoc[advancedIncrementOp]
-   **** xref:eventing:eventing-handler-advancedDecrementOp.adoc[advancedDecrementOp]
-   **** xref:eventing:eventing-handler-advancedTouchOp.adoc[advancedTouchOp]
-   **** xref:eventing:eventing-handler-advanced-keepLastN.adoc[advancedKeepLastN]
-   **** xref:eventing:eventing-handler-advanced-docControlledSelfExpiry.adoc[advancedDocControlledSelfExpiry]
-   **** xref:eventing:eventing-handler-multiCollectionEventing.adoc[multiCollectionEventing]
-   **** xref:eventing:eventing-handler-advancedSelfRecursion.adoc[advancedSelfRecursion]
-   **** xref:eventing:eventing-handler-advancedMutateInField.adoc[advancedMutateInField]
-   **** xref:eventing:eventing-handler-advancedMutateInArray.adoc[advancedMutateInArray]
-  *** Binary Document Support
-   **** xref:eventing:eventing-handler-basicBinaryKV.adoc[basicBinaryKV]
-   **** xref:eventing:eventing-handler-advancedBinaryKV.adoc[advancedBinaryKV]
-  *** Performance Functions
-   **** xref:eventing:eventing-handler-fasterToLocalString.adoc[fasterToLocalString]
- ** xref:eventing:eventing-debugging-and-diagnosability.adoc[Debugging and Diagnosability]
- ** xref:eventing:eventing-statistics.adoc[Statistics]
- ** xref:eventing:troubleshooting-best-practices.adoc[Troubleshooting and Best Practices]
- ** xref:eventing:eventing-faq.adoc[Frequently Asked Questions]
-include::analytics:partial$nav.adoc[]
+include::third-party:partial$nav.adoc[]
 
 .Learn
 * xref:learn:architecture-overview.adoc[Overview]
@@ -338,8 +162,6 @@ include::analytics:partial$nav.adoc[]
  ** xref:manage:manage-security/manage-system-secrets.adoc[Manage System Secrets]
  ** xref:manage:manage-security/manage-connections-and-disks.adoc[Manage Connections and Disks]
 * xref:manage:manage-statistics/manage-statistics.adoc[Manage Statistics]
-* xref:manage:manage-indexes/manage-indexes.adoc[Manage Indexes]
-* xref:manage:import-documents/import-documents.adoc[Import Documents]
 * xref:manage:manage-expiration.adoc[Manage Expiration]
 * xref:manage:manage-backup-and-restore/manage-backup-and-restore.adoc[Manage Backup and Restore]
  ** xref:backup-restore:enterprise-backup-restore.adoc[cbbackupmgr]
@@ -349,8 +171,6 @@ include::analytics:partial$nav.adoc[]
   *** xref:backup-restore:cbbackupmgr-network-filesystems.adoc[Network Filesystems]
   *** xref:backup-restore:cbbackupmgr-encryption.adoc[Encryption]
 * xref:manage:monitor/monitor-intro.adoc[Monitor]
- ** xref:manage:monitor/monitoring-n1ql-query.adoc[Monitor Queries]
- ** xref:manage:monitor/monitoring-indexes.adoc[Monitor Indexes]
  ** xref:manage:monitor/xdcr-monitor-timestamp-conflict-resolution.adoc[Monitor Clock Drift]
  ** xref:manage:monitor/set-up-prometheus-for-monitoring.adoc[Configure Prometheus to Collect Couchbase Metrics]
 * xref:manage:troubleshoot/troubleshoot.adoc[Troubleshoot]

modules/cli/pages/cbcollect-info-tool.adoc

@@ -195,7 +195,7 @@ Generated at collection-time.
 
 | `system:completed_requests`
 | A list of recent, completed requests.
-See xref:manage:monitor/monitoring-n1ql-query.adoc#sys-completed-req[system:completed_requests].
+See xref:n1ql:n1ql-manage/monitoring-n1ql-query.adoc#sys-completed-req[system:completed_requests].
 |===
 
 == Options

modules/cli/pages/cbq-tool.adoc

@@ -14,4 +14,4 @@ cbq> create primary index on `beer-sample`;
 cbq> select * from `beer-sample` limit 1;
 ----
 
-For detailed information, see xref:tools:cbq-shell.adoc[].
+For detailed information, see xref:n1ql:n1ql-intro/cbq.adoc[].