Skip to content

Commit 6f448ae

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-role-assignments-refactor
2 parents 24bda1f + ffcb478 commit 6f448ae

File tree

104 files changed

+436
-273
lines changed

Some content is hidden

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

104 files changed

+436
-273
lines changed

articles/active-directory/saas-apps/hrworks-single-sign-on-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ To configure Azure AD single sign-on with HRworks Single Sign-On, perform the fo
105105
`https://login.hrworks.de/?companyId=<companyId>&directssologin=true`
106106

107107
> [!NOTE]
108-
> The value is not real. Update the value with the actual Sign-On URL. Contact [HRworks Single Sign-On Client support team](mailto:support@hrworks.de) to get the value. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
108+
> The value is not real. Update the value with the actual Sign-On URL. Contact the [HRworks Single Sign-On Client support team](https://www.hrworks.de/dienstleistungen/support/) to get the value. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
109109

110110
5. On the **Set up Single Sign-On with SAML** page, in the **SAML Signing Certificate** section, click **Download** to download the **Federation Metadata XML** from the given options as per your requirement and save it on your computer.
111111

articles/active-directory/saas-apps/idc-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
9494
`https://www.idc.com/saml-welcome/<SamlWelcomeCode>`
9595

9696
> [!NOTE]
97-
> These values are not real. Update these values with the actual Identifier and Reply URL. Contact [IDC Client support team](mailto:[email protected]) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
97+
> These values are not real. Update these values with the actual Identifier and Reply URL. Contact the IDC Client support team to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
9898
9999
1. On the **Set up single sign-on with SAML** page, in the **SAML Signing Certificate** section, find **Federation Metadata XML** and select **Download** to download the certificate and save it on your computer.
100100

@@ -136,7 +136,7 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
136136

137137
## Configure IDC SSO
138138

139-
To configure single sign-on on **IDC** side, you need to send the downloaded **Federation Metadata XML** and appropriate copied URLs from Azure portal to [IDC support team](mailto:[email protected]). They set this setting to have the SAML SSO connection set properly on both sides.
139+
To configure single sign-on on the **IDC** side, send the downloaded **Federation Metadata XML** and appropriate copied URLs from the Azure portal to the IDC support team. IDC configures this setting so the SAML SSO connection is set properly on both sides.
140140

141141
### Create IDC test user
142142

articles/active-directory/saas-apps/servicenow-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
9696
> [!NOTE]
9797
> These values aren't real. You need to update these values with the actual sign-on URL and identifier, which is explained later in the tutorial. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
9898

99-
1. On the **Set up single sign-on with SAML** page, in the **SAML Signing Certificate** section, find **Certificate (Base64)**. Select **Download** to download the certificate and save it on your computer.
99+
1. On the **Set up single sign-on with SAML** page, in the **SAML Signing Certificate** section, find **Certificate (Base64)**.
100100

101101
![Screenshot of the SAML Signing Certificate section, with Download highlighted](common/certificatebase64.png)
102102

articles/active-directory/users-groups-roles/directory-assign-admin-roles.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ Users in this role can read settings and administrative information across Micro
242242
> These features are currently in development.
243243
>
244244
245-
### [Group Administrator](#group-administrator)
245+
### [Group Administrator](#group-administrator-permissions)
246246

247247
Users in this role can create/manage groups and its settings like naming and expiration policies. It is important to understand that assigning a user to this role gives them the ability to manage all groups in the tenant across various workloads like Teams, SharePoint, Yammer in addition to Outlook. Also the user will be able to manage the various groups settings across various admin portals like Microsoft Admin Center, Azure portal, as well as workload specific ones like Teams and SharePoint Admin Centers.
248248

@@ -275,7 +275,9 @@ This role was previously called "Password Administrator" in the [Azure portal](h
275275

276276
### [Intune Administrator](#intune-service-administrator-permissions)
277277

278-
Users with this role have global permissions within Microsoft Intune Online, when the service is present. Additionally, this role contains the ability to manage users and devices in order to associate policy, as well as create and manage groups. More information at [Role-based administration control (RBAC) with Microsoft Intune](https://docs.microsoft.com/intune/role-based-access-control)
278+
Users with this role have global permissions within Microsoft Intune Online, when the service is present. Additionally, this role contains the ability to manage users and devices in order to associate policy, as well as create and manage groups. More information at [Role-based administration control (RBAC) with Microsoft Intune](https://docs.microsoft.com/intune/role-based-access-control).
279+
280+
This role can create and manage all security groups. However, Intune Admin does not have admin rights over Office groups. That means the admin cannot update owners or memberships of all Office groups in the tenant. However, he/she can manage the Office group that he creates which comes as a part of his/her end user privileges. So, any Office group (not security group) that he/she creates should be counted against his/her quota of 250.
279281

280282
> [!NOTE]
281283
> In Microsoft Graph API, Azure AD Graph API, and Azure AD PowerShell, this role is identified as "Intune Service Administrator ". It is "Intune Administrator" in the [Azure portal](https://portal.azure.com).
@@ -1077,8 +1079,8 @@ Can read everything that a Global Administrator can, but not edit anything.
10771079
| microsoft.office365.usageReports/allEntities/read | Read Office 365 usage reports. |
10781080
| microsoft.office365.webPortal/allEntities/standard/read | Read standard properties on all resources in microsoft.office365.webPortal. |
10791081

1080-
### Group Administrator
1081-
Can manage all aspects of groups and group settings like naming and expiration policies
1082+
### Group Administrator permissions
1083+
Can manage all aspects of groups and group settings like naming and expiration policies.
10821084

10831085
| **Actions** | **Description** |
10841086
| --- | --- |

articles/azure-app-configuration/quickstart-dotnet-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ In this quickstart, you incorporate Azure App Configuration into a .NET Framewor
109109
110110
## Next steps
111111
112-
In this quickstart, you created a new App Configuration store and used it with a .NET Framework console app. The value `AppSettings` of `ConfiguratoinManager` won't change after the application is started. The App Configuration .NET Standard configuration provider library, however can also be used in a .NET Framework app. To learn how to enable your .NET Framework app to dynamically refresh configuration settings, continue to the next tutorial.
112+
In this quickstart, you created a new App Configuration store and used it with a .NET Framework console app. The value `AppSettings` of `ConfigurationManager` won't change after the application is started. The App Configuration .NET Standard configuration provider library, however can also be used in a .NET Framework app. To learn how to enable your .NET Framework app to dynamically refresh configuration settings, continue to the next tutorial.
113113
114114
> [!div class="nextstepaction"]
115115
> [Enable dynamic configuration](./enable-dynamic-configuration-dotnet.md)

articles/azure-databricks/databricks-extract-load-sql-data-warehouse.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: 'Tutorial: Perform ETL operations using Azure Databricks'
3-
description: Learn how to extract data from Data Lake Storage Gen2 into Azure Databricks, transform the data, and then load the data into Azure SQL Data Warehouse.
2+
title: 'Tutorial - Perform ETL operations using Azure Databricks'
3+
description: In this tutorial, learn how to extract data from Data Lake Storage Gen2 into Azure Databricks, transform the data, and then load the data into Azure SQL Data Warehouse.
44
author: mamccrea
55
ms.author: mamccrea
66
ms.reviewer: jasonh

articles/azure-databricks/quickstart-create-databricks-workspace-portal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Run a Spark job on Azure Databricks using Azure portal
3-
description: The quickstart shows how to use the Azure portal to create an Azure Databricks workspace, an Apache Spark cluster, and run a Spark job.
2+
title: Quickstart - Run a Spark job on Azure Databricks using Azure portal
3+
description: This quickstart shows how to use the Azure portal to create an Azure Databricks workspace, an Apache Spark cluster, and run a Spark job.
44
services: azure-databricks
55
ms.service: azure-databricks
66
author: mamccrea

articles/azure-databricks/quickstart-create-databricks-workspace-resource-manager-template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Create an Azure Databricks workspace with Azure Resource manager
3-
description: The quickstart shows how to use the Azure Resource Manager template to create an Azure Databricks workspace, then create an Apache Spark cluster, and run a Spark job.
2+
title: Quickstart - Create an Azure Databricks workspace with Azure Resource manager
3+
description: This quickstart shows how to use the Azure Resource Manager template to create an Azure Databricks workspace, then create an Apache Spark cluster, and run a Spark job.
44
services: azure-databricks
55
ms.service: azure-databricks
66
author: mamccrea

articles/azure-databricks/service-endpoint-cosmosdb.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Implement Azure Databricks with a Cosmos DB endpoint
2+
title: Tutorial - Implement Azure Databricks with a Cosmos DB endpoint
33
description: This tutorial describes how to implement Azure Databricks in a virtual network with a Service Endpoint enabled for Cosmos DB.
44
author: mamccrea
55
ms.author: mamccrea

articles/azure-databricks/store-secrets-azure-key-vault.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Access blob storage using key vault - Azure Databricks
2+
title: Tutorial - Access blob storage using key vault using Azure Databricks
33
description: This tutorial describes how to access Azure Blob Storage from Azure Databricks using secrets stored in a key vault.
44
author: mamccrea
55
ms.author: mamccrea

0 commit comments

Comments
 (0)