Merge pull request #822 from WigF1/master

Multiple fixes

Instructions/Labs/AZ-204_lab_01.md

@@ -129,7 +129,7 @@ In this lab, you will explore how to create a web application on Azure by using
 
 1. On the **Web App** blade, select **Create**.
 
-1. On the **Create Web App** blade, on the **Basics** tab, perform the following actions, and then select the **Monitoring** tab:
+1. On the **Create Web App** blade, on the **Basics** tab, perform the following actions, and then select the **Monitor + secure** tab:
 
    | Setting                            | Action                                                                                                  |
    | ---------------------------------- | ------------------------------------------------------------------------------------------------------- |
@@ -147,7 +147,7 @@ In this lab, you will explore how to create a web application on Azure by using
 
    ![Create web app blade](./media/l01_create_a_web_app.png)
 
-1. On the **Monitoring** tab, in the **Enable Application Insights** section, select **No**, and then select **Review + create**.
+1. On the **Monitor + secure** tab, in the **Enable Application Insights** section, select **No**, and then select **Review + create**.
 
 1. On the **Review + create** tab, review the options that you selected during the previous steps.
 
@@ -273,7 +273,7 @@ In this exercise, you created a web app in Azure, and then deployed your `ASP.NE
 
 1. On the **Web App** blade, select **Create**.
 
-1. On the **Create Web App** blade, on the **Basics** tab, perform the following actions, and then select the **Monitoring** tab:
+1. On the **Create Web App** blade, on the **Basics** tab, perform the following actions, and then select the **Monitor + secure** tab:
 
    | Setting                            | Action                        |
    | ---------------------------------- | ----------------------------- |
@@ -290,7 +290,7 @@ The following screenshot displays the configured settings on the **Create web ap
 
 ![Create web app blade](./media/l01_create_a_front_end_web_app.png)
 
-1. On the **Monitoring** tab, in the **Enable Application Insights** section, select **No**, and then select **Review + create**.
+1. On the **Monitor + secure** tab, in the **Enable Application Insights** section, select **No**, and then select **Review + create**.
 
 1. From the **Review + create** tab, review the options that you selected during the previous steps.
 

Instructions/Labs/AZ-204_lab_05.md

@@ -150,7 +150,7 @@ In this lab, you will explore how to create and deploy containers to the Azure C
 
 1. Review the results. At least one IP address should be listed, representing the IP address assigned to your computer.
 
-1. Switch back to From the **Visual Studio Code** window and, from the **Explorer** pane, open the **Dockerfile** file.
+1. Switch back to the **Visual Studio Code** window and, from the **Explorer** pane, open the **Dockerfile** file.
 
 1. Copy and paste the following code into the **Dockerfile** file:
 

Instructions/Labs/AZ-204_lab_07.md

@@ -123,19 +123,19 @@ In this lab, you will create a storage account and an Azure Function app that wi
 
 1. On the **Function App** blade, select **Create**.
 
-1. On the **Create Function App** blade, on the **Basics** tab, perform the following actions, and then select **Next: Storage**:
+1. On the **Select a hosting option** page, ensure **Consumption** is select, and then click **Select**.
+
+1. On the **Create Function App (Consumption)** blade, on the **Basics** tab, perform the following actions, and then select **Next: Storage**:
 
    | Setting                           | Action                              |
    | --------------------------------- | ----------------------------------- |
    | **Subscription** drop-down list   | Retain the default value            |
    | **Resource group** drop-down list | Select **ConfidentialStack**        |
    | **Function App name** text box    | Enter **securefunc**_[yourname]_    |
-   | **Publish** section               | Select **Code**                     |
    | **Runtime stack** drop-down list  | Select **.NET**                     |
    | **Version** drop-down list        | Select **8 (LTS), isolated worker model**                        |
    | **Region** drop-down list         | Select the **East US** region       |
    | **Operating System** section      | Select **Linux**                    |
-   | **Hosting** drop-down list        | Select **Consumption (Serverless)** |
 
    The following screenshot displays the configured settings in the **Create Function App** blade.
 
@@ -566,7 +566,7 @@ In this exercise, you used a service identity to read the value of a secret stor
 
 1. In the new browser window, refer to the URL that you copied for the blob.
 
-1. An error message indicating that the resource wasn't found should now display.
+1. An error message indicating that public access is not permitted should now display.
 
    > **Note**: This is expected as anonymous access for our blobs is not enabled.
 

Instructions/Labs/AZ-204_lab_08.md

@@ -167,7 +167,7 @@ In this exercise, you created a new Azure web app by using a container image sou
 
 1. On the **API Management services** blade, select **+ Create**.
 
-1. On the **Install API Management gateway** blade, perform the following actions, and then select **Review + create**:
+1. On the **Create API Management service** blade, perform the following actions, and then select **Review + create**:
 
 
     | Setting | Action |

Instructions/Labs/AZ-204_lab_09.md

@@ -119,14 +119,14 @@ In this lab, you will start with a proof-of-concept web app, hosted in a contain
 
 1. On the **Marketplace** search results blade, select the **Web App** result, and then select **Create**.
 
-1. On the **Create Web App** blade, on the **Basics** tab, perform the following actions, and then select the **Docker** tab:
+1. On the **Create Web App** blade, on the **Basics** tab, perform the following actions, and then select the **Container** tab:
 
    | Setting | Action |
    | -- | -- |
    | **Subscription** drop-down list | Retain the default value |
    | **Resource group** drop-down list | Select **PubSubEvents** in the list |
    | **Name** text box | Enter **eventviewer**_[yourname]_ |
-   | **Publish** section | Select **Docker Container** |
+   | **Publish** section | Select **Container** |
    | **Operating System** section | Select **Linux** |
    | **Region** drop-down list | Select **East US** |
    | **Linux Plan (East US)** section | Select **Create new**, in the **Name** text box, enter **EventPlan**, and then select **OK** |
@@ -136,14 +136,14 @@ In this lab, you will start with a proof-of-concept web app, hosted in a contain
 
    ![Screenshot displaying the configured settings on the Create Web App blade](./media/l09_create_web_app.png)
 
-1. On the **Docker** tab, perform the following actions, and select **Review + create**:
+1. On the **Container** tab, perform the following actions, and select **Review + create**:
 
     | Setting | Action |
     | -- | -- |
-    | **Options** drop-down list | Select **Single Container** |
-    | **Image Source** drop-down list | Select **Docker Hub** |
-    | **Access Type** drop-down list | Select **Public** |
-    | **Image and tag** text box | Enter **microsoftlearning/azure-event-grid-viewer:latest** |
+    | **Image Source** | Select **Docker Hub or other registries** |
+    | **Options** | Select **Single Container** |
+    | **Access Type** | Select **Public** |
+    | **Image and tag**  | Enter **microsoftlearning/azure-event-grid-viewer:latest** |
 
    The following screenshot displays the configured settings on the **Docker** tab.
 

Instructions/Labs/AZ-204_lab_11.md

@@ -91,9 +91,9 @@ In this lab, you will create an Application Insights resource in Azure that will
 
 1. In the Azure portal, use the **Search resources, services, and docs** text box at the top of the page to search for **App Services** and then, in the list of results, select **App Services**.
 
-1. On the **App Services** blade, select **+ Create**.
+1. On the **App Services** blade, select **+ Create**, and then select **+ Web App**.
 
-1. On the **Create Web App** blade, on the **Basics** tab, perform the following actions, and then select the **Monitoring** tab:
+1. On the **Create Web App** blade, on the **Basics** tab, perform the following actions, and then select the **Monitor + secure** tab:
 
     | Setting | Action |
     | -- | -- |
@@ -107,14 +107,14 @@ In this lab, you will create an Application Insights resource in Azure that will
     | **Windows Plan (East US)** section | Select **Create new**, in the **Name** text box, enter **MonitoredPlan**, and then select **OK** |
     | **Pricing plan** section |  Retain the default value |
 
-1. On the **Monitoring** tab, perform the following actions, and then select **Review + create**:
+1. On the **Monitor + secure** tab, perform the following actions, and then select **Review + create**:
 
     | Setting | Action |
     | -- | -- |
     | **Enable Application Insights** section | Ensure that **Yes** is selected |
     | **Application Insights** drop-down list | Select the **instrm**_[yourname]_ Application Insights resource that you created previously in this lab |
 
-1. On the **Review + create** tab, review the options that you selected during the previous steps.
+1. On the **Create Web App** tab, review the options that you selected during the previous steps.
 
 1. Select **Create** to create the web API by using your specified configuration.
 
@@ -126,19 +126,19 @@ In this lab, you will create an Application Insights resource in Azure that will
 
 1. In the **Environment Variables** section, perform the following actions:
 
-    a.  On the **Application settings** tab, select **Show Values** to display secrets associated with your web API.
+    a.  On the **App settings** tab, select **Show values** to display secrets associated with your web API.
 
     b.  Note the value representing the **APPLICATIONINSIGHTS_CONNECTION_STRING** key. This value was set automatically when you built the web API resource.
 
-1. On the **App Service** blade, in the **Settings** section, select the **Properties** link.
+1. On the **App Service** blade, select **Overview** at the top of the service menu.
 
-1. In the **Properties** section, record the value of the **URL** link. You'll use this value later in the lab to submit requests to the web API.
+1. On the **App Service** blade, in the **Essentials** section, record the value of the **Default domain** link. You'll use this value later in the lab to submit requests to the web API.
 
 #### Task 4: Configure web API autoscale options
 
 1. On the **App Service** blade, in the **Settings** section, select the **Scale out (App Service Plan)** link.
 
-1. Scroll down untill you see the **Scale out method**. Click on the **Rules Based** option, then select the **Manage rules based scaling**.
+1. Scroll down until you see the **Scale out method**. Select the **Rules Based** option, then select **Configure**.
 
 ![Selecting the correct option for scale out method](./media/l11_scale_web_app_choose_rules.png)
 
@@ -279,8 +279,9 @@ In this exercise, you created the Azure resources that you'll use for the remain
        },
        "AllowedHosts": "*"
     }
+    ```
 
-    > **Note**" Ensure you have replaced the placeholder with your own instrumentation key that you recorded earlier.
+    > **Note** Ensure you have replaced the placeholder with your own instrumentation key that you recorded earlier.
 
 1. Save the changes to the **appsettings.json** file and close it.