From 607ba3aec4ce19b18d9de7fe1e15ad812d7baca5 Mon Sep 17 00:00:00 2001
From: Victor Lee <victor@tigergraph.com>
Date: Tue, 23 Jul 2024 00:52:51 -0400
Subject: [PATCH 01/26] Update index.adoc

---
 home/modules/ROOT/pages/index.adoc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/home/modules/ROOT/pages/index.adoc b/home/modules/ROOT/pages/index.adoc
index a71eca4..1673718 100644
--- a/home/modules/ROOT/pages/index.adoc
+++ b/home/modules/ROOT/pages/index.adoc
@@ -2,7 +2,6 @@
 :navtitle: home
 :page-role: home
 
-
 ====
 * xref:4.1@tigergraph-server:release-notes:index.adoc[TigerGraph Server 4.1.0 Preview] was released on Aug. 30, 2024.
 

From 8235c28ce09604922df99933c27028bd411ca015 Mon Sep 17 00:00:00 2001
From: Victor Lee <victor@tigergraph.com>
Date: Tue, 23 Jul 2024 01:52:40 -0400
Subject: [PATCH 02/26] Update antora-playbook.yml


From 28d0d3a6611084c3c829c2d656045b242022a477 Mon Sep 17 00:00:00 2001
From: Victor Lee <victor@tigergraph.com>
Date: Fri, 20 Sep 2024 11:18:19 -0400
Subject: [PATCH 03/26] disable the "current" version alias

---
 antora-playbook.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/antora-playbook.yml b/antora-playbook.yml
index 921993f..259e257 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -74,6 +74,6 @@ asciidoc:
     - ./libs/tabs-block.js
 urls:
   html_extension_style: drop
-  latest_version_segment_strategy: redirect:from
-  latest_version_segment: current
+  #latest_version_segment_strategy: redirect:to
+  #latest_version_segment: current
   redirect_facility: netlify

From a0aa4d236f3457e55e96c317ac7e25e3cbb8713a Mon Sep 17 00:00:00 2001
From: Victor Lee <victor@tigergraph.com>
Date: Fri, 20 Sep 2024 11:33:56 -0400
Subject: [PATCH 04/26] switch the direction of url version alias behavior

---
 antora-playbook.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/antora-playbook.yml b/antora-playbook.yml
index 259e257..921993f 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -74,6 +74,6 @@ asciidoc:
     - ./libs/tabs-block.js
 urls:
   html_extension_style: drop
-  #latest_version_segment_strategy: redirect:to
-  #latest_version_segment: current
+  latest_version_segment_strategy: redirect:from
+  latest_version_segment: current
   redirect_facility: netlify

From fe74075a39255588e6161a10c96ecc25cbb9df96 Mon Sep 17 00:00:00 2001
From: Victor Lee <victor@tigergraph.com>
Date: Wed, 25 Sep 2024 23:48:00 -0400
Subject: [PATCH 05/26] DOC-2230 fix cloudbeta redirects - cloud-dev branch

---
 netlify.toml | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/netlify.toml b/netlify.toml
index ba2af5c..fa9893a 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -42,21 +42,8 @@
     to = "/cloud/support/faqs"
 
 [[redirects]]
-    from = "/cloud/start/get_started"
-    to = "/cloud/current/start/get_started"
-
-[[redirects]]
-    from = "/cloudbeta/overview"
-    to = "/cloudbeta/current/overview"
-
-# cloud and cloudbeta- general redirect from "current" to "main"
-[[redirects]]
-    from = "/cloud/current/*"
-    to = "/cloud/main/:splat"
-
-[[redirects]]
-    from = "/cloudbeta/current/*"
-    to = "/cloudbeta/main/:splat"
+    from = "/cloud4/current/*"
+    to = "/cloud4/main/:splat"
 
 # redirects for language reference
 [[redirects]]

From 170eb60a183c62f51689ebde248f043ca5a18513 Mon Sep 17 00:00:00 2001
From: Chengrun Peng <chengrun.peng@tigergraph.com>
Date: Thu, 26 Sep 2024 16:30:03 +0800
Subject: [PATCH 06/26] Update antora-playbook.yml

---
 antora-playbook.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/antora-playbook.yml b/antora-playbook.yml
index 921993f..34f8367 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -2,7 +2,7 @@ site:
   title: Docs
   # Special Instructions
   # In order to document the subtle configuration differences between
-  # the main branch and the staging branch, this file should contain BOTH configurations.
+  # the main branch and the staging branch, this file should contain BOTH configurations..
 
   # In each section (e.g. Section 1), there should be one or more lines of code for the
   # main (Prod) branch, followed by corresponding lines of code for the staging branch.keys:

From d475a51384ae25c850b534e5be1b0af53210c747 Mon Sep 17 00:00:00 2001
From: Chengrun Peng <chengrun.peng@tigergraph.com>
Date: Fri, 27 Sep 2024 11:16:28 +0800
Subject: [PATCH 07/26] Update antora-playbook.yml

---
 antora-playbook.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/antora-playbook.yml b/antora-playbook.yml
