Skip to content

Commit 1dd7454

Browse files
committed
minor formatting fixes
1 parent 5e84633 commit 1dd7454

3 files changed

Lines changed: 25 additions & 15 deletions

File tree

modules/install/pages/install-linux.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88

99
Couchbase Server can be installed and run on Red Hat-based distributions, Oracle Enterprise, Amazon Linux, Ubuntu, Debian, and SUSE Enterprise.
1010

11-
The following procedures use Couchbase packages, and require the user who performs the install to have _root_ or _sudo_ privileges:
11+
The following procedures use Couchbase packages, and require the user who performs the install to have root or sudo privileges:
1212

1313
* xref:install:rhel-suse-install-intro.adoc[Install on Red Hat-based distributions, Oracle Linux, or Amazon Linux].
1414

1515
* xref:install:ubuntu-debian-install.adoc[Install on Ubuntu and Debian].
1616

1717
* xref:install:install_suse.adoc[Install on SUSE Enterprise].
1818

19-
Additionally, a _non-package-based_ install is performed on all the above platforms.
20-
Unlike the package-based install, this does _not_ require root or sudo privileges.
19+
Additionally, a non-package-based install is performed on all the above platforms.
20+
Unlike the package-based install, this does not require root or sudo privileges.
2121
After the non-package-based install, the same user can stop, start, and get status on the server; and can also perform upgrade.
2222

23-
The non-package-based procedure is the same for all the above platforms: see xref:install:non-root.adoc[Non-Root Install and Upgrade] for detailed information.
23+
The non-package-based procedure is the same for all the above platforms: see xref:install:non-root.adoc[Non-Root Install and Upgrade] for detailed information.

modules/install/pages/migration.adoc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Cluster 1 (Bucket A) and Cluster 2 (Bucket A’) replicate data into each other.
2626
2727
== Migration during Unidirectional Replication
2828

29-
Follow these steps to migrate your data to a new cluster during unidirectional replication:
29+
Follow these steps to migrate your data to a new bucket during unidirectional replication:
3030

3131
. Stop application traffic coming into Cluster 1 (Bucket A).
3232
+
@@ -38,31 +38,31 @@ For more information, see xref:manage:monitor/monitor-intro.html#monitoring-with
3838
For instructions, see
3939
xref:manage:manage-xdcr/xdcr-management-overview.adoc[XDCR Management Overview].
4040

41-
. Run the `cbbackupmgr` tool to back up the entire bucket’s (Bucket A) data.
41+
. Run the `cbbackupmgr` tool to back up the bucket’s (Bucket A) data.
4242
For instructions, see xref:backup-restore:enterprise-backup-restore.adoc[Backup].
4343

4444
. Delete Bucket A from Cluster 1.
4545
For instructions, see
4646
xref:manage:manage-buckets/delete-bucket.adoc[Delete a Bucket].
4747

48-
. Create Bucket B and select the Timestamp-based Conflict Resolution type.
48+
. Create Bucket B on Cluster 1 and select the Timestamp-based Conflict Resolution type.
4949
For instructions, see
5050
xref:manage:manage-buckets/create-bucket.adoc[Create a Bucket].
5151

52-
. Run the `cbbackupmgr` tool to restore data.
53-
When restoring data from a backup, disable the Conflict Resolution setting on the destination cluster and then use the `--force-updates` option.
52+
. Run the `cbbackupmgr` tool on Cluster 1 to restore data to Bucket B.
53+
Turn off the Conflict Resolution setting on the destination cluster and then use the `--force-updates` option to restore data from backup.
5454
Do this because the source and destination clusters have different conflict resolution types.
5555

56-
. After the restore operation is complete on Cluster 1, delete Bucket A’ from Cluster 2.
56+
. After the data restore operation is complete on Cluster 1, delete Bucket A’ from Cluster 2.
5757

58-
. Create Bucket B’ and select the Timestamp-based Conflict Resolution type.
58+
. Create Bucket B’ on Cluster 2 and select the Timestamp-based Conflict Resolution type.
5959

