Skip to content

Commit b1a8f3a

Browse files
authored
Merge pull request #95814 from MicrosoftDocs/master
11/13 AM Publish
2 parents 49cf978 + b16bbda commit b1a8f3a

File tree

95 files changed

+325
-275
lines changed

Some content is hidden

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

95 files changed

+325
-275
lines changed

articles/active-directory/develop/active-directory-configurable-token-lifetimes.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ Clients use access tokens to access a protected resource. An access token can be
4949

5050
### SAML tokens
5151

52-
SAML tokens are used by many web based SAAS applications, and are obtained using Azure Active Directory's SAML2 protocol endpoint. They are also consumed by applications using WS-Federation. The default lifetime of the token is 1 hour. After From and applications perspective the validity period of the token is specified by the NotOnOrAfter value of the <conditions …> element in the token. After the token validity period the client must initiate a new authentication request, which will often be satisfied without interactive sign in as a result of the Single Sign On (SSO) Session token.
52+
SAML tokens are used by many web based SAAS applications, and are obtained using Azure Active Directory's SAML2 protocol endpoint. They are also consumed by applications using WS-Federation. The default lifetime of the token is 1 hour. From an application's perspective, the validity period of the token is specified by the NotOnOrAfter value of the `<conditions …>` element in the token. After the validity period of the token has ended, the client must initiate a new authentication request, which will often be satisfied without interactive sign in as a result of the Single Sign On (SSO) Session token.
5353

54-
The value of NotOnOrAfter can be changed using the AccessTokenLifetime parameter in a TokenLifetimePolicy. It will be set to the lifetime configured in the policy if any, plus a clock skew factor of five minutes.
54+
The value of NotOnOrAfter can be changed using the `AccessTokenLifetime` parameter in a `TokenLifetimePolicy`. It will be set to the lifetime configured in the policy if any, plus a clock skew factor of five minutes.
5555

56-
Note that the subject confirmation NotOnOrAfter specified in the <SubjectConfirmationData> element is not affected by the Token Lifetime configuration.
56+
Note that the subject confirmation NotOnOrAfter specified in the `<SubjectConfirmationData>` element is not affected by the Token Lifetime configuration.
5757

5858
### Refresh tokens
5959

articles/active-directory/develop/active-directory-saml-claims-customization.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ From the **Choose name identifier format** dropdown, you can select one of the f
6060
| **Persistent** | Azure AD will use Persistent as the NameID format. |
6161
| **EmailAddress** | Azure AD will use EmailAddress as the NameID format. |
6262
| **Unspecified** | Azure AD will use Unspecified as the NameID format. |
63+
| **Windows domain qualified name** | Azure AD will use WindowsDomainQualifiedName as the NameID format. |
6364

6465
Transient NameID is also supported, but is not available in the dropdown and cannot be configured on Azure's side. To learn more about the NameIDPolicy attribute, see [Single Sign-On SAML protocol](single-sign-on-saml-protocol.md).
6566

articles/active-directory/saas-apps/salesforce-provisioning-tutorial.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@ This starts the initial synchronization of any users and/or groups assigned to S
115115

116116
For more information on how to read the Azure AD provisioning logs, see [Reporting on automatic user account provisioning](../manage-apps/check-status-user-account-provisioning.md).
117117

118+
## Common issues
119+
* The default attribute mapping for provisioning to Salesforce includes the SingleAppRoleAssignments expression to provision user roles into Salesforce. Ensure that the users do not have multiple roles assigned to them on the application as the attribute mapping only supports provisioning one role.
120+
118121
## Additional resources
119122

120123
* [Managing user account provisioning for Enterprise Apps](tutorial-list.md)

articles/aks/concepts-scale.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Currently, you can't tune these cooldown values from the default.
4747

4848
## Cluster autoscaler
4949

50-
To respond to changing pod demands, Kubernetes has a cluster autoscaler, which is currently in preview in AKS, that adjusts the number of nodes based on the requested compute resources in the node pool. By default, the cluster autoscaler checks the Metrics API server every 10 seconds for any required changes in node count. If the cluster autoscale determines that a change is required, the number of nodes in your AKS cluster is increased or decreased accordingly. The cluster autoscaler works with RBAC-enabled AKS clusters that run Kubernetes 1.10.x or higher.
50+
To respond to changing pod demands, Kubernetes has a cluster autoscaler, that adjusts the number of nodes based on the requested compute resources in the node pool. By default, the cluster autoscaler checks the Metrics API server every 10 seconds for any required changes in node count. If the cluster autoscale determines that a change is required, the number of nodes in your AKS cluster is increased or decreased accordingly. The cluster autoscaler works with RBAC-enabled AKS clusters that run Kubernetes 1.10.x or higher.
5151

5252
![Kubernetes cluster autoscaler](media/concepts-scale/cluster-autoscaler.png)
5353

articles/app-service/app-service-security-controls.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This article documents the security controls built into Azure App Service.
2222

2323
| Security control | Yes/No | Notes | Documentation
2424
|---|---|--|
25-
| Service endpoint support| Yes | Currently available in preview for App Service.| [Azure App Service Access Restrictions](app-service-ip-restrictions.md)
25+
| Service endpoint support| Yes | Available for App Service.| [Azure App Service Access Restrictions](app-service-ip-restrictions.md)
2626
| VNet injection support| Yes | App Service Environments are private implementations of App Service dedicated to a single customer injected into a customer's virtual network. | [Introduction to the App Service Environments](environment/intro.md)
2727
| Network Isolation and Firewalling support| Yes | For the public multi-tenant variation of App Service, customers can configure network ACLs (IP Restrictions) to lock down allowed inbound traffic. App Service Environments are deployed directly into virtual networks and hence can be secured with NSGs. | [Azure App Service Access Restrictions](app-service-ip-restrictions.md)
2828
| Forced tunneling support| Yes | App Service Environments can be deployed into a customer's virtual network where forced tunneling is configured. | [Configure your App Service Environment with forced tunneling](environment/forced-tunnel-support.md)
@@ -60,4 +60,4 @@ This article documents the security controls built into Azure App Service.
6060

