Skip to content

Commit f1a1f33

Browse files
committed
Merge branch 'main' into release-monitor-alerts-backup
2 parents 1c64f4d + 698ed89 commit f1a1f33

File tree

187 files changed

+4264
-4042
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+4264
-4042
lines changed

.openpublishing.redirection.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4024,6 +4024,26 @@
40244024
"source_path_from_root": "/articles/managed-grafana/how-to-transition-domain.md",
40254025
"redirect_url": "/azure/managed-grafana/overview",
40264026
"redirect_document_id": false
4027+
},
4028+
{
4029+
"source_path_from_root": "/articles/load-balancer/move-across-regions-external-load-balancer-portal.md",
4030+
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
4031+
"redirect_document_id": false
4032+
},
4033+
{
4034+
"source_path_from_root": "/articles/load-balancer/move-across-regions-external-load-balancer-powershell.md",
4035+
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
4036+
"redirect_document_id": false
4037+
},
4038+
{
4039+
"source_path_from_root": "/articles/load-balancer/move-across-regions-internal-load-balancer-portal.md",
4040+
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
4041+
"redirect_document_id": false
4042+
},
4043+
{
4044+
"source_path_from_root": "/articles/load-balancer/move-across-regions-internal-load-balancer-powershell.md",
4045+
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
4046+
"redirect_document_id": false
40274047
}
40284048
]
40294049
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ The following diagram describes the app registrations and the app architecture.
6262
Before you follow the procedures in this article, make sure that your computer is running:
6363

6464
* [Visual Studio Code](https://code.visualstudio.com/) or any other code editor.
65-
* [Node.js runtime](https://nodejs.org/en/download/) and [npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm/).
65+
* [Node.js runtime](https://nodejs.org/en/download/package-manager/) and [npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm/).
6666
* [Angular CLI](https://angular.io/cli).
6767

6868
## Step 1: Configure your user flow

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ The following diagram describes the app registrations and the app architecture.
6262
Before you follow the procedures in this article, make sure that your computer is running:
6363

6464
* [Visual Studio Code](https://code.visualstudio.com/) or another code editor.
65-
* [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.
65+
* [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.
6666

6767
## Step 1: Configure your user flow
6868

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ The app architecture and registrations are illustrated in the following diagram:
6060
A computer that's running:
6161

6262
* [Visual Studio Code](https://code.visualstudio.com/), or another code editor.
63-
* [Node.js runtime](https://nodejs.org/en/download/)
63+
* [Node.js runtime](https://nodejs.org/en/download/package-manager/)
6464

6565
## Step 1: Configure your user flow
6666

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ In this article, you learn how to create your web app that calls your web API. T
2929

3030
- [Visual Studio Code](https://code.visualstudio.com/), or another code editor
3131

32-
- [Node.js runtime](https://nodejs.org/en/download/)
32+
- [Node.js runtime](https://nodejs.org/en/download/package-manager/)
3333

3434
## Step 1: Create a protected web API
3535

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ In the next sections, you create a new web API project. Select your programming
7676
# [Node.js](#tab/nodejsgeneric)
7777
7878
* [Visual Studio Code](https://code.visualstudio.com/), or another code editor
79-
* [Node.js runtime](https://nodejs.org/en/download/)
79+
* [Node.js runtime](https://nodejs.org/en/download/package-manager/)
8080
8181
---
8282

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ In this quickstart, you use a single-page application to sign in using a social
2828
## Prerequisites
2929

3030
- [Visual Studio Code](https://code.visualstudio.com/)
31-
- [Node.js](https://nodejs.org/en/download/)
31+
- [Node.js](https://nodejs.org/en/download/package-manager/)
3232
- Social account from Facebook, Google, or Microsoft
3333
- Code sample from GitHub: [ms-identity-b2c-javascript-spa](https://github.com/Azure-Samples/ms-identity-b2c-javascript-spa):
3434

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ mvn com.microsoft.azure:azure-webapp-maven-plugin:2.13.0:config
104104
1. For **Create new run configuration**, type **Y**, then **Enter**.
105105
1. For **Define value for OS**, type **2** for Linux, then **Enter**.
106106
1. For **Define value for javaVersion**, type **1** for Java 17, then **Enter**.
107-
1. For **Define value for pricingTier**, type **9** for P1v2, then **Enter**.
107+
1. For **Define value for pricingTier**, type **3** for P1v2, then **Enter**.
108108
1. For **Confirm**, type **Y**, then **Enter**.
109109
110110
```

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ The deployment process to Azure App Service uses your Azure credentials from the
5252
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.
5353

5454
```azurecli-interactive
55-
mvn com.microsoft.azure:azure-webapp-maven-plugin:2.12.0:config
55+
mvn com.microsoft.azure:azure-webapp-maven-plugin:2.13.0:config
5656
```
5757

5858
1. For **Create new run configuration**, type **Y**, then **Enter**.
5959
1. For **Define value for OS**, type **2** for Linux, then **Enter**.
6060
1. For **Define value for javaVersion**, type **2** for Java 11, then **Enter**.
61-
1. For **webContainer** option, type **1** for Jbosseap 7, then **Enter**.
61+
1. For **webContainer** option, type **4** for Jbosseap 7, then **Enter**.
6262
1. For **Define value for pricingTier**, type **1** for P1v3, then **Enter**.
6363
1. For **Confirm**, type **Y**, then **Enter**.
6464

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ The deployment process to Azure App Service uses your Azure credentials from the
4444
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.
4545

4646
```azurecli-interactive
47-
mvn com.microsoft.azure:azure-webapp-maven-plugin:2.12.0:config
47+
mvn com.microsoft.azure:azure-webapp-maven-plugin:2.13.0:config
4848
```
4949

5050
1. For **Create new run configuration**, type **Y**, then **Enter**.
5151
1. For **Define value for OS**, type **1** for Windows, or **2** for Linux, then **Enter**.
52-
1. For **Define value for javaVersion**, type **3** for Java 17, then **Enter**.
52+
1. For **Define value for javaVersion**, type **1** for Java 17, then **Enter**.
5353
1. For **Define value for webContainer**, type **1** for Tomcat 10.0, then **Enter**.
54-
1. For **Define value for pricingTier**, type **9** for P1v2, then **Enter**.
54+
1. For **Define value for pricingTier**, type **3** for P1v2, then **Enter**.
5555
1. For **Confirm**, type **Y**, then **Enter**.
5656

5757
```

0 commit comments

Comments
 (0)