From 1c7b0a647b03161e5c3b7c9bbbed4d710ce56114 Mon Sep 17 00:00:00 2001
From: Amarantha Kulkarni <amarantha-k@users.noreply.github.com>
Date: Mon, 12 Oct 2020 17:17:32 -0700
Subject: [PATCH 01/19] Update nav

---
 modules/ROOT/nav.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc
index 13f536f..5e1ca53 100644
--- a/modules/ROOT/nav.adoc
+++ b/modules/ROOT/nav.adoc
@@ -21,7 +21,7 @@ include::mobile-travel-sample:partial$nav.adoc[]
 * xref:standalone@userprofile-couchbase-mobile:userprofile:xamarin/userprofile_basic.adoc[Getting Started on Xamarin]
 * xref:standalone@userprofile-couchbase-mobile:userprofile:android/userprofile_basic.adoc[Getting Started on Android]
 // * Getting Started with Peer-to-Peer Sync
-include::cbl-p2p-sync-websockets:partial$nav.adoc[]
+// include::cbl-p2p-sync-websockets:partial$nav.adoc[]
 * Xcode Playground
 ** xref:tutorials:swift-playground:overview.adoc[Overview]
 * Recycler Views with Live Queries$nav.adoc[]

From 34b41e6b49a32d3fe2074c4badaffc65ce48e7b0 Mon Sep 17 00:00:00 2001
From: Amarantha Kulkarni <amarantha-k@users.noreply.github.com>
Date: Mon, 12 Oct 2020 17:19:43 -0700
Subject: [PATCH 02/19] Update: p2p needs to be verified on stage

---
 modules/ROOT/pages/index.adoc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc
index 76e425c..1c9f03c 100644
--- a/modules/ROOT/pages/index.adoc
+++ b/modules/ROOT/pages/index.adoc
@@ -254,10 +254,10 @@ The series of tutorials demonstrates the core capabilities of Couchbase Mobile w
 
 // BEGIN include P2P sync over websocket tutorials - one entry per language/platform
 
-:param-language: Swift
-:param-platform: iOS
-:param-module: swift
-include::partial$p2p-sync-entry-skeleton.adoc[]
+// :param-language: Swift
+// :param-platform: iOS
+// :param-module: swift
+// include::partial$p2p-sync-entry-skeleton.adoc[]
 
 // Uncomment the following as the platforms are available
 

From 7c6c6d54e1d65207aedf575826f2e726eebbe4ab Mon Sep 17 00:00:00 2001
From: Amarantha Kulkarni <amarantha-k@users.noreply.github.com>
Date: Tue, 13 Oct 2020 11:15:54 -0700
Subject: [PATCH 03/19] Add P2P tutorial

---
 modules/ROOT/nav.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc
index 5e1ca53..13f536f 100644
--- a/modules/ROOT/nav.adoc
+++ b/modules/ROOT/nav.adoc
@@ -21,7 +21,7 @@ include::mobile-travel-sample:partial$nav.adoc[]
 * xref:standalone@userprofile-couchbase-mobile:userprofile:xamarin/userprofile_basic.adoc[Getting Started on Xamarin]
 * xref:standalone@userprofile-couchbase-mobile:userprofile:android/userprofile_basic.adoc[Getting Started on Android]
 // * Getting Started with Peer-to-Peer Sync
-// include::cbl-p2p-sync-websockets:partial$nav.adoc[]
+include::cbl-p2p-sync-websockets:partial$nav.adoc[]
 * Xcode Playground
 ** xref:tutorials:swift-playground:overview.adoc[Overview]
 * Recycler Views with Live Queries$nav.adoc[]

From fd687be29b6afa7032aaf6383ed0f795315a507f Mon Sep 17 00:00:00 2001
From: Amarantha Kulkarni <amarantha-k@users.noreply.github.com>
Date: Tue, 13 Oct 2020 11:17:58 -0700
Subject: [PATCH 04/19] Add P2P tutorial card

---
 modules/ROOT/pages/index.adoc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc
index 1c9f03c..4ed4688 100644
--- a/modules/ROOT/pages/index.adoc
+++ b/modules/ROOT/pages/index.adoc
@@ -253,11 +253,10 @@ The series of tutorials demonstrates the core capabilities of Couchbase Mobile w
 ++++
 
 // BEGIN include P2P sync over websocket tutorials - one entry per language/platform
-
-// :param-language: Swift
-// :param-platform: iOS
-// :param-module: swift
-// include::partial$p2p-sync-entry-skeleton.adoc[]
+:param-language: Swift
+:param-platform: iOS
+:param-module: swift
+include::partial$p2p-sync-entry-skeleton.adoc[]
 
 // Uncomment the following as the platforms are available
 

From 4525fd2a53f2857266aa7975dbbf8a7f3d83d1bb Mon Sep 17 00:00:00 2001
From: Priya Rajagopal <rajagp@users.noreply.github.com>
Date: Mon, 16 Nov 2020 13:10:16 -0500
Subject: [PATCH 05/19] Moved Xcode playground tutorial (#33)

1) Moved Xcode playground tutorial to before the Android recycler view
2) Slightly tweaked description of Xcode playground tutorial
3) Updated CBL version supported by playground tutorial
---
 modules/ROOT/pages/index.adoc | 47 ++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc
index 4ed4688..f20d49e 100644
--- a/modules/ROOT/pages/index.adoc
+++ b/modules/ROOT/pages/index.adoc
@@ -399,12 +399,13 @@ The user Interface is written in JavaScript while the business logic and data mo
 </div>
 ++++
 
+
 [.column]
 [.data-filter-column]
 ====== {empty}
 ++++
-    <div data-category="beginner android java dotnet mobile developer" class="sub-heading two-column-heading">
-        <h3 class="text-color-brand-blue-secondary">Android Recycler Views with Couchbase Lite</h3>
+    <div data-category="beginner swift mobile developer" class="sub-heading two-column-heading">
+        <h3 class="text-color-brand-blue-secondary">Xcode playground for Couchbase Lite Query</h3>
         <div class="filter-info">
 ++++
 pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>Mobile Developer</span>]
@@ -414,7 +415,7 @@ pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>M
 ++++
 [.content]
 
-This tutorial will demonstrate how you can use Couchbase Lite as a data source for Recycler Views in your Android application.
+A Xcode Playground to explore the Query API in Couchbase Lite 2.x. While the playground demonstrates the queries in swift, given the unified nature of the QueryBuilder API, you should be able to easily translate the queries to any of the other platform languages supported on Couchbase Lite.
 
 ++++
 <div class="other-info-list">
@@ -422,15 +423,15 @@ This tutorial will demonstrate how you can use Couchbase Lite as a data source f
 
 [.box]
 
-* xref:tutorials:university-lister:android.adoc[Start Here]
+* xref:tutorials:swift-playground:overview.adoc[Start Here]
 
 [.box]
 .Component
-* Couchbase Lite 2.1
+* Couchbase Lite 2.8.1
 
 [.box]
 .Languages
-* Java
+* Swift
 
 ++++
 </div>
@@ -440,18 +441,18 @@ This tutorial will demonstrate how you can use Couchbase Lite as a data source f
 [.data-filter-column]
 ====== {empty}
 ++++