index 34f8367..420d4fa 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -6,6 +6,7 @@ site:
 
   # In each section (e.g. Section 1), there should be one or more lines of code for the
   # main (Prod) branch, followed by corresponding lines of code for the staging branch.keys:
+  
 
   # If this is the main (prod) branch, then comment out the staging branch config.
   # If this is the staging branch, then comment out the main branch config.

From 11fc2c100647083d0afcf4eb4fc9b710749946dc Mon Sep 17 00:00:00 2001
From: Sam Zhou <sam.zhou@tigergraph.com>
Date: Fri, 27 Sep 2024 14:27:13 +0800
Subject: [PATCH 08/26] Revert "Update antora-playbook.yml"

This reverts commit 7e95b1916e113b7605aaf570fa6766dd4b61e79f.
---
 antora-playbook.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/antora-playbook.yml b/antora-playbook.yml
index 420d4fa..34f8367 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -6,7 +6,6 @@ site:
 
   # In each section (e.g. Section 1), there should be one or more lines of code for the
   # main (Prod) branch, followed by corresponding lines of code for the staging branch.keys:
-  
 
   # If this is the main (prod) branch, then comment out the staging branch config.
   # If this is the staging branch, then comment out the main branch config.

From cedf2e3545f0cc96fdf6820fcedcba4439ba7048 Mon Sep 17 00:00:00 2001
From: Sam Zhou <sam.zhou@tigergraph.com>
Date: Tue, 8 Oct 2024 14:29:10 +0800
Subject: [PATCH 09/26] fixed the branch issue

---
 antora-playbook.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/antora-playbook.yml b/antora-playbook.yml
index 34f8367..4471ab0 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -46,7 +46,7 @@ content:
     - url: https://github.com/tigergraph/gui-docs.git
       branches: [3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9.3, 3.10.1, 4.1.o]
     - url: https://github.com/tigergraph/cloud-docs.git
-      branches: [main]
+      branches: [cloud-dev]
       start_paths: [modules/cloud, modules/cloudbeta]
     - url: https://github.com/tigergraph/tigdsl-docs.git
       branches: [3.7, 3.8, 3.9.2]

From 948928db70e089e117f48517dbc80979a011d4b7 Mon Sep 17 00:00:00 2001
From: Sam Zhou <sam.zhou@tigergraph.com>
Date: Tue, 8 Oct 2024 14:38:10 +0800
Subject: [PATCH 10/26] Update redirects

---
 netlify.toml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/netlify.toml b/netlify.toml
index fa9893a..ed0a176 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -41,6 +41,19 @@
     from = "/cloud/tigergraph-cloud-faqs"
     to = "/cloud/support/faqs"
 
+[[redirects]]
+    from = "/cloud/start/get_started"
+    to = "/cloud/current/start/get_started"
+
+[[redirects]]
+    from = "/cloud4/overview"
+    to = "/cloud4/current/overview"
+
+# cloud and cloudbeta- general redirect from "current" to "main"
+[[redirects]]
+    from = "/cloud/current/*"
+    to = "/cloud/main/:splat"
+
 [[redirects]]
     from = "/cloud4/current/*"
     to = "/cloud4/main/:splat"

From 7a1c4e3219cdc8747ac6738d82334be4875f5f26 Mon Sep 17 00:00:00 2001
From: Sam Zhou <sam.zhou@tigergraph.com>
Date: Tue, 8 Oct 2024 14:40:31 +0800
Subject: [PATCH 11/26] updated url

---
 antora-playbook.yml                | 4 ++--
 home/modules/ROOT/pages/index.adoc | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/antora-playbook.yml b/antora-playbook.yml
index 4471ab0..4e6ec31 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -47,7 +47,7 @@ content:
       branches: [3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9.3, 3.10.1, 4.1.o]
     - url: https://github.com/tigergraph/cloud-docs.git
       branches: [cloud-dev]
-      start_paths: [modules/cloud, modules/cloudbeta]
+      start_paths: [modules/cloud, modules/cloud4]
     - url: https://github.com/tigergraph/tigdsl-docs.git
       branches: [3.7, 3.8, 3.9.2]
     - url: https://github.com/tigergraph/gsql-docs.git
@@ -69,7 +69,7 @@ ui:
     snapshot: true
 asciidoc:
   attributes:
-    page-component-order: '!home, cloud, cloudbeta, cloudBeta, tigergraph-server, gsql-ref, gui, insights, graph-ml, pytigergraph, ml-workbench, graphql, tg-copilot'
+    page-component-order: '!home, cloud, cloud4, tigergraph-server, gsql-ref, gui, insights, graph-ml, pytigergraph, ml-workbench, graphql, tg-copilot'
   extensions:
     - ./libs/tabs-block.js
 urls:
diff --git a/home/modules/ROOT/pages/index.adoc b/home/modules/ROOT/pages/index.adoc
index 1673718..d29e82b 100644
--- a/home/modules/ROOT/pages/index.adoc
+++ b/home/modules/ROOT/pages/index.adoc
@@ -7,7 +7,7 @@
 
 * xref:3.10@tigergraph-server:release-notes:index.adoc#_fixed_and_improved_in_3_10_1[TigerGraph Server 3.10.1] was released on May 7, 2024.
 
