edits

Author: KarlErickson

learn-pr/advocates/create-java-webapp-to-app-service-linux/1-introduction.yml

@@ -3,9 +3,8 @@ uid: learn.azure.build-tomcat-java-appservice.1
 title: Introduction
 metadata:
   title: Introduction
-  titleSuffix: Azure
-  description: This is an introduction to a topic about deploying Java-based web apps.
-  ms.date: 02/13/2025
+  description: Introduces a training module that shows you how to deploy Java-based web apps.
+  ms.date: 02/20/2025
   author: KarlErickson
   ms.author: ayangupta
   ms.topic: unit

learn-pr/advocates/create-java-webapp-to-app-service-linux/2-azure-app-service-explanation.yml

@@ -3,8 +3,8 @@ uid: learn.azure.build-tomcat-java-appservice.2
 title: Introduction to Azure App Service
 metadata:
   title: Introduction to Azure App Service
-  description: What is Azure App Service? Find out more in this module.
-  ms.date: 02/13/2025
+  description: Describes Azure App Service.
+  ms.date: 02/20/2025
   author: KarlErickson
   ms.author: ayangupta
   ms.topic: unit

learn-pr/advocates/create-java-webapp-to-app-service-linux/3-exercise-create-simple-java-app.yml

@@ -3,9 +3,8 @@ uid: learn.azure.build-tomcat-java-appservice.3
 title: Exercise - Create a simple Tomcat Java web app 
 metadata:
   title: Exercise - Create a Simple Tomcat Java Web App
-  titleSuffix: Azure
-  description: Create a simple Java web app and deploy it locally.
-  ms.date: 02/13/2025
+  description: Shows you how to create a simple Java web app and deploy it locally.
+  ms.date: 02/20/2025
   author: KarlErickson
   ms.author: ayangupta
   ms.topic: unit

learn-pr/advocates/create-java-webapp-to-app-service-linux/4-exercise-deploy-to-app-service.yml

@@ -3,8 +3,8 @@ uid: learn.azure.build-tomcat-java-appservice.4
 title: Exercise - Deploy a web app to Azure App Service
 metadata:
   title: Exercise - Deploy a Web App to Azure App Service
-  description: Deploy a simple Tomcat Java web app to Azure App Service.
-  ms.date: 02/13/2025
+  description: Shows you how to deploy a simple Tomcat Java web app to Azure App Service.
+  ms.date: 02/20/2025
   author: KarlErickson
   ms.author: ayangupta
   ms.topic: unit

learn-pr/advocates/create-java-webapp-to-app-service-linux/5-knowledge-check.yml

@@ -4,7 +4,7 @@ title: Knowledge check
 metadata:
   title: Knowledge Check
   description: Check your knowledge of creating and deploying Java web apps to Azure App Service.
-  ms.date: 02/13/2025
+  ms.date: 02/20/2025
   author: KarlErickson
   ms.author: ayangupta
   ms.topic: unit
@@ -13,7 +13,7 @@ durationInMinutes: 5
 quiz:
   title: Check your knowledge
   questions:
-    - content: What is the primary purpose of using Apache Maven in Java web application development?
+    - content: What's the primary purpose of using Apache Maven in Java web application development?
       choices:
         - content: To provide a web server for hosting the application.
           isCorrect: false

learn-pr/advocates/create-java-webapp-to-app-service-linux/6-summary.yml

@@ -3,9 +3,8 @@ uid: learn.azure.build-tomcat-java-appservice.6
 title: Summary
 metadata:
   title: Summary
-  titleSuffix: Azure
-  description: This is a summary of the module and instructions for cleanup of Azure resources.
-  ms.date: 02/13/2025
+  description: Summarizes the module and provides instructions for the cleanup of Azure resources.
+  ms.date: 02/20/2025
   author: KarlErickson
   ms.author: ayangupta
   ms.topic: unit

learn-pr/advocates/create-java-webapp-to-app-service-linux/includes/1-introduction.md

