Skip to content

Commit 256572f

Browse files
authored
Merge pull request #291555 from MicrosoftDocs/main
Publish 12/6 11:00 AM IST
2 parents ef39705 + 57862bd commit 256572f

File tree

84 files changed

+1528
-1297
lines changed

Some content is hidden

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

84 files changed

+1528
-1297
lines changed

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
```

articles/azure-cache-for-redis/cache-high-availability.md

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Various high availability options are available in the Standard, Premium, and En
2020
| Option | Description | Availability | Standard | Premium | Enterprise |
2121
| ------------------- | ------- | ------- | :------: | :---: | :---: |
2222
| [Standard replication](#standard-replication-for-high-availability)| Dual-node replicated configuration in a single data center with automatic failover | 99.9% (see [details](https://azure.microsoft.com/support/legal/sla/cache/v1_1/)) |Yes|Yes|Yes|
23-
| [Zone redundancy](#zone-redundancy) | Multi-node replicated configuration across Availability Zones, with automatic failover | 99.9% in Premium; 99.99% in Enterprise (see [details](https://azure.microsoft.com/support/legal/sla/cache/v1_1/)) |Yes (Preview)|Yes|Yes|
23+
| [Zone redundancy](#zone-redundancy) | Multi-node replicated configuration across Availability Zones, with automatic failover | 99.9% in Premium; 99.99% in Enterprise (see [details](https://azure.microsoft.com/support/legal/sla/cache/v1_1/)) |Yes|Yes|Yes|
2424
| Geo-replication | Linked cache instances in two regions, with user-controlled failover | Premium; Enterprise (see [details](https://azure.microsoft.com/support/legal/sla/cache/v1_1/)) |No| [Passive](#passive-geo-replication) | [Active](#active-geo-replication) |
2525
| [Import/Export](#importexport) | Point-in-time snapshot of data in cache. | 99.9% (see [details](https://azure.microsoft.com/support/legal/sla/cache/v1_1/)) |No|Yes|Yes|
2626
| [Persistence](#persistence) | Periodic data saving to storage account. | 99.9% (see [details](https://azure.microsoft.com/support/legal/sla/cache/v1_1/)) |No|Yes|Preview|
@@ -61,19 +61,16 @@ Also, Azure Cache for Redis provides more replica nodes in the Premium tier. A [
6161

6262
## Zone redundancy
6363

64-
Applicable tiers: **Standard (preview)**, **Premium**, **Enterprise**, **Enterprise Flash**
64+
Applicable tiers: **Standard**, **Premium**, **Enterprise**, **Enterprise Flash**
6565

6666
Recommended for: **High availability**, **Disaster recovery - intra region**
6767

68-
Azure Cache for Redis supports zone redundant configurations in the Standard (preview), Premium, and Enterprise tiers. A [zone redundant cache](cache-how-to-zone-redundancy.md) can place its nodes across different [Azure Availability Zones](../reliability/availability-zones-overview.md) in the same region. It eliminates data center or Availability Zone outage as a single point of failure and increases the overall availability of your cache.
69-
70-
> [!NOTE]
71-
> On the Premium caches, only _automatic zone allocation_ is in public preview. Manual selection of availability zones us unchanged. Manual selection is GA (General Availability).
68+
Azure Cache for Redis supports zone redundant configurations in the Standard, Premium, and Enterprise tiers. A [zone redundant cache](cache-how-to-zone-redundancy.md) can place its nodes across different [Azure Availability Zones](../reliability/availability-zones-overview.md) in the same region. It eliminates data center or Availability Zone outage as a single point of failure and increases the overall availability of your cache.
7269

7370
If a cache is configured to use two or more zones as described earlier in the article, the cache nodes are created in different zones. When a zone goes down, cache nodes in other zones are available to keep the cache functioning as usual.
7471

7572
> [!IMPORTANT]
76-
> You can now enable _automatic zone allocation_ for all caches in applicable tiers and regions. For more information, see [Enable zone redundancy for Azure Cache for Redis](cache-how-to-zone-redundancy.md).
73+
> Azure Cache For Redis by default creates zone redundant caches for Premium, Standard Tiers using _Automatic_Zonal_Allocation_ in regions that support zones. For more information, see [Enable zone redundancy for Azure Cache for Redis](cache-how-to-zone-redundancy.md).
7774
7875
### Premium tier
7976

@@ -102,19 +99,21 @@ When a data node becomes unavailable or a network split happens, a failover simi
10299

103100
### Regional availability
104101

105-
Zone-redundant Premium tier caches are available in the following regions:
102+
Zone-redundant Premium, Standard tier caches are available in the following regions:
106103

107104
| Americas | Europe | Middle East | Africa | Asia Pacific |
108105
|---|---|---|---|---|
109106
| Brazil South | France Central | Qatar Central | South Africa North | Australia East |
110-
| Canada Central | Germany West Central | | | Central India |
111-
| Central US | North Europe | | | Japan East |
112-
| East US | Norway East | | | Korea Central |
113-
| East US 2 | UK South | | | Southeast Asia |
114-
| South Central US | West Europe | | | East Asia |
115-
| US Gov Virginia | Sweden Central | | | China North 3 |
116-
| West US 2 | Switzerland North | | | |
117-
| West US 3 | Poland Central | | | |
107+
| Canada Central | Italy North | UAE North | | Central India |
108+
| Central US | Germany West Central | Israel Central | | Japan East |
109+
| East US | Norway East | | | |
110+
| East US 2 | North Europe | | | Southeast Asia |
111+
| South Central US | UK South | | | East Asia |
112+
| US Gov Virginia | West Europe | | | China North 3 |
113+
| West US 2 | Sweden Central | | |Korea Central |
114+
| West US 3 | Switzerland North | | | New Zealand North |
115+
| Mexico Central | Poland Central ||||
116+
||Spain Central ||||
118117

119118
Zone-redundant Enterprise and Enterprise Flash tier caches are available in the following regions:
120119

0 commit comments

Comments
 (0)