Skip to content

Commit 371f585

Browse files
Merge branch 'release/3.5' into AV-82442_FreeTier-Java3.5
2 parents 48708aa + bfb35dd commit 371f585

3 files changed

Lines changed: 7 additions & 8 deletions

File tree

modules/hello-world/pages/overview.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
include::hello-world:example$Overview.java[tag=overview,indent=0]
1111
----
1212

13-
The Couchbase Java client allows applications to access a Couchbase database.
13+
The Couchbase Java client allows applications to access a Couchbase cluster.
1414
It offers synchronous APIs as well as reactive and asynchronous equivalents to maximize flexibility and performance. +
1515

1616
{empty} +

modules/hello-world/pages/spring-data-sample-application.adoc

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,10 @@ public interface UserRepository extends CouchbaseRepository<User, String>, Dynam
5353
}
5454
----
5555

56-
Using the Spring Data Couchbase repository allows us to reduce boilerplate in our code and add a layer of abstraction to our
57-
database interactions.
56+
Using the Spring Data Couchbase repository allows us to reduce boilerplate in our code and add a layer of abstraction to our cluster interactions.
5857

59-
Creating a user shows the typical security concerns, with salted password hashes, as well as the advantages of using
60-
Spring Data Couchbase to `save` the username into the database using the `userRepository` we mentioned previously:
58+
Creating a user shows the typical security concerns, with salted password hashes,
59+
as well as the advantages of using Spring Data Couchbase to `save` the username into the database using the `userRepository` we mentioned previously:
6160

6261
[source,java]
6362
----
@@ -105,4 +104,4 @@ List<Map<String, Object>> results = new ArrayList<Map<String, Object>>();
105104

106105
include::{version-common}@sdk:shared:partial$sample-application.adoc[tag=data-model]
107106

108-
include::{version-common}@sdk:shared:partial$sample-application.adoc[tag=rest-api]
107+
include::{version-common}@sdk:shared:partial$sample-application.adoc[tag=rest-api]

modules/hello-world/pages/start-using-sdk.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ include::project-docs:partial$attributes.adoc[]
1111
[abstract]
1212
{description}
1313

14-
The Couchbase Java client allows applications to access a Couchbase database.
14+
The Couchbase Java client allows applications to access a Couchbase cluster.
1515
It offers synchronous APIs as well as reactive and asynchronous equivalents to maximize flexibility and performance.
1616

1717
In this guide, you will learn:
@@ -113,7 +113,7 @@ Note, the Travel Sample dataset is installed automatically when deploying a Cape
113113
* A user is created with permissions to access the cluster (at least Application Access permissions).
114114
See the xref:cloud:get-started:cluster-and-data.adoc#credentials[Capella connection page] for more details.
115115
116-
IMPORTANT: Couchbase Capella uses xref:cloud:organizations:organization-projects-overview.adoc[Roles] to control user access to database resources.
116+
IMPORTANT: Couchbase Capella uses xref:cloud:organizations:organization-projects-overview.adoc[Roles] to control user access to cluster resources.
117117
For the purposes of this guide, you can use the *Organization Owner* role automatically assigned to your account during installation of the Capella cluster.
118118
In a production scenario, we strongly recommend setting up users with more granular access roles as a best practice.
119119
--

0 commit comments

Comments
 (0)