6060
. Create a new unidirectional replication for Bucket B.
6161
See xref:manage:manage-xdcr/xdcr-management-overview.adoc[XDCR Management Overview].
6262

6363
== Migration during Bidirectional Replication
6464

65-
Follow these steps to migrate your data to a new cluster during bidirectional replication:
65+
Follow these steps to migrate your data to a new bucket during bidirectional replication:
6666

6767
. Stop application traffic coming into Cluster 1 (Bucket A) and Cluster 2 (Bucket A’).
6868
+
@@ -74,7 +74,7 @@ For more information, see xref:manage:monitor/monitor-intro.html#monitoring-with
7474
For instructions, see
7575
xref:manage:manage-xdcr/xdcr-management-overview.adoc[XDCR Management Overview].
7676

77-
. Run the `cbbackupmgr` tool on both clusters to backup the entire bucket data.
77+
. Run the `cbbackupmgr` tool on both clusters to backup the bucket data.
7878
For instructions, see
7979
xref:backup-restore:enterprise-backup-restore.adoc[Backup].
8080

@@ -86,7 +86,7 @@ xref:manage:manage-buckets/delete-bucket.adoc[Delete a Bucket].
8686
For instructions, see xref:manage:manage-buckets/create-bucket.adoc[Create a Bucket].
8787

8888
. Run the `cbbackupmgr` tool to restore data.
89-
When restoring data from a backup, disable the Conflict Resolution setting on the destination cluster and then use the `--force-updates` option.
89+
Turn off the Conflict Resolution setting on the destination cluster and then use the `--force-updates` option to restore data from backup.
9090
Do this because the source and destination clusters have different conflict resolution types.
9191

9292
. After the restore operation is complete on both clusters, create replication streams both ways between Cluster 1 and Cluster 2.

modules/install/pages/rhel-suse-install-intro.adoc

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ Enterprise::
6363
+
6464
--
6565
.To install the latest release
66+
67+
Run the following command:
68+
6669
[source,console]
6770
----
6871
sudo yum install couchbase-server
@@ -71,6 +74,7 @@ You'll be prompted to start the download of Couchbase Server (plus any dependenc
7174
For each of these prompts, type `y` to accept and continue.
7275
7376
.To install a specific release
77+
7478
. List the available releases.
7579
+
7680
[source,console]
@@ -86,6 +90,7 @@ couchbase-server.x86_64 <version_number>-<build_number>
8690
----
8791
+
8892
The following is an example of the listing:
93+
+
8994
[subs=+quotes]
9095
----
9196
couchbase-server.x86_64 *8.0.0-3777*
@@ -113,6 +118,9 @@ Community::
113118
+
114119
--
115120
.To install the latest release
121+
122+
Run the following command:
123+
116124
[source,console]
117125
----
118126
sudo yum install couchbase-server-community
@@ -121,6 +129,7 @@ You'll be prompted to start the download of Couchbase Server and its dependencie
121129
For each of these prompts, type `y` to accept and continue.
122130
123131
.To install a specific release
132+
124133
. List the available releases.
125134
+
126135
[source,console]
@@ -136,6 +145,7 @@ couchbase-server-community.x86_64 <version_number>-<build_number>
136145
----
137146
+
138147
The following is an example of the listing:
148+
+
139149
[subs=+quotes]
140150
----
141151
couchbase-server-community.x86_64 *8.0.0-3777*
@@ -164,7 +174,7 @@ After the installation is complete, Couchbase Server starts automatically.
164174
Couchbase Server continues to start automatically at run levels 2, 3, 4, and 5, and explicitly shuts down at run levels 0, 1, and 6.
165175
You can use the `systemctl` command, a `service` on older operating systems, to start and stop the Couchbase Server service, and to verify the current status.
166176
For more information, see xref:startup-shutdown.adoc[Couchbase Server Startup and Shutdown].
167-
+
177+
168178
. Open the Couchbase Web Console in a browser to xref:testing.adoc[verify] that the installation was successful and that the node is available.
169179

170180
=== Install Using RPM Package

0 commit comments

Comments
 (0)