Pdt az400 m08 l18 0317

Instructions/Labs/AZ400_M00_Validate_lab_environment.md

@@ -8,7 +8,7 @@ lab:
 
 # Student lab manual
 
-## Instructions
+## Instructions to create an Azure DevOps Organization (you only have to do this once)
 
 > **Note**: Start at step 4, if you do already have a **personal Microsoft Account** setup and an active Microsoft Azure Pass subscription linked to that account.
 
@@ -34,3 +34,36 @@ lab:
 18. Toggle the switch to **On** for **Allow public projects**
     > Note: Extensions used in some labs might require a public project to allow using the free version.
 19. **Wait at least 3 hours before using the CI/CD capabilities** so that the new settings are reflected in the backend. Otherwise, you will still see the message *"No hosted parallelism has been purchased or granted"*.
+
+## Instructions to create the sample Azure DevOps Project (you only have to do this once)
+
+### Exercise 0: Configure the lab prerequisites
+
+> **Note**: make sure you completed the steps to create your Azure DevOps Organization before continuing with these steps.
+
+In this exercise, you will set up the prerequisites for the lab, which consist of a new Azure DevOps project with a repository based on the [eShopOnWeb](https://github.com/MicrosoftLearning/eShopOnWeb). 
+
+#### Task 1:  Create and configure the team project
+
+In this task, you will create an **eShopOnWeb** Azure DevOps project to be used by several labs.
+
+1.  On your lab computer, in a browser window open your Azure DevOps organization. Click on **New Project**. Give your project the name **eShopOnWeb** and leave the other fields with defaults. Click on **Create**.
+
+    ![Create Project](images/create-project.png)
+
+#### Task 2:  Import eShopOnWeb Git Repository
+
+In this task you will import the eShopOnWeb Git repository that will be used by several labs.
+
+1.  On your lab computer, in a browser window open your Azure DevOps organization and the previously created **eShopOnWeb** project. Click on **Repos>Files** , **Import a Repository**. Select **Import**. On the **Import a Git Repository** window, paste the following URL https://github.com/MicrosoftLearning/eShopOnWeb.git  and click **Import**:
+
+    ![Import Repository](images/import-repo.png)
+
+1.  The repository is organized the following way:
+    - **.ado** folder contains Azure DevOps YAML pipelines
+    - **.devcontainer** folder container setup to develop using containers (either locally in VS Code or GitHub Codespaces)
+    - **.azure** folder contains Bicep&ARM infrastructure as code templates used in some lab scenarios.
+    - **.github** folder container YAML GitHub workflow definitions.
+    - **src** folder contains the .NET 6 website used on the lab scenarios.
+
+You have now completed the necessary prerequisite steps to continue with the different individual labs for this AZ-400 course. 

Instructions/Labs/AZ400_M01_L01_Agile_Planning_and_Portfolio_Management_with_Azure_Boards.md

@@ -92,9 +92,9 @@ Each new project is configured with a default team, which name matches the proje
 
  ![In the "interations" tab, click on "Edit"](images/m1/EShop-WEB-edit_iteration_v1.png)
 
-    > **Note**: Specify the Start Date as the first work day of last week, and specify Friday in 3 weeks from the Start Date as the End Date. This follows the best practice of having 3-week Sprints.
+    > **Note**: Specify the Start Date as the first work day of last week, and count 3 full work weeks for each sprint. For example, if March 6 is the first work day of the sprint, it goes until March 24th. Sprint 2 starts on March 27, which is 3 weeks out from March 6.
 
-1. Repeat the previous step to add **Sprint 2** and **Sprint 3**. The second sprint is our current iteration, reflecting the working days of the current week, and the third is reflecting the dates of next week.
+1. Repeat the previous step to add **Sprint 2** and **Sprint 3**. You could say that we are currently in the 2nd week of the first sprint.
 
     ![Do the same for Sprint 2 and 3, make sure they are created for "EShop-Web" team](images/m1/EShop-WEB-3sprints_v1.png)