-* xref:cloudBeta:overview:index.adoc[TigerGraph Cloud 4.0 beta] was released on Apr. 29, 2024.
+* xref:cloud4:overview:index.adoc[TigerGraph Cloud 4 beta] was released on Apr. 29, 2024.
 
 Click here to see other xref:index.adoc#_announcements[].
 ====
@@ -32,7 +32,7 @@ A fully-managed cloud database built on the fast and highly scalable TigerGraph
 
 xref:cloud:start:overview.adoc[TigerGraph Cloud] |
 xref:cloud:start:get_started.adoc[Get Started] |
-xref:cloudBeta:overview:index.adoc[TigerGraph Cloud 4.0]
+xref:cloud4:overview:index.adoc[TigerGraph Cloud 4]
 
 ¦
 image:tg_suites-homecard.png[alt=TigerGraphSuite,width=74,height=74]
@@ -84,7 +84,7 @@ Recent News and Releases
 ====
 * xref:1.7@pytigergraph:release-notes:index.adoc[pyTigerGraph 1.7] was released on Aug. 21, 2024.
 * xref:0.9@tg-copilot:intro:index.adoc[CoPilot 0.9] was released on Aug. 19, 2024.
-* xref:cloudBeta:overview:index.adoc[TigerGraph Cloud 4.0] - TigerGraph Cloud 4.0 beta version was released on Apr. 29, 2024.
+* xref:cloud4:overview:index.adoc[TigerGraph Cloud 4] - TigerGraph Cloud 4 beta version was released on Apr. 29, 2024.
 //* xref:1.6@pytigergraph:release-notes:index.adoc[pyTigerGraph 1.6] was released on Apr. 29, 2024.
 //* xref:tigergraph-server:release-notes:index.adoc[TigerGraph 3.10.0] preview version was released on Mar. 13, 2024.
 * xref:3.9@tigergraph-server:release-notes:index.adoc#_fixed_and_improved_in_3_9_3_3[TigerGraph 3.9.3-3] was released on Feb. 15, 2024.

From 40e385af0d7afcaef1be751266a571e8797179fa Mon Sep 17 00:00:00 2001
From: Sam Zhou <sam.zhou@tigergraph.com>
Date: Tue, 8 Oct 2024 14:55:21 +0800
Subject: [PATCH 12/26] Update antora-playbook.yml

---
 antora-playbook.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/antora-playbook.yml b/antora-playbook.yml
index 4e6ec31..d579cfd 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -46,7 +46,7 @@ content:
     - url: https://github.com/tigergraph/gui-docs.git
       branches: [3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9.3, 3.10.1, 4.1.o]
     - url: https://github.com/tigergraph/cloud-docs.git
-      branches: [cloud-dev]
+      branches: [dev]
       start_paths: [modules/cloud, modules/cloud4]
     - url: https://github.com/tigergraph/tigdsl-docs.git
       branches: [3.7, 3.8, 3.9.2]

From 11b298a41ff5bc1b719f4dcfdddbc7d5188050d1 Mon Sep 17 00:00:00 2001
From: Sam Zhou <sam.zhou@tigergraph.com>
Date: Thu, 10 Oct 2024 10:23:23 +0800
Subject: [PATCH 13/26] Update change

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

diff --git a/home/modules/ROOT/pages/index.adoc b/home/modules/ROOT/pages/index.adoc
index d29e82b..bf68c31 100644
--- a/home/modules/ROOT/pages/index.adoc
+++ b/home/modules/ROOT/pages/index.adoc
@@ -7,7 +7,7 @@
 
 * xref:3.10@tigergraph-server:release-notes:index.adoc#_fixed_and_improved_in_3_10_1[TigerGraph Server 3.10.1] was released on May 7, 2024.
 
-* xref:cloud4:overview:index.adoc[TigerGraph Cloud 4 beta] was released on Apr. 29, 2024.
+* xref:cloud4:overview:index.adoc[TigerGraph Cloud 4] was released on Apr. 29, 2024.
 
 Click here to see other xref:index.adoc#_announcements[].
 ====

From cd1cbfec77886ea7c2b8c90f34e8737721e60b52 Mon Sep 17 00:00:00 2001
From: Sam Zhou <sam.zhou@tigergraph.com>
Date: Thu, 10 Oct 2024 10:31:54 +0800
Subject: [PATCH 14/26] update

---
 antora-playbook.yml                | 2 +-
 home/modules/ROOT/pages/index.adoc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/antora-playbook.yml b/antora-playbook.yml
index d579cfd..7367607 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -34,7 +34,7 @@ content:
   # What branch, main or some staging, e.g. cloud-dev?
   sources:
     - url: https://github.com/tigergraph/doc-site.git
-      branches: [main]
+      branches: [cloud-dev]
     #- url: https://github.com/tigergraph/doc-site.git
     #  branches: [staging]
 
diff --git a/home/modules/ROOT/pages/index.adoc b/home/modules/ROOT/pages/index.adoc
index bf68c31..d41aeed 100644
--- a/home/modules/ROOT/pages/index.adoc
+++ b/home/modules/ROOT/pages/index.adoc
@@ -30,7 +30,7 @@ image:cloudIcon-homecard.png[alt=TigerGraphCloud,width=74,height=74]
 
 A fully-managed cloud database built on the fast and highly scalable TigerGraph Enterprise Server engine.
 
