Skip to content

Commit 2ea195a

Browse files
committed
Minor fixes
1 parent 2db0c4d commit 2ea195a

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

modules/install/pages/migration.adoc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ xref:manage:manage-buckets/create-bucket.adoc[Create a Bucket].
5151

5252
. Run the `cbbackupmgr` tool on Cluster 1 to restore data to Bucket B.
5353
Use the xref:backup-restore/ccbackupmgr-restore.adoc[`cbbackupmgr restore`] command with the option `--force-updates` to restore data from the backup.
54-
This option turns off conflict resolution during the restore,
54+
This option disables conflict resolution during the restore,
5555
and it's needed because the bucket you're restoring to has a different conflict resolution type than the bucket the backup is from.
5656
+
5757
NOTE: The `--force-updates` option also updates the CAS of the restored documents.
@@ -89,10 +89,8 @@ xref:manage:manage-buckets/delete-bucket.adoc[Delete a Bucket].
8989
For instructions, see xref:manage:manage-buckets/create-bucket.adoc[Create a Bucket].
9090

9191
. Run the `cbbackupmgr` tool to restore data.
92-
Turn off the Conflict Resolution setting on the destination cluster and then use the `--force-updates` option to restore data from backup.
93-
Do this because the source and destination clusters have different conflict resolution types.
9492
Use the xref:backup-restore/ccbackupmgr-restore.adoc[`cbbackupmgr restore`] command with the option `--force-updates` to restore data from the backup.
95-
This option turns off conflict resolution during the restore,
93+
This option disables conflict resolution during the restore,
9694
and it's needed because the bucket you're restoring to has a different conflict resolution type than the bucket the backup is from.
9795
+
9896
NOTE: The `--force-updates` option also updates the CAS of the restored documents.

0 commit comments

Comments
 (0)