Remaining train the trainer tasks (#179)

## Purpose
<!-- Describe the intention of the changes being proposed. What problem
does it solve or functionality does it add? -->
* ...

## Does this introduce a breaking change?
<!-- Mark one with an "x". -->
```
[ ] Yes
[x] No
```

## Pull Request Type
What kind of change does this Pull Request introduce?

<!-- Please check the one that applies to this PR using "x". -->
```
[ ] Bugfix
[ ] Feature
[ ] Code style update (formatting, local variables)
[ ] Refactoring (no functional changes, no api changes)
[x] Documentation content changes
[ ] Other... Please describe:
```

## How to Test
Preview server updated here:
https://ronline-java-aca-preview.azurewebsites.net/

---------

Co-authored-by: Songbo Wang <[email protected]>

Author: rotycenh

docs/02_lab_launch/0201.md

@@ -10,7 +10,7 @@ parent: 'Lab 2: Deploy applications to Azure Container Apps'
 Before performing any additional actions, you'll need to store your user info as an environment variable that you can use in subsequent steps. 
 
 {: .note }
-We already collected your subscription information as part of the [preparing your subscription]({% link install.md %}#preparing-your-subscription) instructions. Make sure you've completed this process and and any other [installation steps]({% link install.md %}) are complete before proceeding.
+We already collected your subscription information as part of the [preparing your subscription]({% link install.md %}#configure-your-subscription-and-deploy-prerequisite-azure-resources) instructions. Make sure you've completed this process and and any other [installation steps]({% link install.md %}) are complete before proceeding.
 
 ## Step-by-step guidance
 

docs/02_lab_launch/0202.md

@@ -67,7 +67,7 @@ This involves three things:
 1.  Create a new Azure Container Apps environment in your resource group, and configure it to use the new subnet. 
 
     {: .note}
-    > If you've already successfully run the `create-azure-resources.sh` script discussed in the [installation instructions]({% link install.md %}#preparing-your-subscription), you can skip this step.
+    > If you've already successfully run the `create-azure-resources.sh` script discussed in the [installation instructions]({% link install.md %}#configure-your-subscription-and-deploy-prerequisite-azure-resources), you can skip this step.
 
     We’ll be creating the service on an [Azure Container Apps Dedicated plan](https://learn.microsoft.com/azure/container-apps/plans#dedicated) using the [workload profiles](https://learn.microsoft.com/azure/container-apps/workload-profiles-overview) option. This plan gives you more advanced features than the alternative [Azure Container Apps Consumption plan](https://learn.microsoft.com/azure/container-apps/plans#consumption) type:
 

docs/02_lab_launch/0203.md

@@ -17,7 +17,7 @@ By default, the MySQL database you create will have a firewall enabled that will
 ## Step-by-step guidance
 
 {: .note}
-> If you've already successfully run the `create-azure-resources.sh` script discussed in the [installation instructions]({% link install.md %}#preparing-your-subscription), skip to step 2.
+> If you've already successfully run the `create-azure-resources.sh` script discussed in the [installation instructions]({% link install.md %}#configure-your-subscription-and-deploy-prerequisite-azure-resources), skip to step 2.
 
 1.  To create an Azure Database for MySQL - Flexible Server instance, run the following commands. Replace the \<*sqladmin-password*\> placeholder with a complex password, and record its value.
 
@@ -46,7 +46,7 @@ By default, the MySQL database you create will have a firewall enabled that will
     > Wait for the provisioning to complete. This usually takes around three minutes.
 
     {: .note }
-    > If the command fails and you get the message, “No available SKUs in this location,” try again with a different region by adding the following line to the command: \--location \<*another-region*\>. It’s OK to create the MySQL Server in a different region from your other resources.
+    > If the create command fails and you get a message like, “No available SKUs in this location”, try again with a different region by adding the following line to the command: \--location \<*another-region*\>. It’s OK to create the MySQL Server instances in any region that supported it, even if it's a different from where you deployed your other resources to.
 
 2.  To create the database that your applications will use, run the following commands:
 

docs/02_lab_launch/0206.md

@@ -14,7 +14,7 @@ To give your Container Apps environment secure access to the container registry,
 ## Step-by-step guidance
 
 {: .note}
-> If you've already successfully run the `create-azure-resources.sh` script discussed in the [installation instructions]({% link install.md %}#preparing-your-subscription), skip to step 2.
+> If you've already successfully run the `create-azure-resources.sh` script discussed in the [installation instructions]({% link install.md %}#configure-your-subscription-and-deploy-prerequisite-azure-resources), skip to step 2.
 
 1.  Create a container registry instance to build and save your container images.
 

docs/02_lab_launch/0209.md

@@ -16,6 +16,6 @@ The following image should reflect your application architecture after a success
 {: .important }
 > The work you did in this lab is fundamental to both this lab and the next several labs you’ll be working through, so please do not delete any of the Azure resources you've created here.
 >
-> As we mentioned in the [Install instructions]({% link install.md %}#preparing-your-subscription), you can use both the `saveenv` and `loadenv` commands to manually save and load your environment variables at any time.
+> As we mentioned in the [Install instructions]({% link install.md %}#configure-your-subscription-and-deploy-prerequisite-azure-resources), you can use both the `saveenv` and `loadenv` commands to manually save and load your environment variables at any time.
 >
 >You've done a lot in this lab, so now is a good time to run `saveenv` to make sure your current environment variables will be there if you have to start a new bash session.  

docs/03_lab_openai/0301.md

@@ -1,16 +1,16 @@
 ---
-title: '1. Create an Azure OpenAI account (Optional)'
+title: '1. Create an Azure OpenAI account'
 layout: default
 nav_order: 1
 parent: 'Lab 3: Integrate Azure OpenAI Service with your apps'
 ---
 
-# Create an Azure OpenAI account (Optional)
+# Create an Azure OpenAI account
 
 Before you can add AI capabilities to your application, you need to create an Azure OpenAI account and deploy the language models that you want to use.
 
 {: .note}
-> If you've already successfully run the `create-azure-resources.sh` script discussed in the [installation instructions]({% link install.md %}#preparing-your-subscription), or if you already have valid `AZURE-OPENAI-ENDPOINT` and `AZURE-OPENAI-API-KEY` values for an existing Azure OpenAI instance, you can skip this section.
+> If you've already successfully run the `create-azure-resources.sh` script discussed in the [installation instructions]({% link install.md %}#configure-your-subscription-and-deploy-prerequisite-azure-resources), or if you already have valid `AZURE-OPENAI-ENDPOINT` and `AZURE-OPENAI-API-KEY` values for an existing Azure OpenAI instance, you can skip this section.
 
 The following step-by-step guidance will show you how to create an Azure OpenAI account using the Azure CLI. If you’d like to learn more about creating these accounts, see the following documentation: [Create and deploy an Azure OpenAI Service resource](https://learn.microsoft.com/azure/ai-services/openai/how-to/create-resource)
 

docs/03_lab_openai/03_openai.md

@@ -57,13 +57,13 @@ Your first step in this process is to create a new Spring Boot application:
 1.  In Visual Studio Code, open the `pom.xml` file and find the `spring-ai.version` value for the project.
 
     ```xml
-    <spring-ai.version>1.0.0-M5</spring-ai.version>
+    <spring-ai.version>1.0.0-M6</spring-ai.version>
     ```
 
 1.  In your command-line window, save this version number as an environment variable for later use (modifying the version number to match the value you see in your actual `pom.xml` file).
 
     ```bash
-    SPRING_AI_VERSION=1.0.0-M5
+    SPRING_AI_VERSION=<spring-ai.version>
     ```
 
 ### Generate AI code using Github Copilot
@@ -78,7 +78,7 @@ To do this, you’ll download a version-appropriate example code file from the S
 
     ```bash
     TEST_FILE="https://raw.githubusercontent.com/spring-projects/spring-ai/refs/heads/${SPRING_AI_VERSION}/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiChatClientIT.java"
-    wget $TEST_FILE -P spring-petclinic-chat-service/src/main/resources/
+    curl $TEST_FILE -o spring-petclinic-chat-service/src/main/resources/AzureOpenAiChatClientIT.java
     ```
 
 1.  In Visual Studio Code, open the `Github Copilot Chat` window and select the `ChatServiceApplication.java` file. The file name appears in the "Ask Copilot" input box as "Current file context".

docs/03_lab_openai/03_openai_existing.md

@@ -281,18 +281,22 @@ Start from a simple spring boot application, we will add AI components to the pr
 
 # (Optional) Integrate the chat client into api-gateway
 
+<details markdown="1">
+
+<summary><b><a>Click here to view the contents of this optional section.</a></b></summary>
+
 1. Update service `api-gateway` to add a new chat window.
 
    - Add new route entry for `chat-service`. Note this name will be used later. Open file `spring-petclinic-api-gateway/src/main/resources/application.yml` and append new entry like below:
 
-    ```yml
-           - id: chat-service
-             uri: lb://chat-service
-             predicates:
+   ```yml
+         - id: chat-service
+            uri: lb://chat-service
+            predicates:
                - Path=/api/chat/**
-             filters:
+            filters:
                - StripPrefix=2
-     ```
+   ```
 
    - Add chatbox for api gateway
 
@@ -306,16 +310,16 @@ Start from a simple spring boot application, we will add AI components to the pr
    APP_NAME=api-gateway
    mvn clean package -DskipTests -pl spring-petclinic-$APP_NAME
    az containerapp update --name $APP_NAME --resource-group $RESOURCE_GROUP \
-       --source ./spring-petclinic-$APP_NAME
+      --source ./spring-petclinic-$APP_NAME
    ```
 
    - Check the new chatbox in the petclinic page.
 
    ```bash
    api_gateway_FQDN=$(az containerapp show \
-     --resource-group $RESOURCE_GROUP \
-     --name $APP_NAME \
-     --query properties.configuration.ingress.fqdn \
+   --resource-group $RESOURCE_GROUP \
+   --name $APP_NAME \
+   --query properties.configuration.ingress.fqdn \
       -o tsv)
 
    echo https://$api_gateway_FQDN
@@ -329,8 +333,14 @@ Start from a simple spring boot application, we will add AI components to the pr
 
    ![lab 5 open-ai-rag-bot](../../images/open-ai-rag-bot.png)
 
+</details>
+
 # (Optional) Prepare the simple project
 
+<details markdown="1">
+
+<summary><b><a>Click here to view the contents of this optional section.</a></b></summary>
+
 1. Create a project from [spring initializr](https://start.spring.io/):
 
    ```bash
@@ -365,3 +375,5 @@ Start from a simple spring boot application, we will add AI components to the pr
 1. Enable Eureka Client in class `ChatServiceApplication`:
 
    ![lab 5 eureka client](../../images/open-ai-eureka-client.png)
+
+</details>

docs/04_lab_monitor/0402.md

@@ -23,7 +23,7 @@ To learn more about how Log Analytics works with Azure Container Apps, review:
 ## Step-by-step guidance
 
 {: .note}
-> If you've already successfully run the `create-azure-resources.sh` script discussed in the [installation instructions]({% link install.md %}#preparing-your-subscription), skip to step 2.
+> If you've already successfully run the `create-azure-resources.sh` script discussed in the [installation instructions]({% link install.md %}#configure-your-subscription-and-deploy-prerequisite-azure-resources), skip to step 2.
 
 1.  In your command-line environment, create a new Log Analytics workspace:
 

docs/04_lab_monitor/0403.md

@@ -27,7 +27,7 @@ For additional information on how this works, review:
 ## Step-by-step guidance
 
 {: .note}
-> If you've already successfully run the `create-azure-resources.sh` script discussed in the [installation instructions]({% link install.md %}#preparing-your-subscription), skip to step 2.
+> If you've already successfully run the `create-azure-resources.sh` script discussed in the [installation instructions]({% link install.md %}#configure-your-subscription-and-deploy-prerequisite-azure-resources), skip to step 2.
 
 1.  Your first step is to create an Application Insights resource. Execute this statement in your command-line environment:
 
@@ -74,7 +74,11 @@ For additional information on how this works, review:
     {: .note }
     > The script [../tools/update-apps-appinsights.sh](https://github.com/Azure-Samples/java-on-aca/blob/main/tools/update-apps-appinsights.sh) includes all the steps to update the target apps, and it runs the commands in parallel to save time. If you’d like to explore the details, open the file and review its contents.
 
-    (Optional) Alternatively, you can manually build each app individually by running the following commands:
+    <details markdown="1">
+
+    <summary><b>(Optional)</b> Alternatively, you can manually build each app individually. <a>Click here for instructions on how to do this</a>.</summary>
+    
+    Run the following commands:
 
     ```bash
     APP_NAME="customers-service"
@@ -99,6 +103,8 @@ For additional information on how this works, review:
     {: .note }
     > Notice that for each of the applications, we indicate a different role-name. Application Insights uses this role-name in its Application map feature to show the communication between your applications.
 
+    </details>
+
     {: .note }
     > After redeploying, you’ll need to make sure everything is back up and running as expected. Verify that your applications are operational, and check the console log to determine whether any application is in a failed state.
 

docs/04_lab_monitor/0405.md

@@ -19,7 +19,7 @@ If you’d like to learn more about how Azure Managed Grafana helps visualize ex
 ## Step-by-step guidance
 
 {: .note}
-> If you've already successfully run the `create-azure-resources.sh` script discussed in the [installation instructions]({% link install.md %}#preparing-your-subscription), skip to step 2.
+> If you've already successfully run the `create-azure-resources.sh` script discussed in the [installation instructions]({% link install.md %}#configure-your-subscription-and-deploy-prerequisite-azure-resources), skip to step 2.
 
 1.  Provision Azure Managed Grafana. In your command-line environment, create an Azure Managed Grafana instance:
 

index.md

@@ -45,11 +45,11 @@ To run this lab, you’ll need:
 Before running this lab, be sure that all the required tooling is available. We’ve provided three options:
 
 * [Use GitHub Codespaces (preferred)]({% link install.md %}#use-github-codespaces-strongly-recommended), which will create a cloud-based development environment with the required tools installed and configured.
-* [Use Visual Studio Code with remote containers option]({% link install.md %}#using-visual-studio-code-with-remote-containers), which will create a Docker container on your local machine with the required tools preconfigured.
-* [Install all the tools on your local machine]({% link install.md %}#install-all-the-tools-on-your-local-machine-not-recommended).
+* [Use Visual Studio Code with remote containers option]({% link install.md %}#optional-use-visual-studio-code-with-remote-containers), which will create a Docker container on your local machine with the required tools preconfigured.
+* [Install all the tools on your local machine]({% link install.md %}#optional-install-all-the-tools-on-your-local-machine-not-recommended).
 
 We’ve tested this lab using GitHub Codespaces, which is the recommended option for running it.
 
-After the tooling is set up, you'll need to perform some steps to [prepare your subscription]({% link install.md %}#preparing-your-subscription) before continuing with the labs.
+After the tooling is set up, you'll need to perform some steps to [prepare your subscription]({% link install.md %}#configure-your-subscription-and-deploy-prerequisite-azure-resources) before continuing with the labs.
 
 You can find the full installation guidance and the options for running this lab in the [Installation]({% link install.md %}) instructions.