Skip to content

Commit 91b0569

Browse files
authored
Merge pull request #230009 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 5bc9479 + 774639f commit 91b0569

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

articles/active-directory/enterprise-users/domains-manage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Keep your domain names current with your Registrar, and verify TXT records for a
9494

9595
* If you purposefully are expiring your domain name or turning over ownership to someone else (separately from your Azure AD tenant), you should delete it from your Azure AD tenant prior to expiring or transferring.
9696
* If you do allow your domain name to expire, if you are able to reactivate it/regain control of it, carefully review all TXT records with the registrar to ensure no tampering of your domain name took place.
97-
* If you can't reactivate or regain control of your domain name immediately, you should delete it from your Azure AD tenant. Dom't readd/re-verify until you are able to resolve ownership of the domain name and verify the full TXT record for correctness.
97+
* If you can't reactivate or regain control of your domain name immediately, you should delete it from your Azure AD tenant. Don't read/re-verify until you are able to resolve ownership of the domain name and verify the full TXT record for correctness.
9898

9999
>[!NOTE]
100100
> Microsoft will not allow a domain name to be verified with more than Azure AD tenant. Once you delete a domain name from your tenant, you will not be able to re-add/re-verify it with your Azure AD tenant if it is subsequently added and verified with another Azure AD tenant.

articles/azure-cache-for-redis/cache-how-to-premium-persistence.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,10 @@ Using managed identity adds the cache instance to the [trusted services list](..
233233

234234
No, you can't use Append-only File (AOF) persistence with multiple replicas (more than one replica).
235235

236+
### How do I check if soft delete is enabled on my storage account?
237+
238+
Select the storage account that your cache is using for persistence. Select **Data Protection** from the Resource menu. In the working pane, check the state of *Enable soft delete for blobs*.
239+
236240
## Next steps
237241

238242
Learn more about Azure Cache for Redis features.

articles/frontdoor/front-door-wildcard-domain.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,18 @@ When configuring a routing rule, you can select a wildcard domain as a front-end
146146

147147
## Next steps
148148

149+
::: zone pivot="front-door-standard-premium"
150+
151+
- Learn how to [create an Azure Front Door profile](create-front-door-portal.md).
152+
- Learn how to [add a custom domain](standard-premium/how-to-add-custom-domain.md) to your Azure Front Door.
153+
- Learn how to [enable HTTPS on a custom domain](standard-premium/how-to-configure-https-custom-domain.md).
154+
155+
::: zone-end
156+
157+
::: zone pivot="front-door-classic"
158+
149159
- Learn how to [create an Azure Front Door profile](quickstart-create-front-door.md).
150160
- Learn how to [add a custom domain](front-door-custom-domain.md) to your Azure Front Door.
151161
- Learn how to [enable HTTPS on a custom domain](front-door-custom-domain-https.md).
162+
163+
::: zone-end

0 commit comments

Comments
 (0)