Skip to content

Commit efa504d

Browse files
authored
Merge pull request #194902 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 cbe7611 + 196c5ab commit efa504d

File tree

20 files changed

+44
-28
lines changed

20 files changed

+44
-28
lines changed

articles/active-directory/authentication/howto-authentication-passwordless-security-key.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ There are two ways to get your AAGUID. You can either ask your security key prov
9999
1. Click **Security Info**.
100100
1. If the user already has at least one Azure AD Multi-Factor Authentication method registered, they can immediately register a FIDO2 security key.
101101
1. If they don't have at least one Azure AD Multi-Factor Authentication method registered, they must add one.
102+
1. An Administrator can issue a [Temporary Access Pass](howto-authentication-temporary-access-pass.md) to allow the user to register a Passwordless authentication method.
102103
1. Add a FIDO2 Security key by clicking **Add method** and choosing **Security key**.
103104
1. Choose **USB device** or **NFC device**.
104105
1. Have your key ready and choose **Next**.
@@ -141,4 +142,4 @@ If a user's UPN changes, you can no longer modify FIDO2 security keys to account
141142

142143
[Learn more about device registration](../devices/overview.md)
143144

144-
[Learn more about Azure AD Multi-Factor Authentication](../authentication/howto-mfa-getstarted.md)
145+
[Learn more about Azure AD Multi-Factor Authentication](../authentication/howto-mfa-getstarted.md)

articles/active-directory/develop/msal-net-token-cache-serialization.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The recommendation is:
3434