-xref:cloud:start:overview.adoc[TigerGraph Cloud] |
+xref:cloud:start:overview.adoc[TigerGraph Cloud Classic] |
 xref:cloud:start:get_started.adoc[Get Started] |
 xref:cloud4:overview:index.adoc[TigerGraph Cloud 4]
 

From 6a025c149350dd29e1e9eade2c565138cebe9e33 Mon Sep 17 00:00:00 2001
From: Sam Zhou <sam.zhou@tigergraph.com>
Date: Fri, 25 Oct 2024 16:30:22 +0800
Subject: [PATCH 15/26] Updateed the order

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

diff --git a/home/modules/ROOT/pages/index.adoc b/home/modules/ROOT/pages/index.adoc
index c41167d..b7d6e16 100644
--- a/home/modules/ROOT/pages/index.adoc
+++ b/home/modules/ROOT/pages/index.adoc
@@ -30,9 +30,9 @@ image:cloudIcon-homecard.png[alt=TigerGraphCloud,width=74,height=74]
 
 A fully-managed cloud database built on the fast and highly scalable TigerGraph Enterprise Server engine.
 
-xref:cloud:start:overview.adoc[TigerGraph Cloud Classic] |
-xref:cloud:start:get_started.adoc[Get Started] |
-xref:cloud4:overview:index.adoc[TigerGraph Cloud 4]
+xref:cloud4:overview:index.adoc[TigerGraph Cloud 4] |
+xref:cloud4:get-started:index.adoc[Get Started] |
+xref:cloud:start:overview.adoc[TigerGraph Cloud Classic]
 
 ¦
 image:tg_suites-homecard.png[alt=TigerGraphSuite,width=74,height=74]

From 5171f4081b9ffe7120ff9e26e06abbb67e42c17e Mon Sep 17 00:00:00 2001
From: Sam Zhou <sam.zhou@tigergraph.com>
Date: Sun, 27 Oct 2024 19:41:39 +0800
Subject: [PATCH 16/26] update

---
 antora-playbook.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/antora-playbook.yml b/antora-playbook.yml
index ea6b5ea..3d28903 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -43,15 +43,15 @@ content:
       start_paths: home
     - url: https://github.com/tigergraph/cloud-docs.git
       branches: [dev]
-      start_paths: [modules/cloud, modules/cloudbeta]
+      start_paths: [modules/cloud, modules/cloud4]
     - url: https://github.com/tigergraph/server-docs.git
-      branches: [3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9.3, 3.10.1, 4.1.o]
+      branches: [3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9.3, 3.10.1, 3.11.0, 4.1.o]
     - url: https://github.com/tigergraph/gsql-docs.git
-      branches: [3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9.3, 3.10.1, 4.1.o]
+      branches: [3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9.3, 3.10.1, 3.11.0, 4.1.o]
     - url: https://github.com/tigergraph/gui-docs.git
-      branches: [3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9.3, 3.10.1, 4.1.o]
-    - url: https://github.com/tigergraph/insights-docs
-      branches: [3.7, 3.8, 3.9.3, 3.10.1, 4.1.o]
+      branches: [3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9.3, 3.10.1, 3.11.0, 4.1.o]
+    - url: https://github.com/tigergraph/insights-docs.git
+      branches: [3.7, 3.8, 3.9.3, 3.10.1, 3.11.0, 4.1.o]
     - url: https://github.com/tigergraph/tigdsl-docs.git
       branches: [3.7, 3.8, 3.9.2]
     - url: https://github.com/tigergraph/tigergraphql.git
@@ -64,12 +64,12 @@ content:
       branches: [main]
 ui:
   bundle:
-    url: https://github.com/tigergraph/antora-ui/blob/main/build/ui-bundle.zip?raw=true
-    #url: /Users/victorlee/Documents/GitHub1/Docs/antora-ui/build/ui-bundle.zip?raw=true
+    url: https://github.com/tigergraph/antora-ui/blob/cloud-dev/build/ui-bundle.zip?raw=true
+    #url: /Users/sam/Documents/GitHub/antora-ui/build/ui-bundle.zip
     snapshot: true
 asciidoc:
   attributes:
-    page-component-order: '!home, cloud, cloud4, tigergraph-server, gsql-ref, gui, insights, graph-ml, pytigergraph, ml-workbench, graphql, tg-copilot'
+    page-component-order: '!home, cloud4, tigergraph-server, gsql-ref, gui, insights, graph-ml, pytigergraph, ml-workbench, graphql, tg-copilot, cloud'
   extensions:
     - ./libs/tabs-block.js
 urls:

From 17a65b7f8dbf03352fb835dbb38033a1208c43d0 Mon Sep 17 00:00:00 2001
From: Sam Zhou <sam.zhou@tigergraph.com>
Date: Sun, 27 Oct 2024 19:58:08 +0800
Subject: [PATCH 17/26] Update

---
 antora-playbook.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/antora-playbook.yml b/antora-playbook.yml