-    <div data-category="beginner java dotnet developer" class="sub-heading two-column-heading">
-        <h3 class="text-color-brand-blue-secondary">Using Couchbase Server as a User Profile Store</h3>
+    <div data-category="beginner android java dotnet mobile developer" class="sub-heading two-column-heading">
+        <h3 class="text-color-brand-blue-secondary">Android Recycler Views with Couchbase Lite</h3>
         <div class="filter-info">
 ++++
-pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>Developer</span>]
+pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>Mobile Developer</span>]
 ++++
         </div>
     </div>
 ++++
 [.content]
 
-An comprehensive tutorial that demonstrates how to use Couchbase Server, Spring Data, Full-Text Search and Cross Data Center Replication (XDCR) to build a production-grade User Profile Store micro-service.
+This tutorial will demonstrate how you can use Couchbase Lite as a data source for Recycler Views in your Android application.
 
 ++++
 <div class="other-info-list">
@@ -459,18 +460,15 @@ An comprehensive tutorial that demonstrates how to use Couchbase Server, Spring
 
 [.box]
 
-* xref:tutorials:profile-store:install.adoc[Start Here]
-* xref:tutorials:profile-store:dotnet.adoc[.NET]
-* xref:tutorials:profile-store:java.adoc[Java]
+* xref:tutorials:university-lister:android.adoc[Start Here]
 
 [.box]
 .Component
-* Couchbase Server 6.0
+* Couchbase Lite 2.1
 
 [.box]
 .Languages
 * Java
-* .NET
 
 ++++
 </div>
@@ -491,7 +489,7 @@ pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>D
 ++++
 [.content]
 
-An comprehensive tutorial that demonstrates how to use Couchbase Server, Spring Data, Full Text Search, and Cross Data Center Replication (XDCR) to build a production-grade User Profile Store micro-service.
+An comprehensive tutorial that demonstrates how to use Couchbase Server, Spring Data, Full-Text Search and Cross Data Center Replication (XDCR) to build a production-grade User Profile Store micro-service.
 
 ++++
 <div class="other-info-list">
@@ -520,18 +518,18 @@ An comprehensive tutorial that demonstrates how to use Couchbase Server, Spring
 [.data-filter-column]
 ====== {empty}
 ++++
-    <div data-category="beginner swift mobile developer" class="sub-heading two-column-heading">
-        <h3 class="text-color-brand-blue-secondary">Xcode playground for Couchbase Lite Query</h3>
+    <div data-category="beginner java dotnet developer" class="sub-heading two-column-heading">
+        <h3 class="text-color-brand-blue-secondary">Using Couchbase Server as a User Profile Store</h3>
         <div class="filter-info">
 ++++
-pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>Mobile Developer</span>]
+pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>Developer</span>]
 ++++
         </div>
     </div>
 ++++
 [.content]
 
-A Xcode Playground to demonstrate and explore the Query interface in Couchbase Lite 2.0. While the playground demonstrates the queries in swift, given the unified nature of the QueryBuilder API, you should be able to easily translate the queries to any of the other platform languages supported on Couchbase Lite.
+An comprehensive tutorial that demonstrates how to use Couchbase Server, Spring Data, Full Text Search, and Cross Data Center Replication (XDCR) to build a production-grade User Profile Store micro-service.
 
 ++++
 <div class="other-info-list">
@@ -539,15 +537,18 @@ A Xcode Playground to demonstrate and explore the Query interface in Couchbase L
 
 [.box]
 
-* xref:tutorials:swift-playground:overview.adoc[Start Here]
+* xref:tutorials:profile-store:install.adoc[Start Here]
+* xref:tutorials:profile-store:dotnet.adoc[.NET]
+* xref:tutorials:profile-store:java.adoc[Java]
 
 [.box]
 .Component
-* Couchbase Lite 2.1
+* Couchbase Server 6.0
 
 [.box]
 .Languages
-* Swift
+* Java
+* .NET
 
 ++++
 </div>

From 0aa1f7948faaf2e76aac165ee297d6646117c43a Mon Sep 17 00:00:00 2001
From: ibsoln <52778946+ibsoln@users.noreply.github.com>
Date: Thu, 19 Nov 2020 17:57:17 +0000
Subject: [PATCH 06/19] DOC-7713-C2  (#34)

* Commit 1 -- Correct nav error introduced in 07d492e7d6ba61cb19bba6caef2bb51218b5505a, which corrupted the Recycler tutorial link in the nav menu.

* DOC-7713-C2bAdd Getting Started with P2P on Xamarin tutorial code samples
https://issues.couchbase.com/browse/DOC-7713

Comprises 2 commits:
Commit 1 -- Correct nav error introduced in 07d492e7d6ba61cb19bba6caef2bb51218b5505a, which corrupted the Recycler tutorial link in the nav menu.
Commit 2 (this) -- add C# tutorial to nav and index cards
---
 modules/ROOT/nav.adoc         | 9 +++++----
 modules/ROOT/pages/index.adoc | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc
index 13f536f..67bea02 100644
--- a/modules/ROOT/nav.adoc
+++ b/modules/ROOT/nav.adoc
@@ -21,10 +21,11 @@ include::mobile-travel-sample:partial$nav.adoc[]
 * xref:standalone@userprofile-couchbase-mobile:userprofile:xamarin/userprofile_basic.adoc[Getting Started on Xamarin]
 * xref:standalone@userprofile-couchbase-mobile:userprofile:android/userprofile_basic.adoc[Getting Started on Android]
 // * Getting Started with Peer-to-Peer Sync
-include::cbl-p2p-sync-websockets:partial$nav.adoc[]
-* Xcode Playground
-** xref:tutorials:swift-playground:overview.adoc[Overview]
-* Recycler Views with Live Queries$nav.adoc[]
+include::cbl-p2p-sync-websockets:partial$/nav.adoc[]
+// * Xcode Playground
+* xref:tutorials:swift-playground:overview.adoc[Xcode Playground]
+* Recycler Views with Live Queries
+include::university-lister:partial$nav.adoc[]
 * Build a Cordova Plugin
 include::hotel-lister:partial$nav.adoc[]
 * Build a React Native Module
diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc
index f20d49e..591da9f 100644
--- a/modules/ROOT/pages/index.adoc
+++ b/modules/ROOT/pages/index.adoc
@@ -269,10 +269,10 @@ include::partial$p2p-sync-entry-skeleton.adoc[]
 // :param-platform: Android
 // include::partial$p2p-sync-entry-skeleton.adoc[]
 
-// :param-language: C#.Net
-// :param-platform: Xamarin
-// :param-module: csharp
-// include::partial$p2p-sync-entry-skeleton.adoc[]
+:param-language: C#
+:param-platform: Xamarin
+:param-module: dotnet
+include::partial$p2p-sync-entry-skeleton.adoc[]
 
 // END include P2P sync over websocket tutorials - one entry per language/platform
 

From 22b13841cd61205fefbe451c5c39d5f7ebb17c8e Mon Sep 17 00:00:00 2001
From: amarantha-k <amarantha@couchbase.com>
Date: Tue, 1 Dec 2020 00:18:51 -0800
Subject: [PATCH 07/19] Add first-timer tutorial series

---
 modules/ROOT/nav.adoc         |  9 +++--
 modules/ROOT/pages/index.adoc | 63 ++++++++++++++++++++++++++---------
 2 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc
index 67bea02..3d1ec44 100644
--- a/modules/ROOT/nav.adoc
+++ b/modules/ROOT/nav.adoc
@@ -1,11 +1,14 @@
 include::partial$_attributes-local.adoc[]
 
-.Developer Bootstrap Exercises
-include::quick-start:partial$nav.adoc[]
+.Get Started with Couchbase Cloud Self-Service Trials
+include::cbc-self-service-trials:partial$nav.adoc[]
 
-.Getting Started with Couchbase Community Edition
+.Get Started with Couchbase Community Edition
 include::getting-started-ce:partial$nav.adoc[]
 
+.Developer Bootstrap Exercises
+include::quick-start:partial$nav.adoc[]
+
 .Tutorials
 .Couchbase Server
 * Session Storage
diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc
index 591da9f..7c83a9e 100644
--- a/modules/ROOT/pages/index.adoc
+++ b/modules/ROOT/pages/index.adoc
@@ -33,8 +33,8 @@ pass:[<i class="fas fa-book-reader fa-7x"></i>]
 [.data-filter-column]
 ====== {empty}
 ++++
-<div data-category="beginner java nodejs dotnet developer" class="sub-heading two-column-heading">
-<h3 class="text-color-brand-blue-secondary">Developer Bootstrap Exercises</h3>
+<div data-category="beginner developer" class="sub-heading two-column-heading">
+<h3 class="text-color-brand-blue-secondary">Couchbase Cloud First-Timer Tutorial Series</h3>
 <div class="filter-info">
 ++++
 pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>Developer</span>]
