Skip to content

Commit 3316ab4

Browse files
authored
Merge pull request #310877 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 3200851 + fa979e6 commit 3316ab4

5 files changed

Lines changed: 11 additions & 9 deletions

File tree

articles/active-directory-b2c/add-password-reset-policy.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.subservice: b2c
1212
zone_pivot_groups: b2c-policy-type
1313
ms.custom: sfi-image-nochange
1414

15-
#Customer Intent: As an Azure AD B2C administrator, I want to set up a password reset flow for local accounts, so that users can reset their passwords if they forget them.
15+
# Customer Intent: As an Azure AD B2C administrator, I want to set up a password reset flow for local accounts, so that users can reset their passwords if they forget them.
1616
---
1717

1818
# Set up a password reset flow in Azure Active Directory B2C
@@ -43,7 +43,7 @@ The default name of the **Change email** button in *selfAsserted.html* is **chan
4343
[!INCLUDE [active-directory-b2c-customization-prerequisites](../../includes/active-directory-b2c-customization-prerequisites.md)]
4444

4545

46-
- The B2C Users need to have an authentication method specified for self-service password reset. Select the B2C User, in the left menu under **Manage**, select **Authentication methods**. Ensure **Authentication contact info** is set. B2C users created via a Sign-up flow has this set by default. For users created via Azure Portal or by Graph API, you need to set **Authentication contact info** for SSPR to work.
46+
- The B2C users need to have an authentication method specified for self-service password reset. Select the B2C User, in the left menu under **Manage**, select **Authentication methods**. Ensure **Authentication contact info** is set. B2C users created via a Sign-up flow has this set by default. For users created via Azure Portal or by Graph API, you need to set **Authentication contact info** for SSPR to work.
4747

4848

4949
## Self-service password reset (recommended)
@@ -52,7 +52,7 @@ The new password reset experience is now part of the sign-up or sign-in policy.
5252

5353
::: zone pivot="b2c-user-flow"
5454

55-
The self-service password reset experience can be configured for the Sign in (Recommended) or Sign up and sign in (Recommended) user flows. If you don't have one of these user flows setup, create a [sign-up or sign-in](add-sign-up-and-sign-in-policy.md) user flow.
55+
The self-service password reset experience can be configured for the Sign in (Recommended) or Sign up and sign in (Recommended) user flows. If you don't have one of these user flows set up, create a [sign-up or sign-in](add-sign-up-and-sign-in-policy.md) user flow.
5656

5757
To set up self-service password reset for the sign-up or sign-in user flow:
5858

articles/application-gateway/application-gateway-faq.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,10 @@ sections:
443443
answer: |
444444
Yes, the Application Gateway v2 SKU supports Key Vault. For more information, see [TLS termination with Key Vault certificates](key-vault-certs.md).
445445
446+
- question: Why can't I select an Azure key vault from a different subscription in the Azure portal when configuring a TLS listener certificate on Application Gateway?
447+
answer: |
448+
The Azure portal currently allows selecting key vaults only from the same subscription as Application Gateway. This is a known portal limitation. However, Application Gateway does support using a key vault from a different subscription (within the same Microsoft Entra ID tenant) by configuring the certificate through the Azure CLI or PowerShell by using the key vault secret ID, provided the Application Gateway managed identity has the required permissions on the key vault.
449+
446450
- question: How do I configure HTTPS listeners for .com and .NET sites?
447451
answer: |
448452
For multiple domain-based (host-based) routing, you can create multisite listeners, set up listeners that use HTTPS as the protocol, and associate the listeners with the routing rules. For more information, see [Hosting multiple sites by using Application Gateway](./multiple-site-overview.md).

