Skip to content

Commit b65f64e

Browse files
authored
Merge pull request #196608 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 b140780 + 1eeb028 commit b65f64e

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

articles/active-directory/develop/publisher-verification-overview.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ A blue "verified" badge appears on the Azure AD consent prompt and other screens
2626

2727
![Consent prompt](./media/publisher-verification-overview/consent-prompt.png)
2828

29-
> [!NOTE]
30-
> We recently changed the color of the "verified" badge from blue to gray. We will revert that change sometime in the last half of February 2022, so the "verified" badge will be blue.
31-
3229
This feature is primarily for developers building multi-tenant apps that leverage [OAuth 2.0 and OpenID Connect](active-directory-v2-protocols.md) with the [Microsoft identity platform](v2-overview.md). These apps can sign users in using OpenID Connect, or they may use OAuth 2.0 to request access to data using APIs like [Microsoft Graph](https://developer.microsoft.com/graph/).
3330

3431
## Benefits

articles/active-directory/develop/workload-identity-federation.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ Typically, a software workload (such as an application, service, script, or cont
2929
You use workload identity federation to configure an Azure AD app registration to trust tokens from an external identity provider (IdP), such as GitHub. Once that trust relationship is created, your software workload can exchange trusted tokens from the external IdP for access tokens from Microsoft identity platform. Your software workload then uses that access token to access the Azure AD protected resources to which the workload has been granted access. This eliminates the maintenance burden of manually managing credentials and eliminates the risk of leaking secrets or having certificates expire.
3030

3131
## Supported scenarios
32+
> [!NOTE]
33+
> Azure AD-issued tokens might not be used for federated identity flows.
3234
3335
The following scenarios are supported for accessing Azure AD protected resources using workload identity federation:
3436

articles/azure-arc/data/create-complete-managed-instance-directly-connected.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ In addition, you need the following additional extensions to connect the cluster
4242

4343
## Access your Kubernetes cluster
4444

45-
After installing the client tools, you need access to a Kubernetes cluster. You can create Kubernetes cluster with [`az aks create`](/cli/azure/aks#az-aks-create), or you can follow the steps below to create the cluster in the Azure portal.
45+
After installing the client tools, you need access to a Kubernetes cluster. You can create a Kubernetes cluster with [`az aks create`](/cli/azure/aks#az-aks-create), or you can follow the steps below to create the cluster in the Azure portal.
4646

4747
### Create a cluster
4848

@@ -116,7 +116,7 @@ After creating the cluster, connect to the cluster through the Azure CLI.
116116

117117
### Arc enable the Kubernetes cluster
118118

119-
Now that the cluster is running, connect the cluster to Azure. When you connect a cluster to Azure, you Arc enable it. Arc enabling your cluster allow you to view and manage the cluster, and deploy and manage additional services such as Arc-enabled data services on the cluster directly from Azure portal.
119+
Now that the cluster is running, connect the cluster to Azure. When you connect a cluster to Azure, you Arc enable it. Arc enabling your cluster allows you to view and manage the cluster, and deploy and manage additional services such as Arc-enabled data services on the cluster directly from Azure portal.
120120

121121
Use `az connectedk8s connect` to connect the cluster to Azure:
122122

@@ -181,7 +181,7 @@ NAME STATE
181181
<namespace> Ready
182182
```
183183

184-
## Create Azure Arc-enabled SQL Managed Instance
184+
## Create an Azure Arc-enabled SQL Managed Instance
185185

186186
1. In the portal, locate the resource group.
187187
1. In the resource group, select **Create**.

articles/storage/common/storage-use-azcopy-files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ You can upload the contents of a directory without copying the containing direct
108108
**Example**
109109

110110
```azcopy
111-
azcopy copy 'C:\myDirectory\*' 'https://mystorageaccount.file.core.windows.net/myfileshare/myFileShareDirectory?sv=2018-03-28&ss=bjqt&srs=sco&sp=rjklhjup&se=2019-05-10T04:37:48Z&st=2019-05-09T20:37:48Z&spr=https&sig=%2FSOVEFfsKDqRry4bk3qz1vAQFwY5DDzp2%2B%2F3Eykf%2FJLs%3D" --preserve-smb-permissions=true --preserve-smb-info=true
111+
azcopy copy 'C:\myDirectory\*' 'https://mystorageaccount.file.core.windows.net/myfileshare/myFileShareDirectory?sv=2018-03-28&ss=bjqt&srs=sco&sp=rjklhjup&se=2019-05-10T04:37:48Z&st=2019-05-09T20:37:48Z&spr=https&sig=%2FSOVEFfsKDqRry4bk3qz1vAQFwY5DDzp2%2B%2F3Eykf%2FJLs%3D' --preserve-smb-permissions=true --preserve-smb-info=true
112112
```
113113

114114
> [!NOTE]

0 commit comments

Comments
 (0)