Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-arm-quickstart

rolyon · rolyon · commit 10bfae43eade · 2020-05-22T14:52:13.000-07:00
diff --git a/articles/active-directory-b2c/secure-rest-api.md b/articles/active-directory-b2c/secure-rest-api.md
@@ -237,7 +237,7 @@ For the ServiceUrl, replace your-tenant-name with the name of your Azure AD tena
   <DisplayName></DisplayName>
   <Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.RestfulProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
   <Metadata>
-    <Item Key="ServiceUrl">https://login.microsoftonline.com/your-tenant-name.microsoft.com/oauth2/v2.0/token</Item>
+    <Item Key="ServiceUrl">https://login.microsoftonline.com/your-tenant-name.onmicrosoft.com/oauth2/v2.0/token</Item>
     <Item Key="AuthenticationType">Basic</Item>
      <Item Key="SendClaimsIn">Form</Item>
   </Metadata>
diff --git a/articles/active-directory/saas-apps/maxient-conduct-manager-software-tutorial.md b/articles/active-directory/saas-apps/maxient-conduct-manager-software-tutorial.md
@@ -24,9 +24,9 @@ ms.collection: M365-identity-device-management
 
 In this tutorial, you'll learn how to integrate Maxient Conduct Manager Software with Azure Active Directory (Azure AD). When you integrate Maxient Conduct Manager Software with Azure AD, you can:
 
-* Control in Azure AD who has access to Maxient Conduct Manager Software.
+* Utilize Azure AD to authenticate your users for the Maxient Conduct Manager Software
 * Enable your users to be automatically signed-in to Maxient Conduct Manager Software with their Azure AD accounts.
-* Manage your accounts in one central location - the Azure portal.
+
 
 To learn more about SaaS app integration with Azure AD, see [What is application access and single sign-on with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/active-directory-appssoaccess-whatis).
 
@@ -39,8 +39,7 @@ To get started, you need the following items:
 
 ## Scenario description
 
-In this tutorial, you configure and test Azure AD SSO in a test environment.
-
+In this tutorial, you will configure your Azure AD for use with Maxient Conduct Manager Software.
 
 
 * Maxient Conduct Manager Software supports **SP and IDP** initiated SSO
@@ -62,16 +61,13 @@ To configure the integration of Maxient Conduct Manager Software into Azure AD,
 
 ## Configure and test Azure AD single sign-on for Maxient Conduct Manager Software
 
-Configure and test Azure AD SSO with Maxient Conduct Manager Software using a test user called **B.Simon**. For SSO to work, you need to establish a link relationship between an Azure AD user and the related user in Maxient Conduct Manager Software.
+Configure and test Azure AD SSO with Maxient Conduct Manager Software. For SSO to work, you need to establish a connection between Azure AD and the Maxient Conduct Manager Software.
 
 To configure and test Azure AD SSO with Maxient Conduct Manager Software, complete the following building blocks:
 
