Changes and improvements following initial review. (#22)

* TimesTen: Initial population

* Work in progress

* Finalising workshop instructions etc.

* QA fixes #1

* QA fixes #2

* Typo and grammar corrections

* URL fixup, additional minor tweaks.

* Minor updates and fixes.

* Improve connection instructions.

* cleanup migration

cleanup migration

* clean up after migration

clean up after migration

* Update to README file

* Various improvements based on feedback.

* URL corrections

* Correcting e-mail address for 'help'

Co-authored-by: Kevin Lazarz <kevin.lazarz@oracle.com>

Author: ChrisJ60

timesten/cache-introduction/01-introduction/introduction.md

@@ -10,11 +10,11 @@ Estimated Workshop Time: **60 minutes**
 
 ### About Oracle TimesTen In-Memory Database
 
-Oracle TimesTen In-Memory Database (TimesTen) delivers real time application performance (low response time and high throughput) by changing the assumptions around where data resides at runtime. By managing data in memory, and optimizing data structures and access algorithms accordingly, database operations execute with maximum efficiency achieving dramatic gains in responsiveness and throughput.
+Oracle TimesTen In-Memory Database (TimesTen) delivers real-time application performance (low response time and high throughput) by changing the assumptions around where data resides at runtime. By managing data in memory, and optimizing data structures and access algorithms accordingly, database operations execute with maximum efficiency achieving dramatic gains in responsiveness and throughput.
 
-TimesTen is a relational database, with SQL as its access language and PL/SQL as its procedural language, so you can leverage your existing Oracle Database skills. It supports a wide range of database APIs such as JDBC, ODBC, ODP.NET and Oracle Call Interface (OCI) and several Open Source languages, such as Python and Node.js, are supported via Open Source APIs. TimesTen provides full persistence and has built in high-availability.
+TimesTen is a relational database, with SQL as its access language and PL/SQL as its procedural language so that you can leverage your existing Oracle Database skills. It supports many database APIs such as JDBC, ODBC, ODP.NET and Oracle Call Interface (OCI) and several Open Source languages, such as Python and Node.js, are supported via Open Source APIs. TimesTen provides full persistence and has built-in high availability.
 
-TimesTen can be deployed both as a database of record or as a high performance relational cache in front of an Oracle database to acceleratae Oracle database applications. This lab focuses on the cache deployment mode.
+TimesTen can be deployed both as a database of record or as a high-performance relational cache in front of an Oracle database to accelerate Oracle database applications. This lab focuses on the cache deployment mode.
 
 ![TimesTen Cache Architecture Diagram](./images/tt-cache-architecture.png " ")
 
@@ -26,7 +26,7 @@ In this workshop you will:
 * Create a TimesTen instance
 * Execute some basic TimesTen commands
 * Prepare the Oracle database for TimesTen caching
-* Prepare a TimesTen datbase and set it up as a cache
+* Prepare a TimesTen database and set it up as a cache
 * Load data from the Oracle database into the cached tables and activate cache refresh
 * Verify cache refresh
 * Run a simple OLTP benchmark to see the performance benefit of TimesTen

timesten/cache-introduction/02-prepare-setup/prepare-setup.md

@@ -2,7 +2,7 @@
 
 ## Introduction
 
-In this lab, you will download the Oracle Resource Manager (ORM) stack zip file needed to setup the resource needed to run this workshop. This workshop requires a compute instance and a Virtual Cloud Network (VCN) and subnet.
+In this lab, you will download the Oracle Resource Manager (ORM) stack zip file needed to set up the resources needed to run this workshop. This workshop requires a compute instance and a Virtual Cloud Network (VCN) and subnet.
 
 Estimated Time: **15 minutes**
 
@@ -29,38 +29,46 @@ We strongly recommend using this stack to create a self-contained/dedicated VCN
 
 ## Task 2: Adding security rules to an existing VCN
 
-This workshop requires a certain number of ports to be available, a requirement that can be met by using the default ORM stack execution that creates a dedicated VCN. In order to use an existing VCN/subnet the following ports should be added to the Ingress rules.
+This workshop requires a certain number of ports to be available, a requirement that can be met by using the default ORM stack execution that creates a dedicated VCN. In order to use an existing VCN/subnet, the following ports should be added to the Ingress rules.
 
 | Port           |Description                            |
 | :------------- | :------------------------------------ |
 | 22             | SSH                                   |
-| 80             | Remote Desktiop using noVNC           |
-| 6080           | Remote Desktop using noVNC            |
+| 80             | Remote Desktop using noVNC            |
+
 
 1.  Go to *Networking >> Virtual Cloud Networks*
 
 2.  Choose your network
 
 3.  Under Resources, select *Security Lists*
 
-4.  Click on *Default Security Lists *under the Create Security List button
+4.  Click on *Default Security Lists* under the Create Security List button
 
-5.  Click *Add Ingress Rule* button
+5.  Click the *Add Ingress Rule* button
 
 6.  Enter the following:
     - Source CIDR: 0.0.0.0/0
-    - Destination Port Range: *Refer to above table*
+    - Destination Port Range: *Refer to the above table*
 
 7.  Click the Add Ingress Rules button
 
 ## Task 3: Setup your OCI compute instance
 
-Using the details from the two steps above, proceed to the lab *Environment Setup* to setup your workshop environment using Oracle Resource Manager (ORM) using one of the following options:
+Using the details from the two steps above, proceed to the lab *Environment Setup* to set up your workshop environment using Oracle Resource Manager (ORM) using one of the following options:
 
   -  Create Stack:  *Compute + Networking*
   -  Create Stack:  *Compute only* using an existing VCN where security lists have been updated as per *Task 2* above
 
-**IMPORTANT:** When deploying the workshop compute instance via the ORM stack, it is strongly recommended that you enable the optional SSH access using either your own SSH public key or a generated SSH key pair. SSH connectivity offers a better user experience, especially for copy/paste, than noVNC connectivity.
+**IMPORTANT**
+
+When deploying the workshop compute instance via the ORM stack, as described in the next lab:
+
+1. By default SSH access using a system generated SSH private key is enabled. SSH access is recommended for this workshop as it offers a better user experience, especially for copy/paste, than noVNC connectivity.
+
+2. If you wish to provide your own SSH public key, uncheck the option *Auto Generate SSH Key Pair* and follow the on-screen instructions to either upload or copy/paste your SSH public key.  
+
+3. Unless you wish to customize SSH connectivity as desccribed in (2), you can accept all the defaults provided by the ORM stack.
 
 You may now *proceed to the next lab (Environment setup)*.
 

timesten/cache-introduction/03-connect-to-instance/connect-to-instance.md

@@ -2,13 +2,13 @@
 
 ## Introduction
 
-In this lab you will learn the different ways to connect to the OCI compute instance that hosts the workshop.
+In this lab, you will learn the different ways to connect to the OCI compute instance that hosts the workshop.
 
 The workshop requires you to use a terminal session to run various commands and observe their output. Often you may need to copy and paste commands or text from the workshop instructions into the terminal session.
 
-If you chose to run the workshop in the LiveLabs sandbox then the only connection method available to you by default is a GUI session using the browser based VNC mechanism. It is possible to setup SSH connectivity by adding your own SSH key into the instance (follow the instructions provided in the noVNC lab).
+If you chose to run the workshop in the LiveLabs sandbox then the only connection method available to you by default is a GUI session using the browser-based VNC mechanism. It is possible to set up SSH connectivity by adding your own SSH key into the instance (follow the instructions provided in the noVNC lab).
 
-If you chose to run the workshop in your own tenancy, or in a free-trial Cloud account, then you can use the same browser based GUI connection method. Also, if you selected the option during deploymemnt via the ORM stack, you also have the option to use SSH connectivity (**strongly recommended)**. 
+If you chose to run the workshop in your own tenancy, or in a free-trial Cloud account, then you can use the same browser-based GUI connection method. Also, if you selected the option during deployment via the ORM stack, you also have the option to use SSH connectivity (**strongly recommended)**. 
 
 Estimated Time: **5 minutes**
 
@@ -23,46 +23,74 @@ This lab assumes that you have:
 
 - Completed all the previous labs in this workshop, in sequence.
 
-## Task 1: Connect using noVNC
+## Task 1: Connect using noVNC remote desktop
+
+All environments support browser based noVNC connections. The lab *Using noVNC Remote Desktop* provides information on using the noVNC remote desktop.
 
 _LiveLabs sandbox_
 
-In the LiveLabs reservation page for your active reservation you will see the URL to use for a noVNC connection to the workshop instance.
+In the LiveLabs reservation page for your active reservation, you will see the URL to use for a noVNC connection to the workshop instance.
 
 _Own tenancy or free-trial Cloud account_
 
-At the end of the ORM stack apply job execution report you will see the noVNC connection URL.
+At the end of the ORM stack 'apply' job execution log you will see the noVNC connection URL.
+
+```
+remote_desktop = [
+  "http://140.238.65.52/livelabs/vnc.html?password=yO56MG6tnJ&resize=scale&quality=9&autoconnect=true&reconnect=true",
+]
+```
+The noVNC connection URL can also be viewed and copied on the Stack's Application Information tab:
 
-Copy / paste the URL into your browser and you should then see the workshop desktop.
+![Workshp noVNC connection URL](./images/orm-novnc-url.png " ")
+
+Copy/paste the URL from the log into your browser and you should then see the workshop desktop.
 
 ![Workshp noVNC Desktop](./images/novnc-desktop.png " ")
 
-You can use the *Activities* menu, or double click the *Terminal* icon on the desktop to open a terminal session.
+You can use the **Terminal** option under the *Activities* menu, or double-click the *Terminal* icon on the desktop, to open a terminal session.
 
 ## Task 2: Connect using SSH (optional but recommended)
 
 You can connect to the instance as the oracle user using an SSH private key.
 
 _LiveLabs sandbox_
 
-You can follow the instructions in the noVNC lab to add an SSH poublic key to the oracle user's SSH **authorized_keys** file. You then connect using the corresponding SSH private key.
+Follow the instructions in the lab *Using noVNC Remote Desktop* to add your SSH public key to the **oracle** user's SSH **authorized_keys** file. You can then connect to the workshop compute instance using the corresponding SSH private key.
 
-_Own tenancy or free-trial Cloud account - user provided public key_
+_Own tenancy or free-trial Cloud account - user-provided public key_
 
-If you provided your own SSH public key as part of the ORM stack deployment process then you can connect using the corresponding SSH private key.
+If you enabled SSH connectivity by providing your own SSH public key as part of the ORM stack deployment process then you can connect using the corresponding SSH private key.
 
-_Own tenancy or free-trial Cloud account - system generated key pair_
+_Own tenancy or free-trial Cloud account - system-generated key pair_
 
-The SSH private key needed to connect is displayed at the end of the ORM stack apply job log. Copy/paste the key into a file on your client computer, or import into into your SSH client, and use that file to connect.
+If you enabled SSH connectivity using a system generated key as part of the ORM stack deployment process, the SSH private key needed to connect is displayed at the end of the ORM stack 'apply' job execution log. 
+
+```
+generated_instance_ssh_private_key = -----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAu8ta42Xs+O/JvkDfpjWo4c2uqb9xkR2IncidGFE1FO4GlMm6
+...
+2o0ssyrFUAo93fbkfdNfqojnnVJaMjGrpwaTS80Y7tbIrreex2R+9g==
+-----END RSA PRIVATE KEY-----
+```
+
+The generated SSH private key can also be viewed and copied on the Stack's Application Information tab:
+
+![Workshp SSH private key](./images/orm-ssh-key.png " ")
+
+Copy/paste the key into a file on your client computer, or import into your SSH client, and use it to connect via SSH.
 
 **NOTE:** On Linux and macOS systems, SSH private keys should be stored in your user's .ssh directory (**~/.ssh**) and must have permissions of **600 (rw-------)**.
 
-Assuming that the SSH private key is **~/.ssh/id_livelabs** and the oublic IP address of the workshop compiute instance is **123.123.123.123** then you can connect using:
+Assuming that the SSH private key is **~/.ssh/id_livelabs** and the public IP address of the workshop compute instance is **123.123.123.123** then you can connect using:
 
-**ssh -i ~/.ssh/id_livelabs oracle@123.123.123.123**
+```
+<copy>
+ssh -i ~/.ssh/id_livelabs oracle@123.123.123.123
+</copy>
+```
 
 ```
-$ ssh -i ~/.ssh/id_livelabs oracle@123.123.123.123                                                      11:55:17
 The authenticity of host '123.123.123.123 (123.123.123.123)' can't be established.
 ED25519 key fingerprint is SHA256:bm2wv3HgyBIhIRov6+EtId10rQHyq1LXpXglQMpqhqA.
 This key is not known by any other names

timesten/cache-introduction/03-connect-to-instance/images/orm-novnc-url.png

@@ -2,7 +2,7 @@
 
 ## Introduction
 
-In this lab you will start up all the components required to run the labs making up this workshop.
+In this lab, you will start up all the components required to run the labs making up this workshop.
 
 The workshop uses an Oracle database which runs in its own container (**dbhost**). A second container (**tthost1**) provides the TimesTen environment. These containers, and the host system (**ttlivelabvm**), are all connected using a custom Docker network. This setup provides a realistic multi-host environment with the convenience of just a single compute instance.
 
@@ -20,7 +20,7 @@ This lab assumes that you have:
 
 ### Starting over from the beginning
 
-Once you have successfully completed this lab, if at any point you want to start the whole workshop again from the beginning, just go the the **~/lab** directory and run the script **labReset.sh**. That script will take 5-8 minutes to run and it will reset everything back to the way it was after this lab completed.
+Once you have successfully completed this lab, if at any point you want to start the whole workshop again from the beginning, just go to the **~/lab** directory and run the script **labReset.sh**. That script will take 5-8 minutes to run and it will reset everything back to the way it will be after this lab is completed.
 
 ## Task 1: Connect to the environment
 
@@ -30,16 +30,21 @@ Connect to the OCI compute instance and open a terminal session, as the user **o
 
 Change to the **lab** directory:
 
-**cd ~/lab**
-
-`[oracle@ttlivelabvm ~] cd ~/lab`
+```
+<copy>
+cd ~/lab
+</copy>
+```
 
 Initialize the workshop:
 
-**labSetup.sh cache-intro**
+```
+<copy>
+labSetup.sh cache-intro
+</copy>
+```
 
 ```
-[oracle@ttlivelabvm ~] labSetup.sh cache-intro
 info: setting up workshop 'cache-intro', this will take several minutes...
 info: starting hosts: OK
 info: host initialization: OK
@@ -48,7 +53,7 @@ info: Oracle Database state successfully reset
 info: starting Oracle Database: OK
 ```
 
-This command will take between 5 and 8 minutes to complete. Once the setup has completed successfully, *proceed to the next lab*. You can keep your terminal session open ready for the next lab.
+This command will take between 5 and 8 minutes to complete. Once the setup script has completed successfully, *proceed to the next lab*. You can keep your terminal session open ready for the next lab.
 
 ## Acknowledgements