Merge pull request #41944 from MicrosoftDocs/master

5/22 PM Publish

Author: huypub

.openpublishing.redirection.json

@@ -4045,6 +4045,21 @@
             "redirect_url": "/azure/container-service/dcos-swarm",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/container-service/dcos-swarm/container-service-create-acs-cluster-cli.md",
+            "redirect_url": "/azure/container-service/dcos-swarm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/container-service/dcos-swarm/container-service-swarm-walkthrough.md",
+            "redirect_url": "/azure/container-service/dcos-swarm/container-service-swarm-mode-walkthrough",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/container-service/dcos-swarm/container-service-connect.md",
+            "redirect_url": "/azure/container-service/dcos-swarm",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/aks/azure-files.md",
             "redirect_url": "/azure/aks/azure-files-dynamic-pv",
@@ -6930,6 +6945,16 @@
             "redirect_url": "https://docs.microsoft.com/rest/api/searchservice/add-scoring-profiles-to-a-search-index",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/search/search-api-2017-11-11-preview.md",
+            "redirect_url": "/azure/search/search-api-preview",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/search/search-api-2016-09-01-preview.md",
+            "redirect_url": "/azure/search/search-api-2017-11-11-preview",
+            "redirect_document_id": true
+        },
         {
             "source_path": "articles/search/search-api-2015-02-28-preview.md",
             "redirect_url": "articles/search/search-api-2016-09-01-preview.md",
@@ -21539,7 +21564,7 @@
             "source_path": "articles/active-directory/develop/active-directory-v2-devquickstarts-node-api.md",
             "redirect_url": "https://github.com/AzureADQuickStarts/AppModelv2-WebAPI-nodejs",
             "redirect_document_id": false
-        },        
+        },
         {
             "source_path": "articles/active-directory/active-directory-b2b-add-guest-to-role.md",
             "redirect_url": "/azure/active-directory/b2b/add-guest-to-role",
@@ -21570,7 +21595,7 @@
             "redirect_url": "/azure/active-directory/b2b/auditing-and-reporting",
             "redirect_document_id": true
         },
