Skip to content

Commit de8a41d

Browse files
authored
Merge pull request #301779 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents d137471 + 0d51aee commit de8a41d

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

articles/azure-functions/functions-how-to-azure-devops.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ variables:
240240
# Container registry service connection established during pipeline creation
241241
dockerRegistryServiceConnection: <Docker registry service connection>
242242
imageRepository: <Name of your image repository>
243-
containerRegistry: <Name of the Azure container registry>
243+
containerRegistry: <Name of the Azure Container Registry>
244244
dockerfilePath: '$(Build.SourcesDirectory)/Dockerfile'
245245
tag: '$(Build.BuildId)'
246246

articles/oracle/oracle-db/oracle-database-network-plan.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ Default network features enable basic network connectivity for both new and exis
2222
Advanced network features enhance the virtual networking experience, offering improved security, performance, and control—similar to standard Azure VMs. These features are generally available for new deployments in the following regions:
2323

2424
* Australia East
25-
* Australia Southeast
25+
* Australia Southeast
26+
* Canada Central
2627
* Central US
2728
* East US
2829
* East US2

articles/oracle/oracle-db/oracle-database-regions.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ The list below mentions the Azure and corresponding OCI regions with the regiona
5757
| West US | US West (San Jose) |||| | Preview available | Single |
5858
| Central US | US Midwest (Chicago) |||| | | Dual |
5959
| East US 2 | US East (Ashburn) || | | | | Dual |
60+
| South Central US || | | | | Dual |
6061

6162
> [!NOTE]
6263
> To provision Oracle Database@Azure resources in a supported region, your tenancy must be subscribed to the target region. Learn how to [manage regions](https://docs.oracle.com/iaas/Content/Identity/regions/managingregions.htm#Managing_Regions) and [subscribe to an infrastructure region](https://docs.oracle.com/iaas/Content/Identity/regions/To_subscribe_to_an_infrastructure_region.htm#subscribe).

articles/reliability/reliability-fabric.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,12 @@ OneLake data remains accessible through multiple channels:
195195
* Azure Storage Explorer: See [Integrate OneLake with Azure Storage Explorer](/fabric/onelake/onelake-azure-storage-explorer)
196196

197197
* OneLake File Explorer: See [Use OneLake file explorer to access Fabric data](/fabric/onelake/onelake-file-explorer)
198-
199-
The OneLake catalog remains available during disaster failover in read-only mode:
198+
199+
* In a disaster scenario, the OneLake catalog is in read-only mode:
200+
200201
* Explore tab: You can access the Explore tab to view all items and workspaces, including their metadata and related details.
201-
* Govern tab: You can access the Govern tab to view insights, recommended actions, and governance tools - based on the most recent successful model refresh prior to failover.
202+
203+
* Govern tab: You can access the Govern tab to view insights, recommended actions, and governance tools - based on the most recent successful model refresh prior to failover.
202204

203205
#### Phase 3: Recovery plan
204206

articles/reliability/reliability-functions.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ When you configure Elastic Premium function app plans as zone redundant, the pla
4949

5050
Instance spreading with a zone-redundant deployment is determined inside the following rules, even as the app scales in and out:
5151

52-
- The minimum function app instance count is three.
52+
- The minimum function app instance count is two.
5353
- When you specify a capacity larger than the number of zones, the instances are spread evenly only when the capacity is a multiple of the number of zones.
5454
- For a capacity value more than Number of Zones * Number of instances, extra instances are spread across the remaining zones.
5555

@@ -107,8 +107,8 @@ Availability zone support is a property of the Premium plan. Here are current co
107107
- You can only enable availability zones in the plan when you create your app. You can't convert an existing Premium plan to use availability zones.
108108
- You must use a [zone redundant storage account (ZRS)](../storage/common/storage-redundancy.md#zone-redundant-storage) for your function app's [default host storage account](../azure-functions/storage-considerations.md#storage-account-requirements). If you use a different type of storage account, your app might behave unexpectedly during a zonal outage.
109109
- Both Windows and Linux are supported.
110-
- Function apps hosted on a Premium plan must have a minimum of three [always ready instances](../azure-functions/functions-premium-plan.md#always-ready-instances).
111-
- The platform enforces this minimum count behind the scenes if you specify an instance count fewer than three.
110+
- Function apps hosted on a Premium plan must have a minimum of two [always ready instances](../azure-functions/functions-premium-plan.md#always-ready-instances).
111+
- The platform enforces this minimum count behind the scenes if you specify an instance count fewer than two.
112112
- If you aren't using Premium plan or a scale unit that supports availability zones, are in an unsupported region, or are unsure, see the [migration guidance](../reliability/migrate-functions.md).
113113
::: zone-end
114114
### Pricing
@@ -118,7 +118,7 @@ There's no separate meter associated with enabling availability zones. Pricing f
118118
When you enable availability zones in an app with always-ready instance configuration of fewer than two instances for each [per-function scaling function or group](../azure-functions/flex-consumption-plan.md#per-function-scaling), the platform automatically creates two instances of the [always-ready](../azure-functions/flex-consumption-plan.md#always-ready-instances) type for each per-function scaling function or group. These new instances are also billed as always-ready instances.
119119
::: zone-end
120120
::: zone pivot="premium-plan"
121-
There's no extra cost associated with enabling availability zones. Pricing for a zone-redundant Premium App Service plan is the same as a single zone Premium plan. For each App Service plan you use, you're charged based on the SKU you choose, the capacity you specify, and any instances you scale to based on your autoscale criteria. If you enable availability zones on a plan with fewer than three instances, the platform enforces a minimum instance count of three for that App Service plan, and you're charged for all three instances.
121+
There's no extra cost associated with enabling availability zones. Pricing for a zone-redundant Premium App Service plan is the same as a single zone Premium plan. For each App Service plan you use, you're charged based on the SKU you choose, the capacity you specify, and any instances you scale to based on your autoscale criteria. If you enable availability zones on a plan with fewer than two instances, the platform enforces a minimum instance count of two for that App Service plan, and you're charged for both instances.
122122
::: zone-end
123123
### Create a function app in a zone-redundant plan
124124
::: zone pivot="flex-consumption-plan"

0 commit comments

Comments
 (0)