index 3d28903..51f67ec 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -45,21 +45,21 @@ content:
       branches: [dev]
       start_paths: [modules/cloud, modules/cloud4]
     - url: https://github.com/tigergraph/server-docs.git
-      branches: [3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9.3, 3.10.1, 3.11.0, 4.1.o]
+      branches: [3.6, 3.9.3, 3.10.1, 3.11.0, 4.1.o]
     - url: https://github.com/tigergraph/gsql-docs.git
-      branches: [3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9.3, 3.10.1, 3.11.0, 4.1.o]
+      branches: [3.6, 3.9.3, 3.10.1, 3.11.0, 4.1.o]
     - url: https://github.com/tigergraph/gui-docs.git
-      branches: [3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9.3, 3.10.1, 3.11.0, 4.1.o]
-    - url: https://github.com/tigergraph/insights-docs.git
-      branches: [3.7, 3.8, 3.9.3, 3.10.1, 3.11.0, 4.1.o]
+      branches: [3.6, 3.9.3, 3.10.1, 3.11.0, 4.1.o]
+    - url: https://github.com/tigergraph/insights-docs
+      branches: [3.9.3, 3.10.1, 3.11.0, 4.1.o]
     - url: https://github.com/tigergraph/tigdsl-docs.git
-      branches: [3.7, 3.8, 3.9.2]
+      branches: ["3.10"]
     - url: https://github.com/tigergraph/tigergraphql.git
-      branches: [3.7, 3.8, 3.9]
+      branches: [3.9]
     - url: https://github.com/tigergraph/pytigergraph-docs
-      branches: ["v1.0", "v1.1", "v1.2","v1.3","v1.4","v1.5","v1.6", "v1.7"]
+      branches: ["v1.5","v1.6", "v1.7"]
     - url: https://github.com/tigergraph/mlworkbench-docs.git
-      branches: [1.0, 1.1, 1.2, 1.3, 1.4]
+      branches: [1.4]
     - url: https://github.com/tigergraph/copilot-docs.git
       branches: [main]
 ui:

From 93c8cb28c281ac6ae31144812832dbf6c603d35a Mon Sep 17 00:00:00 2001
From: Sam Zhou <sam.zhou@tigergraph.com>
Date: Sun, 27 Oct 2024 20:19:50 +0800
Subject: [PATCH 18/26] update antora playbook

---
 antora-playbook.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/antora-playbook.yml b/antora-playbook.yml
index 51f67ec..6efb12b 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -2,7 +2,7 @@ site:
   title: Docs
   # Special Instructions
   # In order to document the subtle configuration differences between
-  # the main branch and the staging branch, this file should contain BOTH configurations..
+  # the main branch and the staging branch, this file should contain BOTH configurations.
 
   # In each section (e.g. Section 1), there should be one or more lines of code for the
   # main (Prod) branch, followed by corresponding lines of code for the staging branch.keys:
@@ -34,7 +34,7 @@ content:
   # What branch, main or some staging, e.g. cloud-dev?
   sources:
     - url: https://github.com/tigergraph/doc-site.git
-      branches: [cloud-dev]
+      branches: [main]
     #- url: https://github.com/tigergraph/doc-site.git
     #  branches: [staging]
 
@@ -43,7 +43,7 @@ content:
       start_paths: home
     - url: https://github.com/tigergraph/cloud-docs.git
       branches: [dev]
-      start_paths: [modules/cloud, modules/cloud4]
+      start_paths: [modules/cloud, modules/cloudbeta]
     - url: https://github.com/tigergraph/server-docs.git
       branches: [3.6, 3.9.3, 3.10.1, 3.11.0, 4.1.o]
     - url: https://github.com/tigergraph/gsql-docs.git
@@ -65,15 +65,15 @@ content:
 ui:
   bundle:
     url: https://github.com/tigergraph/antora-ui/blob/cloud-dev/build/ui-bundle.zip?raw=true
-    #url: /Users/sam/Documents/GitHub/antora-ui/build/ui-bundle.zip
+    #url: /Users/victorlee/Documents/GitHub1/Docs/antora-ui/build/ui-bundle.zip?raw=true
     snapshot: true
 asciidoc:
   attributes:
-    page-component-order: '!home, cloud4, tigergraph-server, gsql-ref, gui, insights, graph-ml, pytigergraph, ml-workbench, graphql, tg-copilot, cloud'
+    page-component-order: '!home, tigergraph-server, gsql-ref, cloud, cloudbeta, cloudBeta, gui, insights, graph-ml, pytigergraph, ml-workbench, graphql, tg-copilot'
   extensions:
     - ./libs/tabs-block.js
 urls:
   html_extension_style: drop
   latest_version_segment_strategy: redirect:from
   latest_version_segment: current
-  redirect_facility: netlify
+  redirect_facility: netlify
\ No newline at end of file

From cce6200267c008f8cf788c84270411ee694b9930 Mon Sep 17 00:00:00 2001
From: Sam Zhou <sam.zhou@tigergraph.com>
Date: Sun, 27 Oct 2024 20:20:03 +0800
Subject: [PATCH 19/26] update

---
 antora-playbook.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/antora-playbook.yml b/antora-playbook.yml
