Skip to content

Commit 6397c17

Browse files
authored
Merge pull request #110487 from MicrosoftDocs/master
Merge master to live, 4am
2 parents 441db70 + 98c578f commit 6397c17

File tree

93 files changed

+1170
-320
lines changed

Some content is hidden

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

93 files changed

+1170
-320
lines changed

articles/active-directory-b2c/custom-policy-keep-me-signed-in.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ To enable KMSI, set the content definition `DataUri` element to [page identifier
5050

5151
## Add the metadata to the self-asserted technical profile
5252

53-
To add the KMSI checkbox to the sign-up and sign-in page, set the `setting.enableRememberMe` metadata to false. Override the SelfAsserted-LocalAccountSignin-Email technical profiles in the extension file.
53+
To add the KMSI checkbox to the sign-up and sign-in page, set the `setting.enableRememberMe` metadata to true. Override the SelfAsserted-LocalAccountSignin-Email technical profiles in the extension file.
5454

5555
1. Find the ClaimsProviders element. If the element doesn't exist, add it.
5656
1. Add the following claims provider to the ClaimsProviders element:

articles/active-directory/devices/hybrid-azuread-join-manual.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Use the following table to get an overview of the steps that are required for yo
8484
| Configure service connection point | ![Check][1] | ![Check][1] | ![Check][1] |
8585
| Set up issuance of claims | | ![Check][1] | ![Check][1] |
8686
| Enable non-Windows 10 devices | | | ![Check][1] |
87-
| Verify joined devices | ![Check][1] | ![Check][1] | [Check][1] |
87+
| Verify joined devices | ![Check][1] | ![Check][1] | ![Check][1] |
8888

8989
## Configure a service connection point
9090

articles/active-directory/fundamentals/whats-new.md

Lines changed: 18 additions & 4 deletions
Large diffs are not rendered by default.

articles/active-directory/manage-apps/application-proxy-configure-single-sign-on-on-premises-apps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ Before you can provide SSO for on-premises applications, you need to enable Appl
7171

7272
2. In the **Set up Single Sign-On with SAML** page, go to the **Basic SAML Configuration** heading and select its **Edit** icon (a pencil). Make sure the **External URL** you configured in Application Proxy is populated in the **Identifier**, **Reply URL**, and **Logout URL** fields. These URLs are required for Application Proxy to work correctly.
7373

74-
3. Edit the **Reply URL** configured earlier so that its domain is reachable by Application Proxy. For example, if your **External URL** is `https://contosotravel-f128.msappproxy.net` and the original **Reply URL** was `https://contosotravel.com/acs`, you'll need to update the original **Reply URL** to `https://contosotravel-f128.msappproxy.net/acs`.
74+
3. Edit the **Reply URL** configured earlier so that its domain reachable on the internet via Application Proxy. For example, if your **External URL** is `https://contosotravel-f128.msappproxy.net` and the original **Reply URL** was `https://contosotravel.com/acs`, you'll need to update the original **Reply URL** to `https://contosotravel-f128.msappproxy.net/acs`.
7575

7676
![Enter basic SAML configuration data](./media/application-proxy-configure-single-sign-on-on-premises-apps/basic-saml-configuration.png)
7777

7878

7979
4. Select the checkbox next to the updated **Reply URL** to mark it as the default.
8080

81-
* If the required **Reply URL** is already listed, mark this **Reply URL** as default and delete the previously configured **Reply URL**.
81+
* Aftering marking the required **Reply URL** as default, you can also delete the previously configured **Reply URL** that used the internal URL.
8282

8383
* For an SP-initiated flow, make sure the back-end application specifies the correct **Reply URL** or Assertion Consumer Service URL for receiving the authentication token.
8484

articles/aks/azure-ad-rbac.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
2-
title: Control cluster resources with RBAC and Azure AD in Azure Kubernetes Service
2+
title: Use Azure AD and RBAC for clusters
3+
titleSuffix: Azure Kubernetes Service
34
description: Learn how to use Azure Active Directory group membership to restrict access to cluster resources using role-based access control (RBAC) in Azure Kubernetes Service (AKS)
45
services: container-service
56

articles/aks/azure-disks-dynamic-pv.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
2-
title: Dynamically create and use a persistent volume with Azure disks in Azure Kubernetes Service (AKS)
2+
title: Dynamically create Azure disks volume
3+
titleSuffix: Azure Kubernetes Service
34
description: Learn how to dynamically create a persistent volume with Azure disks in Azure Kubernetes Service (AKS)
45
services: container-service
56
ms.topic: article

articles/aks/azure-files-dynamic-pv.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
2-
title: Dynamically create a Files volume for multiple pods in Azure Kubernetes Service (AKS)
2+
title: Dynamically create Azure Files share
3+
titleSuffix: Azure Kubernetes Service
34
description: Learn how to dynamically create a persistent volume with Azure Files for use with multiple concurrent pods in Azure Kubernetes Service (AKS)
45
services: container-service
56
ms.topic: article

articles/aks/azure-files-volume.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
2-
title: Create a static volume for multiple pods in Azure Kubernetes Service (AKS)
2+
title: Manually create Azure Files share
3+
titleSuffix: Azure Kubernetes Service
34
description: Learn how to manually create a volume with Azure Files for use with multiple concurrent pods in Azure Kubernetes Service (AKS)
45
services: container-service
56
ms.topic: article
@@ -131,7 +132,7 @@ Volumes:
131132

132133
## Mount options
133134

134-
The default value for *fileMode* and *dirMode* is *0755* for Kubernetes version 1.9.1 and above. If using a cluster with Kuberetes version 1.8.5 or greater and statically creating the persistent volume object, mount options need to be specified on the *PersistentVolume* object. The following example sets *0777*:
135+
The default value for *fileMode* and *dirMode* is *0755* for Kubernetes version 1.9.1 and above. If using a cluster with Kubernetes version 1.8.5 or greater and statically creating the persistent volume object, mount options need to be specified on the *PersistentVolume* object. The following example sets *0777*:
135136

136137
```yaml
137138
apiVersion: v1

articles/aks/azure-nfs-volume.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
2-
title: Create an NFS (Network File System) Ubuntu Server for use by pods of Azure Kubernetes Service (AKS)
2+
title: Create NFS Ubuntu Linux Server volume
3+
titleSuffix: Azure Kubernetes Service
34
description: Learn how to manually create an NFS Ubuntu Linux Server volume for use with pods in Azure Kubernetes Service (AKS)
45
services: container-service
56
author: ozboms

articles/aks/developer-best-practices-pod-security.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
2-
title: Developer best practices - Pod security in Azure Kubernetes Services (AKS)
2+
title: Pod security best practices
3+
titleSuffix: Azure Kubernetes Service
34
description: Learn the developer best practices for how to secure pods in Azure Kubernetes Service (AKS)
45
services: container-service
56
author: zr-msft

0 commit comments

Comments
 (0)