3535
A shared cache is faster because it's not serialized. However, the memory will grow as tokens are cached. The number of tokens is equal to the number of tenants times the number of downstream APIs. An app token is about 2 KB in size, whereas tokens for a user are about 7 KB in size. It's great for development, or if you have few users.
3636
- If you want to use an in-memory token cache and control its size and eviction policies, use the [Microsoft.Identity.Web in-memory cache option](msal-net-token-cache-serialization.md?tabs=aspnet#in-memory-token-cache-1).
37-
- If you build an SDK and want to write your own token cache serializer for confidential client applications, inherit from [Microsoft.Identity.Web.MsalAsbtractTokenCacheProvider](https://github.com/AzureAD/microsoft-identity-web/blob/master/src/Microsoft.Identity.Web.TokenCache/MsalAbstractTokenCacheProvider.cs) and override the `WriteCacheBytesAsync` and `ReadCacheBytesAsync` methods.
37+
- If you build an SDK and want to write your own token cache serializer for confidential client applications, inherit from [Microsoft.Identity.Web.MsalAbstractTokenCacheProvider](https://github.com/AzureAD/microsoft-identity-web/blob/master/src/Microsoft.Identity.Web.TokenCache/MsalAbstractTokenCacheProvider.cs) and override the `WriteCacheBytesAsync` and `ReadCacheBytesAsync` methods.
3838

3939

4040
## [ASP.NET Core web apps and web APIs](#tab/aspnetcore)
@@ -496,7 +496,7 @@ The strategies are different depending on whether you're writing a token cache s
496496

497497
### Custom token cache for a web app or web API (confidential client application)
498498

499-
If you want to write your own token cache serializer for confidential client applications, we recommend that you inherit from [Microsoft.Identity.Web.MsalAsbtractTokenCacheProvider](https://github.com/AzureAD/microsoft-identity-web/blob/master/src/Microsoft.Identity.Web.TokenCache/MsalAbstractTokenCacheProvider.cs) and override the `WriteCacheBytesAsync` and `ReadCacheBytesAsync` methods.
499+
If you want to write your own token cache serializer for confidential client applications, we recommend that you inherit from [Microsoft.Identity.Web.MsalAbstractTokenCacheProvider](https://github.com/AzureAD/microsoft-identity-web/blob/master/src/Microsoft.Identity.Web.TokenCache/MsalAbstractTokenCacheProvider.cs) and override the `WriteCacheBytesAsync` and `ReadCacheBytesAsync` methods.
500500
501501
Examples of token cache serializers are provided in [Microsoft.Identity.Web/TokenCacheProviders](https://github.com/AzureAD/microsoft-identity-web/blob/master/src/Microsoft.Identity.Web.TokenCache).
502502

articles/active-directory/enterprise-users/directory-delete-howto.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Expired (30 days) | Data accessible to all| Users have normal access to Microsof
5757
Disabled (30 days) | Data accessible to admin only | Users can’t access Microsoft 365 files, or apps<br>Admins can access the Microsoft 365 admin center but can’t assign licenses to or update users
5858
Deprovisioned (30 days after Disabled) | Data deleted (automatically deleted if no other services are in use) | Users can’t access Microsoft 365 files, or apps<br>Admins can access the Microsoft 365 admin center to purchase and manage other subscriptions
5959

60-
## Delete a subscription
60+
## Delete a Office/Microsoft 365 subscription
6161

6262
You can put a subscription into the **Deprovisioned** state to be deleted in three days using the Microsoft 365 admin center.
6363

@@ -88,6 +88,16 @@ You can put a subscription into the **Deprovisioned** state to be deleted in thr
8888
1. Once you have deleted a subscription in your organization and 72 hours have elapsed, you can sign back into the Azure AD admin center again and there should be no required action and no subscriptions blocking your organization deletion. You should be able to successfully delete your Azure AD organization.
8989

9090
![pass subscription check at deletion screen](./media/directory-delete-howto/delete-checks-passed.png)
91+
92+
## Delete an Azure subscription
93+
94+
If you have an Active or Cancelled Azure Subscription associated to your Azure AD Tenant then you would not be able to delete Azure AD Tenant. After you cancel, billing is stopped immediately. However, Microsoft waits 30 - 90 days before permanently deleting your data in case you need to access it or you change your mind. We don't charge you for keeping the data.
95+
96+
- If you have a free trial or pay-as-you-go subscription, you don't have to wait 90 days for the subscription to automatically delete. You can delete your subscription three days after you cancel it. The Delete subscription option isn't available until three days after you cancel your subscription. For more details please read through [Delete free trial or pay-as-you-go subscriptions](https://docs.microsoft.com/azure/cost-management-billing/manage/cancel-azure-subscription#delete-free-trial-or-pay-as-you-go-subscriptions).
97+
- All other subscription types are deleted only through the [subscription cancellation](https://docs.microsoft.com/azure/cost-management-billing/manage/cancel-azure-subscription#cancel-subscription-in-the-azure-portal) process. In other words, you can't delete a subscription directly unless it's a free trial or pay-as-you-go subscription. However, after you cancel a subscription, you can create an [Azure support request](https://go.microsoft.com/fwlink/?linkid=2083458) to ask to have the subscription deleted immediately.
98+
- Alternatively, you can also move/transfer the Azure subscription to another Azure AD tenant account. When you transfer billing ownership of your subscription to an account in another Azure AD tenant, you can move the subscription to the new account's tenant. Additionally, perfoming Switch Directory on the subscription would not help as the billing would still be aligned with Azure AD Tenant which was used to sign up for the subscription. For more information review [Transfer a subscription to another Azure AD tenant account](https://docs.microsoft.com/azure/cost-management-billing/manage/billing-subscription-transfer#transfer-a-subscription-to-another-azure-ad-tenant-account)
99+
100+
Once you have all the Azure and Office/Microsoft 365 Subscriptions cancelled and deleted you can proceed with cleaning up rest of the things within Azure AD Tenant before actually delete it.
91101

92102
## Enterprise apps with no way to delete
93103

articles/active-directory/enterprise-users/groups-assign-sensitivity-labels.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ To apply published labels to groups, you must first enable the feature. These st
6666
1. Save the changes and apply the settings:
6767
6868
```powershell
69-
Set-AzureADDirectorySetting -Id $grpUnifiedSetting.Id -DirectorySetting $setting
69+
Set-AzureADDirectorySetting -Id $grpUnifiedSetting.Id -DirectorySetting $Setting
7070
```
7171
7272
If you’re receiving a Request_BadRequest error, it's because the settings already exist in the tenant, so when you try to create a new property:value pair, the result is an error. In this case, take the following steps:
@@ -160,4 +160,4 @@ If you must make a change, use an [Azure AD PowerShell script](https://github.co
160160
- [Use sensitivity labels with Microsoft Teams, Microsoft 365 groups, and SharePoint sites](/microsoft-365/compliance/sensitivity-labels-teams-groups-sites)
161161
- [Update groups after label policy change manually with Azure AD PowerShell script](https://github.com/microsoftgraph/powershell-aad-samples/blob/master/ReassignSensitivityLabelToO365Groups.ps1)
162162
- [Edit your group settings](../fundamentals/active-directory-groups-settings-azure-portal.md)
163-
- [Manage groups using PowerShell commands](../enterprise-users/groups-settings-v2-cmdlets.md)
163+
- [Manage groups using PowerShell commands](../enterprise-users/groups-settings-v2-cmdlets.md)

articles/active-directory/privileged-identity-management/pim-create-azure-ad-roles-and-resource-roles-review.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ Based on your selections in **Upon completion settings**, auto-apply will be exe
143143
> [!NOTE]
144144
> It is possible for a security group to have other groups assigned to it. In this case, only the users assigned directly to the security group assigned to the role will appear in the review of the role.
145145
146+
146147
## Update the access review
147148

148149
After one or more access reviews have been started, you may want to modify or update the settings of your existing access reviews. Here are some common scenarios that you might want to consider:

articles/app-service/reference-app-settings.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,7 @@ For more information on custom containers, see [Run a custom container in Azure]
334334
| `DOCKER_REGISTRY_SERVER_URL` | URL of the registry server, when running a custom container in App Service. For security, this variable is not passed on to the container. | `https://<server-name>.azurecr.io` |
335335
| `DOCKER_REGISTRY_SERVER_USERNAME` | Username to authenticate with the registry server at `DOCKER_REGISTRY_SERVER_URL`. For security, this variable is not passed on to the container. ||
336336
| `DOCKER_REGISTRY_SERVER_PASSWORD` | Password to authenticate with the registry server at `DOCKER_REGISTRY_SERVER_URL`. For security, this variable is not passed on to the container. ||
337+
| `DOCKER_ENABLE_CI` | Set to `true` to enable the continuous deployment for custom containers. The default is `false` for custom containers. ||
337338
| `WEBSITE_PULL_IMAGE_OVER_VNET` | Connect and pull from a registry inside a Virtual Network or on-premise. Your app will need to be connected to a Virtual Network using VNet integration feature. This setting is also needed for Azure Container Registry with Private Endpoint. ||
338339
| `WEBSITES_WEB_CONTAINER_NAME` | In a Docker Compose app, only one of the containers can be internet accessible. Set to the name of the container defined in the configuration file to override the default container selection. By default, the internet accessible container is the first container to define port 80 or 8080, or, when no such container is found, the first container defined in the configuration file. | |
339340
| `WEBSITES_PORT` | For a custom container, the custom port number on the container for App Service to route requests to. By default, App Service attempts automatic port detection of ports 80 and 8080. This setting is *not* injected into the container as an environment variable. ||

articles/azure-monitor/agents/agent-linux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ The following are not supported:
7878
- CIS
7979
- SELinux (custom hardening like MLS)
8080
81-
CIS and SELinux hardening support is planned for [Azure Monitoring Agent](./azure-monitor-agent-overview.md). Further hardening and customization methods are not supported nor planned for OMS Agent. For instance, OS images like Github Enterprise Server which include customizations such as limitations to user account privileges are not supported.
81+
CIS and SELinux hardening support is planned for [Azure Monitoring Agent](./azure-monitor-agent-overview.md). Further hardening and customization methods are not supported nor planned for OMS Agent. For instance, OS images like GitHub Enterprise Server which include customizations such as limitations to user account privileges are not supported.
8282
8383
## Agent prerequisites
8484

articles/azure-monitor/containers/container-insights-enable-existing-clusters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This article describes how to set up Container insights to monitor managed Kuber
1313
You can enable monitoring of an AKS cluster that's already deployed using one of the supported methods:
1414

1515
* Azure CLI
16-
* Terraform
16+
* [Terraform](#enable-using-terraform)
1717
* [From Azure Monitor](#enable-from-azure-monitor-in-the-portal) or [directly from the AKS cluster](#enable-directly-from-aks-cluster-in-the-portal) in the Azure portal
1818
* With the [provided Azure Resource Manager template](#enable-using-an-azure-resource-manager-template) by using the Azure PowerShell cmdlet `New-AzResourceGroupDeployment` or with Azure CLI.
1919

articles/azure-signalr/scripts/signalr-cli-create-with-app-service-github-oauth.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ This sample script creates a new Azure SignalR Service resource, which is used t
2626

2727
:::code language="azurecli" source="~/azure_cli_scripts/azure-signalr/create-signalr-with-app-service/create-signalr-with-app-service.sh" id="FullScript":::
2828

29-
### Enable Github authentication and Git deployment for web app
29+
### Enable GitHub authentication and Git deployment for web app
3030

3131
1. Update the values in the following script for the desired deployment username and its passwor
3232

articles/cognitive-services/Translator/language-support.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ ms.author: lajanuar
3636
| Azerbaijani | `az` ||||||
3737
| Bangla | `bn` ||||||
3838
| Bashkir | `ba` ||||||
39+
| 🆕Basque | `eu` ||||||
3940
| Bosnian (Latin) | `bs` ||||||
4041
| Bulgarian | `bg` ||||||
4142
| Cantonese (Traditional) | `yue` ||||||
@@ -56,6 +57,7 @@ ms.author: lajanuar
5657
| Finnish | `fi` ||||||
5758
| French | `fr` ||||||
5859
| French (Canada) | `fr-ca` ||||||
60+
| 🆕Galician | `gl` ||||||
5961
| Georgian | `ka` ||||||
6062
| German | `de` ||||||
6163
| Greek | `el` ||||||
@@ -112,7 +114,7 @@ ms.author: lajanuar
112114
| Serbian (Latin) | `sr-Latn` ||||||
113115
| Slovak | `sk` ||||||
114116
| Slovenian | `sl` ||||||
115-
| 🆕Somali | `so` ||||||
117+
| Somali | `so` ||||||
116118
| Spanish | `es` ||||||
117119
| Swahili | `sw` ||||||
118120
| Swedish | `sv` ||||||
@@ -134,7 +136,7 @@ ms.author: lajanuar
134136
| Vietnamese | `vi` ||||||
135137
| Welsh | `cy` ||||||
136138
| Yucatec Maya | `yua` ||||||
137-
| 🆕Zulu | `zu` ||||||
139+
| Zulu | `zu` ||||||
138140

139141
> [!NOTE]
140142
> Language code `pt` will default to `pt-br`, Portuguese (Brazil).

0 commit comments

Comments
 (0)