Skip to content

Commit 7d6fea2

Browse files
authored
Merge pull request #193971 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 6625d58 + 00a3b6d commit 7d6fea2

File tree

12 files changed

+32
-28
lines changed

12 files changed

+32
-28
lines changed

articles/active-directory-b2c/tutorial-register-applications.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@ To register a web application in your Azure AD B2C tenant, you can use our new u
5050

5151
The following restrictions apply to redirect URIs:
5252

53-
* The reply URL must begin with the scheme `https`.
53+
* The reply URL must begin with the scheme `https`, unless you use a localhost redirect URL.
5454
* The reply URL is case-sensitive. Its case must match the case of the URL path of your running application. For example, if your application includes as part of its path `.../abc/response-oidc`, do not specify `.../ABC/response-oidc` in the reply URL. Because the web browser treats paths as case-sensitive, cookies associated with `.../abc/response-oidc` may be excluded if redirected to the case-mismatched `.../ABC/response-oidc` URL.
55+
* The reply URL should include or exclude the trailing forward slash as your application expects it. For example, `https://contoso.com/auth-response` and `https://contoso.com/auth-response/` might be treated as nonmatching URLs in your application.
5556

5657
1. Under **Permissions**, select the *Grant admin consent to openid and offline_access permissions* check box.
5758
1. Select **Register**.
@@ -71,6 +72,7 @@ To register a web application in your Azure AD B2C tenant, you can use our new u
7172

7273
* The reply URL must begin with the scheme `https`, unless using `localhost`.
7374
* The reply URL is case-sensitive. Its case must match the case of the URL path of your running application. For example, if your application includes as part of its path `.../abc/response-oidc`, do not specify `.../ABC/response-oidc` in the reply URL. Because the web browser treats paths as case-sensitive, cookies associated with `.../abc/response-oidc` may be excluded if redirected to the case-mismatched `.../ABC/response-oidc` URL.
75+
* The reply URL should include or exclude the trailing forward slash as your application expects it. For example, `https://contoso.com/auth-response` and `https://contoso.com/auth-response/` might be treated as nonmatching URLs in your application.
7476

7577
1. Select **Create** to complete the application registration.
7678

articles/aks/api-server-authorized-ip-ranges.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ az aks create \
103103

104104
## Update a cluster's API server authorized IP ranges
105105

106-
To update the API server authorized IP ranges on an existing cluster, use [az aks update][az-aks-update] command and use the *`--api-server-authorized-ip-ranges`*,--load-balancer-outbound-ip-prefixes*, *`--load-balancer-outbound-ips`*, or--load-balancer-outbound-ip-prefixes* parameters.
106+
To update the API server authorized IP ranges on an existing cluster, use [az aks update][az-aks-update] command and use the *`--api-server-authorized-ip-ranges`*, *`--load-balancer-outbound-ip-prefixes`*, *`--load-balancer-outbound-ips`*, or *`--load-balancer-outbound-ip-prefixes`* parameters.
107107

108108
The following example updates API server authorized IP ranges on the cluster named *myAKSCluster* in the resource group named *myResourceGroup*. The IP address range to authorize is *73.140.245.0/24*:
109109

articles/aks/integrations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Azure Kubernetes Service (AKS) provides additional, supported functionality for
1212

1313
## Add-ons
1414

15-
Add-ons provide extra capabilities for your AKS cluster and their installation and configuration is managed Azure. Use `az aks addon` to manage all add-ons for your cluster.
15+
Add-ons provide extra capabilities for your AKS cluster and their installation and configuration is managed by Azure. Use `az aks addon` to manage all add-ons for your cluster.
1616

1717
The below table shows the available add-ons.
1818

