Skip to content

Commit 2d01750

Browse files
authored
1 parent 1b8c493 commit 2d01750

File tree

279 files changed

+392
-3217
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

279 files changed

+392
-3217
lines changed

modules/ROOT/examples/.DS_Store

-2 KB
Binary file not shown.

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

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,24 @@
2828

2929

3030
// List styles
31-
:ordered: [loweralpha]
32-
:unordered:
33-
:steps: [arabic]
34-
:steps2: [lowerroman]
35-
:steps3: [loweralpha]
31+
:list-style--ordered: [loweralpha]
32+
:list-style--unordered:
33+
:list-style--steps: [arabic]
34+
:list-style--steps2: [lowerroman]
35+
:list-style--steps3: [loweralpha]
3636
//
3737

3838
// Begin -- Source Languages
39-
:langAndroid: android
40-
:langAndroidFull: java-android
41-
:langClang: clang
42-
:langCsharp: csharp
43-
:langJava: java
44-
:langJavaFull: java
45-
:langJavascript: javascript
46-
:langObjc: objc
47-
:langObjcFull: objective-c
48-
:langSwift: swift
39+
// :langAndroid: kotlin
40+
// :langAndroidFull: java-android
41+
// :langClang: clang
42+
// :langCsharp: csharp
43+
// :langJava: java
44+
// :langJavaFull: java
45+
// :langJavascript: javascript
46+
// :langObjc: objc
47+
// :langObjcFull: objective-c
48+
// :langSwift: swift
4949
:platform-android: android
5050
:platform-clang: clang
5151
:platform-jvm: jvm
@@ -60,7 +60,7 @@
6060
:lang-mod-java: java
6161
:lang-mod-objc: objc
6262
:lang-mod-swift: swift
63-
:lang-name-android: kotlin-or-java
63+
:lang-name-android: kotlin
6464
:lang-name-clang: clang
6565
:lang-name-csharp: csharp
6666
:lang-name-java: java
@@ -91,13 +91,13 @@
9191
:nmStarterCode: StarterCode1.0
9292
:nmSampleAppUser: admin
9393
:nmSampleAppPassword: password
94-
:nmLangJava: java
95-
:nmLangJS: javascript
96-
:nmLangClang: C
97-
:nmLangNet: C#/.Net
98-
:nmLangSwift: Swift
99-
:nmLangobjc: Objective-C
100-
:nmLangAndroid: Android
94+
// :nmLangJava: java
95+
// :nmLangJS: javascript
96+
// :nmLangClang: C
97+
// :nmLangNet: C#/.Net
98+
// :nmLangSwift: Swift
99+
// :nmLangobjc: Objective-C
100+
// :nmLangAndroid: Android
101101

102102
:tknwip: Under Construction
103103
:tknwip-note: This page is {tknwip} and is included as a place holder only.
@@ -194,16 +194,19 @@
194194
:objc-examples: {lang-mod-objc}:example$
195195
:swift-examples: {lang-mod-swift}:example$
196196

197-
:snippets-pfx--android: example$java-android/app/src/main/java/com/couchbase
197+
:snippets-pfx--android: example$snippets/app/src/main/
198+
:snippets-pfx--android-kt: {snippets-pfx--android}kotlin/com/couchbase/code_snippets/
199+
:snippets-pfx--android-java: {snippets-pfx--android}java/com/couchbase/code_snippets/
198200
:snippets-pfx: example$code_snippets/
199-
:snippets-content--android: {lang-mod-android}:{snippets-pfx--android}/code_snippets/Examples.java
201+
:snippets-content--android-kotlin: {lang-mod-android}:{snippets-pfx--android-kt}Examples.kt
202+
:snippets-content--android-java: {lang-mod-android}:{snippets-pfx--android-java}Examples.java
200203
:snippets-content--clang: {lang-mod-clang}:{snippets-pfx}SampleCodeTest.cc
201204
:snippets-content--csharp: {lang-mod-csharp}:{snippets-pfx}Program.cs
202205
:snippets-content--java: {lang-mod-java}:{snippets-pfx}Examples.java
203206
:snippets-content--objc: {lang-mod-objc}:{snippets-pfx}SampleCodeTest.m
204207
:snippets-content--swift: {lang-mod-swift}:{snippets-pfx}SampleCodeTest.swift
205208

206-
:snippets-p2psync-ws--android: {lang-mod-android}:{snippets-pfx--android}/code_snippets/p2psync-websocket.java
209+
// :snippets-p2psync-ws--android: {lang-mod-android}:{snippets-pfx--android}/code_snippets/p2psync-websocket.java
207210
:snippets-p2psync-ws--clang: {snippets-content--clang}
208211
:snippets-p2psync-ws--csharp: {lang-mod-csharp}:{snippets-pfx}p2psync-websocket.cs
209212
:snippets-p2psync-ws--java: {lang-mod-java}:{snippets-pfx}p2psync-websocket.java

