Forward port doc 12691

modules/ROOT/nav.adoc

@@ -82,6 +82,8 @@ include::third-party:partial$nav.adoc[]
     **** xref:learn:clusters-and-availability/xdcr-filtering.adoc[XDCR Advanced Filtering]
     **** xref:learn:clusters-and-availability/xdcr-conflict-resolution.adoc[XDCR Conflict Resolution]
     **** xref:learn:clusters-and-availability/xdcr-with-scopes-and-collections.adoc[XDCR with Scopes and Collections]
+    **** xref:learn:clusters-and-availability/xdcr-enable-crossclusterversioning.adoc[XDCR enableCrossClusterVersioning]
+    **** xref:learn:clusters-and-availability/xdcr-active-active-sgw.adoc[XDCR Active-Active with Sync Gateway]
   *** xref:learn:clusters-and-availability/groups.adoc[Server Group Awareness]
 * xref:learn:security/security-overview.adoc[Security]
  ** xref:learn:security/authentication.adoc[Authentication]
@@ -232,11 +234,15 @@ include::third-party:partial$nav.adoc[]
    **** xref:install:upgrade-docker-cluster-online-full-capacity.adoc[]
   *** xref:install:upgrade-ipv6-cluster.adoc[IPv6 Cluster-Upgrade]
  ** xref:install:upgrade-feature-availability.adoc[Feature Availability During Upgrade]
-* Migration
- ** xref:install:migrating-application-data.adoc[Migrating Data]
+* xref:install:couchbase-migrations.adoc[Data Migration]
+ ** xref:install:migrating-application-data.adoc[]
  ** xref:install:migration.adoc[Enabling Timestamp-based Conflict Resolution for Migrated Data]
- // ** xref:install:migrate-couchdb.adoc[Migrating from Apache CouchDB]
- // ** xref:install:migrate-mysql.adoc[Migrating from Relational Databases]
+
+////
+ ** xref:install:migrate-couchdb.adoc[Migrating from Apache CouchDB]
+ ** xref:install:migrate-mysql.adoc[Migrating from Relational Databases]
+////
+
 
 
 
@@ -245,6 +251,7 @@ include::third-party:partial$nav.adoc[]
 * xref:elasticsearch-connector::index.adoc[Elasticsearch Plug-in]
 * xref:kafka-connector::index.adoc[Kafka Connector]
 * xref:spark-connector::index.adoc[Spark Connector]
+* xref:power-bi-connector::index.adoc[Power BI Connector]
 * xref:tableau-connector::index.adoc[Tableau Connector]
 * xref:connectors:odbc-jdbc-drivers.adoc[Couchbase ODBC and JDBC Drivers]
 
@@ -311,10 +318,13 @@ include::cli:partial$cbcli/nav.adoc[]
   *** xref:cli:cbstats/cbstats-workload.adoc[workload]
  ** xref:cli:cbsummary.adoc[cbsummary]
  ** xref:cli:cbtools/cbtransfer.adoc[cbtransfer]
+  ** xref:cli:cbmigrate-tool.adoc[cbmigrate]
  ** xref:cli:cbtools/cbworkloadgen.adoc[cbworkloadgen]
  ** xref:cli:couchbase-server.adoc[couchbase-server]
+ ** xref:cli:finderr.adoc[finderr]
  ** xref:cli:mctimings.adoc[mctimings]
  ** xref:cli:mcstat.adoc[mcstat]
+ ** xref:cli:mctestauth.adoc[mctestauth]
 * xref:rest-api:rest-intro.adoc[REST API Reference]
 
 ** xref:rest-api:rest-cluster-intro.adoc[Nodes and Clusters API]
@@ -504,14 +514,14 @@ include::cli:partial$cbcli/nav.adoc[]
      *** xref:rest-api:backup-node-threads.adoc[]
 
    ** xref:rest-api:rest-fts.adoc[Search Service API]
