Skip to content

Commit 3ed317e

Browse files
authored
Merge pull request #102730 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents bb4d218 + b21fc95 commit 3ed317e

File tree

4 files changed

+2
-9
lines changed

4 files changed

+2
-9
lines changed

articles/active-directory/reports-monitoring/reference-sign-ins-error-codes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ You can also programmatically access the sign-in data using the [reporting API](
140140
|53002|Application used is not an approved application for Conditional Access. User needs to use one of the apps from the list of approved applications to use in order to get access.|
141141
|53003|Access has been blocked due to Conditional Access policies.|
142142
|53004|User needs to complete Multi-factor authentication registration process before accessing this content. User should register for multi-factor authentication.|
143+
|53032|Acount has been blocked due to Azure AD Identity Protection policies.|
143144
|65001|Application X doesn't have permission to access application Y or the permission has been revoked. Or The user or administrator has not consented to use the application with ID X. Send an interactive authorization request for this user and resource. Or The user or administrator has not consented to use the application with ID X. Send an authorization request to your tenant admin to act on behalf of the App : Y for Resource : Z.|
144145
|65004|User declined to consent to access the app. Have the user retry the sign-in and consent to the app|
145146
|65005|The application required resource access list does not contain applications discoverable by the resource or The client application has requested access to resource, which was not specified in its required resource access list or Graph service returned bad request or resource not found. If the application supports SAML, you may have configured the application with the wrong Identifier (Entity). Try out the resolution listed for SAML using the link below: [https://docs.microsoft.com/azure/active-directory/application-sign-in-problem-federated-sso-gallery?/?WT.mc_id=DMC_AAD_Manage_Apps_Troubleshooting_Nav#no-resource-in-requiredresourceaccess-list](https://docs.microsoft.com/azure/active-directory/application-sign-in-problem-federated-sso-gallery?/?WT.mc_id=DMC_AAD_Manage_Apps_Troubleshooting_Nav)|

articles/aks/virtual-nodes-cli.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -314,10 +314,6 @@ az aks disable-addons --resource-group myResourceGroup --name myAKSCluster --add
314314

315315
Now, remove the virtual network resources and resource group:
316316

317-
318-
> [!NOTE]
319-
> If you receive an error while attempting to remove the network profile, allow 3-4 days for the platform to automatically mitigate the issue and attempt the deletion again. If you need to delete a network profile immediately, [open a support request](https://azure.microsoft.com/support/create-ticket/) referencing the Azure Container Instances service.
320-
321317
```azurecli-interactive
322318
# Change the name of your resource group, cluster and network resources as needed
323319
RES_GROUP=myResourceGroup

articles/container-instances/container-instances-vnet.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,6 @@ az container delete --resource-group myResourceGroup --name appcontaineryaml -y
256256

257257
### Delete network resources
258258

259-
260-
> [!NOTE]
261-
> If you receive an error while attempting to remove the network profile, allow 3-4 days for the platform to automatically mitigate the issue and attempt the deletion again. If you need to delete a network profile immediately, [open a support request](https://azure.microsoft.com/support/create-ticket/) referencing the Azure Container Instances service.
262-
263259
This feature currently requires several additional commands to delete the network resources you created earlier. If you used the example commands in previous sections of this article to create your virtual network and subnet, then you can use the following script to delete those network resources.
264260

265261
Before executing the script, set the `RES_GROUP` variable to the name of the resource group containing the virtual network and subnet that should be deleted. Update the name of the virtual network if you did not use the `aci-vnet` name suggested earlier. The script is formatted for the Bash shell. If you prefer another shell such as PowerShell or Command Prompt, you'll need to adjust variable assignment and accessors accordingly.

articles/virtual-machines/linux/instance-metadata-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ The signature blob is a [pkcs7](https://aka.ms/pkcs7) signed version of document
540540
541541
Instance metadata can be retrieved in Windows via the PowerShell utility `curl`:
542542
543-
```bash
543+
```powershell
544544
curl -H @{'Metadata'='true'} "http://169.254.169.254/metadata/attested/document?api-version=2018-10-01&nonce=1234567890" | select -ExpandProperty Content
545545
```
546546

0 commit comments

Comments
 (0)