Skip to content

Commit 5d61658

Browse files
authored
Merge pull request #116475 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents c9ed7ee + 6e9ebb7 commit 5d61658

File tree

12 files changed

+25
-25
lines changed

12 files changed

+25
-25
lines changed

articles/active-directory-b2c/configure-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ You can configure the token lifetime on any user flow.
5050

5151
## Next steps
5252

53-
Learn more about how to [use access tokens](access-tokens.md).
53+
Learn more about how to [request access tokens](access-tokens.md).
5454

5555

5656

articles/active-directory/authentication/howto-sspr-deployment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Note: For users who have [Password hash synchronization (PHS)](https://docs.micr
106106

107107
You can help users register quickly by deploying SSPR alongside another popular application or service in the organization. This action will generate a large volume of sign-ins and will drive registration.
108108

109-
Before deploying SSPR, you may opt to determine the number and the average cost of each password reset call. YOU can use this data post deployment to show the value SSPR is bringing to the organization.
109+
Before deploying SSPR, you may opt to determine the number and the average cost of each password reset call. You can use this data post deployment to show the value SSPR is bringing to the organization.
110110

111111
#### Enable combined registration for SSPR and MFA
112112

@@ -344,4 +344,4 @@ Audit logs for registration and password reset are available for 30 days. If sec
344344

345345
* [Consider implementing Azure AD password protection](https://docs.microsoft.com/azure/active-directory/authentication/concept-password-ban-bad)
346346

347-
* [Consider implementing Azure AD Smart Lockout](https://docs.microsoft.com/azure/active-directory/authentication/howto-password-smart-lockout)
347+
* [Consider implementing Azure AD Smart Lockout](https://docs.microsoft.com/azure/active-directory/authentication/howto-password-smart-lockout)

articles/active-directory/users-groups-roles/roles-assign-graph.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Body
3939
{
4040
"principalId":"ab2e1023-bddc-4038-9ac1-ad4843e7e539",
4141
"roleDefinitionId":"194ae4cb-b126-40b2-bd5b-6091b380977d",
42-
"resourceScopes":["/"]
42+
"resourceScopes":"/"
4343
}
4444
```
4545

@@ -63,7 +63,7 @@ Body
6363
{
6464
"principalId":" 2142743c-a5b3-4983-8486-4532ccba12869",
6565
"roleDefinitionId":"194ae4cb-b126-40b2-bd5b-6091b380977d",
66-
"resourceScopes":["/"]
66+
"resourceScopes":"/"
6767
}
6868
```
6969

@@ -90,7 +90,7 @@ Body
9090
{
9191
"principalId":"ab2e1023-bddc-4038-9ac1-ad4843e7e539",
9292
"roleDefinitionId":"194ae4cb-b126-40b2-bd5b-6091b380977d",
93-
"resourceScopes":["/ab2e1023-bddc-4038-9ac1-ad4843e7e539"]
93+
"resourceScopes":"/ab2e1023-bddc-4038-9ac1-ad4843e7e539"
9494
}
9595
```
9696

@@ -136,13 +136,13 @@ HTTP/1.1 200 OK
136136
"id":"mhxJMipY4UanIzy2yE-r7JIiSDKQoTVJrLE9etXyrY0-1"
137137
"principalId":"ab2e1023-bddc-4038-9ac1-ad4843e7e539",
138138
"roleDefinitionId":"10dae51f-b6af-4016-8d66-8c2a99b929b3",
139-
"resourceScopes":["/"]
139+
"resourceScopes":"/"
140140
} ,
141141
{
142142
"id":"CtRxNqwabEKgwaOCHr2CGJIiSDKQoTVJrLE9etXyrY0-1"
143143
"principalId":"ab2e1023-bddc-4038-9ac1-ad4843e7e539",
144144
"roleDefinitionId":"3671d40a-1aac-426c-a0c1-a3821ebd8218",
145-
"resourceScopes":["/"]
145+
"resourceScopes":"/"
146146
}
147147
```
148148

@@ -162,7 +162,7 @@ HTTP/1.1 200 OK
162162
"id":"CtRxNqwabEKgwaOCHr2CGJIiSDKQoTVJrLE9etXyrY0-1"
163163
"principalId":"ab2e1023-bddc-4038-9ac1-ad4843e7e539",
164164
"roleDefinitionId":"3671d40a-1aac-426c-a0c1-a3821ebd8218",
165-
"resourceScopes":["/"]
165+
"resourceScopes":"/"
166166
}
167167
```
168168

@@ -182,7 +182,7 @@ HTTP/1.1 200 OK
182182
"id":"mhxJMipY4UanIzy2yE-r7JIiSDKQoTVJrLE9etXyrY0-1",
183183
"principalId":"ab2e1023-bddc-4038-9ac1-ad4843e7e539",
184184
"roleDefinitionId":"10dae51f-b6af-4016-8d66-8c2a99b929b3",
185-
"resourceScopes":["/"]
185+
"resourceScopes":"/"
186186
}
187187
```
188188

articles/azure-resource-manager/templates/deploy-github-actions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ The script outputs a JSON object similar to this:
5656
Copy the JSON output and store it as a GitHub secret within your GitHub repository. See [Prerequisite](#prerequisites) if you don't have a repository yet.
5757

5858
1. From your GitHub repository, select the **Settings** tab.
59-
1. Select **Secret** from the left menu.
59+
1. Select **Secrets** from the left menu.
6060
1. Enter the following values:
6161

6262
- **Name**: AZURE_CREDENTIALS

articles/azure-resource-manager/templates/parameter-files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ To deploy to different environments, create more than one parameter file. When n
187187

188188
You can use inline parameters and a local parameter file in the same deployment operation. For example, you can specify some values in the local parameter file and add other values inline during deployment. If you provide values for a parameter in both the local parameter file and inline, the inline value takes precedence.
189189

190-
However, when you use an external parameter file, you can't pass other values either inline or from a local file. All inline parameters are ignored. Provide all parameter values in the external file.
190+
It's possible to use an external parameter file, by providing the URI to the file. When you do this, you can't pass other values either inline or from a local file. All inline parameters are ignored. Provide all parameter values in the external file.
191191

192192
## Parameter name conflicts
193193

articles/azure-vmware/hybrid-cloud-extension-installation.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
title: Install Hybrid Cloud Extension (HCX)
3-
description: Set up the VMWare Hybrid Cloud Extension (HCX) solution for your Azure VMWare Solution (AVS) private cloud
3+
description: Set up the VMware Hybrid Cloud Extension (HCX) solution for your Azure VMware Solution (AVS) private cloud
44
ms.topic: how-to
55
ms.date: 05/19/2020
66
---
77

8-
# Install HCX for Azure VMWare Solution
8+
# Install HCX for Azure VMware Solution
99

10-
In this article, we go through procedures to set up the VMWare Hybrid Cloud Extension (HCX) solution for your Azure VMWare Solution (AVS) private cloud. HCX Advanced (default installation) supports up to three external sites, where each external site requires an HCX Enterprise manager or connector to be installed and activated.
10+
In this article, we go through procedures to set up the VMware Hybrid Cloud Extension (HCX) solution for your Azure VMware Solution (AVS) private cloud. HCX Advanced (default installation) supports up to three external sites, where each external site requires an HCX Enterprise manager or connector to be installed and activated.
1111
HCX enables migration of your VMware workloads to the cloud and or other connected sites through various built-in HCX supported migration types. If more than three sites are required, customers have the option to enable the HCX Enterprise add-on through Support. HCX Enterprise carries additional charges for customers after general availability (GA) but provides [additional features](https://cloud.vmware.com/community/2019/08/08/introducing-hcx-enterprise/).
1212

1313
Thoroughly review [Before you begin](#before-you-begin), [Software version requirements](#software-version-requirements), and [Prerequisites](#prerequisites) first.
@@ -48,7 +48,7 @@ Infrastructure components must be running the required minimum version.
4848
* Global reach should be configured between on-premises and AVS SDDC ER
4949
circuits.
5050

51-
* All required ports should be open between on-premises and AVS SDDC (see [VMWare HCX documentation](https://docs.vmware.com/en/VMware-HCX/services/user-guide/GUID-E456F078-22BE-494B-8E4B-076EF33A9CF4.html)).
51+
* All required ports should be open between on-premises and AVS SDDC (see [VMware HCX documentation](https://docs.vmware.com/en/VMware-HCX/services/user-guide/GUID-E456F078-22BE-494B-8E4B-076EF33A9CF4.html)).
5252

5353
* One IP address for HCX Manager at on-premises and a minimum of two IP addresses
5454
for Interconnect (IX) and Network Extension (NE) appliance.
@@ -308,4 +308,4 @@ To check the status of the appliance, select **Interconnect** > **Appliances**.
308308
## Next steps
309309

310310
When the appliance interconnect **Tunnel Status** is **UP** and green, you are ready to
311-
migrate and protect AVS VMs using HCX. See [VMware HCX documentation](https://docs.vmware.com/en/VMware-HCX/index.html) and [Migrating Virtual Machines with VMware HCX](https://docs.vmware.com/en/VMware-HCX/services/user-guide/GUID-D0CD0CC6-3802-42C9-9718-6DA5FEC246C6.html?hWord=N4IghgNiBcIBIGEAaACAtgSwOYCcwBcMB7AOxAF8g) in the VMWare technical documentation.
311+
migrate and protect AVS VMs using HCX. See [VMware HCX documentation](https://docs.vmware.com/en/VMware-HCX/index.html) and [Migrating Virtual Machines with VMware HCX](https://docs.vmware.com/en/VMware-HCX/services/user-guide/GUID-D0CD0CC6-3802-42C9-9718-6DA5FEC246C6.html?hWord=N4IghgNiBcIBIGEAaACAtgSwOYCcwBcMB7AOxAF8g) in the VMware technical documentation.

articles/azure-vmware/tutorial-access-private-cloud.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.date: 05/04/2020
99

1010
During preview, AVS does not allow you to manage your private cloud with your on-premises vCenter. You'll need to perform additional setup and connection to a local vCenter instance through a jump box.
1111

12-
In this tutorial, you create a Windows virtual machine for a jump box in the resource group you created in the previous tutorial [Tutorial: Configure networking for your VMWare private cloud in Azure](tutorial-configure-networking.md) and sign into vCenter. This is a VM on the same virtual network you created and provides access to vCenter and NSX Manager.
12+
In this tutorial, you create a Windows virtual machine for a jump box in the resource group you created in the previous tutorial [Tutorial: Configure networking for your VMware private cloud in Azure](tutorial-configure-networking.md) and sign into vCenter. This is a VM on the same virtual network you created and provides access to vCenter and NSX Manager.
1313

1414
In this tutorial, you learn how to:
1515

@@ -75,4 +75,4 @@ In this tutorial you learned how to:
7575
Continue to the next tutorial to learn how to scale your AVS private cloud.
7676

7777
> [!div class="nextstepaction"]
78-
> [Scale an AVS private cloud](tutorial-scale-private-cloud.md)
78+
> [Scale an AVS private cloud](tutorial-scale-private-cloud.md)

articles/azure-vmware/tutorial-configure-networking.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Tutorial - Configure networking for your VMWare private cloud in Azure
2+
title: Tutorial - Configure networking for your VMware private cloud in Azure
33
description: Learn to create and configure the networking needed to deploy your private cloud in Azure
44
ms.topic: tutorial
55
ms.date: 05/04/2020

articles/azure-vmware/tutorial-create-private-cloud.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ In this tutorial, you learn how to:
2525

2626
## Register the resource provider
2727

28-
In order to use the Azure VMWare Solution you must first register the resource provider. The following example registers the resource provider with your subscription.
28+
In order to use the Azure VMware Solution you must first register the resource provider. The following example registers the resource provider with your subscription.
2929

3030
```azurecli-interactive
3131
az provider register -n Microsoft.AVS --subscription <your subscription ID>

articles/cosmos-db/change-feed.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ This feature is currently supported by the following Azure Cosmos DB APIs and cl
2828

2929
## Change feed and different operations
3030

31-
Today, you see all inserts and updates in the change feed. You can't filter the change feed for for a specific type of operation. One possible alternative, is to add a "soft marker" on the item for updates and filter based on that when processing items in the change feed.
31+
Today, you see all inserts and updates in the change feed. You can't filter the change feed for a specific type of operation. One possible alternative, is to add a "soft marker" on the item for updates and filter based on that when processing items in the change feed.
3232

3333
Currently change feed doesn't log deletes. Similar to the previous example, you can add a soft marker on the items that are being deleted. For example, you can add an attribute in the item called "deleted" and set it to "true" and set a TTL on the item, so that it can be automatically deleted. You can read the change feed for historic items (the most recent change corresponding to the item, it doesn't include the intermediate changes), for example, items that were added five years ago. You can read the change feed as far back as the origin of your container but if an item is deleted, it will be removed from the change feed.
3434

0 commit comments

Comments
 (0)