Skip to content

Commit bf053f2

Browse files
committed
Merge branch 'master' of https://github.com/Microsoft/azure-docs-pr into ultravox0905
2 parents ee316ab + 9ea57d5 commit bf053f2

File tree

190 files changed

+2288
-2303
lines changed

Some content is hidden

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

190 files changed

+2288
-2303
lines changed

.openpublishing.redirection.json

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4480,6 +4480,11 @@
44804480
"redirect_url": "/azure/app-service/containers/configure-language-java",
44814481
"redirect_document_id": false
44824482
},
4483+
{
4484+
"source_path": "articles/app-service/containers/quickstart-docker-go.md",
4485+
"redirect_url": "/azure/app-service/containers/quickstart-docker",
4486+
"redirect_document_id": false
4487+
},
44834488
{
44844489
"source_path": "articles/app-service/containers/tutorial-ruby-mysql-app.md",
44854490
"redirect_url": "/azure/app-service/containers/tutorial-ruby-postgres-app",
@@ -36520,19 +36525,29 @@
3652036525
},
3652136526
{
3652236527
"source_path": "articles/monitoring-and-diagnostics/azure-diagnostics-schema-1dot0.md",
36523-
"redirect_url": "/azure/azure-monitor/platform/diagnostics-extension-schema-1dot0",
36524-
"redirect_document_id": true
36528+
"redirect_url": "/azure/azure-monitor/platform/diagnostics-extension-schema-1dot3",
36529+
"redirect_document_id": false
3652536530
},
3652636531
{
3652736532
"source_path": "articles/monitoring-and-diagnostics/azure-diagnostics-schema-1dot2.md",
36528-
"redirect_url": "/azure/azure-monitor/platform/diagnostics-extension-schema-1dot2",
36529-
"redirect_document_id": true
36533+
"redirect_url": "/azure/azure-monitor/platform/diagnostics-extension-schema-1dot3",
36534+
"redirect_document_id": false
3653036535
},
3653136536
{
3653236537
"source_path": "articles/monitoring-and-diagnostics/azure-diagnostics-schema-1dot3-and-later.md",
3653336538
"redirect_url": "/azure/azure-monitor/platform/diagnostics-extension-schema-1dot3",
3653436539
"redirect_document_id": true
36535-
},
36540+
},
36541+
{
36542+
"source_path": "articles/azure-monitor/platform/azure-diagnostics-schema-1dot0.md",
36543+
"redirect_url": "/azure/azure-monitor/platform/diagnostics-extension-schema-1dot3",
36544+
"redirect_document_id": false
36545+
},
36546+
{
36547+
"source_path": "articles/azure-monitor/platform/azure-diagnostics-schema-1dot2.md",
36548+
"redirect_url": "/azure/azure-monitor/platform/diagnostics-extension-schema-1dot3",
36549+
"redirect_document_id": false
36550+
},
3653636551
{
3653736552
"source_path": "articles/monitoring-and-diagnostics/azure-diagnostics-storage.md",
3653836553
"redirect_url": "/azure/azure-monitor/platform/diagnostics-extension-to-storage",
@@ -41665,6 +41680,11 @@
4166541680
"source_path": "articles/azure-monitor/app/sample-mscrm.md",
4166641681
"redirect_url": "/azure/azure-monitor/app/javascript",
4166741682
"redirect_document_id": false
41683+
},
41684+
{
41685+
"source_path": "articles/sql-database/sql-database-managed-instance-pools.md",
41686+
"redirect_url": "/azure/sql-database/sql-database-instance-pools",
41687+
"redirect_document_id": false
4166841688
}
4166941689
]
4167041690
}

