Merge branch 'release/4.0' into DOC-10990-4.0

Author: RichardSmedley

modules/howtos/pages/managing-connections.adoc

@@ -62,7 +62,7 @@ couchbase://nodeA.example.com,nodeB.example.com
 couchbase://127.0.0.1?network=external&operation_timeout=10.0
 ----
 
-The full list of recognized parameters is documented in the client settings reference.
+The full list of recognized parameters is documented in the https://docs.couchbase.com/sdk-api/couchbase-node-client-4.0.0/interfaces/ConnectOptions.html[API reference].
 
 A connection string may optionally be prefixed by either "couchbase://" or "couchbases://".
 If you wish to use TLS, the connection string must be configured as described in <<ssl>>.

modules/project-docs/pages/compatibility.adoc

@@ -103,7 +103,8 @@ The Node.js SDK is tested and supported on the following platforms:
 * CentOS 7.
 * Ubuntu (LTS) 18.04 (_Bionic_), & 20.04 (_Focal_).
 * Debian 9 (_Stretch_) & 10 (_Buster_).
-* Alpine Linux (since Node.js SDK 3.2.5).
+* Alpine Linux versions that have not reached https://alpinelinux.org/releases/[end-of-life support] (since Node.js SDK 3.2.5). 
+Note that while Alpine _might_ provide support upon request for older versions, any version that has reached end-of-life support is outside the scope of Couchbase technical support.
 
 [discrete]
 === Microsoft Windows

modules/project-docs/pages/migrating-sdk-code-to-3.n.adoc

@@ -542,5 +542,5 @@ In addition:
 * The required minimum version of Node.js is now v12 (the oldest supported maintenance LTS release).
 * Ping error entries are now typed.
 * `get` requests on locked documents now retry rather than fast-fail.
-* The changes to xref:ref:client-settings.adoc[Client Settings] are not currently documented.
-* The changes to xref:howtos:managing-connections.adoc#connection-strings[Connection Strings] are not currently documented.
+* The changes to xref:ref:client-settings.adoc[Client Settings] are documented in the https://docs.couchbase.com/sdk-api/couchbase-node-client-4.0.0/interfaces/ConnectOptions.html[API reference].
+* The changes to xref:howtos:managing-connections.adoc#connection-strings[Connection Strings] are documented in the https://docs.couchbase.com/sdk-api/couchbase-node-client-4.0.0/functions/connect.html[API reference].

modules/project-docs/pages/ottoman-release-notes.adoc

@@ -6,7 +6,7 @@
 [abstract]
 {description}
 
-These pages cover the 2._x_ versions of the Ottoman ODM. 
+These pages cover the 2.0 - 2.2 versions of the Ottoman ODM. 
 
 The Ottoman ODM will run on any https://github.com/nodejs/Release[supported LTS version of Node.js].
 
@@ -15,10 +15,13 @@ The Ottoman ODM will run on any https://github.com/nodejs/Release[supported LTS
 == Support in Node.js SDK 4.0
 
 Ottoman is currently *not supported* in Node.js SDK 4.0.
-We intend to fully support it with the next 4.1 release.
+It *is supported* from the 4.1 release onwards of the Node.js SDK.
 
 In the meantime, if you are interested in checking out Ottoman, 
-please read the xref:3.2@nodejs-sdk:hello-world:start-using-ottoman.adoc[Ottoman for Node.js SDK 3.2] page.
+please read the
+xref:4.2@nodejs-sdk:hello-world:start-using-ottoman.adoc[Ottoman for Node.js SDK 4.2] page, the
+xref:4.1@nodejs-sdk:hello-world:start-using-ottoman.adoc[Ottoman for Node.js SDK 4.1] page, or the
+xref:3.2@nodejs-sdk:hello-world:start-using-ottoman.adoc[Ottoman for Node.js SDK 3.2] page.
 
 == Version 2.2.0 (29 March 2022)
 

modules/ref/pages/client-settings.adoc

@@ -9,12 +9,9 @@ include::project-docs:partial$attributes.adoc[]
 [abstract]
 {description}
 
-WARNING: The backend implementation of client settings changed substantially in 4.0 and is not currently fully documented.
-This will be resolved in a future 4.x release.
-See xref:project-docs:migrating-sdk-code-to-3.n.adoc#sdk4-specifics[more details on migrating to 4.0].
 
-Some details from the old `libcouchbase`
-https://docs.couchbase.com/sdk-api/couchbase-c-client/group__lcb-cntl-settings.html[settings list] may be useful for reference.
+TIP: The backend implementation of client settings changed substantially in 4.0.
+Full details can be found in https://docs.couchbase.com/sdk-api/couchbase-node-client-4.0.0/interfaces/ConnectOptions.html[the API Reference].
 
 // == Timeout Options