index 6efb12b..bfa510f 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -34,7 +34,7 @@ content:
   # What branch, main or some staging, e.g. cloud-dev?
   sources:
     - url: https://github.com/tigergraph/doc-site.git
-      branches: [main]
+      branches: [cloud-dev]
     #- url: https://github.com/tigergraph/doc-site.git
     #  branches: [staging]
 
@@ -43,7 +43,7 @@ content:
       start_paths: home
     - url: https://github.com/tigergraph/cloud-docs.git
       branches: [dev]
-      start_paths: [modules/cloud, modules/cloudbeta]
+      start_paths: [modules/cloud, modules/cloud4]
     - url: https://github.com/tigergraph/server-docs.git
       branches: [3.6, 3.9.3, 3.10.1, 3.11.0, 4.1.o]
     - url: https://github.com/tigergraph/gsql-docs.git
@@ -69,7 +69,7 @@ ui:
     snapshot: true
 asciidoc:
   attributes:
-    page-component-order: '!home, tigergraph-server, gsql-ref, cloud, cloudbeta, cloudBeta, gui, insights, graph-ml, pytigergraph, ml-workbench, graphql, tg-copilot'
+    page-component-order: '!home, tigergraph-server, gsql-ref, cloud4, gui, insights, graph-ml, pytigergraph, ml-workbench, graphql, tg-copilot, cloud'
   extensions:
     - ./libs/tabs-block.js
 urls:

From 7574a87294d01e2f01dec9443eff8f35f437564a Mon Sep 17 00:00:00 2001
From: Victor Lee <victor@tigergraph.com>
Date: Mon, 28 Oct 2024 01:53:28 -0400
Subject: [PATCH 20/26] Update branch names for server, gsql, gui, and insights

---
 antora-playbook.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/antora-playbook.yml b/antora-playbook.yml
index bfa510f..c0ed238 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -45,13 +45,13 @@ content:
       branches: [dev]
       start_paths: [modules/cloud, modules/cloud4]
     - url: https://github.com/tigergraph/server-docs.git
-      branches: [3.6, 3.9.3, 3.10.1, 3.11.0, 4.1.o]
+      branches: [3.6, 3.9, "3.10", 3.11, 4.1]
     - url: https://github.com/tigergraph/gsql-docs.git
-      branches: [3.6, 3.9.3, 3.10.1, 3.11.0, 4.1.o]
+      branches: [3.6, 3.9, "3.10", 3.11, 4.1]
     - url: https://github.com/tigergraph/gui-docs.git
-      branches: [3.6, 3.9.3, 3.10.1, 3.11.0, 4.1.o]
+      branches: [3.6, 3.9, "3.10", 3.11, 4.1]
     - url: https://github.com/tigergraph/insights-docs
-      branches: [3.9.3, 3.10.1, 3.11.0, 4.1.o]
+      branches: [3.6, 3.9, "3.10", 3.11, 4.1]
     - url: https://github.com/tigergraph/tigdsl-docs.git
       branches: ["3.10"]
     - url: https://github.com/tigergraph/tigergraphql.git
@@ -76,4 +76,4 @@ urls:
   html_extension_style: drop
   latest_version_segment_strategy: redirect:from
   latest_version_segment: current
-  redirect_facility: netlify
\ No newline at end of file
+  redirect_facility: netlify

From d3217934881cd1a53760d6962e71c50a11bc0738 Mon Sep 17 00:00:00 2001
From: Lin Yu <lin.yu@tigergraph.com>
Date: Wed, 30 Oct 2024 13:54:11 +0800
Subject: [PATCH 21/26] add mailto

---
 netlify.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netlify.toml b/netlify.toml
index ed0a176..28eb3bc 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -6,7 +6,7 @@
 [[headers]]
   for = "/*"
   [headers.values]
-    Content-Security-Policy = "default-src * 'unsafe-inline' 'unsafe-eval'; script-src * 'unsafe-inline' 'unsafe-eval' https://cdnjs.cloudflare.com; connect-src * 'unsafe-inline'; img-src * data: blob: 'unsafe-inline'; frame-src *; style-src * 'unsafe-inline';"
+    Content-Security-Policy = "default-src * 'unsafe-inline' 'unsafe-eval'; script-src * 'unsafe-inline' 'unsafe-eval' https://cdnjs.cloudflare.com; connect-src * 'unsafe-inline'; img-src * data: blob: 'unsafe-inline'; frame-src * mailto: ; style-src * 'unsafe-inline';"
     X-Content-Type-Options = "nosniff"
     X-Frame-Options = "DENY"
 

From fa1ba53f9311dae2c1f7b3355c1a0b5241fa00ff Mon Sep 17 00:00:00 2001
From: Sam Zhou <sam.zhou@tigergraph.com>
Date: Mon, 4 Nov 2024 18:17:42 +0800
Subject: [PATCH 22/26] Add GA release time

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

diff --git a/home/modules/ROOT/pages/index.adoc b/home/modules/ROOT/pages/index.adoc
index 82d2cdf..abd027f 100644
--- a/home/modules/ROOT/pages/index.adoc
+++ b/home/modules/ROOT/pages/index.adoc
@@ -3,13 +3,16 @@
 :page-role: home
 
 ====