articles/active-directory/authentication/howto-password-ban-bad-on-premises-deploy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ When a newer version of the Azure AD Password Protection Proxy software is avail
292292
293293
It is not required to uninstall the current version of the Proxy software - the installer will perform an in-place upgrade. No reboot should be required when upgrading the Proxy software. The software upgrade may be automated using standard MSI procedures, for example: `AzureADPasswordProtectionProxySetup.exe /quiet`.
294294
295-
The Proxy agent supports automatic upgrade. Automatic upgrade uses the Microsoft Azure AD Connect Agent Updater service which is installed side-by-side with the Proxy service. Automatic upgrade is on by default, and may be enabled or disabled using the Set-AzureADPasswordProtectionProxyConfiguration cmdlet. The current setting can be queried using the Get-AzureADPasswordProtectionProxyConfiguration cmdlet. Microsoft recommends that the automatic upgrade be left enabled.
295+
The Proxy agent supports automatic upgrade. Automatic upgrade uses the Microsoft Azure AD Connect Agent Updater service which is installed side-by-side with the Proxy service. Automatic upgrade is on by default, and may be enabled or disabled using the `Set-AzureADPasswordProtectionProxyConfiguration` cmdlet. The current setting can be queried using the `Get-AzureADPasswordProtectionProxyConfiguration` cmdlet. Microsoft recommends that the automatic upgrade be left enabled.
296296
297297
The `Get-AzureADPasswordProtectionProxy` cmdlet may be used to query the software version of all currently installed Proxy agents in a forest.
298298

articles/active-directory/manage-apps/bread/toc.yml

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
tocHref: /azure/active-directory/saas-apps/
77
topicHref: /azure/active-directory/index
88
items:
9-
- name: Manage applications
9+
- name: Application management
1010
tocHref: /azure/active-directory/saas-apps/
1111
topicHref: /azure/active-directory/manage-apps/index
1212

@@ -18,7 +18,30 @@
1818
tocHref: /azure/active-directory/fundamentals/
1919
topicHref: /azure/active-directory/index
2020
items:
21-
- name: Manage applications
21+
- name: Application management
2222
tocHref: /azure/active-directory/fundamentals/
2323
topicHref: /azure/active-directory/manage-apps/index
2424

25+
- name: Azure
26+
tocHref: /azure/
27+
topicHref: /azure/index
28+
items:
29+
- name: Active Directory
30+
tocHref: /azure/active-directory/hybrid/
31+
topicHref: /azure/active-directory/index
32+
items:
33+
- name: Application management
34+
tocHref: /azure/active-directory/hybrid/
35+
topicHref: /azure/active-directory/manage-apps/index
36+
37+
- name: Azure
38+
tocHref: /azure/
39+
topicHref: /azure/index
40+
items:
41+
- name: Active Directory
42+
tocHref: /azure/active-directory/develop/
43+
topicHref: /azure/active-directory/index
44+
items:
45+
- name: Application management
46+
tocHref: /azure/active-directory/develop/
47+
topicHref: /azure/active-directory/manage-apps/index

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

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.workload: identity
1414
ms.tgt_pltfrm: na
1515
ms.devlang: na
1616
ms.topic: tutorial
17-
ms.date: 08/23/2019
17+
ms.date: 09/03/2019
1818
ms.author: jeedes
1919

2020
ms.collection: M365-identity-device-management
@@ -41,7 +41,8 @@ To get started, you need the following items:
4141

4242
In this tutorial, you configure and test Azure AD SSO in a test environment.
4343

