Skip to content

Commit 1652986

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into QueryAlertSetting
2 parents 6d3fb01 + 0e8be90 commit 1652986

File tree

215 files changed

+2087
-1177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

215 files changed

+2087
-1177
lines changed

articles/active-directory-b2c/custom-email-mailjet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ If you don't already have one, start by setting up a Mailjet account (Azure cust
4545
2. Navigate to the [API Key Management page](https://dev.mailjet.com/email/guides/senders-and-domains/#use-a-sender-on-all-api-keys-(metasender)). Record the **API Key** and **Secret Key** for use in a later step. Both keys are generated automatically when your account is created.
4646

4747
> [!IMPORTANT]
48-
> Mailjet offers customers the ability to send emails from shared IP and [dedicated IP addresses](https://documentation.mailjet.com/hc/articles/360043101973-What-is-a-dedicated-IP). When using dedicated IP addresses, you need to build your own reputation properly with an IP address warm-up. For more information, see [How do I warm up my IP ?](https://documentation.mailjet.com/hc/articles/1260803352789-How-do-I-warm-up-my-IP-).
48+
> Mailjet offers customers the ability to send emails from shared IP and [dedicated IP addresses](https://documentation.mailjet.com/hc/en-us/articles/1260803352789-Dedicated-IPs-What-They-Are-and-How-to-Warm-Them-Up). When using dedicated IP addresses, you need to build your own reputation properly with an IP address warm-up. For more information, see [How do I warm up my IP ?](https://documentation.mailjet.com/hc/articles/1260803352789-How-do-I-warm-up-my-IP-).
4949
5050
## Create Azure AD B2C policy key
5151

articles/active-directory-b2c/partner-f5.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ To upgrade the Guided Configuration, go to my.f5.com for [K85454683: Upgrade F5
140140

141141
Use BIG-IP configured with a client SSL profile to secure client-side traffic over TLS. Import a certificate that matches the domain name, used by the public-facing URL for your app. We recommend you use a public certificate authority, but you can use BIG-IP self-signed certificates for testing.
142142

143-
To add and manage certificates in the BIG-IP VE, go to techdocs.f5.com for [BIG-IP System: SSL Administration](https://techdocs.f5.com/kb/en-us/products/big-ip_ltm/manuals/product/bigip-ssl-administration-13-0-0.html).
143+
To add and manage certificates in the BIG-IP VE, go to techdocs.f5.com for [BIG-IP System: SSL Administration](https://techdocs.f5.com/en-us/bigip-17-5-0/big-ip-system-ssl-administration.html).
144144

145145

146146
## Guided Configuration
@@ -453,4 +453,4 @@ The same access log provides detail.
453453
9. In the top-left corner, select **Apply Access Policy**.
454454
10. Select **Apply**.
455455

456-
For more information, go to techdocs.f5.com for [OAuth client and resource server troubleshooting tips](https://techdocs.f5.com/kb/en-us/products/big-ip_apm/manuals/product/apm-authentication-sso-13-0-0/37.html#GUID-774384BC-CF63-469D-A589-1595D0DDFBA2)
456+
For more information, go to techdocs.f5.com for [OAuth client and resource server troubleshooting tips](https://techdocs.f5.com/en-us/bigip-17-0-0/big-ip-access-policy-manager-oauth-configuration/apm-oauth-client-and-resource-server.html)

articles/api-management/api-management-troubleshoot-cannot-add-custom-domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Check whether the issue is resolved. To do this, try to create the custom domain
5050
## Related content
5151
Learn more about API Management service:
5252

53-
- Check out more [videos](https://azure.microsoft.com/documentation/videos/index/?services=api-management) about API Management.
53+
- Check out more videos about API Management.
5454
* For other ways to secure your back-end service, see [Mutual Certificate authentication](api-management-howto-mutual-certificates.md).
5555

5656
* [Create an API Management service instance](get-started-create-service-instance.md).

articles/app-service/app-service-configure-premium-v4-tier.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Configure Premium V4 tier
33
description: Learn how to better performance for your web, mobile, and API app in Azure App Service by scaling to the new Premium V4 pricing tier.
44
keywords: app service, azure app service, scale, scalable, app service plan, app service cost
55
ms.topic: article
6-
ms.date: 06/09/2025
6+
ms.date: 06/13/2025
77
ms.author: msangapu
88
author: msangapu-msft
99
ms.custom:
@@ -98,7 +98,6 @@ Premium V4 is available in the following regions:
9898

9999
- Australia East
100100
- Canada Central
101-
- North Europe
102101
- East US
103102
- East US 2
104103
- France Central

articles/app-service/configure-basic-auth-disable.md

Lines changed: 65 additions & 69 deletions
Large diffs are not rendered by default.

articles/app-service/configure-ssl-certificate.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ The following table lists the options for you to add certificates in App Service
3838

3939
The [free App Service managed certificate](#create-a-free-managed-certificate) and the [App Service certificate](configure-ssl-app-service-certificate.md) already satisfy the requirements of App Service. If you choose to upload or import a private certificate to App Service, your certificate must meet the following requirements:
4040

41-
* Be exported as a [password-protected .pfx file](https://en.wikipedia.org/w/index.php?title=X.509&section=4#Certificate_filename_extensions), encrypted by using triple DES.
42-
* Contain a private key at least 2,048 bits long.
41+
* Be exported as a [password-protected PFX file](https://en.wikipedia.org/w/index.php?title=X.509&section=4#Certificate_filename_extensions).
4342
* Contain all intermediate certificates and the root certificate in the certificate chain.
4443

4544
If you want to help secure a custom domain in a TLS binding, the certificate must meet these extra requirements:
@@ -48,7 +47,7 @@ If you want to help secure a custom domain in a TLS binding, the certificate mus
4847
* Be signed by a trusted certificate authority.
4948

5049
> [!NOTE]
51-
> *Elliptic curve cryptography (ECC) certificates* work with App Service but aren't covered by this article. For the exact steps to create ECC certificates, work with your certificate authority.
50+
> **Elliptic Curve Cryptography (ECC) certificates** work with App Service when uploaded as a PFX, but currently cannot be imported from Key Vault. They aren't covered by this article. For the exact steps to create ECC certificates, work with your certificate authority.
5251
5352
After you add a private certificate to an app, the certificate is stored in a deployment unit that's bound to the App Service plan's resource group, region, and operating system (OS) combination. Internally, it's called a *webspace*. That way, the certificate is accessible to other apps in the same resource group, region, and OS combination. Private certificates uploaded or imported to App Service are shared with app services in the same deployment unit.
5453

0 commit comments

Comments
 (0)