validation and acrolinx

Author: Cephas Lin

articles/app-service/configure-authentication-user-identities.md

@@ -20,19 +20,19 @@ For all language frameworks, App Service makes the claims in the incoming token
 |------------------------------|-----------------------------------------------------------------------|
 | `X-MS-CLIENT-PRINCIPAL`      | A Base64 encoded JSON representation of available claims. For more information, see [Decoding the client principal header](#decoding-the-client-principal-header).   |
 | `X-MS-CLIENT-PRINCIPAL-ID`   | An identifier for the caller set by the identity provider.            |
-| `X-MS-CLIENT-PRINCIPAL-NAME` | A human-readable name for the caller set by the identity provider, e.g. Email Address, User Principal Name.   |
+| `X-MS-CLIENT-PRINCIPAL-NAME` | A human-readable name for the caller set by the identity provider, such as email address or user principal name.   |
 | `X-MS-CLIENT-PRINCIPAL-IDP`  | The name of the identity provider used by App Service Authentication. |
 
 Provider tokens are also exposed through similar headers. For example, Microsoft Entra also sets `X-MS-TOKEN-AAD-ACCESS-TOKEN` and `X-MS-TOKEN-AAD-ID-TOKEN` as appropriate.
 
 > [!NOTE]
-> Different language frameworks may present these headers to the app code in different formats, such as lowercase or title case.
+> Different language frameworks might present these headers to the app code in different formats, such as lowercase or title case.
 
-Code that is written in any language or framework can get the information that it needs from these headers. [Decoding the client principal header](#decoding-the-client-principal-header) covers this process. For some frameworks, the platform also provides extra options that may be more convenient.
+Code that is written in any language or framework can get the information that it needs from these headers. [Decoding the client principal header](#decoding-the-client-principal-header) covers this process. For some frameworks, the platform also provides extra options that might be more convenient.
 
 ### Decoding the client principal header
 
-`X-MS-CLIENT-PRINCIPAL` contains the full set of available claims as Base64 encoded JSON. These claims go through a default claims-mapping process, so some may have different names than you would see if processing the token directly. The decoded payload is structured as follows:
+`X-MS-CLIENT-PRINCIPAL` contains the full set of available claims as Base64 encoded JSON. These claims go through a default claims-mapping process, so some might have different names than you would see if processing the token directly. The decoded payload is structured as follows:
 
 ```json
 {
@@ -52,12 +52,12 @@ Code that is written in any language or framework can get the information that i
 |------------|------------------|---------------------------------------|
 | `auth_typ` | string           | The name of the identity provider used by App Service Authentication. |
 | `claims`   | array of objects | An array of objects representing the available claims. Each object contains `typ` and `val` properties. |
-| `typ`      | string           | The name of the claim. This may have been subject to default claims mapping and could be different from the corresponding claim contained in a token. |
+| `typ`      | string           | The name of the claim. It might be subject to default claims mapping and could be different from the corresponding claim contained in a token. |
 | `val`      | string           | The value of the claim.                                      |
 | `name_typ` | string           | The name claim type, which is typically a URI providing scheme information about the `name` claim if one is defined. |
 | `role_typ` | string           | The role claim type, which is typically a URI providing scheme information about the `role` claim if one is defined. |
 
-To process this header, your app will need to decode the payload and iterate through the `claims` array to find the claims of interest. It may be convenient to convert these into a representation used by the app's language framework. Here's an example of this process in C# that constructs a [ClaimsPrincipal](/dotnet/api/system.security.claims.claimsprincipal) type for the app to use:
+To process this header, your app needs to decode the payload and iterate through the `claims` array to find the claims of interest. It it be convenient to convert them into a representation used by the app's language framework. Here's an example of this process in C# that constructs a [ClaimsPrincipal](/dotnet/api/system.security.claims.claimsprincipal) type for the app to use:
 
 ```csharp
 using System;

articles/app-service/configure-common.md

@@ -34,7 +34,7 @@ Other language stacks, likewise, get the app settings as environment variables a
 - [Node.js](configure-language-nodejs.md#access-environment-variables)
 - [PHP](configure-language-php.md#access-environment-variables)
 - [Python](configure-language-python.md#access-app-settings-as-environment-variables)
-- [Java](configure-language-java-data-sources.md#configure-data-sources)
+- [Java](configure-language-java-data-sources.md)
 - [Custom containers](configure-custom-container.md#configure-environment-variables)
 
 App settings are always encrypted when stored (encrypted-at-rest).
@@ -216,7 +216,7 @@ At runtime, connection strings are available as environment variables, prefixed
 * Notification Hub: `NOTIFICATIONHUBCONNSTR_`
 * Service Bus: `SERVICEBUSCONNSTR_`
 * Event Hub: `EVENTHUBCONNSTR_`
-* Document Db: `DOCDBCONNSTR_`
+* Document DB: `DOCDBCONNSTR_`
 * Redis Cache: `REDISCACHECONNSTR_`
 
 >[!Note]

articles/app-service/configure-language-java-apm.md

@@ -99,7 +99,7 @@ To enable via the Azure CLI, you need to create an Application Insights resource
 
 1. Create a NewRelic account at [NewRelic.com](https://newrelic.com/signup)
 2. Download the Java agent from NewRelic. It has a file name similar to *newrelic-java-x.x.x.zip*.
-3. Copy your license key, you'll need it to configure the agent later.
+3. Copy your license key, you need it to configure the agent later.
 4. [SSH into your App Service instance](configure-linux-open-ssh-session.md) and create a new directory */home/site/wwwroot/apm*.
 5. Upload the unpacked NewRelic Java agent files into a directory under */home/site/wwwroot/apm*. The files for your agent should be in */home/site/wwwroot/apm/newrelic*.
 6. Modify the YAML file at */home/site/wwwroot/apm/newrelic/newrelic.yml* and replace the placeholder license value with your own license key.
@@ -187,18 +187,22 @@ To enable via the Azure CLI, you need to create an Application Insights resource
 ## Configure Datadog
 
 # [Windows](#tab/windows)
-* The configuration options are different depending on which Datadog site your organization is using. Therefore please reference and follow the steps here in the official [Datadog Integration for Azure Documentation](https://docs.datadoghq.com/integrations/azure/)
+* The configuration options are different depending on which Datadog site your organization is using. See the official [Datadog Integration for Azure Documentation](https://docs.datadoghq.com/integrations/azure/)
+
+# [Linux](#tab/linux)
+* The configuration options are different depending on which Datadog site your organization is using. See the official [Datadog Integration for Azure Documentation](https://docs.datadoghq.com/integrations/azure/)
 
-# [Linux](#tab/windows)
-* The configuration options are different depending on which Datadog site your organization is using. Therefore please reference and follow the steps here in the official [Datadog Integration for Azure Documentation](https://docs.datadoghq.com/integrations/azure/)
+---
 
 ## Configure Dynatrace
 
 # [Windows](#tab/windows)
-* Dynatrace provides an [Azure Native Dynatrace Service](https://www.dynatrace.com/monitoring/technologies/azure-monitoring/). To monitor Azure App Services using Dynatrace, please follow the steps in the official [Dynatrace for Azure documentation](https://docs.datadoghq.com/integrations/azure/)
+* Dynatrace provides an [Azure Native Dynatrace Service](https://www.dynatrace.com/monitoring/technologies/azure-monitoring/). To monitor Azure App Services using Dynatrace, see the official [Dynatrace for Azure documentation](https://docs.datadoghq.com/integrations/azure/)
 
-# [Linux](#tab/windows)
-* Dynatrace provides an [Azure Native Dynatrace Service](https://www.dynatrace.com/monitoring/technologies/azure-monitoring/). To monitor Azure App Services using Dynatrace, please follow the steps in the official [Dynatrace for Azure documentation](https://docs.datadoghq.com/integrations/azure/)
+# [Linux](#tab/linux)
+* Dynatrace provides an [Azure Native Dynatrace Service](https://www.dynatrace.com/monitoring/technologies/azure-monitoring/). To monitor Azure App Services using Dynatrace, see the official [Dynatrace for Azure documentation](https://docs.datadoghq.com/integrations/azure/)
+
+---
 
 ## Next steps
 

articles/app-service/getting-started.md

@@ -7,7 +7,6 @@ ms.topic: overview
 ms.custom: devx-track-extended-java, devx-track-python, devx-track-js
 ms.date: 8/31/2023
 zone_pivot_groups: app-service-getting-started-stacks
-<!-- #customer intent: As a developer, I want to learn how to deploy my web applications to Azure App Service so that I can take advantage of its managed platform and easily scale my applications. -->
 ---
 
 # Getting started with Azure App Service

articles/app-service/includes/deploy-intelligent-apps/deploy-intelligent-apps-linux-java-pivot.md

@@ -17,11 +17,7 @@ You can use Azure App Service to create applications using Azure OpenAI and Open
 
 ### Set up web app
 
-<<<<<<< HEAD
-For this Spring Boot application, we're building off the [quickstart](../../quickstart-java.md?tabs=springboot&pivots=java-maven-javase) app and adding an extra feature to make a request to an Azure OpenAI or OpenAI service. Add the following code to your application:
-=======
 For this Spring Boot application, we're building off the [quickstart](../../quickstart-java.md?tabs=springboot&pivots=java-javase) app and adding an extra feature to make a request to an Azure OpenAI or OpenAI service. Add the following code to your application:
->>>>>>> 186f85b0178b (acrolinx and template errors)
 
 ```bash
   @RequestMapping("/")
@@ -35,9 +31,9 @@ For this Spring Boot application, we're building off the [quickstart](../../quic
 
 ### Secure your app with managed identity
 
-Although optional, it's highly recommended to secure your application using [managed identity](../../overview-managed-identity.md) to authenticate your app to your Azure OpenAI resource. Skip this step if you are not using Azure OpenAI. This enables your application to access the Azure OpenAI resource without needing to manage API keys.
+Although optional, it's highly recommended to secure your application using [managed identity](../../overview-managed-identity.md) to authenticate your app to your Azure OpenAI resource. Skip this step if you're not using Azure OpenAI. This enables your application to access the Azure OpenAI resource without needing to manage API keys.
 
-Follow the steps below to secure your application:
+To secure your application:
 
 Add the Azure OpenAI dependency package. This package enables using Azure credentials in your app.
 
@@ -60,16 +56,16 @@ OpenAIClient client = new OpenAIClientBuilder()
     .buildClient();
 ```
 
-Once the credentials are added to the application, you�ll then need to enable managed identity in your application and grant access to the resource.
+Once the credentials are added to the application, you need to enable managed identity in your application and grant access to the resource.
 
-1. In your web app resource, navigate to the **Identity** page and turn on **System assigned** and click **Save**
-2. Once System assigned identity is turned on, it will register the web app with Microsoft Entra ID and the web app can be granted permissions to access protected resources.  
+1. In your web app resource, navigate to the **Identity** page and turn on **System assigned** and select **Save**.
+2. Once System assigned identity is turned on, it registers the web app with Microsoft Entra ID and the web app can be granted permissions to access protected resources.  
 3. Go to your Azure OpenAI resource and navigate to the **Access control (IAM)** page on the left pane.  
-4. Find the Grant access to this resource card and click on **Add role assignment**
-5. Search for the **Cognitive Services OpenAI User** role and click **Next**
-6. On the **Members** tab, find **Assign access to** and choose the **Managed identity** option
-7. Next, click on **+Select Members**  and find your web app
-8. Click **Review + assign**
+4. Find the Grant access to this resource card and select **Add role assignment**.
+5. Search for the **Cognitive Services OpenAI User** role and select **Next**.
+6. On the **Members** tab, find **Assign access to** and choose the **Managed identity** option.
+7. Next, select **+Select Members**  and find your web app.
+8. Select **Review + assign**.
 
 Your web app is now added as a cognitive service OpenAI user and can communicate to your Azure OpenAI resource.
 
@@ -291,7 +287,7 @@ public class Application {
 
 If you completed the steps above, you can deploy to App Service as you normally would. If you run into any issues, remember that you need to complete the following steps: grant your app access to your Key Vault, and add the app settings with key vault references as your values. App Service resolves the app settings in your application that match what you added in the portal.
 
-Once the app is deployed, you can visit your site URL and you're greeted with the text that contains the response from your chat message prompt.  
+Once the app is deployed, you can visit your site URL and see the text that contains the response from your chat message prompt.  
 
 
 ### Authentication

articles/app-service/includes/quickstart-java/quickstart-java-linux-maven-pivot.md

@@ -58,7 +58,7 @@ mvn clean install
 cd booty-duke-app-service
 ```
 
-If you see a message about being in **detached HEAD** state, this message is safe to ignore. Because you will not be making any commits, detached HEAD state is appropriate.
+If you see a message about being in **detached HEAD** state, this message is safe to ignore. Because you won't make any commits, detached HEAD state is appropriate.
 
 # [Tomcat](#tab/tomcat)
 
@@ -94,7 +94,7 @@ cd petstore-ee7
 mvn clean install
 ```
 
-If you see a message about being in **detached HEAD** state, this message is safe to ignore. Because you will not be making any commits, detached HEAD state is appropriate.
+If you see a message about being in **detached HEAD** state, this message is safe to ignore. Because you won't making any commits, detached HEAD state is appropriate.
 
 ---
 
@@ -103,7 +103,7 @@ If you see a message about being in **detached HEAD** state, this message is saf
 > [!TIP]
 > The Maven plugin supports **Java 17** and **Tomcat 10.0**. For more information about latest support, see [Java 17 and Tomcat 10.0 are available on Azure App Service](https://devblogs.microsoft.com/java/java-17-and-tomcat-10-0-available-on-azure-app-service/).
 
-The deployment process to Azure App Service uses your Azure credentials from the Azure CLI automatically. If the Azure CLI isn't installed locally, then the Maven plugin authenticates with Oauth or device login. For more information, see [authentication with Maven plugins](https://github.com/microsoft/azure-maven-plugins/wiki/Authentication).
+The deployment process to Azure App Service uses your Azure credentials from the Azure CLI automatically. If the Azure CLI isn't installed locally, then the Maven plugin authenticates with Oauth or device sign-in. For more information, see [authentication with Maven plugins](https://github.com/microsoft/azure-maven-plugins/wiki/Authentication).
 
 Run the Maven command shown next to configure the deployment. This command helps you to set up the App Service operating system, Java version, and Tomcat version.
 
@@ -206,7 +206,7 @@ mvn com.microsoft.azure:azure-webapp-maven-plugin:2.11.0:config
 
 ---
 
-After you've confirmed your choices, the plugin adds the above plugin element and requisite settings to your project's `pom.xml` file that configure your web app to run in Azure App Service.
+After you confirm your choices, the plugin adds the above plugin element and requisite settings to your project's `pom.xml` file that configure your web app to run in Azure App Service.
 
 The relevant portion of the `pom.xml` file should look similar to the following example.
 
@@ -228,7 +228,7 @@ The relevant portion of the `pom.xml` file should look similar to the following
 </build>           
 ```
 
-You can modify the configurations for App Service directly in your `pom.xml`. Some common configurations are listed below:
+You can modify the configurations for App Service directly in your `pom.xml`. Some common configurations are listed in the following table:
 
 Property | Required | Description | Version
 ---|---|---|---
@@ -243,7 +243,7 @@ Property | Required | Description | Version
 
 For the complete list of configurations, see the plugin reference documentation. All the Azure Maven Plugins share a common set of configurations. For these configurations see [Common Configurations](https://github.com/microsoft/azure-maven-plugins/wiki/Common-Configuration). For configurations specific to App Service, see [Azure Web App: Configuration Details](https://github.com/microsoft/azure-maven-plugins/wiki/Azure-Web-App:-Configuration-Details).
 
-Be careful about the values of `<appName>` and `<resourceGroup>` (`helloworld-1590394316693` and `helloworld-1590394316693-rg` accordingly in the demo), they are used later.
+Be careful about the values of `<appName>` and `<resourceGroup>` (`helloworld-1590394316693` and `helloworld-1590394316693-rg` accordingly in the demo). They're used later.
 
 ## 4 - Deploy the app
 
@@ -282,7 +282,7 @@ Once deployment is completed, your application is ready at `http://<appName>.azu
 
 ---
 
-**Congratulations!** You've deployed your first Java app to App Service.
+**Congratulations!** You deployed your first Java app to App Service.
 
 ## 5 - Clean up resources
 
@@ -292,4 +292,4 @@ In the preceding steps, you created Azure resources in a resource group. If you
 az group delete --name <your resource group name; for example: helloworld-1558400876966-rg> --yes
 ```
 
-This command may take a minute to run.
+This command might take a minute to run.