@@ -44,9 +44,9 @@ pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>D
 ++++
 [.content]
 
-Are you a developer interested in a fast start with Couchbase? This expanding set of basic first-steps exercises provide a fast track from zero to your substantial interactions with Couchbase Server using your favorite development frameworks and IDEs.
+This series of “First Timer” tutorials is intended to get you going quickly with your Couchbase Cloud FREE Trial and provide a whirlwind tour of important Couchbase Cloud capabilities at a high level. 
 
-xref:quick-start:quickstart-docker-image-manual-cb65.adoc[Start Here]
+xref:cbc-self-service-trials:index.adoc[Start Here]
 
 ++++
 <div class="other-info-list">
@@ -56,23 +56,13 @@ xref:quick-start:quickstart-docker-image-manual-cb65.adoc[Start Here]
 [.component]
 
 .Component
-* Server 6.5 CE or EE
-* SDK 3.0 or 2.x
-
-[.box]
-[.languages]
-
-.Languages
-* Java
-* Node.js
-* .NET
+* Couchbase Cloud
 
 ++++
 </div>
 ++++
 
 
-
 [.column]
 [.data-filter-column]
 ====== {empty}
@@ -111,6 +101,49 @@ xref:getting-started-ce:index.adoc[Start Here]
 </div>
 ++++
 
+[.column]
+[.data-filter-column]
+====== {empty}
+++++
+<div data-category="beginner java nodejs dotnet developer" class="sub-heading two-column-heading">
+<h3 class="text-color-brand-blue-secondary">Developer Bootstrap Exercises</h3>
+<div class="filter-info">
+++++
+pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>Developer</span>]
+++++
+</div>
+</div>
+++++
+[.content]
+
+Are you a developer interested in a fast start with Couchbase? This expanding set of basic first-steps exercises provide a fast track from zero to your substantial interactions with Couchbase Server using your favorite development frameworks and IDEs.
+
+xref:quick-start:quickstart-docker-image-manual-cb65.adoc[Start Here]
+
+++++
+<div class="other-info-list">
+++++
+
+[.box]
+[.component]
+
+.Component
+* Server 6.5 CE or EE
+* SDK 3.0 or 2.x
+
+[.box]
+[.languages]
+
+.Languages
+* Java
+* Node.js
+* .NET
+
+++++
+</div>
+++++
+
+
 [.column]
 [.data-filter-column]
 ====== {empty}

From ef1a532c7a531acfd4e2af08ab983834cbbb7ba7 Mon Sep 17 00:00:00 2001
From: Priya Rajagopal <rajagp@users.noreply.github.com>
Date: Fri, 9 Jul 2021 19:10:44 -0400
Subject: [PATCH 08/19] Updated travel sample card

Updated to 2.8 version of SGW and CBL
---
 modules/ROOT/pages/index.adoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc
index 7c83a9e..b49b51e 100644
--- a/modules/ROOT/pages/index.adoc
+++ b/modules/ROOT/pages/index.adoc
@@ -603,7 +603,7 @@ pass:attributes[<h5><img src="{url-icon-intermediate}" alt="" />Intermediate</h5
 [.content]
 
 An in-depth walkthrough of the Couchbase Mobile capabilities on iOS, Android, Java (desktop) and .NET (UWP and Xamarin) platforms.
-At the end of this multi-part tutorial, you should have a good understanding of how to architect a solution using Couchbase Mobile, including data modeling, sync, access control, channels, database CRUD and the query API in Couchbase Mobile.
+At the end of this multi-part workshop, you should have a good understanding of how to architect a solution using Couchbase Mobile, including data modeling, sync, access control, channels, database CRUD and the query API in Couchbase Mobile.
 
 ++++
 <div class="other-info-list">
@@ -620,8 +620,8 @@ At the end of this multi-part tutorial, you should have a good understanding of
 [.box]
 .Component
 * Couchbase Server 6.5
-* Couchbase Lite 2.7
-* Sync Gateway 2.7
+* Couchbase Lite 2.8
+* Sync Gateway 2.8
 
 [.box]
 .Languages

From 88443866203e45070070aa3ccc9203697dce0f08 Mon Sep 17 00:00:00 2001
From: Richard Smedley <rgsmedley@gmail.com>
Date: Thu, 28 Oct 2021 20:20:52 +0100
Subject: [PATCH 09/19] -->  Capella

---
 modules/ROOT/pages/index.adoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc
index b49b51e..c9926ec 100644
--- a/modules/ROOT/pages/index.adoc
+++ b/modules/ROOT/pages/index.adoc
@@ -34,7 +34,7 @@ pass:[<i class="fas fa-book-reader fa-7x"></i>]
 ====== {empty}
 ++++
 <div data-category="beginner developer" class="sub-heading two-column-heading">
-<h3 class="text-color-brand-blue-secondary">Couchbase Cloud First-Timer Tutorial Series</h3>
+<h3 class="text-color-brand-blue-secondary">Couchbase Capella First-Timer Tutorial Series</h3>
 <div class="filter-info">
 ++++
 pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>Developer</span>]
@@ -44,7 +44,7 @@ pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>D
 ++++
 [.content]
 
-This series of “First Timer” tutorials is intended to get you going quickly with your Couchbase Cloud FREE Trial and provide a whirlwind tour of important Couchbase Cloud capabilities at a high level. 
+This series of “First Timer” tutorials is intended to get you going quickly with your Couchbase Capella FREE Trial and provide a whirlwind tour of important Couchbase Capella capabilities at a high level. 
 
 xref:cbc-self-service-trials:index.adoc[Start Here]
 