modules/ROOT/pages/_partials/_page-index.adoc

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -38,71 +38,71 @@ ifndef::version[:version: version undefined]
3838

3939
// Begin -- List of links to release notes
4040
// Used in pages that are called before a platform has been selected (e.g. Introduction and What's New)
41-
:xref-cbl-pg-releasenotes-list: xref:couchbase-lite:swift:product/swift-releasenotes.adoc[Swift] | xref:couchbase-lite:objc:product/objc-releasenotes.adoc[Objective-C] | xref:couchbase-lite:java:product/java-releasenotes.adoc[Java] | xref:couchbase-lite:android:product/java-android-releasenotes.adoc[Android (Java)] | xref:couchbase-lite:csharp:product/csharp-releasenotes.adoc[C#.Net]
41+
:xref-cbl-pg-releasenotes-list: xref:couchbase-lite:swift:swift-releasenotes.adoc[Swift] | xref:couchbase-lite:objc:objc-releasenotes.adoc[Objective-C] | xref:couchbase-lite:java:java-releasenotes.adoc[Java] | xref:couchbase-lite:android:java-android-releasenotes.adoc[Android (Java)] | xref:couchbase-lite:csharp:csharp-releasenotes.adoc[C#.Net]
4242
// End -- List of links to release notes
4343

4444
// Begin -- Ref - Page Targets -- a list of all pages (and their relative paths)
4545
//
46-
:cbl-pg-blob: learn/{param-name}-blob.adoc
47-
:cbl-pg-build: start/{param-name}-gs-build.adoc
48-
:cbl-pg-cert-pinning: learn/{param-name}-cert-pinning.adoc
46+
:cbl-pg-blob: blob.adoc
47+
:cbl-pg-build: gs-build.adoc
48+
:cbl-pg-cert-pinning: cert-pinning.adoc
4949
:cbl-pg-changelog-all: changelog.adoc
50-
:cbl-pg-changelog: product/{param-name}-changelog.adoc
50+
:cbl-pg-changelog: changelog.adoc
5151
:cbl-pg-compatibility-all: compatibility.adoc
52-
:cbl-pg-compatibility: product/{param-name}-compatibility.adoc
53-
:cbl-pg-conflict-auto: learn/{param-name}-conflict.adoc#automatic-conflict-resolution
54-
:cbl-pg-conflict-custom: learn/{param-name}-conflict.adoc#custom-conflict-resolution
55-
:cbl-pg-conflict: learn/{param-name}-conflict.adoc
56-
:cbl-pg-database: learn/{param-name}-database.adoc
57-
:cbl-pg-database-prebuilt: {param-name}-prebuilt-database.adoc
58-
:cbl-pg-date-time: learn/{param-name}-date-time.adoc
59-
:cbl-pg-dbo-crud: next/{param-name}-dbo-crud.adoc
60-
:cbl-pg-dbo-p2psync-cloud-using: advance/{param-name}-p2psync-cloud-using.adoc
61-
:cbl-pg-dbo-p2psync-websocket-using-active: advance/{param-name}-p2psync-websocket-using-active.adoc
52+
:cbl-pg-compatibility: compatibility.adoc
53+
:cbl-pg-conflict-auto: conflict.adoc#automatic-conflict-resolution
54+
:cbl-pg-conflict-custom: conflict.adoc#custom-conflict-resolution
55+
:cbl-pg-conflict: conflict.adoc
56+
:cbl-pg-database: database.adoc
57+
:cbl-pg-database-prebuilt: prebuilt-database.adoc
58+
:cbl-pg-date-time: date-time.adoc
59+
// :cbl-pg-dbo-crud: next/dbo-crud.adoc
60+
:cbl-pg-dbo-p2psync-cloud-using: p2psync-cloud-using.adoc
61+
:cbl-pg-dbo-p2psync-websocket-using-active: p2psync-websocket-using-active.adoc
6262
:cbl-pg-dbo-p2psync-websocket-using-passive--delta-sync: {cbl-pg-dbo-p2psync-websocket-using-passive}#configure-delta-sync
63-
:cbl-pg-dbo-p2psync-websocket-using-passive: advance/{param-name}-p2psync-websocket-using-passive.adoc
64-
:cbl-pg-dbo-query: next/{param-name}-dbo-query.adoc
65-
:cbl-pg-dbreplica: learn/{param-name}-dbreplica.adoc
66-
:cbl-pg-dep-upgrade: advance/{param-name}-dep-upgrade.adoc
67-
:cbl-pg-document: learn/{param-name}-document.adoc
68-
:cbl-pg-fts: learn/{param-name}-fts.adoc
69-
:cbl-pg-get-started: start/{param-name}-gs-get-started.adoc
63+
:cbl-pg-dbo-p2psync-websocket-using-passive: p2psync-websocket-using-passive.adoc
64+
:cbl-pg-dbo-query: next/dbo-query.adoc
65+
:cbl-pg-dbreplica: dbreplica.adoc
66+
:cbl-pg-dep-upgrade: dep-upgrade.adoc
67+
:cbl-pg-document: document.adoc
68+
:cbl-pg-fts: fts.adoc
69+
:cbl-pg-get-started: gs-get-started.adoc
7070
:cbl-pg-glossary: refer-glossary.adoc
7171
:cbl-pg-index: index.adoc
72-
:cbl-pg-indexing: learn/{param-name}-indexing.adoc
73-
:cbl-pg-install: start/{param-name}-gs-install.adoc
74-
:cbl-pg-landing-p2psync: learn/{param-name}-landing-p2psync.adoc
75-
:cbl-pg-landing-replications: learn/{param-name}-landing-replications.adoc
76-
:cbl-pg-p2p-manage-tls-id: advance/{param-name}-p2p-managing-tls-id.adoc
77-
:cbl-pg-p2psync-custom: learn/{param-name}-p2psync-custom.adoc
78-
:cbl-pg-p2psync-http: learn/{param-name}-p2psync-http.adoc
79-
:cbl-pg-p2psync-tls: learn/{param-name}-p2psync-tls.adoc
80-
:cbl-pg-p2psync-websocket: learn/{param-name}-p2psync-websocket.adoc
81-
:cbl-pg-prereqs: start/{param-name}-gs-prereqs.adoc
82-
:cbl-pg-query-live: learn/{param-name}-query-live.adoc
83-
:cbl-pg-query-predictive: learn/{param-name}-query-predictive.adoc
84-
:cbl-pg-query-troubleshooting: learn/{param-name}-query-troubleshooting.adoc
85-
:cbl-pg-query-using: learn/{param-name}-query-using.adoc
86-
:cbl-pg-query: learn/{param-name}-query.adoc
72+
:cbl-pg-indexing: indexing.adoc
73+
:cbl-pg-install: gs-install.adoc
74+
:cbl-pg-landing-p2psync: landing-p2psync.adoc
75+
:cbl-pg-landing-replications: landing-replications.adoc
76+
:cbl-pg-p2p-manage-tls-id: p2p-managing-tls-id.adoc
77+
:cbl-pg-p2psync-custom: p2psync-custom.adoc
78+
:cbl-pg-p2psync-http: p2psync-http.adoc
79+
:cbl-pg-p2psync-tls: p2psync-tls.adoc
80+
:cbl-pg-p2psync-websocket: p2psync-websocket.adoc
81+
:cbl-pg-prereqs: gs-prereqs.adoc
82+
:cbl-pg-query-live: query-live.adoc
83+
:cbl-pg-query-predictive: query-predictive.adoc
84+
:cbl-pg-query-troubleshooting: query-troubleshooting.adoc
85+
:cbl-pg-query-using: query-using.adoc
86+
:cbl-pg-query: query.adoc
8787
:cbl-pg-quickstart: quickstart.adoc
88-
:cbl-pg-pfx-api: refer/{param-name}-pfx-api.adoc
89-
:cbl-pg-refer-glossary: refer/{param-name}-refer-glossary.adoc
88+
:cbl-pg-pfx-api: pfx-api.adoc
89+
:cbl-pg-refer-glossary: refer-glossary.adoc
9090
:cbl-pg-releasenotes-all: releasenotes.adoc
91-
:cbl-pg-releasenotes: product/{param-name}-releasenotes.adoc
91+
:cbl-pg-releasenotes: releasenotes.adoc
9292
:cbl-pg-replication--delta-sync: {cbl-pg-replication}#delta-sync
9393
:cbl-pg-replication--status: {cbl-pg-replication}#lbl-repl-status
9494
:cbl-pg-replication--states: {cbl-pg-replication}#lbl-repl-states
95-
:cbl-pg-replication: learn/{param-name}-replication.adoc
96-
:cbl-pg-supported-os: product/{param-name}-supported-os.adoc
95+
:cbl-pg-replication: replication.adoc
96+
:cbl-pg-supported-os: supported-os.adoc
9797
:cbl-pg-supportnotes-all: supportnotices.adoc
98-
:cbl-pg-supportnotes: product/{param-name}-supportnotices.adoc
99-
:cbl-pg-sync-p2p: learn/{param-name}-sync-p2p.adoc
100-
:cbl-pg-sync-svr: learn/{param-name}-sync-svr.adoc
101-
:cbl-pg-thread-safety: learn/{param-name}-thread-safety.adoc
102-
:cbl-pg-troubleshooting-crashes: {param-name}-troubleshooting-crashes.adoc
103-
:cbl-pg-troubleshooting-logs: {param-name}-troubleshooting-logs.adoc
104-
:cbl-pg-troubleshooting-queries: {param-name}-troubleshooting-queries.adoc
105-
:cbl-pg-troubleshooting: advance/{param-name}-troubleshooting.adoc
98+
:cbl-pg-supportnotes: supportnotices.adoc
99+
:cbl-pg-sync-p2p: sync-p2p.adoc
100+
:cbl-pg-sync-svr: sync-svr.adoc
101+
:cbl-pg-thread-safety: thread-safety.adoc
102+
:cbl-pg-troubleshooting-crashes: troubleshooting-crashes.adoc
103+
:cbl-pg-troubleshooting-logs: troubleshooting-logs.adoc
104+
:cbl-pg-troubleshooting-queries: troubleshooting-queries.adoc
105+
:cbl-pg-troubleshooting: troubleshooting.adoc
106106
//
107107
// End -- Ref - Page Targets
108108

@@ -130,7 +130,7 @@ ifndef::version[:version: version undefined]
130130
:xref-cbl-pg-database: {xref-cbl-pfx-database}[Databases]
131131
:xref-cbl-pg-database-prebuilt: {xref-pfx-cbl}{cbl-pg-database-prebuilt}[Pre-built Database]
132132
:xref-cbl-pg-date-time: {xref-pfx-cbl}{cbl-pg-date-time}[Date and Time Functions]
133-
:xref-cbl-pg-dbo-crud: {xref-pfx-cbl}{cbl-pg-dbo-crud}[Using CRUD Operations]
133+
// :xref-cbl-pg-dbo-crud: {xref-pfx-cbl}{cbl-pg-dbo-crud}[Using CRUD Operations]
134134
:xref-cbl-pg-dbo-p2psync-cloud-using: {xref-pfx-cbl}{cbl-pg-dbo-p2psync-cloud-using}[Peer-to-Peer Synchronization (cloud)]
135135
:xref-cbl-pg-dbo-p2psync-websocket-using-active: {xref-cbl-pfx-dbo-p2psync-websocket-using-active}[Active Peer]
136136
:xref-cbl-pg-dbo-p2psync-websocket-using-passive--delta-sync: {xref-pfx-cbl}{cbl-pg-dbo-p2psync-websocket-using-passive--delta-sync}[Delta Sync]
@@ -190,9 +190,9 @@ ifndef::version[:version: version undefined]
190190

191191
// BEGIN Sync Gateway Links
192192
// SGW Pages linked-to from CBL
193-
:sgw-pg-install: start/gs-sgw-install.adoc
193+
:sgw-pg-install: gs-sgw-install.adoc
194194
:sgw-pg-load-balancer: load-balancer.adoc
195-
:sgw-pg-svr-cfg: start/gs-sgw-svr-cfg.adoc
195+
:sgw-pg-svr-cfg: gs-sgw-svr-cfg.adoc
196196
:sgw-pg-svr-cfg-bmk-createuser: {sgw-pg-svr-cfg}#create-rbac-user
197197
:sgw-pg-svr-cfg-bmk-createBucket: {sgw-pg-svr-cfg}#create-bucket
198198

modules/ROOT/pages/_partials/mobAttrCBL.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@
7777
// List styles
7878
:ordered: [loweralpha]
7979
:unordered:
80-
:steps: [arabic]
81-
:steps2: [lowerroman]
82-
:steps3: [loweralpha]
80+
:list-style--steps: [arabic]
81+
:list-style--steps2: [lowerroman]
82+
:list-style--steps3: [loweralpha]
8383

8484

8585
//
@@ -152,9 +152,9 @@
152152
// List styles
153153
:ordered: [loweralpha]
154154
:unordered:
155-
:steps: [arabic]
156-
:steps2: [lowerroman]
157-
:steps3: [loweralpha]
155+
:list-style--steps: [arabic]
156+
:list-style--steps2: [lowerroman]
157+
:list-style--steps3: [loweralpha]
158158

159159

160160
//

0 commit comments

Comments
 (0)