44-
* Zoom supports **SP** initiated SSO
44+
* Zoom supports **SP** initiated SSO and
45+
* Zoom supports [**Automated** user provisioning](https://docs.microsoft.com/azure/active-directory/saas-apps/zoom-provisioning-tutorial).
4546

4647
## Adding Zoom from the gallery
4748

@@ -86,7 +87,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
8687
`<companyname>.zoom.us`
8788

8889
> [!NOTE]
89-
> These values are not real. Update these values with the actual Sign on URL and Identifier. Contact [Zoom Client support team](https://support.zoom.us/hc/en-us) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
90+
> These values are not real. Update these values with the actual Sign on URL and Identifier. Contact [Zoom Client support team](https://support.zoom.us/hc/) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
9091

9192
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.
9293

@@ -100,7 +101,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
100101
> To learn how to configure Role in Azure AD, see [Configure the role claim issued in the SAML token for enterprise applications](https://docs.microsoft.com/azure/active-directory/develop/active-directory-enterprise-app-role-management).
101102
102103
> [!NOTE]
103-
> Zoom might expect a group claim in the SAML payload. If you have created any groups, contact the [Zoom Client support team](https://support.zoom.us/hc/en-us) with the group information so they can configure the group information on their end. You also need to provide the Object ID to [Zoom Client support team](https://support.zoom.us/hc/en-us) so they can configure the Object ID on their end. To get the Object ID, see [Configuring Zoom with Azure](https://support.zoom.us/hc/en-us/articles/115005887566).
104+
> Zoom might expect a group claim in the SAML payload. If you have created any groups, contact the [Zoom Client support team](https://support.zoom.us/hc/) with the group information so they can configure the group information on their end. You also need to provide the Object ID to [Zoom Client support team](https://support.zoom.us/hc/) so they can configure the Object ID on their end. To get the Object ID, see [Configuring Zoom with Azure](https://support.zoom.us/hc/articles/115005887566).
104105
105106
### Create an Azure AD test user
106107

@@ -171,30 +172,10 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
171172

172173
### Create Zoom test user
173174

174-
In order to enable Azure AD users to sign in to Zoom, they must be provisioned into Zoom. In the case of Zoom, provisioning is a manual task.
175-
176-
### To provision a user account, perform the following steps:
177-
178-
1. Sign in to your **Zoom** company site as an administrator.
179-
180-
2. Click the **Account Management** tab, and then click **User Management**.
181-
182-
3. In the User Management section, click **Add users**.
183-
184-
![User management](./media/zoom-tutorial/ic784703.png "User management")
185-
186-
4. On the **Add users** page, perform the following steps:
187-
188-
![Add users](./media/zoom-tutorial/ic784704.png "Add users")
189-
190-
a. As **User Type**, select **Basic**.
191-
192-
b. In the **Emails** textbox, type the email address of a valid Azure AD account you want to provision.
193-
194-
c. Click **Add**.
175+
The objective of this section is to create a user called B.Simon in Zoom. Zoom supports automatic user provisioning, which is by default enabled. You can find more details [here](https://docs.microsoft.com/azure/active-directory/saas-apps/zoom-provisioning-tutorial) on how to configure automatic user provisioning.
195176

196177
> [!NOTE]
197-
> You can use any other Zoom user account creation tools or APIs provided by Zoom to provision Azure Active Directory user accounts.
178+
> If you need to create a user manually, you need to contact [Zoom Client support team](https://support.zoom.us/hc/)
198179
199180
## Test SSO
200181

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Users with this role have all permissions in the Azure Information Protection se
8282

8383
### [B2C User Flow Administrator](#b2c-user-flow-administrator-permissions)
8484

85-
Users with this role can create and manage B2C User Flows (aka "built-in" policies) in Azure Portal. By creating or editing user flows, these users can change the html/CSS/javascript content of the user experience, change MFA requirements per user flow, change claims in the token and adjust session settings for all policies in the tenant. On the other hand, this role does not include the ability to review user data, or make changes to the attributes that are included in the tenant schema. Changes to Identity Experience Framework (aka Custom) policies is also outside the scope of this role.
85+
Users with this role can create and manage B2C User Flows (also called "built-in" policies) in the Azure portal. By creating or editing user flows, these users can change the html/CSS/javascript content of the user experience, change MFA requirements per user flow, change claims in the token and adjust session settings for all policies in the tenant. On the other hand, this role does not include the ability to review user data, or make changes to the attributes that are included in the tenant schema. Changes to Identity Experience Framework (also known as Custom) policies is also outside the scope of this role.
8686

8787
### [B2C User Flow Attribute Administrator](#b2c-user-flow-attribute-administrator-permissions)
8888

@@ -188,10 +188,10 @@ Users with this role have global permissions within Microsoft Exchange Online, w
188188
189189
### [External Identity Provider Administrator](#external-identity-provider-administrator-permissions)
190190

191-
This administrator manages federation between Azure Active Directory tenants and external identity providers. With this role, users can add new identity providers and configure all available settings (e.g. authentication path, service id, assigned key containers). This user can enable the tenant to trust authentications from external identity providers. The resulting impact on end user experiences depends on the type of tenant:
191+
This administrator manages federation between Azure Active Directory tenants and external identity providers. With this role, users can add new identity providers and configure all available settings (e.g. authentication path, service ID, assigned key containers). This user can enable the tenant to trust authentications from external identity providers. The resulting impact on end user experiences depends on the type of tenant:
192192

193193
* Azure Active Directory tenants for employees and partners: The addition  of a federation (e.g. with Gmail) will immediately impact all guest invitations not yet redeemed. See [Adding Google as an identity provider for B2B guest users](https://docs.microsoft.com/azure/active-directory/b2b/google-federation).
194-
* Azure Active Directory B2C tenants: The addition of a federation (for example, with Facebook, or with another Azure AD organization) does not immediately impact end user flows until the identity provider is added as an option in a user flow (aka built-in policy). See [Configuring a Microsoft account as an identity provider](https://docs.microsoft.com/azure/active-directory-b2c/active-directory-b2c-setup-msa-app) for an example. To change user flows, the limited role of "B2C User Flow Administrator" is required.
194+
* Azure Active Directory B2C tenants: The addition of a federation (for example, with Facebook, or with another Azure AD organization) does not immediately impact end user flows until the identity provider is added as an option in a user flow (also called a built-in policy). See [Configuring a Microsoft account as an identity provider](https://docs.microsoft.com/azure/active-directory-b2c/active-directory-b2c-setup-msa-app) for an example. To change user flows, the limited role of "B2C User Flow Administrator" is required.
195195

196196
### [Global Administrator / Company Administrator](#company-administrator-permissions)
197197

@@ -228,7 +228,7 @@ Users with this role can change passwords, invalidate refresh tokens, manage ser
228228
> [!NOTE]
229229
> Delegating administrative permissions over subsets of users and applying policies to a subset of users is possible with [Administrative Units (preview)](https://docs.microsoft.com/azure/active-directory/users-groups-roles/directory-administrative-units).
230230
>
231-
> This role was previously called "Password Administrator" in [Azure portal](https://portal.azure.com/). We have changed its name to "Helpdesk Administrator" to match its name in Azure AD PowerShell, Azure AD Graph API and Microsoft Graph API.
231+
> This role was previously called "Password Administrator" in the [Azure portal](https://portal.azure.com/). We have changed its name to "Helpdesk Administrator" to match its name in Azure AD PowerShell, Azure AD Graph API and Microsoft Graph API.
232232
233233
### [Intune Administrator](#intune-service-administrator-permissions)
234234

@@ -349,14 +349,14 @@ Windows Defender ATP and EDR | View and investigate alerts. When you turn on rol
349349

350350
### [Service Support Administrator](#service-support-administrator-permissions)
351351

352-
Users with this role can open support requests with Microsoft for Azure and Office 365 services, and views the service dashboard and message center in the [Azure portal](https://portal.azure.com) and [Microsoft 365 admin center](https://admin.microsoft.com). More information at [About Office 365 admin roles](https://support.office.com/article/About-Office-365-admin-roles-da585eea-f576-4f55-a1e0-87090b6aaa9d).
352+
Users with this role can open support requests with Microsoft for Azure and Office 365 services, and views the service dashboard and message center in the [Azure portal](https://portal.azure.com) and [Microsoft 365 admin center](https://admin.microsoft.com). More information at [About admin roles](https://support.office.com/article/About-Office-365-admin-roles-da585eea-f576-4f55-a1e0-87090b6aaa9d).
353353

354354
> [!NOTE]
355355
> In Microsoft Graph API, Azure AD Graph API, and Azure AD PowerShell, this role is identified as "Service Support Administrator." It is "Service Administrator" in the [Azure portal](https://portal.azure.com), the [Microsoft 365 admin center](https://admin.microsoft.com), and the Intune portal.
356356
357357
### [SharePoint Administrator](#sharepoint-service-administrator-permissions)
358358

359-
Users with this role have global permissions within Microsoft SharePoint Online, when the service is present, as well as the ability to create and manage all Office 365 Groups, manage support tickets, and monitor service health. More information at [About Office 365 admin roles](https://support.office.com/article/About-Office-365-admin-roles-da585eea-f576-4f55-a1e0-87090b6aaa9d).
359+
Users with this role have global permissions within Microsoft SharePoint Online, when the service is present, as well as the ability to create and manage all Office 365 Groups, manage support tickets, and monitor service health. More information at [About admin roles](https://support.office.com/article/About-Office-365-admin-roles-da585eea-f576-4f55-a1e0-87090b6aaa9d).
360360

361361
> [!NOTE]
362362
> In Microsoft Graph API, Azure AD Graph API, and Azure AD PowerShell, this role is identified as "SharePoint Service Administrator." It is "SharePoint Administrator" in the [Azure portal](https://portal.azure.com).

articles/aks/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
href: configure-azure-cni.md
160160
- name: Create an internal load balancer
161161
href: internal-lb.md
162-
- name: Use a Standard Load Balancer (preview)
162+
- name: Use a Standard Load Balancer
163163
href: load-balancer-standard.md
164164
- name: Use a static IP address
165165
href: static-ip.md

0 commit comments

Comments
 (0)