articles/app-service/tutorial-python-postgresql-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ To configure environment variables for the web app from VS Code, you must have t
253253
|:----------------|-----------:|
254254
| [!INCLUDE [VS Code connect app to postgres step 1](<./includes/tutorial-python-postgresql-app/connect-postgres-to-app-visual-studio-code-1.md>)] | :::image type="content" source="./media/tutorial-python-postgresql-app/connect-app-to-database-azure-extension-240px.png" lightbox="./media/tutorial-python-postgresql-app/connect-app-to-database-azure-extension.png" alt-text="A screenshot showing how to locate the Azure Tools extension in VS Code." ::: |
255255
| [!INCLUDE [VS Code connect app to postgres step 2](<./includes/tutorial-python-postgresql-app/connect-postgres-to-app-visual-studio-code-2.md>)] | :::image type="content" source="./media/tutorial-python-postgresql-app/connect-app-to-database-create-setting-240px.png" lightbox="./media/tutorial-python-postgresql-app/connect-app-to-database-create-setting.png" alt-text="A screenshot showing how to add a setting to the App Service in VS Code." ::: |
256-
| [!INCLUDE [VS Code connect app to postgres step 3](<./includes/tutorial-python-postgresql-app/connect-postgres-to-app-visual-studio-code-3.md>)] | :::image type="content" source="./media/tutorial-python-postgresql-app/connect-app-to-database-settings-example-a-240px.png" lightbox="./media/tutorial-python-postgresql-app/connect-app-to-database-settings-example-a.png" alt-text="A screenshot showing adding setting name for app service to connect to Postgresql database in VS Code." ::: :::image type="content" source="./media/tutorial-python-postgresql-app/connect-app-to-database-settings-example-b-240px.png" lightbox="./media/tutorial-python-postgresql-app/connect-app-to-database-settings-example-b.png" alt-text="A screenshot showing adding setting value for app service to connect to Postgresql database in VS Code." ::: |
256+
| [!INCLUDE [VS Code connect app to postgres step 3](<./includes/tutorial-python-postgresql-app/connect-postgres-to-app-visual-studio-code-3.md>)] | :::image type="content" source="./media/tutorial-python-postgresql-app/connect-app-to-database-settings-example-a-240px.png" lightbox="./media/tutorial-python-postgresql-app/connect-app-to-database-settings-example-a.png" alt-text="A screenshot showing adding setting name for app service to connect to PostgreSQL database in VS Code." ::: :::image type="content" source="./media/tutorial-python-postgresql-app/connect-app-to-database-settings-example-b-240px.png" lightbox="./media/tutorial-python-postgresql-app/connect-app-to-database-settings-example-b.png" alt-text="A screenshot showing adding setting value for app service to connect to PostgreSQL database in VS Code." ::: |
257257

258258
### [Azure CLI](#tab/azure-cli)
259259

articles/azure-monitor/app/javascript-react-plugin.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ var appInsights = new ApplicationInsights({
7878
instrumentationKey: 'YOUR_INSTRUMENTATION_KEY_GOES_HERE',
7979
enableAutoRouteTracking: true,
8080
extensions: [reactPlugin]
81-
}
8281
}
8382
});
8483
appInsights.loadAppInsights();

articles/azure-vmware/concepts-private-clouds-clusters.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Concepts - Private clouds and clusters
3-
description: Learn about the key capabilities of Azure VMware Solution software-defined data centers and vSphere clusters.
3+
description: Learn about the key capabilities of Azure VMware Solution software-defined data centers and VMware vSphere clusters.
44
ms.topic: conceptual
55
ms.date: 08/25/2021
66
---
@@ -12,8 +12,8 @@ Azure VMware Solution delivers VMware-based private clouds in Azure. The private
1212
A private cloud includes clusters with:
1313

1414
- Dedicated bare-metal server hosts provisioned with VMware ESXi hypervisor
15-
- vCenter Server for managing ESXi and vSAN
16-
- VMware NSX-T software-defined networking for vSphere workload VMs
15+
- VMware vCenter Server for managing ESXi and vSAN
16+
- VMware NSX-T Data Center software-defined networking for vSphere workload VMs
1717
- VMware vSAN datastore for vSphere workload VMs
1818
- VMware HCX for workload mobility
1919
- Resources in the Azure underlay (required for connectivity and to operate the private cloud)
@@ -66,13 +66,13 @@ Azure VMware Solution monitors the following conditions on the host:
6666
- Connection failure
6767

