Skip to content

Commit 22734ba

Browse files
authored
Merge branch 'MicrosoftDocs:main' into send-email-inline-attachments-cli-ps
2 parents 7b833c8 + 0a1d60a commit 22734ba

File tree

302 files changed

+1588
-1358
lines changed

Some content is hidden

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

302 files changed

+1588
-1358
lines changed

articles/active-directory-b2c/partner-ping-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ To create an application in PingAccess for each application in Azure that you wa
209209

210210
Configure the PingFederate authentication policy to federate to the multiple IdPs provided by the Azure AD B2C tenants
211211

212-
1. Create a contract to bridge the attributes between the IdPs and the SP. You should need only one contract unless the SP requires a different set of attributes from each IdP. For more information, see [Federation hub and authentication policy contracts](https://docs.pingidentity.com/access/sources/dita/topic?category=pingfederate&Releasestatus_ce=Current&resourceid=pf_fed_hub_auth_polic_contract) in the Ping Identity documentation.
212+
1. Create a contract to bridge the attributes between the IdPs and the SP. You should need only one contract unless the SP requires a different set of attributes from each IdP. For more information, see [Federation hub and authentication policy contracts](https://docs.pingidentity.com/pingfederate/latest/introduction_to_pingfederate/pf_fed_hub_auth_polic_contract.html) in the Ping Identity documentation.
213213

214214
2. For each IdP, create an IdP connection between the IdP and PingFederate, the federation hub as the SP.
215215

articles/api-management/api-management-howto-api-inspector.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Detailed steps follow.
9898
```json
9999
{
100100
"credentialsExpireAfter": PT1H,
101-
"apiId": ""/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
101+
"apiId": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
102102
"purposes": ["tracing"]
103103
}
104104
```
7.12 KB
Loading

articles/app-service/configure-common.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ Here, you can configure some common settings for the app. Some settings require
443443
> [!NOTE]
444444
> Most modern browsers support HTTP/2 protocol over TLS only, while non-encrypted traffic continues to use HTTP/1.1. To ensure that client browsers connect to your app with HTTP/2, secure your custom DNS name. For more information, see [Secure a custom DNS name with a TLS/SSL binding in Azure App Service](configure-ssl-bindings.md).
445445
- **Web sockets**: For [ASP.NET SignalR] or [socket.io](https://socket.io/), for example.
446-
- **Always On**: Keeps the app loaded even when there's no traffic. When **Always On** isn't turned on (default), the app is unloaded after 20 minutes without any incoming requests. The unloaded app can cause high latency for new requests because of its warm-up time. When **Always On** is turned on, the front-end load balancer sends a GET request to the application root every five minutes. It's important to ensure this request receives a 200 OK response to ensure any re-imaging operations are performed correctly. The continuous ping prevents the app from being unloaded.
446+
- **Always On**: Keeps the app loaded even when there's no traffic. When **Always On** isn't turned on (default), the app is unloaded after 20 minutes without any incoming requests. The unloaded app can cause high latency for new requests because of its warm-up time. When **Always On** is turned on, the front-end load balancer sends a GET request to the application root every five minutes. The continuous ping prevents the app from being unloaded.
447447

448448
Always On is required for continuous WebJobs or for WebJobs that are triggered using a CRON expression.
449449
- **Session affinity**: In a multi-instance deployment, ensure that the client is routed to the same instance for the life of the session. You can set this option to **Off** for stateless applications.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ The service principal app ID or assignee value is the ID for the App Service res
153153

154154
> [!NOTE]
155155
> Do not delete these access policy permissions from key vault. If you do, App Service will not be able to sync your web app with the latest key vault certificate version.
156-
156+
>
157+
> If key vault is configured to disable public access, ensure that Microsoft services have access by checking the 'Allow trusted Microsoft services to bypass this firewall' checkbox. See [Key Vault firewall enabled trusted services only](/azure/key-vault/general/network-security?WT.mc_id=Portal-Microsoft_Azure_KeyVault#key-vault-firewall-enabled-trusted-services-only) documentation for more information.
157158
---
158159

159160
#### [Azure CLI](#tab/azure-cli/rbac)

articles/app-service/deploy-github-actions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ Alternatively, you can authenticate with a User-assigned Managed Identity, a ser
6161

6262
# [OpenID Connect](#tab/openid)
6363

64-
The following procedure describes the steps for creating an active directory application, service principal, and federated credentials using Azure CLI statements. To learn how to create an active directory application, service principal, and federated credentials in Azure portal, see [Connect GitHub and Azure](/azure/developer/github/connect-from-azure#use-the-azure-login-action-with-openid-connect).
64+
The following procedure describes the steps for creating an Microsoft Entra application, service principal, and federated credentials using Azure CLI statements. To learn how to create an Microsoft Entra application, service principal, and federated credentials in Azure portal, see [Connect GitHub and Azure](/azure/developer/github/connect-from-azure#use-the-azure-login-action-with-openid-connect).
6565

66-
1. If you don't have an existing application, register a [new Active Directory application and service principal that can access resources](../active-directory/develop/howto-create-service-principal-portal.md). Create the Active Directory application.
66+
1. If you don't have an existing application, register a [new Microsoft Entra application and service principal that can access resources](../active-directory/develop/howto-create-service-principal-portal.md). Create the Microsoft Entra application.
6767

6868
```azurecli-interactive
6969
az ad app create --display-name myApp
@@ -89,7 +89,7 @@ The following procedure describes the steps for creating an active directory app
8989
az role assignment create --role contributor --subscription $subscriptionId --assignee-object-id $assigneeObjectId --scope /subscriptions/$subscriptionId/resourceGroups/$resourceGroupName/providers/Microsoft.Web/sites/$webappName --assignee-principal-type ServicePrincipal
9090
```
9191
92-
1. Run the following command to [create a new federated identity credential](/graph/api/application-post-federatedidentitycredentials?view=graph-rest-beta&preserve-view=true) for your active directory application.
92+
1. Run the following command to [create a new federated identity credential](/graph/api/application-post-federatedidentitycredentials?view=graph-rest-beta&preserve-view=true) for your Entra app.
9393
9494
- Replace `APPLICATION-OBJECT-ID` with the **appId (generated while creating app)** for your Active Directory application.
9595
- Set a value for `CREDENTIAL-NAME` to reference later.
8.77 KB
Loading
37 KB
Loading
9.8 KB
Loading
19.5 KB
Loading

0 commit comments

Comments
 (0)