@@ -13,7 +13,7 @@ By the end of this module, you'll be able to do the following things:
 ## Prerequisites
 
 - Your own Azure subscription. [Create one for free.](https://azure.microsoft.com/free/).
-- [Azure CLI](/cli/azure/install-azure-cli?WT.mc_id=java-9121-yoterada)
+- [Azure CLI](/cli/azure/install-azure-cli)
 - [JDK 17](https://www.oracle.com/java/technologies/downloads/)
 - [Apache Tomcat 10.1.x](https://tomcat.apache.org/download-10.cgi)
 - [Maven 3.9.9](https://maven.apache.org/download.cgi?.=)

learn-pr/advocates/create-java-webapp-to-app-service-linux/includes/2-azure-app-service-explanation.md

@@ -2,11 +2,11 @@
 
 Azure App Service is a fully managed platform for building, deploying, and scaling web apps. It supports multiple programming languages and frameworks and enables developers to focus on coding, while Azure manages the infrastructure and scaling automatically. Azure App Service offers built-in integration with popular development tools, continuous integration, and deployment capabilities, making it easier to create web and mobile applications with minimal setup.
 
-:::image type="content" source="../media/azure-app-service.png" alt-text="Screenshot that shows Azure App Service in the Azure portal screen." lightbox="../media/azure-app-service.png":::
+:::image type="content" source="../media/azure-app-service.png" alt-text="Screenshot of the Azure portal that shows the Azure App Service page." lightbox="../media/azure-app-service.png":::
 
 ## Key features of Azure App Service
 
-The following are key features of Azure App Services:
+Azure App Service provides the following key features:
 
 - Multiple language support. Azure App Service supports a wide variety of programming languages and frameworks, including ASP.NET, Java, Python, Node.js, PHP, and Ruby. This flexibility enables developers to choose the best tools for their projects.
 - Built-in DevOps. Azure App Service offers seamless integration with CI/CD pipelines using GitHub, Bitbucket, Azure DevOps, and other popular services. This integration ensures continuous deployment and automated testing in your app's lifecycle.

learn-pr/advocates/create-java-webapp-to-app-service-linux/includes/3-exercise-create-simple-java-app.md

@@ -2,18 +2,18 @@ Web applications are widely used to handle real-world tasks such as inventory ma
 
 Suppose you're a developer working on a project to build a dynamic web application where users can enter data and interact with your platform in real time. Your client wants this app to be available locally for testing, and on the cloud for easy access. This setup lets you test on your local machine first, and then deploys to a live environment as a seamless transition. Building this setup from scratch gives you flexibility for future updates and configurations.
 
-In this module, you explore the essential steps for building and deploying a Java web app with Tomcat. You have two options: either clone an existing project from Azure Samples for immediate deployment, or build a new project from scratch with Maven. This module covers setting up your Maven project, configuring Tomcat, deploying the app locally, and using tools like Maven to manage dependencies and packages.
+In this module, you explore the essential steps for building and deploying a Java web app with Tomcat. You have two options: either clone an existing project repo for immediate deployment, or build a new project from scratch with Maven. This module covers setting up your Maven project, configuring Tomcat, deploying the app locally, and using tools like Maven to manage dependencies and packages.
 
 By the end of this module, you'll be able to create and deploy Java-based web applications on Tomcat, preparing you to support web application deployment both locally and in cloud-hosted environments.
 
 ## Create a Java Tomcat web app
 
 In this exercise, you create a minimal Java web application that takes an input and displays the result on the screen. You then deploy the web app locally on your computer using Tomcat. You have the following two options:
 
-1. Option 1: Clone the repo from Azure samples and immediately deploy your web app.
-2. Option 2: Create a Maven Tomcat project from scratch.
+- Option 1: Clone the sample repo and immediately deploy your web app.
+- Option 2: Create a Maven Tomcat project from scratch.
 
-## Option 1: Clone the repo from Azure samples and immediately deploy your web app
+## Option 1: Clone the sample repo and immediately deploy your web app
 
 To clone the repo, use the following steps:
 
@@ -25,23 +25,23 @@ To clone the repo, use the following steps:
 1. Navigate to the cloned project repo by using the following command:
 
     ```bash
-    cd simple-tomcat-app    
+    cd simple-tomcat-app
     ```
 
 Use the following steps to configure your local Tomcat server so you can deploy locally to Tomcat:
 
 > [!WARNING]
-> Storing usernames and passwords directly in configuration files like **tomcat-users.xml** and Maven's **settings.xml** in plaintext isn't considered secure, and we generally don't recommend this practice - especially for production environments. However, as this is just a Learn module, other alternatives are outside the scope of this module. Don't use your real username and password!
+> Storing usernames and passwords directly in configuration files like **tomcat-users.xml** and Maven's **settings.xml** in plain text isn't considered secure, and we generally don't recommend this practice - especially for production environments. However, other alternatives are outside the scope of this training module. Don't use your real username and password!
 
-1. Edit the Tomcat configuration file **conf/tomcat-users.xml** so that it is like the following code sample:
+1. Edit the Tomcat configuration file **conf/tomcat-users.xml** so that it looks like the following example:
 
     ```xml
     <tomcat-users>
         <user username="your-tomcat-username" password="your-tomcat-password" roles="manager-script"/>
     </tomcat-users>
     ```
 
-1. Add your credentials to the Maven **~/.m2/settings.xml** file by using the following code example, where you replace `your-tomcat-username` with a username, and `your-tomcat-password` with a password:
+1. Add your credentials to the Maven **~/.m2/settings.xml** file by using the following example, where you replace `your-tomcat-username` with a username, and `your-tomcat-password` with a password:
 
     ```xml
     <servers>
@@ -59,7 +59,7 @@ Use the following steps to configure your local Tomcat server so you can deploy
     mvn clean package cargo:deploy
     ```
 
-Success! Access your app at `http://localhost:8080/simple-tomcat-app`.
+After deployment, you can access your app at `http://localhost:8080/simple-tomcat-app`.
 
 ## Option 2: Create a Maven Tomcat project from scratch
 
@@ -77,7 +77,7 @@ mvn archetype:generate \
     -DinteractiveMode=false
 ```
 
-The following is typical output:
+The following output is typical:
 
 ```output
 [INFO] ----------------------------------------------------------------------------
@@ -118,50 +118,50 @@ You now have a new Maven web project in a folder named **simple-tomcat-app**. Th
 
 Modify the **pom.xml** file by using the following steps:
 
-1. Open **pom.xml** and set the Java version to 21 by using the following code example:
+1. Open **pom.xml** and set the Java version to 21 by using the following example:
 
     ```xml
     <java.version>21</java.version>
     <maven.compiler.source>21</maven.compiler.source>
     <maven.compiler.target>21</maven.compiler.target>
     ```
 
-1. Add Tomcat and Azure deployment plugins by using the following code example:
+1. Add Tomcat and Azure deployment plugins by using the following example:
 
     ```xml
-           <!-- Tomcat 10 Maven Plugin -->
-       <plugin>
-        <groupId>org.codehaus.cargo</groupId>
-        <artifactId>cargo-maven3-plugin</artifactId>
-        <version>1.9.9</version>
+    <!-- Tomcat 10 Maven Plugin -->
+    <plugin>
+      <groupId>org.codehaus.cargo</groupId>
+      <artifactId>cargo-maven3-plugin</artifactId>
+      <version>1.9.9</version>
+      <configuration>
+        <!-- Container Configuration -->
+        <container>
+          <containerId>tomcat10x</containerId>
+          <type>remote</type>
+        </container>
+        <!-- Configuration for Remote Deployment -->
         <configuration>
-          <!-- Container Configuration -->
-          <container>
-            <containerId>tomcat10x</containerId>
-            <type>remote</type>
-          </container>
-          <!-- Configuration for Remote Deployment -->
-          <configuration>
-            <type>runtime</type>
+          <type>runtime</type>
+          <properties>
+            <cargo.remote.uri>http://localhost:8080/manager/text</cargo.remote.uri>
+            <cargo.remote.username>cargo</cargo.remote.username>
+            <cargo.remote.password>your-cargo-password</cargo.remote.password>
+          </properties>
+        </configuration>
+        <!-- Deployable Artifact Configuration -->
+        <deployables>
+          <deployable>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>${project.artifactId}</artifactId>
+            <type>war</type>
             <properties>
-              <cargo.remote.uri>http://localhost:8080/manager/text</cargo.remote.uri>
-              <cargo.remote.username>cargo</cargo.remote.username>
-              <cargo.remote.password>your-cargo-password</cargo.remote.password>
+              <context>${project.artifactId}</context>
             </properties>
-          </configuration>
-          <!-- Deployable Artifact Configuration -->
-          <deployables>
-            <deployable>
-              <groupId>${project.groupId}</groupId>
-              <artifactId>${project.artifactId}</artifactId>
-              <type>war</type>
-              <properties>
-                <context>${project.artifactId}</context>
-              </properties>
-            </deployable>
-          </deployables>
-        </configuration>
-      </plugin>
+          </deployable>
+        </deployables>
+      </configuration>
+    </plugin>
     ```
 
 Here's the full content of the **pom.xml** file:
@@ -243,7 +243,7 @@ Here's the full content of the **pom.xml** file:
 
 ### Create a web interface
 
-To add a web page, edit the **src/main/webapp/index.jsp** file by using the following code example:
+To add a web page, edit the **src/main/webapp/index.jsp** file by using the following example:
 
 ```html
 <!DOCTYPE html>
@@ -265,7 +265,7 @@ To add a web page, edit the **src/main/webapp/index.jsp** file by using the foll
 
 ### Create a servlet
 
-A servlet is a Java programming class used to extend the capabilities of a server by handling requests and generating dynamic content. Servlets run on the server side within a web container - such as Apache Tomcat - and are primarily used to process HTTP requests in web applications. When a client - for example, a web browser - sends a request to a web server, the servlet processes the request. The servlet performs any necessary business logic, for example, accessing databases or calling other services, and then generates a response - often in the form of HTML - to send back to the client. Servlets enable developers to create dynamic, platform-independent web applications using Java.
+A servlet is a Java programming class used to extend the capabilities of a server by handling requests and generating dynamic content. Servlets run on the server side within a web container - such as Apache Tomcat - and are primarily used to process HTTP requests in web applications. When a client - for example, a web browser - sends a request to a web server, the servlet processes the request. The servlet performs any necessary business logic - for example, accessing databases or calling other services - and then generates a response - often in the form of HTML - to send back to the client. Servlets enable developers to create dynamic, platform-independent web applications using Java.
 
 To create a servlet, use the following steps:
 
@@ -278,25 +278,25 @@ To create a servlet, use the following steps:
 1. Update the contents of the **HelloSeverlet.java** file by using the following code example:
 
     ```java
-       package com.example;
-    
-       import jakarta.servlet.ServletException;
-       import jakarta.servlet.annotation.WebServlet;
-       import jakarta.servlet.http.HttpServlet;
-       import jakarta.servlet.http.HttpServletRequest;
-       import jakarta.servlet.http.HttpServletResponse;
-    
-       import java.io.IOException;
-    
-       @WebServlet("/hello")
-       public class HelloServlet extends HttpServlet {
-           @Override
-           protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-               String name = request.getParameter("name");
-               response.setContentType("text/html");
-               response.getWriter().write("<h1>Hello, " + name + "!</h1>");
-           }
-       }
+    package com.example;
+
+    import jakarta.servlet.ServletException;
+    import jakarta.servlet.annotation.WebServlet;
+    import jakarta.servlet.http.HttpServlet;
+    import jakarta.servlet.http.HttpServletRequest;
+    import jakarta.servlet.http.HttpServletResponse;
+
+    import java.io.IOException;
+
+    @WebServlet("/hello")
+    public class HelloServlet extends HttpServlet {
+        @Override
+        protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+            String name = request.getParameter("name");
+            response.setContentType("text/html");
+            response.getWriter().write("<h1>Hello, " + name + "!</h1>");
+        }
+    }
     ```
 
 Your new file structure looks like this:
@@ -325,17 +325,17 @@ Your new file structure looks like this:
 Use the following steps to configure your local Tomcat server so you can deploy to it:
 
 > [!WARNING]
-> Storing usernames and passwords directly in configuration files like **tomcat-users.xml** and Maven's **settings.xml** in plaintext isn't secure and isn't generally recommended, especially for production environments. However, since this is just a Learn module, other alternatives are outside the scope of this module. Don't use your real username and password!
+> Storing usernames and passwords directly in configuration files like **tomcat-users.xml** and Maven's **settings.xml** in plain text isn't secure and isn't generally recommended, especially for production environments. However, other alternatives are outside the scope of this training module. Don't use your real username and password!
 
-1. Edit the Tomcat configuration file **conf/tomcat-users.xml** by using the following code example:
+1. Edit the Tomcat configuration file **conf/tomcat-users.xml** by using the following example:
 
     ```xml
     <tomcat-users>
         <user username="your-tomcat-username" password="your-tomcat-password" roles="manager-script"/>
     </tomcat-users>
     ```
 
-1. Add your credentials to Maven's **~/.m2/settings.xml** file by using the following code example, replacing `your-tomcat-username` with a username and `your-tomcat-password` with a password:
+1. Add your credentials to Maven's **~/.m2/settings.xml** file by using the following example, replacing `your-tomcat-username` with a username and `your-tomcat-password` with a password:
 
     ```xml
     <servers>
@@ -355,4 +355,4 @@ Use the following command to package and deploy your web app:
 mvn clean package cargo:deploy
 ```
 
-Success! Your app is available at `http://localhost:8080/simple-tomcat-app`.
+After deployment, your app is available at `http://localhost:8080/simple-tomcat-app`.