Merge branch 'oracle-livelabs:main' into main

hybrid-adg/introduction/introduction.md

@@ -3,8 +3,6 @@
 ## About this Workshop
 In this workshop you will be using a compute instance in OCI to simulate the on-premise database, which is deployed in one region (For example: Seoul). The standby cloud database is deployed in another region (For example: Tokyo). The primary and the standby database communicate through public internet.
 
-When provisioning Database Cloud Services in OCI, there are 2 options for the storage management. One is **Oracle Grid Infrastructure** which is using ASM to manage the database files. The other is **Logical Volume Manager** which is using the File System to manage the database files. In Lab 3, please choose the right one according to your requirement. When doing Lab 5, choose Lab 5A for LVM or Lab 5B for ASM.
-
 Estimated Workshop Time: 5 hours
 
 ### About ADG
@@ -35,13 +33,11 @@ In this lab, you will:
 
 * An Oracle Cloud Account - Please view this workshop's LiveLabs landing page to see which environments are supported
 
-*Note: If you have a **Free Trial** account, when your Free Trial expires your account will be converted to an **Always Free** account. You will not be able to conduct Free Tier workshops unless the Always Free environment is available. **[Click here for the Free Tier FAQ page.](https://www.oracle.com/cloud/free/faq.html)***
-
 ## Learn More
 - [Oracle Data Guard](https://www.oracle.com/database/technologies/high-availability/dataguard.html)
 - [Oracle Database 19c](https://www.oracle.com/database/)
 
 ## Acknowledgements
-* **Author** - Minqiao Wang, DB Product Management
-* **Last Updated By/Date** - Minqiao Wang, October 2020
+* **Author** - Minqiao Wang
+* **Last Updated By/Date** - Minqiao Wang, Dec 2023
 

hybrid-adg/test-with-adg/test-with-adg.md

@@ -1,4 +1,4 @@
-# Testing with Active Data Guard
+# Test with Active Data Guard
 
 ## Introduction
 Now we can run some testing with the ADG including DML redirection and switchover.

hybrid-adg/workshops/freetier/manifest.json

@@ -8,7 +8,7 @@
             "filename": "../../introduction/introduction.md"
         },
         {
-            "title": "Getting Started",
+            "title": "Get Started",
             "description": "This is the prerequisites for customers using Free Trial and Paid tenancies, and Always Free accounts (if applicable). The title of the lab and the Contents Menu title (the title above) match for Prerequisite lab. This lab is always first.",
             "filename": "https://oracle-livelabs.github.io/common/labs/cloud-login/pre-register-free-tier-account.md"
         },
@@ -34,7 +34,7 @@
             "filename": "../../deploy-adg-lvm/deploy-adg-lvm.md"
         },
         {            
-            "title": "Lab 6: Testing with Active Data Guard",
+            "title": "Lab 6: Test with Active Data Guard",
             "filename": "../../test-with-adg/test-with-adg.md"
         },
         {