articles/application-gateway/ingress-controller-annotations.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ For AGIC to observe an ingress resource, the resource *must be annotated* with `
3838
| [appgw.ingress.kubernetes.io/use-private-ip](#use-private-ip) | `bool` | `false` ||
3939
| [appgw.ingress.kubernetes.io/override-frontend-port](#override-frontend-port) | `bool` | `false` ||
4040
| [appgw.ingress.kubernetes.io/cookie-based-affinity](#cookie-based-affinity) | `bool` | `false` ||
41-
| [appgw.ingress.kubernetes.io/request-timeout]
42-
(#request-timeout) | `int32` (seconds) | `30` ||
41+
| [appgw.ingress.kubernetes.io/request-timeout](#request-timeout) | `int32` (seconds) | `30` ||
4342
| [appgw.ingress.kubernetes.io/use-private-ip](#use-private-ip) | `bool` | `false` ||
4443
| [appgw.ingress.kubernetes.io/backend-protocol](#backend-protocol) | `string` | `http` | `http`, `https` |
4544
| [appgw.ingress.kubernetes.io/hostname-extension](#hostname-extension) | `string` | `nil` ||

articles/route-server/expressroute-vpn-support.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ You can replace the SD-WAN appliance with an Azure VPN gateway to create a fully
7171

7272
### VPN gateway configuration considerations
7373

74-
For Azure VPN gateways, route learning behavior depends on your BGP configuration:
7574
For Azure VPN gateways, route learning behavior depends on your BGP configuration. BGP-enabled VPN gateways learn on-premises routes dynamically through BGP, provide automatic route updates when network topology changes, and offer enhanced failover and redundancy capabilities. For configuration guidance on BGP-enabled gateways, see [Configure BGP for Azure VPN Gateway](../vpn-gateway/bgp-howto.md). In contrast, VPN gateways without BGP learn routes from local network gateway definitions, require static route configuration for on-premises networks, and need manual updates when topology changes occur. For configuration guidance on non-BGP gateways, see [Create a local network gateway](../vpn-gateway/tutorial-site-to-site-portal.md#LocalNetworkGateway).
7675

7776
Regardless of BGP configuration, VPN gateways advertise learned routes to Azure Route Server when route exchange is enabled.
@@ -95,4 +94,4 @@ When troubleshooting route exchange issues, first verify that route exchange is
9594
- [Azure Route Server frequently asked questions](route-server-faq.md)
9695
- [Configure Azure Route Server](configure-route-server.md)
9796
- [Configure ExpressRoute and VPN coexistence](../expressroute/how-to-configure-coexisting-gateway-portal.md?toc=/azure/route-server/toc.json)
98-
- [Learn about routing preference with Azure Route Server](hub-routing-preference.md)
97+
- [Learn about routing preference with Azure Route Server](hub-routing-preference.md)

articles/sentinel/connect-aws.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ Setting up this connector has two steps:
211211

212212
If your CloudWatch logs aren't in the format accepted by Microsoft Sentinel - .csv file in a GZIP format without a header - use a lambda function [view the source code](https://github.com/Azure/Azure-Sentinel/blob/master/DataConnectors/AWS-S3/CloudWatchLambdaFunction.py) within AWS to send CloudWatch events to an S3 bucket in the accepted format.
213213

214-
The lambda function uses Python 3.9 runtime and x86_64 architecture.
214+
The lambda function uses Python 3.12 runtime and x86_64 architecture.
215215

216216
To deploy the lambda function:
217217

@@ -220,7 +220,7 @@ To deploy the lambda function:
220220

221221
:::image type="content" source="media/cloudwatch-lambda-function/lambda-basic-information.png" alt-text="Screenshot of the AWS Management Console Basic information screen." lightbox="media/cloudwatch-lambda-function/lambda-basic-information.png":::
222222

223-
1. Type a name for the function and select **Python 3.9** as the runtime and **x86_64** as the architecture.
223+
1. Type a name for the function and select **Python 3.12** as the runtime and **x86_64** as the architecture.
224224
1. Select **Create function**.
225225
1. Under **Choose a layer**, select a layer and select **Add**.
226226

0 commit comments

Comments
 (0)