Merge branch 'MicrosoftDocs:main' into Spelling-Wave-20

Author: ArieHein

.openpublishing.redirection.json

@@ -1970,6 +1970,11 @@
       "redirect_url": "/azure/firewall/tutorial-protect-firewall-ddos",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/firewall-manager/check-point-overview.md",
+      "redirect_url": "/azure/firewall-manager/deploy-trusted-security-partner",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/flexible-server/concepts-high-availability.md",
       "redirect_url": "/azure/reliability/reliability-postgre-flexible",

articles/active-directory-b2c/configure-authentication-sample-angular-spa-app.md

@@ -62,7 +62,7 @@ The following diagram describes the app registrations and the app architecture.
 Before you follow the procedures in this article, make sure that your computer is running:
 
 * [Visual Studio Code](https://code.visualstudio.com/) or any other code editor.
-* [Node.js runtime](https://nodejs.org/en/download/) and [npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm/).
+* [Node.js runtime](https://nodejs.org/en/download/package-manager/) and [npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm/).
 * [Angular CLI](https://angular.io/cli).
 
 ## Step 1: Configure your user flow

articles/active-directory-b2c/configure-authentication-sample-react-spa-app.md

@@ -62,7 +62,7 @@ The following diagram describes the app registrations and the app architecture.
 Before you follow the procedures in this article, make sure that your computer is running:
 
 * [Visual Studio Code](https://code.visualstudio.com/) or another code editor.
-* [Node.js runtime](https://nodejs.org/en/download/) and [npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm/). To test that you have Node.js and npm correctly installed on your machine, you can type `node --version` and `npm --version` in a terminal or command prompt.
+* [Node.js runtime](https://nodejs.org/en/download/package-manager/) and [npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm/). To test that you have Node.js and npm correctly installed on your machine, you can type `node --version` and `npm --version` in a terminal or command prompt.
 
 ## Step 1: Configure your user flow
 

articles/active-directory-b2c/configure-authentication-sample-spa-app.md

@@ -60,7 +60,7 @@ The app architecture and registrations are illustrated in the following diagram:
 A computer that's running:
 
 * [Visual Studio Code](https://code.visualstudio.com/), or another code editor.
-* [Node.js runtime](https://nodejs.org/en/download/)
+* [Node.js runtime](https://nodejs.org/en/download/package-manager/)
 
 ## Step 1: Configure your user flow
 

articles/active-directory-b2c/enable-authentication-in-node-web-app-with-api.md

@@ -29,7 +29,7 @@ In this article, you learn how to create your web app that calls your web API. T
 
 - [Visual Studio Code](https://code.visualstudio.com/), or another code editor
 
-- [Node.js runtime](https://nodejs.org/en/download/)
+- [Node.js runtime](https://nodejs.org/en/download/package-manager/)
 
 ## Step 1: Create a protected web API
 

articles/active-directory-b2c/enable-authentication-web-api.md

@@ -76,7 +76,7 @@ In the next sections, you create a new web API project. Select your programming
 # [Node.js](#tab/nodejsgeneric)
 
 * [Visual Studio Code](https://code.visualstudio.com/), or another code editor
-* [Node.js runtime](https://nodejs.org/en/download/)
+* [Node.js runtime](https://nodejs.org/en/download/package-manager/)
 
 ---
 

articles/active-directory-b2c/quickstart-single-page-app.md

@@ -28,7 +28,7 @@ In this quickstart, you use a single-page application to sign in using a social
 ## Prerequisites
 
 - [Visual Studio Code](https://code.visualstudio.com/)
-- [Node.js](https://nodejs.org/en/download/)
+- [Node.js](https://nodejs.org/en/download/package-manager/)
 - Social account from Facebook, Google, or Microsoft
 - Code sample from GitHub: [ms-identity-b2c-javascript-spa](https://github.com/Azure-Samples/ms-identity-b2c-javascript-spa):
 

articles/app-service/app-service-asp-net-migration.md

@@ -55,7 +55,7 @@ __App Service Migration Assistant tool and App Service migration assistant for P
 
 |Migration Tools| Description | Documentation |
 |-----------|-------------|---------------|
-|[App Service Migration Assistant](https://appmigration.microsoft.com/api/download/windows/AppServiceMigrationAssistant.msi)|Migrate .NET web apps from Windows OS to App Service.|[App Service Migration Assistant Documentation](https://github.com/Azure/App-Service-Migration-Assistant/wiki)|
+|[App Service Migration Assistant](https://appmigration.microsoft.com/api/download/windowspreview/AppServiceMigrationAssistant.msi)|Migrate .NET web apps from Windows OS to App Service.|[App Service Migration Assistant Documentation](https://github.com/Azure/App-Service-Migration-Assistant/wiki)|
 |[App Service migration assistant for Java on Apache Tomcat (Windows—preview)](https://appmigration.microsoft.com/api/download/windows/AppServiceMigrationAssistant.msi)|Download prerelease software for migrating Java web applications on Tomcat web server running on Windows servers.|[App Service Migration Assistant Documentation](https://github.com/Azure/App-Service-Migration-Assistant/wiki)|
 |[App Service Migration Assistant PowerShell scripts](https://appmigration.microsoft.com/api/download/psscripts/AppServiceMigrationScripts.zip)|Download PowerShell scripts for discovering and assessing all Microsoft Internet Information Services (IIS) web apps on a single server in bulk and migrating .NET web apps from Windows OS to App Service.|[App Service Migration Assistant Powershell Documentation](https://github.com/Azure/App-Service-Migration-Assistant/wiki/PowerShell-Scripts)<br>[SHA256 Identifier](https://github.com/Azure/App-Service-Migration-Assistant/wiki/Release-Notes)|
 

articles/app-service/includes/quickstart-java/quickstart-java-javase.md

@@ -104,7 +104,7 @@ mvn com.microsoft.azure:azure-webapp-maven-plugin:2.13.0:config
 1. For **Create new run configuration**, type **Y**, then **Enter**.
 1. For **Define value for OS**, type **2** for Linux, then **Enter**.
 1. For **Define value for javaVersion**, type **1** for Java 17, then **Enter**.
-1. For **Define value for pricingTier**, type **9** for P1v2, then **Enter**.
+1. For **Define value for pricingTier**, type **3** for P1v2, then **Enter**.
 1. For **Confirm**, type **Y**, then **Enter**.
 
     ```

articles/app-service/includes/quickstart-java/quickstart-java-jboss.md

@@ -52,13 +52,13 @@ The deployment process to Azure App Service uses your Azure credentials from the
 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.
 
 ```azurecli-interactive
-mvn com.microsoft.azure:azure-webapp-maven-plugin:2.12.0:config
+mvn com.microsoft.azure:azure-webapp-maven-plugin:2.13.0:config
 ```
 
 1. For **Create new run configuration**, type **Y**, then **Enter**.
 1. For **Define value for OS**, type **2** for Linux, then **Enter**.
 1. For **Define value for javaVersion**, type **2** for Java 11, then **Enter**.
-1. For **webContainer** option, type **1** for Jbosseap 7, then **Enter**.
+1. For **webContainer** option, type **4** for Jbosseap 7, then **Enter**.
 1. For **Define value for pricingTier**, type **1** for P1v3, then **Enter**.
 1. For **Confirm**, type **Y**, then **Enter**.