-    *** xref:rest-api:rest-fts-node.adoc[Node Configuration]
-    *** xref:rest-api:rest-fts-indexing.adoc[Indexes]
-    *** xref:rest-api:rest-fts-advanced.adoc[Advanced]
-    *** xref:rest-api:rest-fts-statistics.adoc[Search Statistics]
-    *** xref:rest-api:rest-fts-query.adoc[Active Queries]
-    *** xref:rest-api:rest-fts-partition-file-transfer.adoc[Rebalance Based on File Transfer]
+    *** xref:fts-rest-nodes:index.adoc[Node Configuration]
+    *** xref:fts-rest-indexing:index.adoc[Indexes]
+    *** xref:fts-rest-advanced:index.adoc[Advanced]
+    *** xref:fts-rest-stats:index.adoc[Search Statistics]
+    *** xref:fts-rest-query:index.adoc[Active Queries]
+    *** xref:fts-rest-manage:index.adoc[Search Manager Options]
 
-   ** xref:eventing:eventing-api.adoc[Eventing Service API]
+   ** xref:eventing-rest-api:index.adoc[Eventing Service API]
 
    ** xref:analytics:rest-analytics.adoc[Analytics Service API]
      *** xref:analytics-rest-service:index.adoc[Analytics Service REST API]
@@ -534,14 +544,19 @@ include::cli:partial$cbcli/nav.adoc[]
 * xref:rebalance-reference:rebalance-reference.adoc[Rebalance Reference]
 * xref:metrics-reference:metrics-reference.adoc[Metrics Reference]
  ** xref:metrics-reference:data-service-metrics.adoc[Data Service Metrics]
+  *** xref:metrics-reference:data-service-metrics-cross-reference.adoc[Data Service Metrics Cross Reference]
  ** xref:metrics-reference:query-service-metrics.adoc[Query Service Metrics]
+  *** xref:metrics-reference:query-service-metrics-cross-reference.adoc[Query Service Metrics Cross Reference]
  ** xref:metrics-reference:index-service-metrics.adoc[Index Service Metrics]
+  *** xref:metrics-reference:index-service-metrics-cross-reference.adoc[Index Service Metrics Cross Reference]
  ** xref:metrics-reference:search-service-metrics.adoc[Search Service Metrics]
  ** xref:metrics-reference:eventing-service-metrics.adoc[Eventing Service Metrics]
  ** xref:metrics-reference:analytics-service-metrics.adoc[Analytics Service Metrics]
+  *** xref:metrics-reference:analytics-service-metrics-cross-reference.adoc[Analytics Service Metrics Cross Reference]
  ** xref:metrics-reference:backup-service-metrics.adoc[Backup Service Metrics]
  ** xref:metrics-reference:ns-server-metrics.adoc[Cluster Manager Metrics]
  ** xref:metrics-reference:xdcr-metrics.adoc[XDCR Metrics]
+  *** xref:metrics-reference:xdcr-metrics-cross-reference.adoc[XDCR Metrics Cross Reference]
 * xref:learn:views/views-intro.adoc[Views Reference]
   ** xref:learn:views/views-basics.adoc[View Concepts]
    *** xref:learn:views/views-streaming.adoc[Stream-based Views]

modules/backup-restore/pages/enterprise-backup-restore.adoc

@@ -217,4 +217,17 @@ Unless otherwise specified, backup and restore apply both to _local_ and to _clo
 
 |===
 
-* For local backup only -- _not_ for cloud.
++*+ For local backup only — _not_ for cloud.
+
+.Restoring metadata and users
+****
+* When restoring metadata to a newer Server version,
+if the feature that the metadata applies to no longer exists in the newer Server version, then the metadata may not be restorable.
+
+* If the user roles no longer exist in the version that you wish to restore to, then an error will be logged for the target user.
+
+* In general, if you can upgrade _directly_ to the new version, then you should be able to restore the users.
+If you cannot upgrade directly, then restoring users may cause errors. 
+ For example, if some of the user roles no longer exist in the newer Server version.
+
+****