6161
## Next steps
6262

63-
- Learn more about the [built-in security controls across Azure services](../security/fundamentals/security-controls.md).
63+
- Learn more about the [built-in security controls across Azure services](../security/fundamentals/security-controls.md).

articles/application-gateway/application-gateway-create-multisite-azureresourcemanager-powershell.md

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
---
2-
title: Create an application gateway with multiple site hosting - Azure PowerShell | Microsoft Docs
2+
title: Multiple site hosting using PowerShell
3+
titleSuffix: Azure Application Gateway
34
description: Learn how to create an application gateway that hosts multiple sites using Azure Powershell.
45
services: application-gateway
56
author: vhorne
6-
manager: jpconnock
7-
editor: tysonn
8-
97
ms.service: application-gateway
10-
ms.devlang: na
118
ms.topic: article
12-
ms.tgt_pltfrm: na
13-
ms.workload: infrastructure-services
14-
ms.date: 01/26/2018
9+
ms.date: 11/14/2019
1510
ms.author: victorh
16-
1711
---
12+
1813
# Create an application gateway with multiple site hosting using Azure PowerShell
1914

2015
You can use Azure Powershell to configure [hosting of multiple web sites](application-gateway-multi-site-overview.md) when you create an [application gateway](application-gateway-introduction.md). In this tutorial, you create backend pools using virtual machines scale sets. You then configure listeners and rules based on domains that you own to make sure web traffic arrives at the appropriate servers in the pools. This tutorial assumes that you own multiple domains and uses examples of *www.contoso.com* and *www.fabrikam.com*.

articles/application-gateway/application-gateway-create-url-route-arm-ps.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
2-
title: Create an application gateway with URL path-based routing rules - Azure PowerShell | Microsoft Docs
2+
title: URL path-based routing rules using PowerShell
3+
titleSuffix: Azure Application Gateway
34
description: Learn how to create URL path-based routing rules for an application gateway and virtual machine scale set using Azure PowerShell.
45
services: application-gateway
56
author: vhorne
67
ms.service: application-gateway
78
ms.topic: article
8-
ms.date: 09/05/2019
9+
ms.date: 11/14/2019
910
ms.author: victorh
10-
1111
---
1212

1313
# Create an application gateway with URL path-based routing rules using Azure PowerShell

articles/application-gateway/application-gateway-ssl-cli.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
---
2-
title: Create an application gateway with SSL termination - Azure CLI | Microsoft Docs
2+
title: SSL termination using CLI - Azure Application Gateway
33
description: Learn how to create an application gateway and add a certificate for SSL termination using the Azure CLI.
44
services: application-gateway
55
author: vhorne
6-
manager: jpconnock
7-
editor: tysonn
8-
96
ms.service: application-gateway
107
ms.topic: article
11-
ms.workload: infrastructure-services
12-
ms.date: 7/14/2018
8+
ms.date: 11/14/2019
139
ms.author: victorh
14-
1510
---
11+
1612
# Create an application gateway with SSL termination using the Azure CLI
1713

1814
You can use the Azure CLI to create an [application gateway](application-gateway-introduction.md) with a certificate for [SSL termination](application-gateway-backend-ssl.md) that uses a [virtual machine scale set](../virtual-machine-scale-sets/virtual-machine-scale-sets-overview.md) for backend servers. In this example, the scale set contains two virtual machine instances that are added to the default backend pool of the application gateway.

articles/application-gateway/application-gateway-ssl.md

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
---
2-
title: Configure SSL offload - Azure Application Gateway - PowerShell classic | Microsoft Docs
2+
title: SSL offload using PowerShell - Azure Application Gateway
33
description: This article provides instructions to create an application gateway with SSL offload by using the Azure classic deployment model
4-
documentationcenter: na
54
services: application-gateway
65
author: vhorne
7-
manager: jpconnock
8-
editor: tysonn
9-
10-
ms.assetid: 63f28d96-9c47-410e-97dd-f5ca1ad1b8a4
116
ms.service: application-gateway
12-
ms.devlang: na
137
ms.topic: article
14-
ms.tgt_pltfrm: na
15-
ms.workload: infrastructure-services
16-
ms.date: 01/23/2017
8+
ms.date: 11/13/2019
179
ms.author: victorh
18-
1910
---
11+
2012
# Configure an application gateway for SSL offload by using the classic deployment model
2113

2214
> [!div class="op_single_selector"]

articles/application-gateway/application-gateway-troubleshooting-502.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
title: Troubleshoot Azure Application Gateway Bad Gateway (502) errors
2+
title: Troubleshoot Bad Gateway errors - Azure Application Gateway
33
description: Learn how to troubleshoot Application Gateway 502 errors
44
services: application-gateway
55
author: vhorne
66
ms.service: application-gateway
77
ms.topic: article
8-
ms.date: 4/25/2019
8+
ms.date: 11/14/2019
99
ms.author: amsriva
1010
---
1111

0 commit comments

Comments
 (0)