Skip to content

Commit d2be5ff

Browse files
committed
iMerge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into normesta-reg-updates-14
2 parents d80b83f + 2308f27 commit d2be5ff

File tree

1,114 files changed

+8688
-7457
lines changed

Some content is hidden

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

1,114 files changed

+8688
-7457
lines changed

.openpublishing.redirection.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1970,6 +1970,11 @@
19701970
"redirect_url": "/azure/firewall/tutorial-protect-firewall-ddos",
19711971
"redirect_document_id": false
19721972
},
1973+
{
1974+
"source_path_from_root": "/articles/firewall-manager/check-point-overview.md",
1975+
"redirect_url": "/azure/firewall-manager/deploy-trusted-security-partner",
1976+
"redirect_document_id": false
1977+
},
19731978
{
19741979
"source_path_from_root": "/articles/flexible-server/concepts-high-availability.md",
19751980
"redirect_url": "/azure/reliability/reliability-postgre-flexible",
@@ -4019,6 +4024,26 @@
40194024
"source_path_from_root": "/articles/managed-grafana/how-to-transition-domain.md",
40204025
"redirect_url": "/azure/managed-grafana/overview",
40214026
"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
40224047
}
40234048
]
40244049
}

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/api-center/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ landingContent:
6161
- linkListType: how-to-guide
6262
links:
6363
- text: Analyze APIs using linting rules
64-
url: enable-api-analysis-linting.md
64+
url: enable-managed-api-analysis-linting.md
6565
- linkListType: concept
6666
links:
6767
- text: Use metadata for governance

articles/api-management/inject-vnet-v2.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,11 @@ The subnet needs to be delegated to the **Microsoft.Web/hostingEnvironments** se
6868
6969
For more information about configuring subnet delegation, see [Add or remove a subnet delegation](../virtual-network/manage-subnet-delegation.md).
7070

71+
[!INCLUDE [api-management-virtual-network-address-prefix](../../includes/api-management-virtual-network-address-prefix.md)]
72+
7173
### Permissions
7274

73-
You must have at least the following role-based access control permissions on the subnet or at a higher level to configure virtual network integration:
75+
You must have at least the following role-based access control permissions on the subnet or at a higher level to configure virtual network injection:
7476

7577
| Action | Description |
7678
|-|-|
@@ -86,13 +88,11 @@ When you [create](get-started-create-service-instance.md) a Premium v2 instance
8688

8789
1. In the **Create API Management service** wizard, select the **Networking** tab.
8890
1. In **Connectivity type**, select **Virtual network**.
89-
1. In **Type**, select **Internal**.
90-
1. In **Configure virtual networks**, select the virtual network and the delegated subnet that you want to integrate.
91-
92-
Optionally, provide a public IP address resource if you want to own and control an IP address that's used only for outbound connection to the internet.
91+
1. In **Type**, select **Injection**.
92+
1. In **Configure virtual networks**, select the virtual network and the delegated subnet that you want to inject.
9393
1. Complete the wizard to create the API Management instance.
9494

95-
## DNS settings for integration with private IP address
95+
## DNS settings for access to private IP address
9696

9797
When a Premium v2 API Management instance is injected in a virtual network, you have to manage your own DNS to enable inbound access to API Management.
9898

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ __App Service Migration Assistant tool and App Service migration assistant for P
5555

5656
|Migration Tools| Description | Documentation |
5757
|-----------|-------------|---------------|
58-
|[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)|
58+
|[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)|
5959
|[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)|
6060
|[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)|
6161

0 commit comments

Comments
 (0)