-1. **[Configure Azure AD SSO](#configure-azure-ad-sso)** - to enable your users to use this feature.
-    1. **[Create an Azure AD test user](#create-an-azure-ad-test-user)** - to test Azure AD single sign-on with B.Simon.
-    1. **[Assign the Azure AD test user](#assign-the-azure-ad-test-user)** - to enable B.Simon to use Azure AD single sign-on.
-1. **[Configure Maxient Conduct Manager Software SSO](#configure-maxient-conduct-manager-software-sso)** - to configure the single sign-on settings on application side.
-    1. **[Create Maxient Conduct Manager Software test user](#create-maxient-conduct-manager-software-test-user)** - to have a counterpart of B.Simon in Maxient Conduct Manager Software that is linked to the Azure AD representation of user.
-1. **[Test SSO](#test-sso)** - to verify whether the configuration works.
+1. **[Configure Azure AD SSO](#configure-azure-ad-sso)** - to enable your users to authenticate for use with the Maxient Conduct Manager Software
+    1. **[Assign all users to use Maxient](#assign-all-users-to-be-able-to-authenticate-for-the-Maxient-Conduct-Manager-Software)** - to allow everyone at your institution to be able to authenticate.
+1. **[Test Azure AD Setup With Maxient](#test-with-maxient)** - to verify whether the configuration works, and the correct attributes are being released
 
 ## Configure Azure AD SSO
 
@@ -91,27 +87,15 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
     `https://cm.maxient.com/<SCHOOLCODE>`
 
     > [!NOTE]
-	> The value is not real. Update the value with the actual Sign-on URL. Contact [Maxient Conduct Manager Software Client support team](mailto:support@maxient.com) to get the value. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
+    > The value is not real. Update the value with the actual Sign-on URL. Work with your Maxient Implementation/Support representative to get the value.
 
-1. On the **Set up single sign-on with SAML** page, In the **SAML Signing Certificate** section, click copy button to copy **App Federation Metadata Url** and save it on your computer.
+1. On the **Set up single sign-on with SAML** page, In the **SAML Signing Certificate** section, click copy button to copy **App Federation Metadata Url** and save it on your computer.  You will need to provide your Maxient Implementation/Support representative with this URL.
 
 	![The Certificate download link](common/copy-metadataurl.png)
 
-### Create an Azure AD test user
-
-In this section, you'll create a test user in the Azure portal called B.Simon.
+### Assign All Users to be Able to Authenticate for the Maxient Conduct Manager Software
 
-1. From the left pane in the Azure portal, select **Azure Active Directory**, select **Users**, and then select **All users**.
-1. Select **New user** at the top of the screen.
-1. In the **User** properties, follow these steps:
-   1. In the **Name** field, enter `B.Simon`.  
-   1. In the **User name** field, enter the username@companydomain.extension. For example, `B.Simon@contoso.com`.
-   1. Select the **Show password** check box, and then write down the value that's displayed in the **Password** box.
-   1. Click **Create**.
-
-### Assign the Azure AD test user
-
-In this section, you'll enable B.Simon to use Azure single sign-on by granting access to Maxient Conduct Manager Software.
+In this section, you will grant access for all accounts to authenticate using the Azure system for the Maxient Conduct Manager Software.  It is important to note that this step is **REQUIRED** for Maxient to function properly.  Maxient leverages your Azure AD system to *authenticate* users. The *authorization* of users is performed within the Maxient system for the particular function they’re trying to perform. Maxient does not use attributes from your directory to make those decisions.
 
 1. In the Azure portal, select **Enterprise Applications**, and then select **All applications**.
 1. In the applications list, select **Maxient Conduct Manager Software**.
@@ -123,24 +107,12 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
 
 	![The Add User link](common/add-assign-user.png)
 
-1. In the **Users and groups** dialog, select **B.Simon** from the Users list, then click the **Select** button at the bottom of the screen.
-1. If you're expecting any role value in the SAML assertion, in the **Select Role** dialog, select the appropriate role for the user from the list and then click the **Select** button at the bottom of the screen.
-1. In the **Add Assignment** dialog, click the **Assign** button.
-
-## Configure Maxient Conduct Manager Software SSO
-
-To configure single sign-on on **Maxient Conduct Manager Software** side, you need to send the **App Federation Metadata Url** to [Maxient Conduct Manager Software support team](mailto:support@maxient.com). They set this setting to have the SAML SSO connection set properly on both sides.
-
-### Create Maxient Conduct Manager Software test user
-
-In this section, you create a user called Britta Simon in Maxient Conduct Manager Software. Work with [Maxient Conduct Manager Software support team](mailto:support@maxient.com) to add the users in the Maxient Conduct Manager Software platform. Users must be created and activated before you use single sign-on.
-
-## Test SSO 
-
-In this section, you test your Azure AD single sign-on configuration using the Access Panel.
+1. In the **Users and groups** dialog, select all users (or the appropriate groups) and **assign** them to be able to authenticate with Maxient.
 
-When you click the Maxient Conduct Manager Software tile in the Access Panel, you should be automatically signed in to the Maxient Conduct Manager Software for which you set up SSO. For more information about the Access Panel, see [Introduction to the Access Panel](https://docs.microsoft.com/azure/active-directory/active-directory-saas-access-panel-introduction).
+## Test with Maxient 
 
+If a support ticket has not already been opened with a Maxient Implementation/Support representative, send an email to [support@maxient.com](mailto:support@maxient.com) with the subject "Campus Based Authentication/Azure Setup - \<\<School Name\>\>". In the body of the email, provide the **App Federation Metadata Url**. Maxient staff will respond with a test link to verify the proper attributes are being released.  
+	
 ## Additional resources
 
 - [ List of Tutorials on How to Integrate SaaS Apps with Azure Active Directory ](https://docs.microsoft.com/azure/active-directory/active-directory-saas-tutorial-list)
diff --git a/articles/active-directory/saas-apps/slack-tutorial.md b/articles/active-directory/saas-apps/slack-tutorial.md
@@ -104,6 +104,9 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
     | emailaddress | user.userprincipalname |
     | | |
 
+> [!NOTE]
+	> In order to set up the service provider (SP) configuration, you must click on **Expand** next to **Advanced Options** in the SAML configuration page. In the **Service Provider Issuer** box, enter the workspace URL. The default is slack.com. 
+
 1. On the **Set up single sign-on with SAML** page, in the **SAML Signing Certificate** section,  find **Certificate (Base64)** and select **Download** to download the certificate and save it on your computer.
 
 	![The Certificate download link](common/certificatebase64.png)
@@ -198,4 +201,4 @@ When you click the Slack tile in the Access Panel, you should be automatically s
 
 - [Try Slack with Azure AD](https://aad.portal.azure.com/)
 
-- [What is session control in Microsoft Cloud App Security?](https://docs.microsoft.com/cloud-app-security/proxy-intro-aad)
+- [What is session control in Microsoft Cloud App Security?](https://docs.microsoft.com/cloud-app-security/proxy-intro-aad)
diff --git a/articles/active-directory/user-help/active-directory-passwords-update-your-own-password.md b/articles/active-directory/user-help/active-directory-passwords-update-your-own-password.md
@@ -16,7 +16,7 @@ ms.author: curtand
 
 # Reset your work or school password using security info
 
-If you forgot your work or school password, never got a password from your organization, or have been locked out of your account, you can use your security info and your mobile device to reset your work or school password. Your administrator must turn on this feature for you to be able to set up your information and reset your own password.
+If you forgot your work or school password, never got a password from your organization, or have been locked out of your account, you can use your security info and your mobile device to reset your work or school password. Your administrator must turn on this feature for you to be able to set up your information and [reset your own password](https://docs.microsoft.com/azure/active-directory/user-help/active-directory-passwords-reset-register).
 
 If you know your password, but want to change it, see the [Change your password steps](https://docs.microsoft.com/azure/active-directory/user-help/active-directory-passwords-update-your-own-password#how-to-change-your-password) sections of this article.
 
diff --git a/articles/automation/source-control-integration-legacy.md b/articles/automation/source-control-integration-legacy.md
@@ -126,5 +126,5 @@ To disconnect from your GitHub account, open the Repository Synchronization page
 
 ## Next steps
 
-* [Azure Automation: Source Control Integration in Azure Automation](https://azure.microsoft.com/blog/azure-automation-source-control-13/)  
-* [Azure Automation: Integrating Runbook Source Control using Azure DevOps](https://azure.microsoft.com/blog/azure-automation-integrating-runbook-source-control-using-visual-studio-online/)  
+* For integrating source control in Azure Automation, see [Azure Automation: Source Control Integration in Azure Automation](https://azure.microsoft.com/blog/azure-automation-source-control-13/).  
+* For integrating runbook source control with Visual Studio Online, see [Azure Automation: Integrating Runbook Source Control using Visual Studio Online](https://azure.microsoft.com/blog/azure-automation-integrating-runbook-source-control-using-visual-studio-online/).  
diff --git a/articles/automation/source-control-integration.md b/articles/automation/source-control-integration.md
@@ -117,7 +117,7 @@ The following table defines the minimum PAT permissions required for GitHub. For
 
 ##### Minimum PAT permissions for Azure Repos
 
-The following list defines the minimum PAT permissions required for Azure Repos. For more information about creating a PAT in Azure Repos, see [Authenticate access with personal access tokens](/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate).
+The following list defines the minimum PAT permissions required for Azure Repos. For more information about creating a PAT in Azure Repos, see [Authenticate access with personal access tokens](https://docs.microsoft.com/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate?view=azure-devops&tabs=preview-page).
 
 | Scope  |  Access Type  |
 |---------| ----------|
@@ -190,16 +190,16 @@ To disconnect from a source control repository:
 
 ## Handle encoding issues
 
-If multiple people are editing runbooks in your source control repository using different editors, encoding issues can occur. To learn more about this situation, see [Common causes of encoding issues](/powershell/scripting/components/vscode/understanding-file-encoding#common-causes-of-encoding-issues).
+If multiple people are editing runbooks in your source control repository using different editors, encoding issues can occur. To learn more about this situation, see [Common causes of encoding issues](https://docs.microsoft.com/powershell/scripting/components/vscode/understanding-file-encoding?view=powershell-7#common-causes-of-encoding-issues).
 
 ## Update the PAT
 
 Currently, you can't use the Azure portal to update the PAT in source control. When your PAT is expired or revoked, you can update source control with a new access token in one of these ways:
 
 * Use the [REST API](https://docs.microsoft.com/rest/api/automation/sourcecontrol/update).
-* Use the [Update-AzAutomationSourceControl](/powershell/module/az.automation/update-azautomationsourcecontrol) cmdlet.
+* Use the [Update-AzAutomationSourceControl](https://docs.microsoft.com//powershell/module/az.automation/update-azautomationsourcecontrol) cmdlet.
 
 ## Next steps
 
-* [Azure Automation: Source Control Integration in Azure Automation](https://azure.microsoft.com/blog/azure-automation-source-control-13/)  
-* [Azure Automation: Integrating Runbook Source Control using Azure DevOps](https://azure.microsoft.com/blog/azure-automation-integrating-runbook-source-control-using-visual-studio-online/)  
+* For integrating source control in Azure Automation, see [Azure Automation: Source Control Integration in Azure Automation](https://azure.microsoft.com/blog/azure-automation-source-control-13/).  
+* For integrating runbook source control with Visual Studio Online, see [Azure Automation: Integrating Runbook Source Control using Visual Studio Online](https://azure.microsoft.com/blog/azure-automation-integrating-runbook-source-control-using-visual-studio-online/).
diff --git a/articles/governance/policy/concepts/policy-for-kubernetes.md b/articles/governance/policy/concepts/policy-for-kubernetes.md
@@ -487,8 +487,9 @@ following steps:
 
 1. Set **parameter values**	
 
-   - To exclude Kubernetes namespaces from policy evaluation, specify the list of namespaces in	
-     parameter **Namespace exclusions**. It's recommended to exclude: _kube-system_	
+   - To exclude Kubernetes namespaces from policy evaluation, specify the list of namespaces in
+     parameter **Namespace exclusions**. It's recommended to exclude: _kube-system_,
+     _gatekeeper-system_, and _azure-arc_.
 
 1. Select **Review + create**.
 
diff --git a/articles/virtual-machines/linux/detach-disk.md b/articles/virtual-machines/linux/detach-disk.md
@@ -101,12 +101,10 @@ The disk stays in storage but is no longer attached to a virtual machine.
 ## Detach a data disk using the portal
 
 1. In the left menu, select **Virtual Machines**.
-2. Select the virtual machine that has the data disk you want to detach and click **Stop** to deallocate the VM.
-3. In the virtual machine pane, select **Disks**.
-4. At the top of the **Disks** pane, select **Edit**.
-5. In the **Disks** pane, to the far right of the data disk that you would like to detach, click the ![Detach button image](./media/detach-disk/detach.png) detach button.
-5. After the disk has been removed, click Save on the top of the pane.
-6. In the virtual machine pane, click **Overview** and then click the **Start** button at the top of the pane to restart the VM.
+1. In the virtual machine blade, select **Disks**.
+1. At the top of the **Disks** blade, select **Edit**.
+1. In the **Disks** blade, to the far right of the data disk that you would like to detach, click the ![Detach button image](./media/detach-disk/detach.png) detach button.
+1. After the disk has been removed, click **Save** on the top of the blade.
 
 The disk stays in storage but is no longer attached to a virtual machine.
 