+
+* xref:cloud4:overview:index.adoc[TigerGraph Cloud 4] was released on Nov 6, 2024.
+
 * xref:3.11@tigergraph-server:release-notes:index.adoc[TigerGraph Server 3.11.0 Preview] was released on Oct 25, 2024.
 
 * xref:3.10@tigergraph-server:release-notes:index.adoc#_fixed_and_improved_in_3_10_2[TigerGraph Server 3.10.2] was released on Oct 18, 2024.
 
 * xref:4.1@tigergraph-server:release-notes:index.adoc[TigerGraph Server 4.1.0 Preview] was released on Aug. 30, 2024.
 
-* xref:cloud4:overview:index.adoc[TigerGraph Cloud 4] was released on Apr. 29, 2024.
+* xref:cloud4:overview:index.adoc[TigerGraph Cloud 4 beta] was released on Apr. 29, 2024.
 
 Click here to see other xref:index.adoc#_announcements[]!
 ====

From 50feb3d59ab676d1ce08f4b301c9f88f3af548f5 Mon Sep 17 00:00:00 2001
From: Sam Zhou <sam.zhou@tigergraph.com>
Date: Mon, 4 Nov 2024 18:24:00 +0800
Subject: [PATCH 23/26] Add redirects

---
 netlify.toml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/netlify.toml b/netlify.toml
index 28eb3bc..24da420 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -49,6 +49,11 @@
     from = "/cloud4/overview"
     to = "/cloud4/current/overview"
 
+# redirect cloudbeta to cloud4
+[[redirects]]
+    from = "/cloudBeta"
+    to = "/cloud4/main/overview"
+
 # cloud and cloudbeta- general redirect from "current" to "main"
 [[redirects]]
     from = "/cloud/current/*"

From 289f9287e59d4b7e6f5d4e8027fec635f7a8c7f6 Mon Sep 17 00:00:00 2001
From: Sam Zhou <sam.zhou@tigergraph.com>
Date: Wed, 6 Nov 2024 16:50:59 +0800
Subject: [PATCH 24/26] Add beta back

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

diff --git a/home/modules/ROOT/pages/index.adoc b/home/modules/ROOT/pages/index.adoc
index adcdedd..a5b576a 100644
--- a/home/modules/ROOT/pages/index.adoc
+++ b/home/modules/ROOT/pages/index.adoc
@@ -22,9 +22,9 @@ image:cloudIcon-homecard.png[alt=TigerGraphCloud,width=74,height=74]
 
 A fully-managed cloud database built on the fast and highly scalable TigerGraph Enterprise Server engine.
 
-xref:cloud4:overview:index.adoc[TigerGraph Cloud 4] |
+xref:cloud:start:overview.adoc[TigerGraph Cloud Classic] |
 xref:cloud4:get-started:index.adoc[Get Started] |
-xref:cloud:start:overview.adoc[TigerGraph Cloud Classic]
+xref:cloud4:overview:index.adoc[TigerGraph Cloud 4 Beta]
 
 ¦
 image:tg_suites-homecard.png[alt=TigerGraphSuite,width=74,height=74]
@@ -79,7 +79,7 @@ Recent News and Releases
 * xref:4.1@tigergraph-server:release-notes:index.adoc[TigerGraph Server 4.1.0 Preview] was released on Aug. 30, 2024.
 * xref:1.7@pytigergraph:release-notes:index.adoc[pyTigerGraph 1.7] was released on Aug. 21, 2024.
 * xref:tg-copilot:intro:index.adoc[CoPilot 0.9] was released on Aug. 19, 2024.
-* xref:cloud4:overview:index.adoc[TigerGraph Cloud 4.0] - TigerGraph Cloud 4.0 beta version was released on Apr. 29, 2024.
+* xref:cloud4:overview:index.adoc[TigerGraph Cloud 4] - TigerGraph Cloud 4 beta version was released on Apr. 29, 2024.
 //* xref:1.6@pytigergraph:release-notes:index.adoc[pyTigerGraph 1.6] was released on Apr. 29, 2024.
 //* xref:tigergraph-server:release-notes:index.adoc[TigerGraph 3.10.0] preview version was released on Mar. 13, 2024.
 * xref:3.9@tigergraph-server:release-notes:index.adoc#_fixed_and_improved_in_3_9_3_3[TigerGraph 3.9.3-3] was released on Feb. 15, 2024.

From 4a82950356a25a8e7d78adcecb4017749cbc0ab2 Mon Sep 17 00:00:00 2001
From: Victor Lee <victor@tigergraph.com>
Date: Thu, 7 Nov 2024 00:29:23 -0500
Subject: [PATCH 25/26] touch file to force build

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

diff --git a/home/modules/ROOT/pages/index.adoc b/home/modules/ROOT/pages/index.adoc
index a5b576a..c9c1b0f 100644
--- a/home/modules/ROOT/pages/index.adoc
+++ b/home/modules/ROOT/pages/index.adoc
@@ -1,7 +1,7 @@
 = TigerGraph Documentation
 :navtitle: home
 :page-role: home