-        {               
+        {
             "source_path": "articles/active-directory/active-directory-b2b-claims-mapping.md",
             "redirect_url": "/azure/active-directory/b2b/claims-mapping",
             "redirect_document_id": true

articles/active-directory-b2c/active-directory-b2c-access-tokens.md

@@ -76,7 +76,7 @@ When requesting an access token, the client application needs to specify the des
 > Currently, custom domains are not supported along with access tokens. You must use your tenantName.onmicrosoft.com domain in the request URL.
 
 ```
-https://login.microsoftonline.com/<tenantName>.onmicrosoft.com/oauth2/v2.0/authorize?p=<yourPolicyId>&client_id=<appID_of_your_client_application>&nonce=anyRandomValue&redirect_uri=<redirect_uri_of_your_client_application>&scope=https%3A%2F%2Fcontoso.onmicrosoft.com%2Fnotes%2Fread&response_type=code 
+https://login.microsoftonline.com/<tenantName>.onmicrosoft.com/<yourPolicyId>/oauth2/v2.0/authorize?client_id=<appID_of_your_client_application>&nonce=anyRandomValue&redirect_uri=<redirect_uri_of_your_client_application>&scope=https%3A%2F%2Fcontoso.onmicrosoft.com%2Fnotes%2Fread&response_type=code 
 ```
 
 To acquire multiple permissions in the same request, you can add multiple entries in the single **scope** parameter, separated by spaces. For example:

articles/active-directory-b2c/active-directory-b2c-reference-custom-attr.md

@@ -18,7 +18,7 @@ ms.author: davidmu
 Your Azure Active Directory (Azure AD) B2C directory comes with a built-in set of information (attributes): Given Name, Surname, City, Postal Code, and other attributes. However, every consumer-facing application has unique requirements on what attributes to gather from consumers. With Azure AD B2C, you can extend the set of attributes stored on each consumer account. You can create custom attributes on the [Azure portal](https://portal.azure.com/) and use it in your sign-up policies, as shown below. You can also read and write these attributes by using the [Azure AD Graph API](active-directory-b2c-devquickstarts-graph-dotnet.md).
 
 > [!NOTE]
-> Custom attributes use [Azure AD Graph API Directory Schema Extensions](https://msdn.microsoft.com/library/azure/dn720459.aspx).
+> Custom attributes use [Azure AD Graph API Directory Schema Extensions](https://msdn.microsoft.com/library/azure/ad/graph/howto/azure-ad-graph-api-directory-schema-extensions).
 > 
 > 
 

articles/active-directory/active-directory-reporting-migration.md

@@ -21,14 +21,7 @@ ms.reviewer: dhanyahk
 
 In this article, we describe how to find Azure Active Directory user activity reports in the Azure portal.
 
-## What's new
-
-Reports in the Azure classic portal were separated into categories:
-* Security reports
-* Activity reports
-* Integrated app reports
-
-### Activity and integrated app reports
+## Activity and integrated app reports
 
 For context-based reporting in the Azure portal, existing reports are merged into a single view. A single, underlying API provides the data to the view.
 
@@ -85,7 +78,7 @@ To view details about application usage for all apps or for a single app, under
 
 #### Azure AD anomalous activity reports
 
-Azure AD anomalous activity security reports from the Azure classic portal have been consolidated to provide you with one, central view. This view shows all security-related risk events that Azure AD can detect and report on.
+Azure AD anomalous activity security reports are consolidated to provide you with one central view. This view shows all security-related risk events that Azure AD can detect and report on.
 
 The following table lists the Azure AD anomalous activity security reports, and corresponding risk event types in the Azure portal.
 
@@ -103,8 +96,6 @@ The following Azure AD anomalous activity security reports are not included as r
 * Sign-ins after multiple failures
 * Sign-ins from multiple geographies
 
-These reports are still available in the Azure classic portal, but they will be deprecated at some time in the future.
-
 For more information, see
 [Azure Active Directory risk events](active-directory-identity-protection-risk-events.md).  
 
@@ -124,29 +115,10 @@ For more information about security reports, see:
 - [Risky Sign-ins report in the Azure Active Directory portal](active-directory-reporting-security-risky-sign-ins.md)
 
 
-## Activity reports in the Azure classic portal vs. the Azure portal
-
-The table in this section lists existing reports in the Azure classic portal. It also describes how you can get the same information in the Azure portal.
-
-To view all auditing data, on the **Azure Active Directory** blade, under **ACTIVITY**, go to **Audit logs**.
-
-![Audit logs](./media/active-directory-reporting-migration/61.png "Audit logs")
-
-| Azure classic portal                 | To find in the Azure portal                                                         |
-| ---                                  | ---                                                                        |
-| Audit logs                           | For **Activity Category**, select **Core Directory**.                       |
-| Password reset activity              | For **Activity Category**, select **Self-service Password Management**. |
-| Password reset registration activity | For **Activity Category**, select **Self-service Password Management**.     |
-| Self-service groups activity         | For **Activity Category**, select **Self-service Group Management**.        |
-| Account provisioning activity        | For **Activity Category**, select **Account User Provisioning**.         |
-| Password rollover status             | For **Activity Category**, select **Automatic App Password Rollover**.      |
-| Account provisioning errors          | For **Activity Category**, select **Account User Provisioning**.        |
-| Office365 Group Name Changes         | For **Activity Category**, select **Self-service Password Management**. For **Activity Resource Type**, select **Group**. For **Activity Source**, select **O365 groups**.|
-
 To view the **Application Usage** report, on the **Azure Active Directory** blade, under **MANAGE**, select **Enterprise Applications**, and then select **Sign-ins**.
 
 
-![Enterprise Applications Sign-Ins report](./media/active-directory-reporting-migration/199.png "Enterprise Applications Sign-Ins report")
+![Enterprise Applications Sign-Ins report](./media/active-directory-reporting-migration/199.png)
 
 ## Next steps
 

articles/active-directory/active-directory-saas-asana-tutorial.md

@@ -13,7 +13,7 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 08/01/2017
+ms.date: 05/10/2018
 ms.author: jeedes
 
 ---
@@ -45,7 +45,7 @@ To test the steps in this tutorial, you should follow these recommendations:
 - If you don't have an Azure AD trial environment, you can [get a one-month trial](https://azure.microsoft.com/pricing/free-trial/).
 
 ## Scenario description
-In this tutorial, you test Azure AD single sign-on in a test environment. 
+In this tutorial, you test Azure AD single sign-on in a test environment.
 The scenario outlined in this tutorial consists of two main building blocks:
 
 1. Adding Asana from the gallery
@@ -63,7 +63,7 @@ To configure the integration of Asana into Azure AD, you need to add Asana from
 2. Navigate to **Enterprise applications**. Then go to **All applications**.
 
 	![The Enterprise applications blade][2]
-	
+
 3. To add new application, click **New application** button on the top of dialog.
 
 	![The New application button][3]
@@ -98,8 +98,8 @@ In this section, you enable Azure AD single sign-on in the Azure portal and conf
 
 	![Configure Single Sign-On][4]
 
-2. On the **Single sign-on** dialog, select **Mode** as	**SAML-based Sign-on** to enable single sign-on.
- 
+2. On the **Single sign-on** dialog, select **Mode** as **SAML-based Sign-on** to enable single sign-on.
+
 	![Single sign-on dialog box](./media/active-directory-saas-asana-tutorial/tutorial_asana_samlbase.png)
 
 3. On the **Asana Domain and URLs** section, perform the following steps:
@@ -109,25 +109,25 @@ In this section, you enable Azure AD single sign-on in the Azure portal and conf
     a. In the **Sign-on URL** textbox, type URL: `https://app.asana.com/`
 
 	b. In the **Identifier** textbox, type value: `https://app.asana.com/`
- 
+
 4. On the **SAML Signing Certificate** section, click **Certificate(Base64)** and then save the certificate file on your computer.
 
 	![The Certificate download link](./media/active-directory-saas-asana-tutorial/tutorial_asana_certificate.png)
-	
+
 5. Click **Save** button.
 
 	![Configure Single Sign-On Save button](./media/active-directory-saas-asana-tutorial/tutorial_general_400.png)
 
 6. On the **Asana Configuration** section, click **Configure Asana** to open **Configure sign-on** window. Copy the **SAML Single Sign-On Service URL** from the **Quick Reference section.**
 
-	![Asana Configuration](./media/active-directory-saas-asana-tutorial/tutorial_asana_configure.png) 
+	![Asana Configuration](./media/active-directory-saas-asana-tutorial/tutorial_asana_configure.png)
+
+7. In a different browser window, sign-on to your Asana application. To configure SSO in Asana, access the workspace settings by clicking the workspace name on the top right corner of the screen. Then, click on **\<your workspace name\> Settings**.
 
-7. In a different browser window, sign-on to your Asana application. To configure SSO in Asana, access the workspace settings by clicking the workspace name on the top right corner of the screen. Then, click on **\<your workspace name\> Settings**. 
-   
     ![Asana sso settings](./media/active-directory-saas-asana-tutorial/tutorial_asana_09.png)
 
 8. On the **Organization settings** window, click **Administration**. Then, click **Members must log in via SAML** to enable the SSO configuration. The perform the following steps:
-   
+
     ![Configure Single Sign-On Organization settings](./media/active-directory-saas-asana-tutorial/tutorial_asana_10.png)  
 
      a. In the **Sign-in page URL** textbox, paste the **SAML Single Sign-On Service URL**.
@@ -136,9 +136,6 @@ In this section, you enable Azure AD single sign-on in the Azure portal and conf
 
 9. Click **Save**. Go to [Asana guide for setting up SSO](https://asana.com/guide/help/premium/authentication#gl-saml) if you need further assistance.
 
-> [!TIP]
-> You can now read a concise version of these instructions inside the [Azure portal](https://portal.azure.com), while you are setting up the app!  After adding this app from the **Active Directory > Enterprise Applications** section, simply click the **Single Sign-On** tab and access the embedded documentation through the **Configuration** section at the bottom. You can read more about the embedded documentation feature here: [Azure AD embedded documentation]( https://go.microsoft.com/fwlink/?linkid=845985)
-
 ### Create an Azure AD test user
 
 The objective of this section is to create a test user in the Azure portal called Britta Simon.
@@ -152,16 +149,16 @@ The objective of this section is to create a test user in the Azure portal calle
 	![The Azure Active Directory button](./media/active-directory-saas-asana-tutorial/create_aaduser_01.png) 
 
 2. To display the list of users, go to **Users and groups** and click **All users**.
-	
-	![The "Users and groups" and "All users" links](./media/active-directory-saas-asana-tutorial/create_aaduser_02.png) 
+
+	![The "Users and groups" and "All users" links](./media/active-directory-saas-asana-tutorial/create_aaduser_02.png)
 
 3. To open the **User** dialog, click **Add** on the top of the dialog.
- 
-	![Creating an Azure AD test user](./media/active-directory-saas-asana-tutorial/create_aaduser_03.png) 
+
+	![Creating an Azure AD test user](./media/active-directory-saas-asana-tutorial/create_aaduser_03.png)
 
 4. On the **User** dialog page, perform the following steps:
- 
-	![The Add button](./media/active-directory-saas-asana-tutorial/create_aaduser_04.png) 
+
+	![The Add button](./media/active-directory-saas-asana-tutorial/create_aaduser_04.png)
 
     a. In the **Name** textbox, type **BrittaSimon**.
 
@@ -170,14 +167,18 @@ The objective of this section is to create a test user in the Azure portal calle
 	c. Select **Show Password** and write down the value of the **Password**.
 
     d. Click **Create**.
- 
+
 ### Create an Asana test user
 
+The objective of this section is to create a user called Britta Simon in Asana. Asana supports automatic user provisioning, which is by default enabled. You can find more details [here](active-directory-saas-asana-provisioning-tutorial.md) on how to configure automatic user provisioning.
+
+**If you need to create user manually, please perform following steps:**
+
 In this section, you create a user called Britta Simon in Asana.
 
-1. On **Asana**, go to the **Teams** section on the left panel. Click the plus sign button. 
-   
-    ![Creating an Azure AD test user](./media/active-directory-saas-asana-tutorial/tutorial_asana_12.png) 
+1. On **Asana**, go to the **Teams** section on the left panel. Click the plus sign button.
+
+    ![Creating an Azure AD test user](./media/active-directory-saas-asana-tutorial/tutorial_asana_12.png)
 
 2. Type the email [email protected] in the text box and then select **Invite**.
 
@@ -193,11 +194,11 @@ In this section, you enable Britta Simon to use Azure single sign-on by granting
 
 1. In the Azure portal, open the applications view, and then navigate to the directory view and go to **Enterprise applications** then click **All applications**.
 
-	![Assign User][201] 
+	![Assign User][201]
 
 2. In the applications list, select **Asana**.
 
-	![The Asana link in the Applications list](./media/active-directory-saas-asana-tutorial/tutorial_asana_app.png) 
+	![The Asana link in the Applications list](./media/active-directory-saas-asana-tutorial/tutorial_asana_app.png)
 
 3. In the menu on the left, click **Users and groups**.
 
@@ -212,7 +213,7 @@ In this section, you enable Britta Simon to use Azure single sign-on by granting
 6. Click **Select** button on **Users and groups** dialog.
 
 7. Click **Assign** button on **Add Assignment** dialog.
-	
+
 ### Test single sign-on
 
 The objective of this section is to test your Azure AD single sign-on.
@@ -223,7 +224,7 @@ Go to Asana login page. In the Email address textbox, insert the email address b
 
 * [List of Tutorials on How to Integrate SaaS Apps with Azure Active Directory](active-directory-saas-tutorial-list.md)
 * [What is application access and single sign-on with Azure Active Directory?](manage-apps/what-is-single-sign-on.md)
-
+* [Configure User Provisioning](active-directory-saas-asana-provisioning-tutorial.md)
 
 <!--Image references-->
 
@@ -239,4 +240,4 @@ Go to Asana login page. In the Email address textbox, insert the email address b
 [202]: ./media/active-directory-saas-asana-tutorial/tutorial_general_202.png
 [203]: ./media/active-directory-saas-asana-tutorial/tutorial_general_203.png
 [10]: ./media/active-directory-saas-asana-tutorial/tutorial_general_060.png
-[11]: ./media/active-directory-saas-asana-tutorial/tutorial_general_070.png
+[11]: ./media/active-directory-saas-asana-tutorial/tutorial_general_070.png