Quick fixes

Author: RichardSmedley

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

@@ -205,7 +205,7 @@ Couchbase Capella::
 --
 [source,java]
 ----
-include::devguide:example$java/StartUsingCapella.java[tags=connect-info,indent=0]
+include::devguide:example$java/StartUsingCapella.java[tags=connect,indent=0]
 ----
 --
 
@@ -344,24 +344,22 @@ include::devguide:example$java/StartUsingCapella.java[tag=upsert,indent=0]
 The `get` method reads a document from a collection.
 // If the collection does not have a document with this ID, the `get` method also throws `DocumentNotFoundException`.
 
-As mentioned above, the Scala SDK will not throw exceptions.
-Instead, methods that can error -- such as the `upsert` above --
-will return a Scala `Try` result, which can either be a `Success` containing the result, or a `Failure` containing a _Throwable_ exception.
-The easiest way to handle a single operation is with pattern matching, as shown above.
-
-Now let's get the data back (this example will look a little messy due the nested handling of multiple `Try` results, but we'll see how to clean it up shortly):
+Wrapping the method in a `Try` / `Catch` is a good way to handle exceptions:
 
 [source,java]
 ----
 include::devguide:example$java/StartUsingCapella.java[tag=get,indent=0]
 ----
 
+////
 Here we're fetching the value for the key `docId`,
 converting that value to a `JsonObjectSafe`
 (a simple wrapper around `JsonObject` that returns `Try` results -- see
 xref:howtos:json.adoc#error-handling-and-jsonobjectsafe[JsonObjectSafe] for details),
 and then accessing the value of the *status* key as a String.
+////
 
+////
 ==== Better Error Handling
 
 All three of these operations could fail, so there's quite a lot of error handling code here to do something quite simple.
@@ -382,19 +380,23 @@ include::devguide:example$java/StartUsingCapella.java[tag=get-for,indent=0]
 Either of these methods will stop on the first failed operation.  So the final returned `Try` contains either 
 a) `Success` and the result of the final operation, indicating that everything was successful, or 
 b) `Failure` with the error returned by the first failing operation.
+////
 
 === Replace (Update) and Overloads
 
+////
 You'll notice that most operations in the Scala SDK have two overloads.
 One will take an Options builder, which provides all possible options that operation takes.
 For instance:
+////
 
 .The replace method updates the value of an existing document
 [source,java]
 ----
 include::devguide:example$java/StartUsingCapella.java[tag=replace-options,indent=0]
 ----
 
+////
 These options blocks are implemented as Scala case classes:
 they are immutable data objects that return a copy of themselves on each change.
 
@@ -405,6 +407,7 @@ It takes named arguments instead of an Options object, and provides only the mos
 ----
 include::devguide:example$java/StartUsingCapella.java[tag=replace-named,indent=0]
 ----
+////
 
 CAUTION: When you replace a document, it's usually good practice to use xref:howtos:kv-operations.adoc#optimistic-locking[optimistic locking].
 Otherwise, changes might get lost if two people change the same document at the same time.
@@ -415,9 +418,15 @@ The remove method deletes a document from a collection:
 
 [source,java]
 ----
-include::devguide:example$java/StartUsingCapella.java[indent=0,tag=remove]
+try {
+  collection.remove("my-document");
+} catch (DocumentNotFoundException ex) {
+  System.out.println("Document did not exist when trying to remove");
+}
 ----
 
+Like `replace`, `remove` also optionally takes the CAS value if you want to make sure you are only removing the document if it hasn’t changed since you last fetched it.
+
 
 == Data Modeling
 
@@ -481,13 +490,15 @@ Now you're up and running, try one of the following:
 
 === Additional Resources
 
+////
 The Scala SDK includes three APIs.  
 The examples above show the simple blocking API, for simplicity, but you can also perform all operations in an async style using Scala `Future`, and a reactive style using Project Reactor `SMono` and `SFlux`.
 Please see xref:howtos:concurrent-async-apis.adoc[Choosing an API] for more details.
+////
 
 The API reference is generated for each release and the latest can be found https://docs.couchbase.com/sdk-api/couchbase-scala-client/com/couchbase/client/scala/index.html[here].
 
-Couchbase welcomes community contributions to the Scala SDK.
+Couchbase welcomes community contributions to the Java SDK.
 The SDK source code is available on https://github.com/couchbase/couchbase-jvm-clients[GitHub].
 
 === Troubleshooting
@@ -497,7 +508,7 @@ If you're running the SDK on your laptop against a Capella cluster, see further
 ** Notes on xref:ref:client-settings.adoc#constrained-network-environments[Constrained Network Environments].
 ** xref:project-docs:compatibility.adoc#network-requirements[Network Requirements].
 ** If you have a consumer-grade router which has problems with DNS-SRV records review our xref:howtos:troubleshooting-cloud-connections.adoc#troubleshooting-host-not-found[Troubleshooting Guide].
-* Our https://forums.couchbase.com/c/scala-sdk/37[community forum] is a great source of help.
+* Our https://www.couchbase.com/forums/c/java-sdk/5[community forum] is a great source of help.
 ////