-
+ 
 Click here to see xref:index.adoc#_announcements[Release Notes and Announcements]!
 
 == Get to Know TigerGraph Products

From 5fd16c695110ec7aab1251688828fb95c0d4e8c3 Mon Sep 17 00:00:00 2001
From: Sam Zhou <sam.zhou@tigergraph.com>
Date: Mon, 20 Jan 2025 16:55:24 +0800
Subject: [PATCH 26/26] Update savanna

---
 antora-playbook.yml                |  4 ++--
 home/modules/ROOT/pages/index.adoc |  8 ++++----
 netlify.toml                       | 16 +++++++++++++---
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/antora-playbook.yml b/antora-playbook.yml
index ea2b252..5eba8fb 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -43,7 +43,7 @@ content:
       start_paths: home
     - url: https://github.com/tigergraph/cloud-docs.git
       branches: [dev]
-      start_paths: [modules/cloud, modules/cloud4]
+      start_paths: [modules/cloud, modules/savanna]
     - url: https://github.com/tigergraph/server-docs.git
       branches: [3.6, 3.9, "3.10", 3.11, 4.1]
     - url: https://github.com/tigergraph/gsql-docs.git
@@ -69,7 +69,7 @@ ui:
     snapshot: true
 asciidoc:
   attributes:
-    page-component-order: '!home, tigergraph-server, gsql-ref, cloud4, gui, insights, graph-ml, pytigergraph, ml-workbench, graphql, tg-copilot, cloud'
+    page-component-order: '!home, tigergraph-server, gsql-ref, savanna, gui, insights, graph-ml, pytigergraph, ml-workbench, graphql, tg-copilot, cloud'
   extensions:
     - ./libs/tabs-block.js
 urls:
diff --git a/home/modules/ROOT/pages/index.adoc b/home/modules/ROOT/pages/index.adoc
index 6953c64..035c02d 100644
--- a/home/modules/ROOT/pages/index.adoc
+++ b/home/modules/ROOT/pages/index.adoc
@@ -23,9 +23,9 @@ image:cloudIcon-homecard.png[alt=TigerGraphCloud,width=74,height=74]
 
 A fully-managed cloud database built on the fast and highly scalable TigerGraph Enterprise Server engine.
 
-xref:cloud:start:overview.adoc[TigerGraph Cloud Classic] |
-xref:cloud4:get-started:index.adoc[Get Started] |
-xref:cloud4:overview:index.adoc[TigerGraph Cloud 4 Beta]
+xref:savanna:overview:index.adoc[TigerGraph Savanna]|
+xref:savanna:get-started:index.adoc[Get Started] |
+xref:cloud:start:overview.adoc[TigerGraph Cloud Classic] 
 
 ¦
 image:tg_suites-homecard.png[alt=TigerGraphSuite,width=74,height=74]
@@ -81,7 +81,7 @@ Recent News and Releases
 * xref:3.10@tigergraph-server:release-notes:index.adoc#_fixed_and_improved_in_3_10_2[TigerGraph Server 3.10.2] was released on Oct 18, 2024.
 //* xref:4.1@tigergraph-server:release-notes:index.adoc[TigerGraph Server 4.1.0 Preview] was released on Aug. 30, 2024.
 * xref:tg-copilot:intro:index.adoc[CoPilot 0.9] was released on Aug. 19, 2024.
-* xref:cloud4:overview:index.adoc[TigerGraph Cloud 4] - TigerGraph Cloud 4 beta version was released on Apr. 29, 2024.
+* xref:savanna:overview:index.adoc[TigerGraph Savanna] - TigerGraph Savanna beta version was released on Apr. 29, 2024.
 //* xref:1.6@pytigergraph:release-notes:index.adoc[pyTigerGraph 1.6] was released on Apr. 29, 2024.
 //* xref:tigergraph-server:release-notes:index.adoc[TigerGraph 3.10.0] preview version was released on Mar. 13, 2024.
 //* xref:3.9@tigergraph-server:release-notes:index.adoc#_fixed_and_improved_in_3_9_3_3[TigerGraph 3.9.3-3] was released on Feb. 15, 2024.
diff --git a/netlify.toml b/netlify.toml
index 24da420..dd1dc06 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -46,13 +46,19 @@
     to = "/cloud/current/start/get_started"
 
 [[redirects]]
-    from = "/cloud4/overview"
-    to = "/cloud4/current/overview"
+    from = "/savanna/overview"
+    to = "/savanna/current/overview"
 
 # redirect cloudbeta to cloud4
 [[redirects]]
     from = "/cloudBeta"
-    to = "/cloud4/main/overview"
+    to = "/savanna/main/overview"
+
+# redirect cloud4 to savanna
+[[redirects]]
+    from = "/cloud4"
+    to = "/savanna/main/overview"
+
 
 # cloud and cloudbeta- general redirect from "current" to "main"
 [[redirects]]
@@ -63,6 +69,10 @@
     from = "/cloud4/current/*"
     to = "/cloud4/main/:splat"
 
+[[redirects]]
+    from = "/savanna/current/*"
+    to = "/savanna/main/:splat"
+
 # redirects for language reference
 [[redirects]]
     from = "/dev/gsql-ref/querying/func"