@@ -56,7 +56,7 @@ xref:cbc-self-service-trials:index.adoc[Start Here]
 [.component]
 
 .Component
-* Couchbase Cloud
+* Couchbase Capella
 
 ++++
 </div>

From 61ca33a13d466b5e59c61c20fb0ab431d5c827c9 Mon Sep 17 00:00:00 2001
From: Richard Smedley <rgsmedley@gmail.com>
Date: Thu, 28 Oct 2021 21:05:18 +0100
Subject: [PATCH 10/19] Capella!

---
 modules/ROOT/nav.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc
index 3d1ec44..0dd5304 100644
--- a/modules/ROOT/nav.adoc
+++ b/modules/ROOT/nav.adoc
@@ -1,6 +1,6 @@
 include::partial$_attributes-local.adoc[]
 
-.Get Started with Couchbase Cloud Self-Service Trials
+.Get Started with Couchbase Capella Self-Service Trials
 include::cbc-self-service-trials:partial$nav.adoc[]
 
 .Get Started with Couchbase Community Edition

From 300e7396ad922aec106c2c95590d06847dbdee7c Mon Sep 17 00:00:00 2001
From: ibsoln <52778946+ibsoln@users.noreply.github.com>
Date: Thu, 6 Jan 2022 15:13:48 +0000
Subject: [PATCH 11/19] DOC-9382 -- Userprofile-iOS for 3.0 (#38)

https://issues.couchbase.com/browse/DOC-9382

DOC-9382 - nav changes

(cherry picked from commit 5273ed82f46514223a358d83732c5d51dc798002)

DOC-9382 -- nav tweak

(cherry picked from commit ef0ab0a4e559db5001cdc319aa071041b2fd10d6)

DOC-9382 -- nav tweak 2

(cherry picked from commit 192c56c32ad74950f02c812a094d7d22b9f27080)
---
 antora.yml                                    |   1 +
 modules/ROOT/nav.adoc                         |  30 ++---
 .../_partials/p2p-sync-entry-skeleton.adoc    |   2 +-
 modules/ROOT/pages/index.adoc                 | 119 ++++++++++--------
 4 files changed, 85 insertions(+), 67 deletions(-)

diff --git a/antora.yml b/antora.yml
index b721905..6d44946 100644
--- a/antora.yml
+++ b/antora.yml
@@ -1,5 +1,6 @@
 name: tutorials
 version: 'master'
 title: Tutorials
+display-version: 3.0
 nav:
   - modules/ROOT/nav.adoc
\ No newline at end of file
diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc
index 0dd5304..79a961d 100644
--- a/modules/ROOT/nav.adoc
+++ b/modules/ROOT/nav.adoc
@@ -9,32 +9,28 @@ include::getting-started-ce:partial$nav.adoc[]
 .Developer Bootstrap Exercises
 include::quick-start:partial$nav.adoc[]
 
-.Tutorials
 .Couchbase Server
 * Session Storage
 include::session-storage:partial$nav.adoc[]
+xref::session-storage:partial$nav.adoc[]
 * User Profile Storage
 include::profile-store:partial$nav.adoc[]
 
 .Couchbase Mobile
-
 * Travel Sample
 include::mobile-travel-sample:partial$nav.adoc[]
-* xref:standalone@userprofile-couchbase-mobile:userprofile:userprofile_basic.adoc[Getting Started on iOS]
-* xref:standalone@userprofile-couchbase-mobile:userprofile:xamarin/userprofile_basic.adoc[Getting Started on Xamarin]
-* xref:standalone@userprofile-couchbase-mobile:userprofile:android/userprofile_basic.adoc[Getting Started on Android]
-// * Getting Started with Peer-to-Peer Sync
-include::cbl-p2p-sync-websockets:partial$/nav.adoc[]
-// * Xcode Playground
-* xref:tutorials:swift-playground:overview.adoc[Xcode Playground]
-* Recycler Views with Live Queries
-include::university-lister:partial$nav.adoc[]
-* Build a Cordova Plugin
-include::hotel-lister:partial$nav.adoc[]
-* Build a React Native Module
-include::hotel-finder:partial$nav.adoc[]
-* OpenID Connect Tutorial
-include::openid-connect-implicit-flow:partial$nav.adoc[]
+include::userprofile-sync:partial$nav.adoc[]
+include::cbl-p2p-sync-websockets:partial$nav.adoc[]
+
+// * xref:tutorials:swift-playground:overview.adoc[Xcode Playground]
+// * Recycler Views with Live Queries
+// include::university-lister:partial$nav.adoc[]
+// * Build a Cordova Plugin
+// include::hotel-lister:partial$nav.adoc[]
+// * Build a React Native Module
+// include::hotel-finder:partial$nav.adoc[]
+// * OpenID Connect Tutorial
+// include::openid-connect-implicit-flow:partial$nav.adoc[]
 
 .Build Your Own
 * Tutorial Template
diff --git a/modules/ROOT/pages/_partials/p2p-sync-entry-skeleton.adoc b/modules/ROOT/pages/_partials/p2p-sync-entry-skeleton.adoc
index 4753dbe..a8a632d 100644
--- a/modules/ROOT/pages/_partials/p2p-sync-entry-skeleton.adoc
+++ b/modules/ROOT/pages/_partials/p2p-sync-entry-skeleton.adoc
@@ -33,7 +33,7 @@ This tutorial uses a simple inventory tracker app to demonstrate the peer-to-pee
 
 [.box]
 .Component
-* Couchbase Lite 2.8
+* Couchbase Lite {param-version}
 
 [.box]
 .Languages
diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc
index c9926ec..70de3bb 100644
--- a/modules/ROOT/pages/index.adoc
+++ b/modules/ROOT/pages/index.adoc
@@ -44,7 +44,7 @@ pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>D
 ++++
 [.content]
 
-This series of “First Timer” tutorials is intended to get you going quickly with your Couchbase Capella FREE Trial and provide a whirlwind tour of important Couchbase Capella capabilities at a high level. 
+This series of “First Timer” tutorials is intended to get you going quickly with your Couchbase Capella FREE Trial and provide a whirlwind tour of important Couchbase Capella capabilities at a high level.
 
 xref:cbc-self-service-trials:index.adoc[Start Here]
 
@@ -144,6 +144,11 @@ xref:quick-start:quickstart-docker-image-manual-cb65.adoc[Start Here]
 ++++
 
 
+// Get Started with Couchbase Mobile
+
+
+// Userprofile -- iOS
+
 [.column]
 [.data-filter-column]
 ====== {empty}
@@ -157,40 +162,46 @@ pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>M
         </div>
     </div>
 ++++
-[.content]
 
-The series of tutorials demonstrates the core capabilities of Couchbase Mobile with an iOS app:
+[.content style="list-style: square;"]
+:standalone--xref: xref:userprofile-standalone:userprofile_basic.adoc[Standalone]
+:query--xref: xref:userprofile-query:userprofile_query.adoc[Query]
+:sync--xref: xref:userprofile-sync:userprofile_sync.adoc[Sync]
 
-* "Standalone": database and CRUD operations.
-* "Query": querying capabilities.
-* "Sync": use of Sync Gateway for data sync between clients.
+The series of tutorials demonstrates the core capabilities of Couchbase Mobile with an iOS app:
 
+* {standalone--xref}: Learn about Couchbase Lite's database and CRUD operations.
+* {query--xref}: Explore Couchbase Lite's query capabilities.
+* {sync--xref}: Couple Couchbase Lite with Sync Gateway to tap into the power of data sync.
 
 ++++
 <div class="other-info-list">
 ++++
 
 [.box]
-
-* xref:standalone@userprofile-couchbase-mobile:userprofile:userprofile_basic.adoc[Standalone]
-* xref:query@userprofile-couchbase-mobile:userprofile:userprofile_query.adoc[Query]
-* xref:sync@userprofile-couchbase-mobile:userprofile:userprofile_sync.adoc[Sync]
-
+.Modules
+* {standalone--xref}
+* {query--xref}
+* {sync--xref}
 
 [.box]
-.Component
-* Server 5.5
-* Couchbase Lite 2.1
-* Sync Gateway 2.1
+.Components
+* Server 7.0
+* Couchbase Lite 3.0
+* Sync Gateway 3.0
 
 [.box]
 .Languages
-* Swift
+* iOS 12
+* Swift 5.5
+* Xcode 12.5
 
 ++++
 </div>
 ++++
 
+//  Userprofile -- Android
+
 [.column]
 [.data-filter-column]
 ====== {empty}
@@ -218,7 +229,7 @@ The series of tutorials demonstrates the core capabilities of Couchbase Mobile w
 ++++
 
 [.box]
-
+.Modules
 * xref:standalone@userprofile-couchbase-mobile:userprofile:android/userprofile_basic.adoc[Standalone]
 * xref:query@userprofile-couchbase-mobile:userprofile:android/userprofile_query.adoc[Query]
 * xref:sync@userprofile-couchbase-mobile:userprofile:android/userprofile_sync.adoc[Sync]
@@ -238,6 +249,8 @@ The series of tutorials demonstrates the core capabilities of Couchbase Mobile w
 </div>
 ++++
 
+//  Userprofile -- Xamarin (.Net)
+
 [.column]
 [.data-filter-column]
 ====== {empty}
@@ -265,7 +278,7 @@ The series of tutorials demonstrates the core capabilities of Couchbase Mobile w
 ++++
 
 [.box]
-
+.Modules
 * xref:standalone@userprofile-couchbase-mobile:userprofile:xamarin/userprofile_basic.adoc[Standalone]
 * xref:query@userprofile-couchbase-mobile:userprofile:xamarin/userprofile_query.adoc[Query]
 * xref:sync@userprofile-couchbase-mobile:userprofile:xamarin/userprofile_sync.adoc[Sync]
@@ -285,70 +298,78 @@ The series of tutorials demonstrates the core capabilities of Couchbase Mobile w
 </div>
 ++++
 
+
+// Couchbase Mobile -- Peer to Peer
+
+
 // BEGIN include P2P sync over websocket tutorials - one entry per language/platform
 :param-language: Swift
 :param-platform: iOS
 :param-module: swift
+:param-version: 2.8
 include::partial$p2p-sync-entry-skeleton.adoc[]
 
 // Uncomment the following as the platforms are available
 
 // :param-language: Java
 // :param-module: java
+// :param-version: 2.8
 // include::partial$p2p-sync-entry-skeleton.adoc[]
 
 // :param-language: Android (Java)
 // :param-module: android
 // :param-platform: Android
+// :param-version: 2.8
 // include::partial$p2p-sync-entry-skeleton.adoc[]
 
 :param-language: C#
 :param-platform: Xamarin
 :param-module: dotnet
+:param-version: 3.0.0-beta02
 include::partial$p2p-sync-entry-skeleton.adoc[]
 
 // END include P2P sync over websocket tutorials - one entry per language/platform
 
 
-[.column]
-[.data-filter-column]
-====== {empty}
-++++
-    <div data-category="beginner swift mobile developer" class="sub-heading two-column-heading">
-        <h3 class="text-color-brand-blue-secondary">Background Fetch with Couchbase Lite on iOS</h3>
-        <div class="filter-info">
-++++
-pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>Mobile Developer</span>]
-++++
-        </div>
-    </div>
-++++
-[.content]
+// [.column]
+// [.data-filter-column]
+// ====== {empty}
+// ++++
+//     <div data-category="beginner swift mobile developer" class="sub-heading two-column-heading">
+//         <h3 class="text-color-brand-blue-secondary">Background Fetch with Couchbase Lite on iOS</h3>
+//         <div class="filter-info">
+// ++++
+// pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>Mobile Developer</span>]
+// ++++
+//         </div>
+//     </div>
+// ++++
+// [.content]
 
