Skip to content

Commit 43a438c

Browse files
authored
QF211020 (#627)
* QF211020-1 -- Quick fix to revert api titles * QF211020-1 -- Fix links to central download * QF211020-1 -- Fix API reference links
1 parent 5e42084 commit 43a438c

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

modules/ROOT/pages/_partials/_attributes-local.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,14 +232,14 @@ ifdef::is-live[:url-api-references-pfx: {url-api-references-production}]
232232
ifdef::is-beta[:url-api-references-pfx: {url-api-references-beta}]
233233

234234
// :url-api-references-android: {url-api-references-pfx}{lang-mod-android}
235-
:url-api-references-android: {url-api-references-pfx}{lang-mod-android}-ee/javadoc
236-
:url-api-references-kotlin: {url-api-references-pfx}{lang-mod-android}-ktx-ee
235+
:url-api-references-android: {url-api-references-pfx}{lang-mod-android}/javadoc
236+
:url-api-references-kotlin: {url-api-references-pfx}{lang-mod-android}-ktx
237237

238238
:url-api-references-c: {url-api-references-pfx}{lang-mod-c}
239239
:url-api-references-csharp: {url-api-references-pfx}net
240240
// :url-api-references-csharp: {url-api-references-pfx}{lang-mod-csharp}
241241
// :url-api-references-java: {url-api-references-pfx}{lang-mod-java}
242-
:url-api-references-java: {url-api-references-pfx}{lang-mod-java}-ee
242+
:url-api-references-java: {url-api-references-pfx}{lang-mod-java}
243243
:url-api-references-objc: {url-api-references-pfx}{lang-mod-objc}
244244
:url-api-references-swift: {url-api-references-pfx}{lang-mod-swift}
245245

modules/c/pages/gs-install.adoc

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ endif::[]
4848
_Couchbase Lite for C {version-full}_ is available for all supported platforms -- see: <<lbl-beta-platforms>>.
4949
You can obtain the downloads here:
5050

51-
* _Android_, _iOS_ and _Windows_ -- <<tbl-beta-downloads-ee>>
52-
* _Linux_ and _macOS_ -- {downloads-mobile--xref}.
51+
* _Android_, _iOS_ and _Windows_ -- {downloads-mobile--xref}.
52+
* _Linux_ and _macOS_ -- <<tbl-beta-downloads-ee>>
5353

5454
The binary release download comprises a root directory ({release-dirs}), which contains:
5555

@@ -70,7 +70,7 @@ The binary release download comprises a root directory ({release-dirs}), which c
7070
== Linux
7171
<<lbl-apt>> {barsep}
7272
<<lbl-deb>> {barsep}
73-
<<lbl-man>> {barsep}
73+
<<lbl-man>>
7474

7575
[#lbl-apt]
7676
=== Using APT
@@ -237,15 +237,16 @@ ifdef::is-beta[NOTE: These manual steps will not be needed beyond this BETA stag
237237
[#lbl-linux-steps]
238238
. Install dependencies
239239
+
240-
Users of `.zip` downloads will need to use their package manager to install the following dependencies: `libatomic1`, `libicu57` and `zlib1g`.
240+
Users of `.zip` downloads will need to use their package manager to install the following dependencies: `libatomic1`, `libicu` footnote:[Use whichever version ships with your linux distro] and `zlib1g`.
241241
+
242242
For example to install for ARM32 on ARM64, you might do:
243243
+
244244
[source, bash, subs="normal"]
245245
----
246246
sudo dpkg --add-architecture armhf
247-
sudo apt install -y libatomic1:armhf libicu57:armhf zlib1g:armhf
247+
sudo apt install -y libatomic1:armhf libicu57:armhf zlib1g:armhf // <.>
248248
----
249+
<.> This example uses Debian{nbsp}9 libicu version; you should use the appropriate version for your distro.
249250

250251
. *Download* and *Unpack* the binary release -- see: {downloads-mobile--xref}
251252

@@ -271,7 +272,7 @@ As a convenience, the release package includes a _CMake_ file in `lib/cmake/Couc
271272
To install the Couchbase for C libraries on Windows from a downloaded release binary:
272273

273274
[#lbl-windows-steps]
274-
. Download and extract the release package -- see: <<tbl-beta-downloads-ee>>
275+
. Download and extract the release package -- see: {downloads-mobile--xref}
275276

276277
. From within the root directory, {release-dir}, deploy the `lib`, `include` and `bin` libraries to a location accessible to your compiler.
277278

@@ -295,7 +296,7 @@ CAUTION: Direct access from Swift to Couchbase Lite for C is not possible in thi
295296
This will be available in the next release.
296297

297298
[#lbl-mac-steps]
298-
. Download and extract the release package here -- {downloads-mobile--xref}.
299+
. Download and extract the release package here -- <<tbl-beta-downloads-ee>>.
299300
. Optionally ... From within the root directory, {release-dir}, *Copy* the `include` and `lib` directories to `/usr/local/`
300301
. Within _Xcode_:
301302
.. *Create* a new project
@@ -315,7 +316,7 @@ To install the Couchbase for C libraries on iOS from a downloaded release packag
315316

316317
[#lbl-mac-steps]
317318

318-
. Download and extract the release package here -- <<tbl-beta-downloads-ee>>.
319+
. Download and extract the release package here -- {downloads-mobile--xref}.
319320
. *Drag* `CouchbaseLite.xcframework` into your Xcode project, then within the dialog:
320321
... *Select* _Create Directory References If Needed_
321322
... *Check* the correct target is selected
@@ -336,7 +337,7 @@ In addition to the Couchbase Lite for C download you also require the following
336337

337338
In this instance the release comprises a _ready to adapt_ application project.
338339

339-
. *Download* and *Unpack* the binary release here -- <<tbl-beta-downloads-ee>>
340+
. *Download* and *Unpack* the binary release here -- {downloads-mobile--xref}
340341

341342
. Within _Android Studio_, select and open the project folder (within the {release-dirs} folder)
342343

modules/java/nav-java.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
* xref:java:conflict.adoc[Handling Data Conflicts]
3939

40-
* https://docs.couchbase.com/mobile/{major}.{minor}.{base}-{releasetag}/couchbase-lite-java-ee/[API{nbsp}References]
40+
* https://docs.couchbase.com/mobile/{major}.{minor}.{base}-{releasetag}/couchbase-lite-java/[API{nbsp}References]
4141

4242
* xref:java:dep-upgrade.adoc[Upgrade]
4343

0 commit comments

Comments
 (0)