6868
> [!NOTE]
69-
> Azure VMware Solution tenant admins must not edit or delete the above defined VMware vCenter alarms, as these are managed by the Azure VMware Solution control plane on vCenter. These alarms are used by Azure VMware Solution monitoring to trigger the Azure VMware Solution host remediation process.
69+
> Azure VMware Solution tenant admins must not edit or delete the above defined VMware vCenter Server alarms, as these are managed by the Azure VMware Solution control plane on vCenter Server. These alarms are used by Azure VMware Solution monitoring to trigger the Azure VMware Solution host remediation process.
7070
7171
## Backup and restoration
7272

73-
Private cloud vCenter and NSX-T configurations are on an hourly backup schedule. Backups are kept for three days. If you need to restore from a backup, open a [support request](https://rc.portal.azure.com/#create/Microsoft.Support) in the Azure portal to request restoration.
73+
Private cloud vCenter Server and NSX-T Data Center configurations are on an hourly backup schedule. Backups are kept for three days. If you need to restore from a backup, open a [support request](https://rc.portal.azure.com/#create/Microsoft.Support) in the Azure portal to request restoration.
7474

75-
Azure VMware Solution continuously monitors the health of both the underlay and the VMware components. When Azure VMware Solution detects a failure, it takes action to repair the failed components.
75+
Azure VMware Solution continuously monitors the health of both the physical underlay and the VMware Solution components. When Azure VMware Solution detects a failure, it takes action to repair the failed components.
7676

7777
## Next steps
7878

@@ -86,7 +86,7 @@ Now that you've covered Azure VMware Solution private cloud concepts, you may wa
8686
[concepts-networking]: ./concepts-networking.md
8787

8888
<!-- LINKS - external-->
89-
[VCSA versions]: https://kb.vmware.com/s/article/2143838
89+
[vCSA versions]: https://kb.vmware.com/s/article/2143838
9090
[ESXi versions]: https://kb.vmware.com/s/article/2143832
9191
[vSAN versions]: https://kb.vmware.com/s/article/2150753
9292

articles/azure-vmware/concepts-storage.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ Azure VMware Solution private clouds provide native, cluster-wide storage with V
1212

1313
## vSAN clusters
1414

15-
Local storage in each cluster host is used as part of a vSAN datastore. All diskgroups use an NVMe cache tier of 1.6 TB with the raw, per host, SSD-based capacity of 15.4 TB. The size of the raw capacity tier of a cluster is the per host capacity times the number of hosts. For example, a four host cluster provides 61.6-TB raw capacity in the vSAN capacity tier.
15+
Local storage in each cluster host is claimed as part of a vSAN datastore. All diskgroups use an NVMe cache tier of 1.6 TB with the raw, per host, SSD-based capacity of 15.4 TB. The size of the raw capacity tier of a cluster is the per host capacity times the number of hosts. For example, a four host cluster provides 61.6-TB raw capacity in the vSAN capacity tier.
1616

17-
Local storage in cluster hosts is used in cluster-wide vSAN datastore. All datastores are created as part of private cloud deployment and are available for use immediately. The **cloudadmin** user and all users assigned to the CloudAdmin role can manage datastores with these vSAN privileges:
17+
Local storage in cluster hosts is used in the cluster-wide vSAN datastore. All datastores are created as part of private cloud deployment and are available for use immediately. The **cloudadmin** user and all users assigned to the CloudAdmin role can manage datastores with these vSAN privileges:
1818

1919
- Datastore.AllocateSpace
2020
- Datastore.Browse
@@ -28,27 +28,27 @@ Local storage in cluster hosts is used in cluster-wide vSAN datastore. All datas
2828
2929
## Storage policies and fault tolerance
3030

31-
That default storage policy is set to RAID-1 (Mirroring), FTT-1, and thick provisioning. Unless you adjust the storage policy or apply a new policy, the cluster grows with this configuration. To set the storage policy, see [Configure storage policy](configure-storage-policy.md).
31+
The default storage policy is set to RAID-1 (Mirroring), FTT-1, and thick provisioning. Unless you adjust the storage policy or apply a new policy, the cluster grows with this configuration. To set the storage policy, see [Configure storage policy](configure-storage-policy.md).
3232

33-
In a three-host cluster, FTT-1 accommodates a single host's failure. Microsoft governs failures regularly and replaces the hardware when events are detected from an architecture perspective.
33+
In a three-host cluster, FTT-1 accommodates a single host's failure. Microsoft governs failures regularly and replaces the hardware when events are detected from an operations perspective.
3434

3535
:::image type="content" source="media/concepts/vsphere-vm-storage-policies.png" alt-text="Screenshot that shows the vSphere Client VM Storage Policies.":::
3636

3737

3838
|Provisioning type |Description |
3939
|---------|---------|
4040
|**Thick** | Reserved or pre-allocated storage space. It protects systems by allowing them to function even if the vSAN datastore is full because the space is already reserved. For example, if you create a 10-GB virtual disk with thick provisioning. In that case, the full amount of virtual disk storage capacity is pre-allocated on the physical storage of the virtual disk and consumes all the space allocated to it in the datastore. It won't allow other virtual machines (VMs) to share the space from the datastore. |
41-
|**Thin** | Consumes the space that it needs initially and grows to the data space demand used in the datastore. Outside the default (thick provision), you can create VMs with FTT-1 thin provisioning. For dedupe setup, use thin provisioning for your VM template. |
41+
|**Thin** | Consumes the space that it needs initially and grows to the data space demand used in the datastore. Outside the default (thick provision), you can create VMs with FTT-1 thin provisioning. For deduplication setup, use thin provisioning for your VM template. |
4242

4343
>[!TIP]
4444
>If you're unsure if the cluster will grow to four or more, then deploy using the default policy. If you're sure your cluster will grow, then instead of expanding the cluster after your initial deployment, we recommend to deploy the extra hosts during deployment. As the VMs are deployed to the cluster, change the disk's storage policy in the VM settings to either RAID-5 FTT-1 or RAID-6 FTT-2.
4545
>
46-
>:::image type="content" source="media/concepts/vsphere-vm-storage-policies-2.png" alt-text="Screenshot showing the RAID-5 FTT-1 and RAID-6 Ftt-2 options highlighed.":::
46+
>:::image type="content" source="media/concepts/vsphere-vm-storage-policies-2.png" alt-text="Screenshot showing the RAID-5 FTT-1 and RAID-6 FTT-2 options highlighed.":::
4747
4848

4949
## Data-at-rest encryption
5050

51-
vSAN datastores use data-at-rest encryption by default using keys stored in Azure Key Vault. The encryption solution is KMS-based and supports vCenter operations for key management. When a host is removed from a cluster, data on SSDs is invalidated immediately.
51+
vSAN datastores use data-at-rest encryption by default using keys stored in Azure Key Vault. The encryption solution is KMS-based and supports vCenter Server operations for key management. When a host is removed from a cluster, all data on SSDs is invalidated immediately.
5252

5353
## Azure storage integration
5454

@@ -70,7 +70,7 @@ Now that you've covered Azure VMware Solution storage concepts, you may want to
7070

7171
- [Azure NetApp Files with Azure VMware Solution](netapp-files-with-azure-vmware-solution.md) - You can use Azure NetApp to migrate and run the most demanding enterprise file-workloads in the cloud: databases, SAP, and high-performance computing applications, with no code changes.
7272

73-
- [vSphere role-based access control for Azure VMware Solution](concepts-identity.md) - You use vCenter to manage VM workloads and NSX-T Manager to manage and extend the private cloud. Access and identity management use the CloudAdmin role for vCenter and restricted administrator rights for NSX-T Manager.
73+
- [vSphere role-based access control for Azure VMware Solution](concepts-identity.md) - You use vCenter Server to manage VM workloads and NSX-T Manager to manage and extend the private cloud. Access and identity management use the CloudAdmin role for vCenter Server and restricted administrator rights for NSX-T Manager.
7474

7575

7676
<!-- LINKS - external-->

articles/backup/archive-tier-support.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Archive tier supports the following workloads:
2323

2424
| Workloads | Operations |
2525
| --- | --- |
26-
| Azure Virtual Machines | Only monthly and yearly recovery points. Daily and weekly recovery points aren't supported. <br><br> Age >= 3 months in Vault-atandard tier <br><br> Retention left >= 6 months. <br><br> No active daily and weekly dependencies. |
26+
| Azure Virtual Machines | Only monthly and yearly recovery points. Daily and weekly recovery points aren't supported. <br><br> Age >= 3 months in Vault-standard tier <br><br> Retention left >= 6 months. <br><br> No active daily and weekly dependencies. |
2727
| SQL Server in Azure Virtual Machines <br><br> SAP HANA in Azure Virtual Machines | Only full recovery points. Logs and differentials aren't supported. <br><br> Age >= 45 days in Vault-standard tier. <br><br> Retention left >= 6 months. <br><br> No dependencies. |
2828

2929
>[!Note]
@@ -116,4 +116,4 @@ If the list of recovery points is blank, then all the eligible/recommended recov
116116
## Next steps
117117

118118
- [Use Archive tier](use-archive-tier-support.md)
119-
- [Azure Backup pricing](azure-backup-pricing.md)
119+
- [Azure Backup pricing](azure-backup-pricing.md)

articles/backup/private-endpoints.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ If you're using your custom DNS servers, you'll need to create the required DNS
169169
`<private ip><space><backup service privatelink FQDN>`
170170

171171
>[!NOTE]
172-
>As shown in the screenshot above, the FQDNs depict `xxxxxxxx.<geo>.backup.windowsazure.com` and not `xxxxxxxx.privatelink.<geo>.backup. windowsazure.com`. In such cases, ensure you include (and if required, add) the `.privatelink.` according to the stated format.
172+
>As shown in the screenshot above, the FQDNs depict `xxxxxxxx.<geo>.backup.windowsazure.com` and not `xxxxxxxx.privatelink.<geo>.backup.windowsazure.com`. In such cases, ensure you include (and if required, add) the `.privatelink.` according to the stated format.
173173
174174
#### For Blob and Queue services
175175

@@ -219,7 +219,7 @@ Once the private endpoints created for the vault in your VNet have been approved
219219
In the VM in the locked down network, ensure the following:
220220

221221
1. The VM should have access to AAD.
222-
2. Execute **nslookup** on the backup URL (`xxxxxxxx.privatelink.<geo>.backup. windowsazure.com`) from your VM, to ensure connectivity. This should return the private IP assigned in your virtual network.
222+
2. Execute **nslookup** on the backup URL (`xxxxxxxx.privatelink.<geo>.backup.windowsazure.com`) from your VM, to ensure connectivity. This should return the private IP assigned in your virtual network.
223223

224224
### Configure backup
225225

@@ -651,4 +651,4 @@ After following the process detailed in this article, you don't need to do addit
651651

652652
## Next steps
653653

654-
- Read about all the [security features in Azure Backup](security-overview.md).
654+
- Read about all the [security features in Azure Backup](security-overview.md).

articles/cognitive-services/Face/Face-API-How-to-Topics/how-to-migrate-face-data.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ This guide shows you how to move face data, such as a saved PersonGroup object w
2121

2222
This same migration strategy also applies to LargePersonGroup and LargeFaceList objects. If you aren't familiar with the concepts in this guide, see their definitions in the [Face recognition concepts](../concepts/face-recognition.md) guide. This guide uses the Face .NET client library with C#.
2323

24+
> [!WARNING]
25+
> The Snapshot feature might move your data outside the geographic region you originally selected. Data might move to West US, West Europe, and Southeast Asia regions.
26+
2427
## Prerequisites
2528

2629
You need the following items:

0 commit comments

Comments
 (0)