Skip to content

Commit 5516476

Browse files
authored
Merge pull request #287866 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 f853a16 + 26aa343 commit 5516476

File tree

6 files changed

+10
-28
lines changed

6 files changed

+10
-28
lines changed

articles/load-testing/resource-supported-azure-resource-types.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ This section lists the Azure resource types that Azure Load Testing supports for
2323
* Azure API Management
2424
* Azure App Service
2525
* Azure App Service plan
26+
* Azure Application Gateway
2627
* Azure Application Insights
2728
* Azure Application Gateway
2829
* Azure Batch Service

articles/oracle/oracle-db/provision-manage-oracle-resources.md

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,28 +37,6 @@ The following management functions are available for all resources from the Micr
3737
1. Follow the steps to access the resource blade.
3838
1. You can remove a single or multiple resources from the blade by selecting the checkbox on the left side of the table. Once you have selected the resource(s) to remove, you can then select the **Delete** icon at the top of the blade.
3939
1. You can also remove a single resource by selecting the link to the resource from the **Name** field in the table. From the resource's detail page, select the **Delete** icon at the top of the blade.
40-
* **Move the resource to a new resource group.**
41-
1. Follow the steps to access the resource blade.
42-
1. Select the link to the resource from the **Name** field in the table.
43-
1. From the resource's overview page, select the **Move** link on the Resource group field.
44-
1. From the **Move resources** page, use the drop-down field for **Resource group** to select an existing resource group.
45-
1. To create and use a new resource group, select the **Create new** link below the Resource group field. Enter a new resource group name in the **Name** field. Select the **OK** button to save your new resource group and use it. Select the **Cancel** button to return without creating a new resource group.
46-
* **Move the resource to a new subscription.**
47-
48-
> [!NOTE]
49-
> You must have access to another Microsoft Azure subscription, and that subscription must have been setup for access to OracleDB@Azure. If both of these conditions are not met, you will not be able to successfully move the resource to another subscription.
50-
51-
1. Follow the steps to access the resource blade.
52-
1. Select the link to the resource from the Name field in the table.
53-
1. From the resource's overview page, select the **Move** link on the Subscription field.
54-
1. From the **Move resources** page, use the drop-down field for **Subscription** to select an existing subscription.
55-
1. You can also simultaneously move the resource group for the resource. To do this, note the steps in the **Move the resource to a new resource group** tasks. **Add, manage, or delete tags for the resource.**
56-
1. Follow the steps to access the resource blade.
57-
1. Select the link to the resource from the Name field in the table.
58-
1. From the resource's overview page, select the **Edit** link on the **Tags** field.
59-
1. To create a new tag, enter values in the **Name** and **Value** fields.
60-
1. To edit an existing tag, change the value in the existing tag's **Value** field.
61-
1. To delete an existing tag, select the **Trashcan** icon at the right-side of the tag.
6240

6341
## Manage resource allocation for Oracle Autonomous Database Serverless instances
6442

@@ -81,4 +59,4 @@ Follow the following steps to access the Oracle Autonomous Database@Azure blade.
8159
1. Select the link to the resource from the **Name** field in the table.
8260
1. From the resource's detail page, select the **Go to OCI** link on the **OCI Database URL** field.
8361
1. Log in to OCI.
84-
1. Manage the resource from within the OCI console.
62+
1. Manage the resource from within the OCI console.

articles/reliability/migrate-cache-redis.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ Azure Cache for Redis supports zone redundancy in its Premium, Enterprise, and E
1818

1919
Currently, the only way to convert a resource from non-availability zone support to availability zone support is to redeploy your current cache.
2020

21+
> [!NOTE]
22+
> Zone redundancy isn't supported with geo-replication.
23+
2124
## Prerequisites
2225

2326
To migrate to availability zone support, you must have an Azure Cache for Redis resource in either the Premium, Enterprise, or Enterprise Flash tiers.
@@ -54,4 +57,4 @@ Running multiple caches simultaneously as you convert your data to the new cache
5457
Learn more about:
5558

5659
> [!div class="nextstepaction"]
57-
> [Azure services and regions that support availability zones](availability-zones-service-support.md)
60+
> [Azure services and regions that support availability zones](availability-zones-service-support.md)

articles/sap/automation/plan-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ The control plane provides the following services:
5757

5858
The control plane is defined by using two configuration files, one for the deployer and one for the SAP Library.
5959

60-
The deployment configuration file defines the region, environment name, and virtual network information. For example:
60+
The deployer configuration file defines the region, environment name, and virtual network information. For example:
6161

6262
```tfvars
6363
# Deployer Configuration File

articles/sentinel/data-transformation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Only the following tables are currently supported for custom log ingestion:
101101
- [**CommonSecurityLog**](/azure/azure-monitor/reference/tables/commonsecuritylog)
102102
- [**Syslog**](/azure/azure-monitor/reference/tables/syslog)
103103
- [**ASimAuditEventLogs**](/azure/azure-monitor/reference/tables/asimauditeventlogs)
104-
- **ASimAuthenticationEventLogs**
104+
- [**ASimAuthenticationEventLogs**](/azure/azure-monitor/reference/tables/asimauthenticationeventlogs)
105105
- [**ASimDnsActivityLogs**](/azure/azure-monitor/reference/tables/asimdnsactivitylogs)
106106
- [**ASimFileEventLogs**](/azure/azure-monitor/reference/tables/asimfileeventlogs)
107107
- [**ASimNetworkSessionLogs**](/azure/azure-monitor/reference/tables/asimnetworksessionlogs)

articles/site-recovery/site-recovery-vmware-deployment-planner-analyze-report.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ For example, if the workload characteristics of a disk put it in the P20 or P30
210210

211211
**Boot Type**: Boot type of the virtual machine. It can be either BIOS or EFI. Currently Azure Site Recovery supports Windows Server EFI virtual machines (Windows Server 2012, 2012 R2 and 2016) provided the number of partitions in the boot disk is less than 4 and boot sector size is 512 bytes. To protect EFI virtual machines, Azure Site Recovery mobility service version must be 9.13 or later. Only failover is supported for EFI virtual machines. Failback isn't supported.
212212

213-
**OS Type**: It's OS type of the virtual machine. It can be either Windows or Linux or other based on the chosen template from virtual machineware vSphere while creating the virtual machine.
213+
**OS Type**: It's OS type of the virtual machine. It can be either Windows or Linux or other based on the chosen template from VMware vSphere while creating the virtual machine.
214214

215215
## Incompatible virtual machines
216216

@@ -282,4 +282,4 @@ Learn more about [cost estimation](site-recovery-vmware-deployment-planner-cost-
282282

283283

284284
## Next steps
285-
Learn more about [cost estimation](site-recovery-vmware-deployment-planner-cost-estimation.md).
285+
Learn more about [cost estimation](site-recovery-vmware-deployment-planner-cost-estimation.md).

0 commit comments

Comments
 (0)