Skip to content

Commit f34cfb2

Browse files
tynevitynevi
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 8afb75e + 24fd3f9 commit f34cfb2

File tree

113 files changed

+1916
-699
lines changed

Some content is hidden

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

113 files changed

+1916
-699
lines changed

‎.openpublishing.redirection.json

+8-3
Original file line numberDiff line numberDiff line change
@@ -5955,9 +5955,14 @@
59555955
"redirect_url": "/azure/app-service/manage-backup",
59565956
"redirect_document_id": false
59575957
},
5958+
{
5959+
"source_path": "articles/app-service/web-sites-configure.md",
5960+
"redirect_url": "/azure/app-service/configure-common",
5961+
"redirect_document_id": false
5962+
},
59585963
{
59595964
"source_path": "articles/app-service-web/web-sites-configure.md",
5960-
"redirect_url": "/azure/app-service/web-sites-configure",
5965+
"redirect_url": "/azure/app-service/configure-common",
59615966
"redirect_document_id": false
59625967
},
59635968
{
@@ -6402,7 +6407,7 @@
64026407
},
64036408
{
64046409
"source_path": "articles/app-service-web/web-sites-java-custom-upload.md",
6405-
"redirect_url": "/azure/app-service/web-sites-configure",
6410+
"redirect_url": "/azure/app-service/configure-common",
64066411
"redirect_document_id": false
64076412
},
64086413
{
@@ -9427,7 +9432,7 @@
94279432
},
94289433
{
94299434
"source_path": "articles/app-service-web/web-sites-transform-extend.md",
9430-
"redirect_url": "/azure/app-service/web-sites-configure",
9435+
"redirect_url": "/azure/app-service/configure-common",
94319436
"redirect_document_id": false
94329437
},
94339438
{

‎articles/active-directory/authentication/howto-mfaserver-deploy.md

+7-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: multi-factor-authentication
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: conceptual
9-
ms.date: 07/11/2018
9+
ms.date: 05/20/2019
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -25,6 +25,9 @@ Now that we have determined to use on-premises Multi-Factor Authentication Serve
2525

2626
## Plan your deployment
2727

28+
> [!WARNING]
29+
> Starting in March of 2019 MFA Server downloads will only be available to paid tenants. Free/trial tenants will no longer be able to download or generate and use activation credentials.
30+
2831
Before you download the Azure Multi-Factor Authentication Server, think about what your load and high availability requirements are. Use this information to decide how and where to deploy.
2932

3033
A good guideline for the amount of memory you need is the number of users you expect to authenticate on a regular basis.
@@ -87,6 +90,9 @@ If you aren't using the Event Confirmation feature, and your users aren't using
8790

8891
## Download the MFA Server
8992

93+
> [!WARNING]
94+
> Starting in March of 2019 MFA Server downloads will only be available to paid tenants. Free/trial tenants will no longer be able to download or generate and use activation credentials.
95+
9096
Follow these steps to download the Azure Multi-Factor Authentication Server from the Azure portal:
9197

9298
1. Sign in to the [Azure portal](https://portal.azure.com) as an administrator.
@@ -100,9 +106,6 @@ Follow these steps to download the Azure Multi-Factor Authentication Server from
100106

101107
## Install and configure the MFA Server
102108

103-
> [!WARNING]
104-
> Starting in March of 2019 MFA Server downloads will only be available to paid tenants. Free/trial tenants will no longer be able to download or generate and use activation credentials.
105-
106109
Now that you have downloaded the server you can install and configure it. Be sure that the server you are installing it on meets requirements listed in the planning section.
107110

108111
1. Double-click the executable.

‎articles/active-directory/manage-apps/application-proxy-configure-custom-domain.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ When you have those three requirements ready, follow these steps to set up your
6868
### Certificate format
6969
There is no restriction on the certificate signature methods. Elliptic Curve Cryptography (ECC), Subject Alternative Name (SAN), and other common certificate types are all supported.
7070

71-
You can use a wildcard certificate as long as the wildcard matches the desired external URL.
71+
You can use a wildcard certificate as long as the wildcard matches the desired external URL.
72+
73+
You cannot use a certificate issued by your own public key infrastructure (PKI) due to security considerations.
7274

7375
### Changing the domain
7476
All verified domains appear in the External URL dropdown list for your application. To change the domain, just update that field for the application. If the domain you want isn't in the list, [add it as a verified domain](../fundamentals/add-custom-domain.md). If you select a domain that doesn't have an associated certificate yet, follow steps 5-7 to add the certificate. Then, make sure you update the DNS record to redirect from the new external URL.

‎articles/active-directory/manage-apps/application-proxy-configure-single-sign-on-on-premises-apps.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.workload: identity
1212
ms.tgt_pltfrm: na
1313
ms.devlang: na
1414
ms.topic: conceptual
15-
ms.date: 03/12/2019
15+
ms.date: 05/20/2019
1616
ms.author: mimart
1717
ms.reviewer: japere
1818
ms.custom: it-pro
@@ -47,8 +47,9 @@ Keep in mind the following when you're going through the tutorial:
4747
1. Select **SAML** as the single sign-on method.
4848
1. In the **Set up Single Sign-On with SAML** page, edit the **Basic SAML Configuration** data, and follow the steps in [Enter basic SAML configuration](configure-single-sign-on-non-gallery-applications.md#saml-based-single-sign-on) to configure SAML-based authentication for the application.
4949

50-
* Make sure the **Reply URL** matches or is a path under the **External URL** for the on-premises application that you published through Application Proxy. If your application requires a different **Reply URL** for the SAML configuration, add this as the **first** URL in the list and keep the **External URL** as an additional URL, ordered after the first.
51-
* Ensure that the application also specifies the correct **Reply URL** or Assertion Consumer Service URL to use for receiving the authentication token.
50+
* Make sure the **Reply URL** matches or is a path under the **External URL** for the on-premises application that you published through Application Proxy.
51+
* If your application requires a different **Reply URL** for the SAML configuration, add this as an **additional** URL in the list and mark the checkbox next to it to designate it as the primary **Reply URL** to send IDP-initiated SAML responses to.
52+
* For an SP-initiated flow ensure that the application also specifies the correct **Reply URL** or Assertion Consumer Service URL to use for receiving the authentication token.
5253

5354
![Enter basic SAML configuration data](./media/application-proxy-configure-single-sign-on-on-premises-apps/basic-saml-configuration.png)
5455

‎articles/active-directory/users-groups-roles/TOC.yml

+2
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
href: /azure/active-directory/fundamentals/active-directory-users-assign-role-azure-portal?context=azure/active-directory/users-groups-roles/context/ugr-context
4545
- name: Restore a deleted user
4646
href: /azure/active-directory/fundamentals/active-directory-users-restore?context=azure/active-directory/users-groups-roles/context/ugr-context
47+
- name: Close your account in an unmanaged directory
48+
href: users-close-account.md
4749
- name: Add B2B users
4850
href: /azure/active-directory/b2b/what-is-b2b?context=azure/active-directory/users-groups-roles/context/ugr-context
4951
- name: Assign role to B2B user

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

+24-24
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ Create and manage trust framework policies in the Identity Experience Framework.
365365
Can perform common billing related tasks like updating payment information.
366366

367367
> [!NOTE]
368-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
368+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
369369
>
370370
>
371371
@@ -383,7 +383,7 @@ Can perform common billing related tasks like updating payment information.
383383
Can access and manage Desktop management tools and services including Intune.
384384

385385
> [!NOTE]
386-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
386+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
387387
>
388388
>
389389
@@ -456,7 +456,7 @@ Full access to manage devices in Azure AD.
456456
Can manage all aspects of Azure AD and Microsoft services that use Azure AD identities.
457457

458458
> [!NOTE]
459-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
459+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
460460
>
461461
>
462462
@@ -522,7 +522,7 @@ Can manage all aspects of Azure AD and Microsoft services that use Azure AD iden
522522
Can read and manage compliance configuration and reports in Azure AD and Office 365.
523523

524524
> [!NOTE]
525-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
525+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
526526
>
527527
>
528528
@@ -556,7 +556,7 @@ Can manage conditional access capabilities.
556556
Can manage all aspects of the Dynamics 365 product.
557557

558558
> [!NOTE]
559-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
559+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
560560
>
561561
>
562562
@@ -573,7 +573,7 @@ Can manage all aspects of the Dynamics 365 product.
573573
Can approve Microsoft support requests to access customer organizational data.
574574

575575
> [!NOTE]
576-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
576+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
577577
>
578578
>
579579
@@ -703,7 +703,7 @@ Can read & write basic directory information. For granting access to application
703703
Can manage all aspects of the Exchange product.
704704

705705
> [!NOTE]
706-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
706+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
707707
>
708708
>
709709
@@ -763,7 +763,7 @@ Can reset passwords for non-administrators and Helpdesk Administrators.
763763
Can manage all aspects of the Azure Information Protection product.
764764

765765
> [!NOTE]
766-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
766+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
767767
>
768768
>
769769
@@ -779,7 +779,7 @@ Can manage all aspects of the Azure Information Protection product.
779779
Can manage all aspects of the Intune product.
780780

781781
> [!NOTE]
782-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
782+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
783783
>
784784
>
785785
@@ -827,7 +827,7 @@ Can manage product licenses on users and groups.
827827
Can manage all aspects of the Skype for Business product.
828828

829829
> [!NOTE]
830-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
830+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
831831
>
832832
>
833833
@@ -844,7 +844,7 @@ Can manage all aspects of the Skype for Business product.
844844
Can read messages and updates for their organization in Office 365 Message Center only.
845845

846846
> [!NOTE]
847-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
847+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
848848
>
849849
>
850850
@@ -857,7 +857,7 @@ Can read messages and updates for their organization in Office 365 Message Cente
857857
Do not use - not intended for general use.
858858

859859
> [!NOTE]
860-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
860+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
861861
>
862862
>
863863
@@ -889,7 +889,7 @@ Do not use - not intended for general use.
889889
Do not use - not intended for general use.
890890

891891
> [!NOTE]
892-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
892+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
893893
>
894894
>
895895
@@ -923,7 +923,7 @@ Do not use - not intended for general use.
923923
Can manage all aspects of the Power BI product.
924924

925925
> [!NOTE]
926-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
926+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
927927
>
928928
>
929929
@@ -953,7 +953,7 @@ Allowed to view, set and reset authentication method information for any user (a
953953
Can manage role assignments in Azure AD, and all aspects of Privileged Identity Management.
954954

955955
> [!NOTE]
956-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
956+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
957957
>
958958
>
959959
@@ -966,7 +966,7 @@ Can manage role assignments in Azure AD, and all aspects of Privileged Identity
966966
Can read sign-in and audit reports.
967967

968968
> [!NOTE]
969-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
969+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
970970
>
971971
>
972972
@@ -982,7 +982,7 @@ Can read sign-in and audit reports.
982982
Can read security information and reports, and manage configuration in Azure AD and Office 365.
983983

984984
> [!NOTE]
985-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
985+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
986986
>
987987
>
988988
@@ -1011,7 +1011,7 @@ Can read security information and reports, and manage configuration in Azure AD
10111011
Can read security information and reports in Azure AD and Office 365.
10121012

10131013
> [!NOTE]
1014-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
1014+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
10151015
>
10161016
>
10171017
@@ -1031,7 +1031,7 @@ Can read security information and reports in Azure AD and Office 365.
10311031
Can read service health information and manage support tickets.
10321032

10331033
> [!NOTE]
1034-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
1034+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
10351035
>
10361036
>
10371037
@@ -1047,7 +1047,7 @@ Can read service health information and manage support tickets.
10471047
Can manage all aspects of the SharePoint service.
10481048

10491049
> [!NOTE]
1050-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
1050+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
10511051
>
10521052
>
10531053
@@ -1070,7 +1070,7 @@ Can manage all aspects of the SharePoint service.
10701070
Can manage calling and meetings features within the Microsoft Teams service.
10711071

10721072
> [!NOTE]
1073-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
1073+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
10741074
>
10751075
>
10761076
@@ -1087,7 +1087,7 @@ Can manage calling and meetings features within the Microsoft Teams service.
10871087
Can troubleshoot communications issues within Teams using advanced tools.
10881088

10891089
> [!NOTE]
1090-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
1090+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
10911091
>
10921092
>
10931093
@@ -1101,7 +1101,7 @@ Can troubleshoot communications issues within Teams using advanced tools.
11011101
Can troubleshoot communications issues within Teams using basic tools.
11021102

11031103
> [!NOTE]
1104-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
1104+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
11051105
>
11061106
>
11071107
@@ -1115,7 +1115,7 @@ Can troubleshoot communications issues within Teams using basic tools.
11151115
Can manage the Microsoft Teams service.
11161116

11171117
> [!NOTE]
1118-
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
1118+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
11191119
>
11201120
>
11211121

0 commit comments

Comments
 (0)