-This tutorial discusses how you can use iOS Background App Refresh capability to sync data when in the background.
+// This tutorial discusses how you can use iOS Background App Refresh capability to sync data when in the background.
 
-++++
-<div class="other-info-list">
-++++
+// ++++
+// <div class="other-info-list">
+// ++++
 
-[.box]
+// [.box]
 
-* xref:backgroundfetch@userprofile-couchbase-mobile:userprofile:background-fetch.adoc[Start Here]
+// * xref:backgroundfetch@userprofile-couchbase-mobile:userprofile:background-fetch.adoc[Start Here]
 
 
-[.box]
-.Component
-* Server 5.5
-* Couchbase Lite 2.1
-* Sync Gateway 2.1
+// [.box]
+// .Component
+// * Server 5.5
+// * Couchbase Lite 2.1
+// * Sync Gateway 2.1
 
-[.box]
-.Languages
-* Swift
+// [.box]
+// .Languages
+// * Swift
 
-++++
-</div>
-++++
+// ++++
+// </div>
+// ++++
 
 [.column]
 [.data-filter-column]

From 119008d9eead8d2fa08d52e4c59323104f070360 Mon Sep 17 00:00:00 2001
From: ibsoln <52778946+ibsoln@users.noreply.github.com>
Date: Tue, 18 Jan 2022 10:34:40 +0000
Subject: [PATCH 12/19] DOC-9333 -- Userprofile-Xamarin 3.0 (#40)

* DOC-9382 -- Userprofile-iOS for 3.0
https://issues.couchbase.com/browse/DOC-9382

* DOC-9333 -- Userprofile-xamarin 3.0
https://issues.couchbase.com/browse/DOC-9333
---
 modules/ROOT/nav.adoc         |  4 ++++
 modules/ROOT/pages/index.adoc | 13 ++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc
index 79a961d..c1b686f 100644
--- a/modules/ROOT/nav.adoc
+++ b/modules/ROOT/nav.adoc
@@ -19,7 +19,11 @@ include::profile-store:partial$nav.adoc[]
 .Couchbase Mobile
 * Travel Sample
 include::mobile-travel-sample:partial$nav.adoc[]
+// Getting Started on iOS
 include::userprofile-sync:partial$nav.adoc[]
+// Getting Started on Xamarin
+include::userprofile-sync-xamarin:partial$nav.adoc[]
+
 include::cbl-p2p-sync-websockets:partial$nav.adoc[]
 
 // * xref:tutorials:swift-playground:overview.adoc[Xcode Playground]
diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc
index 70de3bb..39d15b3 100644
--- a/modules/ROOT/pages/index.adoc
+++ b/modules/ROOT/pages/index.adoc
@@ -278,17 +278,16 @@ The series of tutorials demonstrates the core capabilities of Couchbase Mobile w
 ++++
 
 [.box]
-.Modules
-* xref:standalone@userprofile-couchbase-mobile:userprofile:xamarin/userprofile_basic.adoc[Standalone]
-* xref:query@userprofile-couchbase-mobile:userprofile:xamarin/userprofile_query.adoc[Query]
-* xref:sync@userprofile-couchbase-mobile:userprofile:xamarin/userprofile_sync.adoc[Sync]
 
+* xref:userprofile-standalone-xamarin:userprofile_basic.adoc[Standalone]
+* xref:userprofile-query-xamarin:userprofile_query.adoc[Query]
+* xref:userprofile-sync-xamarin:userprofile_sync.adoc[Sync]
 
 [.box]
 .Component
-* Server 5.5
-* Couchbase Lite 2.1
-* Sync Gateway 2.1
+* Server 7.0
+* Couchbase Lite 3.0
+* Sync Gateway 3.0
 
 [.box]
 .Languages

From 7ca9cd405f2f7c8a302156d45bf37a97d906d22e Mon Sep 17 00:00:00 2001
From: ibsoln <52778946+ibsoln@users.noreply.github.com>
Date: Tue, 18 Jan 2022 10:37:05 +0000
Subject: [PATCH 13/19] DOC-9383 -- Userprofile-Android 3.0 (#39)

* DOC-9382 -- Userprofile-iOS for 3.0
https://issues.couchbase.com/browse/DOC-9382

* DOC-9383 -- Userprofile-Android 3.0
https://issues.couchbase.com/browse/DOC-9383
---
 modules/ROOT/nav.adoc         |  2 ++
 modules/ROOT/pages/index.adoc | 13 ++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc
index c1b686f..890b5e1 100644
--- a/modules/ROOT/nav.adoc
+++ b/modules/ROOT/nav.adoc
@@ -23,6 +23,8 @@ include::mobile-travel-sample:partial$nav.adoc[]
 include::userprofile-sync:partial$nav.adoc[]
 // Getting Started on Xamarin
 include::userprofile-sync-xamarin:partial$nav.adoc[]
+// Getting Started on Android
+include::userprofile-sync-android:partial$nav.adoc[]
 
 include::cbl-p2p-sync-websockets:partial$nav.adoc[]
 
diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc
index 39d15b3..5e7b790 100644
--- a/modules/ROOT/pages/index.adoc
+++ b/modules/ROOT/pages/index.adoc
@@ -230,16 +230,15 @@ The series of tutorials demonstrates the core capabilities of Couchbase Mobile w
 
 [.box]
 .Modules
-* xref:standalone@userprofile-couchbase-mobile:userprofile:android/userprofile_basic.adoc[Standalone]
-* xref:query@userprofile-couchbase-mobile:userprofile:android/userprofile_query.adoc[Query]
-* xref:sync@userprofile-couchbase-mobile:userprofile:android/userprofile_sync.adoc[Sync]
-
+* xref:userprofile-standalone-android:userprofile_basic.adoc[Standalone]
+* xref:userprofile-query-android:userprofile_query.adoc[Query]
+* xref:userprofile-sync-android:userprofile_sync.adoc[Sync]
 
 [.box]
 .Component
-* Server 5.5
-* Couchbase Lite 2.6
-* Sync Gateway 2.6
+* Server 7.0
+* Couchbase Lite 3.0
+* Sync Gateway 3.0
 
 [.box]
 .Languages

From 636883ccbbd7a75f1da01cbc2d0fc4638c9ee5f3 Mon Sep 17 00:00:00 2001
From: ibsoln <52778946+ibsoln@users.noreply.github.com>
Date: Fri, 28 Jan 2022 13:58:47 +0000
Subject: [PATCH 14/19] DOC-9334/5 -- P2P for Xamarin and iOS (#41)

https://issues.couchbase.com/browse/DOC-9334
https://issues.couchbase.com/browse/DOC-9335
---
 modules/ROOT/pages/index.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc
index 5e7b790..f466570 100644
--- a/modules/ROOT/pages/index.adoc
+++ b/modules/ROOT/pages/index.adoc
@@ -304,7 +304,7 @@ The series of tutorials demonstrates the core capabilities of Couchbase Mobile w
 :param-language: Swift
 :param-platform: iOS
 :param-module: swift
-:param-version: 2.8
+:param-version: 3.0
 include::partial$p2p-sync-entry-skeleton.adoc[]
 
 // Uncomment the following as the platforms are available
@@ -323,7 +323,7 @@ include::partial$p2p-sync-entry-skeleton.adoc[]
 :param-language: C#
 :param-platform: Xamarin
 :param-module: dotnet
-:param-version: 3.0.0-beta02
+:param-version: 3.0
 include::partial$p2p-sync-entry-skeleton.adoc[]
 
 // END include P2P sync over websocket tutorials - one entry per language/platform

From e79e4fafc90ed4109ae88a843bc1ebfd8a561122 Mon Sep 17 00:00:00 2001
From: ibsoln <52778946+ibsoln@users.noreply.github.com>
Date: Fri, 28 Jan 2022 18:29:52 +0000
Subject: [PATCH 15/19] QF220128-6 -- Revert mobile xamarin tutorials to 2.8
 (#42)

---
 modules/ROOT/pages/index.adoc | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc
index f466570..733f45e 100644
--- a/modules/ROOT/pages/index.adoc
+++ b/modules/ROOT/pages/index.adoc
@@ -277,16 +277,19 @@ The series of tutorials demonstrates the core capabilities of Couchbase Mobile w
 ++++
 
 [.box]
+* xref:standalone@userprofile-couchbase-mobile:userprofile:xamarin/userprofile_basic.adoc[Standalone]
+* xref:query@userprofile-couchbase-mobile:userprofile:xamarin/userprofile_query.adoc[Query]
+* xref:sync@userprofile-couchbase-mobile:userprofile:xamarin/userprofile_sync.adoc[Sync]
 
-* xref:userprofile-standalone-xamarin:userprofile_basic.adoc[Standalone]
-* xref:userprofile-query-xamarin:userprofile_query.adoc[Query]
-* xref:userprofile-sync-xamarin:userprofile_sync.adoc[Sync]
+// * xref:userprofile-standalone-xamarin:userprofile_basic.adoc[Standalone]
+// * xref:userprofile-query-xamarin:userprofile_query.adoc[Query]
+// * xref:userprofile-sync-xamarin:userprofile_sync.adoc[Sync]
 
 [.box]
 .Component
-* Server 7.0
-* Couchbase Lite 3.0
-* Sync Gateway 3.0
+* Server 5.5
+* Couchbase Lite 2.1
+* Sync Gateway 2.1
 
 [.box]
 .Languages
@@ -323,7 +326,7 @@ include::partial$p2p-sync-entry-skeleton.adoc[]
 :param-language: C#
 :param-platform: Xamarin
 :param-module: dotnet
-:param-version: 3.0
+:param-version: 2.8
 include::partial$p2p-sync-entry-skeleton.adoc[]
 
 // END include P2P sync over websocket tutorials - one entry per language/platform

From cd12d7aeb53ead1478e9bfaeb2b942e56b3badd7 Mon Sep 17 00:00:00 2001
From: ibsoln <52778946+ibsoln@users.noreply.github.com>
Date: Tue, 1 Feb 2022 15:09:10 +0000
Subject: [PATCH 16/19] DOC-9333 -- Userprofile-xamarin 3.0 (#44)

https://issues.couchbase.com/browse/DOC-9333
---
 modules/ROOT/pages/index.adoc | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc
index 733f45e..e8b3568 100644
--- a/modules/ROOT/pages/index.adoc
+++ b/modules/ROOT/pages/index.adoc
@@ -277,19 +277,16 @@ The series of tutorials demonstrates the core capabilities of Couchbase Mobile w
 ++++
 
 [.box]
-* xref:standalone@userprofile-couchbase-mobile:userprofile:xamarin/userprofile_basic.adoc[Standalone]
-* xref:query@userprofile-couchbase-mobile:userprofile:xamarin/userprofile_query.adoc[Query]
-* xref:sync@userprofile-couchbase-mobile:userprofile:xamarin/userprofile_sync.adoc[Sync]
 
-// * xref:userprofile-standalone-xamarin:userprofile_basic.adoc[Standalone]
-// * xref:userprofile-query-xamarin:userprofile_query.adoc[Query]
-// * xref:userprofile-sync-xamarin:userprofile_sync.adoc[Sync]
+* xref:userprofile-standalone-xamarin:userprofile_basic.adoc[Standalone]
+* xref:userprofile-query-xamarin:userprofile_query.adoc[Query]
+* xref:userprofile-sync-xamarin:userprofile_sync.adoc[Sync]
 
 [.box]
 .Component
-* Server 5.5
-* Couchbase Lite 2.1
-* Sync Gateway 2.1
+* Server 7.0
+* Couchbase Lite 3.0
+* Sync Gateway 3.0
 
 [.box]
 .Languages

From 592fafd69675f5971fa2e4e0ad22b043f84e3321 Mon Sep 17 00:00:00 2001
From: ibsoln <52778946+ibsoln@users.noreply.github.com>
Date: Thu, 3 Feb 2022 17:58:03 +0000
Subject: [PATCH 17/19] DOC-9335 -- Updates  to new Xamarin P2P tutorial (#45)

---
 modules/ROOT/pages/_partials/p2p-sync-entry-skeleton.adoc | 3 +++
 modules/ROOT/pages/index.adoc                             | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/ROOT/pages/_partials/p2p-sync-entry-skeleton.adoc b/modules/ROOT/pages/_partials/p2p-sync-entry-skeleton.adoc
index a8a632d..8b0179d 100644
--- a/modules/ROOT/pages/_partials/p2p-sync-entry-skeleton.adoc
+++ b/modules/ROOT/pages/_partials/p2p-sync-entry-skeleton.adoc
@@ -34,6 +34,9 @@ This tutorial uses a simple inventory tracker app to demonstrate the peer-to-pee
 [.box]
 .Component
 * Couchbase Lite {param-version}
+* Visual Studio 2019+
+* .Net Core 3.1
+* Xamarin Forms 5.0.0.2012
 
 [.box]
 .Languages
diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc
index e8b3568..5119df2 100644
--- a/modules/ROOT/pages/index.adoc
+++ b/modules/ROOT/pages/index.adoc
@@ -323,7 +323,8 @@ include::partial$p2p-sync-entry-skeleton.adoc[]
 :param-language: C#
 :param-platform: Xamarin
 :param-module: dotnet
-:param-version: 2.8
+:param-version: 3.0
+
 include::partial$p2p-sync-entry-skeleton.adoc[]
 
 // END include P2P sync over websocket tutorials - one entry per language/platform

From cc6167a36eebdc5ad36f615f802effb273521288 Mon Sep 17 00:00:00 2001
From: ibsoln <52778946+ibsoln@users.noreply.github.com>
Date: Tue, 15 Feb 2022 09:59:31 +0000
Subject: [PATCH 18/19] QF220214-3 -- Hide selected tutorials (#46)

---
 modules/ROOT/pages/index.adoc | 193 +++++++++++++++++-----------------
 1 file changed, 98 insertions(+), 95 deletions(-)

diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc
index 5119df2..6c9e997 100644
--- a/modules/ROOT/pages/index.adoc
+++ b/modules/ROOT/pages/index.adoc
@@ -370,87 +370,89 @@ include::partial$p2p-sync-entry-skeleton.adoc[]
 // </div>
 // ++++
 
-[.column]
-[.data-filter-column]
-====== {empty}
-++++
-    <div data-category="beginner swift java javascript mobile developer" class="sub-heading two-column-heading">
-        <h3 class="text-color-brand-blue-secondary">Building a Cordova Plugin with Couchbase Lite</h3>
-        <div class="filter-info">
-++++
-pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>Mobile Developer</span>]
-++++
-        </div>
-    </div>
-++++
-[.content]
+// CORDOVA TUTORIAL
+// [.column]
+// [.data-filter-column]
+// ====== {empty}
+// ++++
+//     <div data-category="beginner swift java javascript mobile developer" class="sub-heading two-column-heading">
+//         <h3 class="text-color-brand-blue-secondary">Building a Cordova Plugin with Couchbase Lite</h3>
+//         <div class="filter-info">
+// ++++
+// pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>Mobile Developer</span>]
+// ++++
+//         </div>
+//     </div>
+// ++++
+// [.content]
 
-In this tutorial, you will learn how to use Couchbase Lite in a Cordova plugin for an Ionic project targeting iOS and Android.
-The user Interface is written in JavaScript while the business logic and data model is written in native Swift/Java.
+// In this tutorial, you will learn how to use Couchbase Lite in a Cordova plugin for an Ionic project targeting iOS and Android.
+// The user Interface is written in JavaScript while the business logic and data model is written in native Swift/Java.
 
-++++
-<div class="other-info-list">
-++++
+// ++++
+// <div class="other-info-list">
+// ++++
 
-[.box]
+// [.box]
 
-* xref:tutorials:hotel-lister:ios.adoc[Swift]
-* xref:tutorials:hotel-lister:android.adoc[Java]
+// * xref:tutorials:hotel-lister:ios.adoc[Swift]
+// * xref:tutorials:hotel-lister:android.adoc[Java]
 
-[.box]
-.Component
-* Couchbase Lite 2.1
+// [.box]
+// .Component
+// * Couchbase Lite 2.1
 
-[.box]
-.Languages
-* Swift
-* Java
-* Javascript
+// [.box]
+// .Languages
+// * Swift
+// * Java
+// * Javascript
 
-++++
-</div>
-++++
+// ++++
+// </div>
+// ++++
 
-[.column]
-[.data-filter-column]
-====== {empty}
-++++
-    <div data-category="beginner swift java javascript mobile developer" class="sub-heading two-column-heading">
-        <h3 class="text-color-brand-blue-secondary">Building a React Native Module with Couchbase Lite</h3>
-        <div class="filter-info">
-++++
-pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>Mobile Developer</span>]
-++++
-        </div>
-    </div>
-++++
-[.content]
+// REACT TUTORIAL
+// [.column]
+// [.data-filter-column]
+// ====== {empty}
+// ++++
+//     <div data-category="beginner swift java javascript mobile developer" class="sub-heading two-column-heading">
+//         <h3 class="text-color-brand-blue-secondary">Building a React Native Module with Couchbase Lite</h3>
+//         <div class="filter-info">
+// ++++
+// pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>Mobile Developer</span>]
+// ++++
+//         </div>
+//     </div>
+// ++++
+// [.content]
 
-In this tutorial, you will learn how to use Couchbase Lite in a React Native project for iOS and Android.
-The user Interface is written in JavaScript while the business logic and data model is written in native Swift/Java.
+// In this tutorial, you will learn how to use Couchbase Lite in a React Native project for iOS and Android.
+// The user Interface is written in JavaScript while the business logic and data model is written in native Swift/Java.
 
-++++
-<div class="other-info-list">
-++++
+// ++++
+// <div class="other-info-list">
+// ++++
 
-[.box]
+// [.box]
 
-* xref:tutorials:hotel-finder:ios.adoc[Swift]
-* xref:tutorials:hotel-finder:android.adoc[Java]
+// * xref:tutorials:hotel-finder:ios.adoc[Swift]
+// * xref:tutorials:hotel-finder:android.adoc[Java]
 
-[.box]
-.Component
-* Couchbase Lite 2.6
+// [.box]
+// .Component
+// * Couchbase Lite 2.6
 
-[.box]
-.Languages
-* Swift
-* Java
-* Javascript
+// [.box]
+// .Languages
+// * Swift
+// * Java
+// * Javascript
 
-++++
-</div>
-++++
+// ++++
+// </div>
+// ++++
 
 
 [.column]
@@ -490,42 +492,43 @@ A Xcode Playground to explore the Query API in Couchbase Lite 2.x. While the pla
 </div>
 ++++
 
-[.column]
-[.data-filter-column]
-====== {empty}
-++++
-    <div data-category="beginner android java dotnet mobile developer" class="sub-heading two-column-heading">
-        <h3 class="text-color-brand-blue-secondary">Android Recycler Views with Couchbase Lite</h3>
-        <div class="filter-info">
-++++
-pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>Mobile Developer</span>]
-++++
-        </div>
-    </div>
-++++
-[.content]
+// RECYCLER VIEW TUTORIAL
+// [.column]
+// [.data-filter-column]
+// ====== {empty}
+// ++++
+//     <div data-category="beginner android java dotnet mobile developer" class="sub-heading two-column-heading">
+//         <h3 class="text-color-brand-blue-secondary">Android Recycler Views with Couchbase Lite</h3>
+//         <div class="filter-info">
+// ++++
+// pass:attributes[<h5><img src="{url-icon-beginner}" alt="" />Beginner</h5><span>Mobile Developer</span>]
+// ++++
+//         </div>
+//     </div>
+// ++++
+// [.content]
 
-This tutorial will demonstrate how you can use Couchbase Lite as a data source for Recycler Views in your Android application.
+// This tutorial will demonstrate how you can use Couchbase Lite as a data source for Recycler Views in your Android application.
 
-++++
-<div class="other-info-list">
-++++
+// ++++
+// <div class="other-info-list">
+// ++++
 
-[.box]
+// [.box]
 
-* xref:tutorials:university-lister:android.adoc[Start Here]
+// * xref:tutorials:university-lister:android.adoc[Start Here]
 
-[.box]
-.Component
-* Couchbase Lite 2.1
+// [.box]
+// .Component
+// * Couchbase Lite 2.1
 
-[.box]
-.Languages
-* Java
+// [.box]
+// .Languages
+// * Java
 
-++++
-</div>
-++++
+// ++++
+// </div>
+// ++++
 
 [.column]
 [.data-filter-column]

From 2d795e3f912d02f6db059ac0d8cff98ec149c6f5 Mon Sep 17 00:00:00 2001
From: ibsoln <52778946+ibsoln@users.noreply.github.com>
Date: Mon, 21 Feb 2022 19:40:06 +0000
Subject: [PATCH 19/19] DOC-9336 -- Updates  to mobile workshop (#47)

---
 modules/ROOT/nav.adoc         |  6 +++---
 modules/ROOT/pages/index.adoc | 19 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc
index 890b5e1..b9c85e5 100644
--- a/modules/ROOT/nav.adoc
+++ b/modules/ROOT/nav.adoc
@@ -17,15 +17,15 @@ xref::session-storage:partial$nav.adoc[]
 include::profile-store:partial$nav.adoc[]
 
 .Couchbase Mobile
-* Travel Sample
-include::mobile-travel-sample:partial$nav.adoc[]
+// Couchbase Mobile Workshop
+include::mobile-travel-tutorial:partial$nav.adoc[]
 // Getting Started on iOS
 include::userprofile-sync:partial$nav.adoc[]
 // Getting Started on Xamarin
 include::userprofile-sync-xamarin:partial$nav.adoc[]
 // Getting Started on Android
 include::userprofile-sync-android:partial$nav.adoc[]
-
+// Peer-to-Peer
 include::cbl-p2p-sync-websockets:partial$nav.adoc[]
 
 // * xref:tutorials:swift-playground:overview.adoc[Xcode Playground]
diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc
index 6c9e997..976831d 100644
--- a/modules/ROOT/pages/index.adoc
+++ b/modules/ROOT/pages/index.adoc
@@ -626,6 +626,7 @@ pass:attributes[<h5><img src="{url-icon-intermediate}" alt="" />Intermediate</h5
 [.content]
 
 An in-depth walkthrough of the Couchbase Mobile capabilities on iOS, Android, Java (desktop) and .NET (UWP and Xamarin) platforms.
+
 At the end of this multi-part workshop, you should have a good understanding of how to architect a solution using Couchbase Mobile, including data modeling, sync, access control, channels, database CRUD and the query API in Couchbase Mobile.
 
 ++++
@@ -634,23 +635,23 @@ At the end of this multi-part workshop, you should have a good understanding of
 
 [.box]
 
-* xref:tutorials:mobile-travel-sample:introduction.adoc[Start Here]
-* xref:tutorials:mobile-travel-sample:swift/installation/index.adoc[iOS]
-* xref:tutorials:mobile-travel-sample:android/installation/index.adoc[Android]
-* xref:tutorials:mobile-travel-sample:java/installation/index.adoc[Java]
-* xref:tutorials:mobile-travel-sample:csharp/installation/index.adoc[.NET]
+* xref:tutorials:mobile-travel-tutorial:introduction.adoc[Start Here]
+* xref:tutorials:mobile-travel-tutorial:swift/installation/index.adoc[iOS]
+* xref:tutorials:mobile-travel-tutorial:android/installation/index.adoc[Android]
+* xref:tutorials:mobile-travel-tutorial:java/installation/index.adoc[Java]
+* xref:tutorials:mobile-travel-tutorial:csharp/installation/index.adoc[.NET]
 
 [.box]
 .Component
-* Couchbase Server 6.5
-* Couchbase Lite 2.8
-* Sync Gateway 2.8
+* Couchbase Server 7.0
+* Couchbase Lite 3.0
+* Sync Gateway 3.0
 
 [.box]
 .Languages
 * Swift
 * Java (Android and Desktop)
-* C#
+* C#/.Net/Xamarin
 
 ++++
 </div>