Merge pull request #94252 from MicrosoftDocs/master

10/31 AM Publish

Author: huypub

articles/active-directory/conditional-access/howto-conditional-access-session-lifetime.md

@@ -50,7 +50,7 @@ The Azure AD default for browser session persistence allows users on personal de
 Conditional Access is an Azure AD Premium capability and requires a premium license. If you would like to learn more about Conditional Access, see [What is Conditional Access in Azure Active Directory?](overview.md#license-requirements)
 
 > [!WARNING]
-> If you are using the [configurable token lifetime](../develop/active-directory-configurable-token-lifetimes.md) feature currently in public preview, please note that we don’t support creating two different policies for the same user or app combination: one with this feature and another one with configurable token lifetime feature. Microsoft plans to retire the configurable token lifetime feature on November 1 and replace it with the Conditional Access authentication session management feature.  
+> If you are using the [configurable token lifetime](../develop/active-directory-configurable-token-lifetimes.md) feature currently in public preview, please note that we don’t support creating two different policies for the same user or app combination: one with this feature and another one with configurable token lifetime feature. Microsoft plans to retire the configurable token lifetime feature on May 1, 2020 and replace it with the Conditional Access authentication session management feature.  
 
 ### Policy 1: Sign-in frequency control
 

articles/active-directory/develop/quickstart-v2-android.md

@@ -12,21 +12,29 @@ ms.devlang: na
 ms.topic: tutorial
 ms.tgt_pltfrm: na
 ms.workload: identity
-ms.date: 07/09/2019
+ms.date: 10/10/2019
 ms.author: jmprieur
 ms.reviwer: brandwe
 ms.custom: aaddev, identityplatformtop40 
 ms.collection: M365-identity-device-management
 ---
 
-# Sign in users and call the Microsoft Graph from an Android app
+# Tutorial: Sign in users and call the Microsoft Graph from an Android app
 
 > [!NOTE]
 > This tutorial has not yet been updated to work with MSAL for Android version 1.0 library. It works with an earlier version, as configured in this tutorial.
 
 In this tutorial, you'll learn how to integrate an Android app with the Microsoft identity platform. Your app will sign in a user, get an access token to call the Microsoft Graph API, and make a request to the Microsoft Graph API.  
 
-When you've completed the guide, your application will accept sign-ins of personal Microsoft accounts (including outlook.com, live.com, and others) and work or school accounts from any company or organization that uses Azure Active Directory.
+> [!div class="checklist"]
+> * Integrate an Android app with the Microsoft identity platform
+> * Sign in a user
+> * Get an access token to call the Microsoft Graph API
+> * Call the Microsoft Graph API.  
+
+When you've completed this tutorial, your application will accept sign-ins of personal Microsoft accounts (including outlook.com, live.com, and others) as well as work or school accounts from any company or organization that uses Azure Active Directory.
+
+If you don’t have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
 
 ## How this tutorial works
 
@@ -52,7 +60,7 @@ This sample uses the Microsoft Authentication library for Android (MSAL) to impl
 
 ## Create a project
 
-This tutorial will create a new project. If you want to download the completed tutorial instead, [download the code](https://github.com/Azure-Samples/active-directory-android-native-v2/archive/master.zip).
+This tutorial will create a new project. If you want to download the completed tutorial instead, [download the code](https://github.com/Azure-Samples/ms-identity-android-java/archive/master.zip).
 
 1. Open Android Studio, and select **Start a new Android Studio project**.
 2. Select **Basic Activity** and select **Next**.
@@ -535,6 +543,10 @@ After you sign in, the app will display the data returned from the Microsoft Gra
 
 The first time any user signs into your app, they will be prompted by Microsoft identity to consent to the permissions requested.  While most users are capable of consenting, some Azure AD tenants have disabled user consent which requires admins to consent on behalf of all users. To support this scenario, register your app's scopes in the Azure portal.
 
+## Clean up resources
+
+When no longer needed, delete the app object that you created in the [Register your application](#register-your-application) step.
+
 ## Get help
 
 Visit [Help and support](https://docs.microsoft.com/azure/active-directory/develop/developer-support-help-options) if you have trouble with this tutorial or with the Microsoft identity platform.

articles/active-directory/develop/tutorial-v2-android.md

@@ -110,7 +110,7 @@ Allow access to the following URLs:
 | --- | --- |
 | \*.msappproxy.net<br>\*.servicebus.windows.net | Communication between the connector and the Application Proxy cloud service |
 | mscrl.microsoft.com:80<br>crl.microsoft.com:80<br>ocsp.msocsp.com:80<br>www.microsoft.com:80 | Azure uses these URLs to verify certificates |
-| login.windows.net<br>login.microsoftonline.com | The connector uses these URLs during the registration process. |
+| login.windows.net<br>secure.aadcdn.microsoftonline-p.com<br>*.microsoftonline.com<br>*.microsoftonline-p.com<br>*.msauth.net<br>*.msauthimages.net<br>*.msecnd.net<br>*.msftauth.net<br>*.msftauthimages.net<br>*.phonefactor.net<br>enterpriseregistration.windows.net<br>management.azure.com<br>policykeyservice.dc.ad.msft.net | The connector uses these URLs during the registration process. |
 
 If your firewall or proxy allows you to configure DNS allow lists, you can allow connections to \*.msappproxy.net and \*.servicebus.windows.net. If not, you need to allow access to the [Azure DataCenter IP ranges](https://www.microsoft.com/download/details.aspx?id=41653). The IP ranges are updated each week.
 

articles/active-directory/manage-apps/application-proxy-configure-connectors-with-proxy-servers.md

@@ -258,7 +258,7 @@ This section provides example SCIM requests emitted by the Azure AD SCIM client
 ###### <a name="request-1"></a>Request
 *GET /Users/5d48a0a8e9f04aa38008* 
 
-###### <a name="response-1"></a>Response
+###### <a name="response-1"></a>Response (User found)
 *HTTP/1.1 200 OK*
 ```json
 {
@@ -285,6 +285,21 @@ This section provides example SCIM requests emitted by the Azure AD SCIM client
 }
 ```
 
+###### Request
+*GET /Users/5171a35d82074e068ce2* 
+
+###### Response (User not found. Note that the detail is not required, only status.)
+
+```json
+{
+    "schemas": [
+        "urn:ietf:params:scim:api:messages:2.0:Error"
+    ],
+    "status": "404",
+    "detail": "Resource 23B51B0E5D7AE9110A49411D@7cca31655d49f3640a494224 not found"
+}
+```
+
 #### Get User by query
 
 ##### <a name="request-2"></a>Request
@@ -469,7 +484,6 @@ This section provides example SCIM requests emitted by the Azure AD SCIM client
 	"schemas": ["urn:ietf:params:scim:schemas:core:2.0:Group", "http://schemas.microsoft.com/2006/11/ResourceManagement/ADSCIM/2.0/Group"],
 	"externalId": "8aa1a0c0-c4c3-4bc0-b4a5-2ef676900159",
 	"displayName": "displayName",
-	"members": [],
 	"meta": {
 		"resourceType": "Group"
 	}