Skip to content

Commit b9c6299

Browse files
authored
Merge pull request #628 from Microsoft/FromPrivateRepo
From private repo
2 parents 446cba7 + 581ea66 commit b9c6299

File tree

62 files changed

+2396
-2331
lines changed

Some content is hidden

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

62 files changed

+2396
-2331
lines changed

articles/active-directory/active-directory-application-proxy-enable.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ Before you can enable and use Application Proxy services, you need to have:
7474
![App Proxy Connector services - screenshot](./media/active-directory-application-proxy-enable/app_proxy_services.png)
7575
5. Click **Finish** in the installation window.
7676

77+
For information about connectors, see [Understand Azure AD Application Proxy connectors](application-proxy-understand-connectors.md).
78+
7779
For high availability purposes, you should deploy at least two connectors. To deploy more connectors, repeat steps 2 and 3, above. Each connector must be registered separately.
7880

7981
If you want to uninstall the Connector, uninstall both the Connector service and the Updater service. Restart your computer to fully remove the service.

articles/active-directory/active-directory-application-proxy-get-started.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,11 @@ With Azure AD Application Proxy you can access different types of internal appli
5050
* Web APIs that you want to expose to rich applications on different devices
5151
* Applications hosted behind a Remote Desktop Gateway
5252

53-
## How does it work?
53+
## How does the service work with connectors?
5454
Application Proxy works by installing a slim Windows Server service called a connector inside your network. With the connector, you don't have to open any inbound ports or put anything in the DMZ. If you have high traffic in your apps you can add more connectors, and the service takes care of the load balancing. The connectors are stateless and pull everything from the cloud as necessary.
5555

56+
For information about connectors, see [Understand Azure AD Application Proxy connectors](application-proxy-understand-connectors.md).
57+
5658
When users access applications remotely, they connect to the published endpoint. Users authenticate in Azure AD and then are routed through the connector to the on-premises application.
5759

5860
![AzureAD Application Proxy diagram](./media/active-directory-appssoaccess-whatis/azureappproxxy.png)
@@ -73,13 +75,14 @@ Make sure you have an Azure AD basic or premium subscription and an Azure AD dir
7375

7476
Setting up Application Proxy is accomplished in two steps:
7577

76-
1. [Enable Application Proxy and configure the connector](active-directory-application-proxy-enable.md)
78+
1. [Enable Application Proxy and configure the connector](active-directory-application-proxy-enable.md).
7779
2. [Publish applications](active-directory-application-proxy-publish.md) - use the quick and easy wizard to get your on-premises apps published and accessible remotely.
7880

7981
## What's next?
8082
There's a lot more you can do with Application Proxy:
8183

8284
* [Publish applications using your own domain name](active-directory-application-proxy-custom-domains.md)
85+
* [Working with existing on-premise Proxy servers](application-proxy-working-with-proxy-servers.md)
8386
* [Enable single-sign on](active-directory-application-proxy-sso-using-kcd.md)
8487
* [Working with claims aware applications](active-directory-application-proxy-claims-aware-apps.md)
8588
* [Enable conditional access](active-directory-application-proxy-conditional-access.md)

articles/active-directory/active-directory-integrating-applications-getting-started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Integrating Azure Active Directory with applications getting started guide | Microsoft Docs
2+
title: Get started integrating Azure AD with apps | Microsoft Docs
33
description: This article is a getting started guide for integrating Azure Active Directory (AD) with on-premises applications, and cloud applications.
44
services: active-directory
55
documentationcenter: ''
@@ -13,7 +13,7 @@ ms.devlang: na
1313
ms.topic: article
1414
ms.tgt_pltfrm: na
1515
ms.workload: identity
16-
ms.date: 02/09/2016
16+
ms.date: 01/23/2017
1717
ms.author: inhenk
1818

1919
---

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ How can you get the collection of activity data started?
2727

2828
| Azure AD Edition | Collection Start |
2929
| :-- | :-- |
30-
|Premium and Premium 2 | When you sign-up for a license |
31-
| Free | The first time you open the [Azure Active Directory blade](https://ms.portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/Overview) or use the [reporting APIs](https://aka.ms/aadreports) |
30+
| Azure AD Premium P1 <br /> Azure AD Premium P2 | When you sign-up for a subscription |
31+
| Azure AD Free | The first time you open the [Azure Active Directory blade](https://ms.portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/Overview) or use the [reporting APIs](https://aka.ms/aadreports) |
3232

3333

3434
When is your activity data available in the Azure portal?
@@ -43,14 +43,14 @@ For how long is the collected data stored?
4343

4444
**Activity reports**
4545

46-
| Report | Azure AD Free | Azure AD Premium 1 | Azure AD Premium 2 |
46+
| Report | Azure AD Free | Azure AD Premium P1 | Azure AD Premium P2 |
4747
| :-- | :-- | :-- | :-- |
4848
| Directory Audit | 7 days | 30 days | 30 days |
4949
| Sign-in Activity | 7 days | 30 days | 30 days |
5050

5151
**Security Signals**
5252

53-
| Report | Azure AD Free | Azure AD Premium 1 | Azure AD Premium 2 |
53+
| Report | Azure AD Free | Azure AD Premium P1 | Azure AD Premium P2 |
5454
| :-- | :-- | :-- | :-- |
5555
| Risky sign-ins | 7 days | 30 days | 90 days |
5656

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.devlang: na
1313
ms.topic: article
1414
ms.tgt_pltfrm: na
1515
ms.workload: identity
16-
ms.date: 12/13/2016
16+
ms.date: 02/03/2017
1717
ms.author: markvi
1818

1919
---
@@ -24,6 +24,7 @@ For the comprehensive list of SaaS apps that have been pre-integrated into Azure
2424

2525
## List of Tutorials
2626

27+
2728
| Logo| App Name |
2829
| --- | --- |
2930
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Frankly.png)| [&frankly](https://go.microsoft.com/fwLink/?LinkID=823723&clcid=0x409)|
@@ -69,6 +70,7 @@ For the comprehensive list of SaaS apps that have been pre-integrated into Azure
6970
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Bonus.ly.png)| [Bonus.ly](https://go.microsoft.com/fwLink/?LinkID=403240&clcid=0x409)|
7071
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Boomi.png)| [Boomi](https://go.microsoft.com/fwLink/?LinkID=510263&clcid=0x409)|
7172
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Box.png)| [Box](https://go.microsoft.com/fwLink/?LinkID=286013&clcid=0x409)|
73+
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Bridge.png)| [Bridge](https://go.microsoft.com/fwLink/?LinkID=837421&clcid=0x409)|
7274
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Brightspace.png)| [Brightspace by Desire2Learn](https://go.microsoft.com/fwLink/?LinkID=522561&clcid=0x409)|
7375
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Bynder.png)| [Bynder](https://go.microsoft.com/fwLink/?LinkID=808011&clcid=0x409)|
7476
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_CAPPM.png)| [CA PPM](http://go.microsoft.com/fwlink/?LinkID=708674&clcid=0x409)|
@@ -92,6 +94,7 @@ For the comprehensive list of SaaS apps that have been pre-integrated into Azure
9294
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_CloudPassage.png)| [CloudPassage](https://go.microsoft.com/fwLink/?LinkID=512732&clcid=0x409)|
9395
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Concur.png)| [Concur](https://go.microsoft.com/fwLink/?LinkID=309575&clcid=0x409)|
9496
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Condeco.png)| [Condeco](https://go.microsoft.com/fwLink/?LinkID=708660&clcid=0x409)|
97+
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Convercent.png)| [Convercent](https://go.microsoft.com/fwLink/?LinkID=286005&clcid=0x409)|
9598
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_CornerstoneOnDemand.png)| [Cornerstone OnDemand](https://go.microsoft.com/fwLink/?LinkID=512745&clcid=0x409)|
9699
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Coupa.png)| [Coupa](https://go.microsoft.com/fwLink/?LinkID=510267&clcid=0x409)|
97100
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_CSStars.png)| [CS Stars](https://go.microsoft.com/fwLink/?LinkID=530245&clcid=0x409)|
@@ -103,6 +106,7 @@ For the comprehensive list of SaaS apps that have been pre-integrated into Azure
103106
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_DowJonesFactiva.png)| [Dow Jones Factiva](https://go.microsoft.com/fwLink/?LinkID=828376&clcid=0x409)|
104107
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Dropbox.png)| [Dropbox for Business](https://go.microsoft.com/fwLink/?LinkID=309581&clcid=0x409)|
105108
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Druva.png)| [Druva](https://go.microsoft.com/fwLink/?LinkID=530221&clcid=0x409)|
109+
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_EasyTerritory.png)| [EasyTerritory](https://go.microsoft.com/fwLink/?LinkID=837427&clcid=0x409)|
106110
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_eBuilder.png)| [e-Builder](https://go.microsoft.com/fwLink/?LinkID=510261&clcid=0x409)|
107111
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Edigitalresearch.png)| [eDigitalResearch](https://go.microsoft.com/fwLink/?LinkID=822851&clcid=0x409)|
108112
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Egnyte.png)| [Egnyte](https://go.microsoft.com/fwLink/?LinkID=510245&clcid=0x409)|
@@ -244,13 +248,13 @@ For the comprehensive list of SaaS apps that have been pre-integrated into Azure
244248
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_SilkRoad.png)| [SilkRoad Life Suite](https://go.microsoft.com/fwLink/?LinkID=530238&clcid=0x409)|
245249
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_SimpleNexus.png)| [SimpleNexus](https://go.microsoft.com/fwLink/?LinkID=522562&clcid=0x409)|
246250
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Skilljar.png)| [Skilljar](https://go.microsoft.com/fwLink/?LinkID=691857&clcid=0x409)|
247-
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_SkydeskEmail.png)| [Skydesk Email](https://go.microsoft.com/fwLink/?LinkID=708683&clcid=0x409)|
251+
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_SkydeskEmail.png)| [SkyDesk Email](https://go.microsoft.com/fwLink/?LinkID=708683&clcid=0x409)|
248252
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Slack.png)| [Slack](https://go.microsoft.com/fwLink/?LinkID=530223&clcid=0x409)|
249253
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Small_Improvements.png)| [Small Improvements](https://go.microsoft.com/fwLink/?LinkID=708659&clcid=0x409)|
250254
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_SmarterU.png)| [SmarterU](https://go.microsoft.com/fwLink/?LinkID=510238&clcid=0x409)|
251255
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Soonr.png)| [Soonr Workplace](https://go.microsoft.com/fwLink/?LinkID=708687&clcid=0x409)|
252256
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Splunk.png)| [Splunk Enterprise and Splunk Cloud](https://go.microsoft.com/fwLink/?LinkID=808003&clcid=0x409)|
253-
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_SpringCM.png)| [Spring CM](https://go.microsoft.com/fwLink/?LinkID=403261&clcid=0x409)|
257+
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_SpringCM.png)| [SpringCM](https://go.microsoft.com/fwLink/?LinkID=403261&clcid=0x409)|
254258
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Sprinklr.png)| [Sprinklr](https://go.microsoft.com/fwLink/?LinkID=522558&clcid=0x409)|
255259
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_StatusPage.png)| [StatusPage](https://go.microsoft.com/fwLink/?LinkID=530247&clcid=0x409)|
256260
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_SuccessFactors.png)| [SuccessFactors](https://go.microsoft.com/fwLink/?LinkID=403221&clcid=0x409)|
@@ -293,6 +297,7 @@ For the comprehensive list of SaaS apps that have been pre-integrated into Azure
293297
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Workday.png)| [Workday](https://go.microsoft.com/fwLink/?LinkID=286020&clcid=0x409)|
294298
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_FBAtWork.png)| [Workplace by Facebook](http://go.microsoft.com/fwlink/?LinkID=708665&clcid=0x409)|
295299
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Workrite.png)| [Workrite](https://go.microsoft.com/fwLink/?LinkID=530242&clcid=0x409)|
300+
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_WorksMobile.png)| [WORKS MOBILE](https://go.microsoft.com/fwLink/?LinkID=839291&clcid=0x409)|
296301
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_xMattersOnDemand.png)| [xMatters OnDemand](https://go.microsoft.com/fwLink/?LinkID=403231&clcid=0x409)|
297302
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Yardi.png)| [Yardi eLearning](https://go.microsoft.com/fwLink/?LinkID=733444&clcid=0x409)|
298303
| ![logo](./media/active-directory-saas-tutorial-list/SaaSApp_Yonyx.png)| [Yonyx Interactive Guides](https://go.microsoft.com/fwLink/?LinkID=828380&clcid=0x409)|

articles/active-directory/develop/active-directory-devhowto-multi-tenant-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: How to build an application that can sign in any Azure Active Directory user| Microsoft Docs
2+
title: How to build an app that can sign in any Azure AD user| Microsoft Docs
33
description: Step by step instructions for building an application that can sign in a user from any Azure Active Directory tenant, also known as a multi-tenant application.
44
services: active-directory
55
documentationcenter: ''
@@ -13,7 +13,7 @@ ms.devlang: na
1313
ms.topic: article
1414
ms.tgt_pltfrm: na
1515
ms.workload: identity
16-
ms.date: 01/07/2017
16+
ms.date: 01/23/2017
1717
ms.author: skwan;bryanla
1818

1919
---
@@ -38,7 +38,7 @@ Let’s look at each step in detail. You can also jump straight to [this list of
3838
## Update registration to be multi-tenant
3939
By default, web app/API registrations in Azure AD are single tenant. You can make your registration multi-tenant by finding the “Application is Multi-Tenant” switch on the configuration page of your application registration in the [Azure classic portal][AZURE-classic-portal] and setting it to “Yes”.
4040

41-
Note: Before an application can be made multi-tenant, Azure AD requires the App ID URI of the application to be globally unique. The App ID URI is one of the ways an application is identified in protocol messages. For a single tenant app, it is sufficient for the App ID URI to be unique within that tenant. For a multi-tenant application, it must be globally unique so Azure AD can find the application across all tenants. Global uniqueness is enforced by requiring the App ID URI to have a host name that matches a verified domain of the Azure AD tenant. For example, if the name of your tenant was contoso.onmicrosoft.com then a valid App ID URI would be `https://contoso.onmicrosoft.com/myapp`. If your tenant had a verified domain of `contoso.com`, then a valid App ID URI would also be `https://contoso.com/myapp`. Setting an application as multi-tenant will fail if the App ID URI doesn’t follow this pattern.
41+
Also note, before an application can be made multi-tenant, Azure AD requires the App ID URI of the application to be globally unique. The App ID URI is one of the ways an application is identified in protocol messages. For a single tenant app, it is sufficient for the App ID URI to be unique within that tenant. For a multi-tenant application, it must be globally unique so Azure AD can find the application across all tenants. Global uniqueness is enforced by requiring the App ID URI to have a host name that matches a verified domain of the Azure AD tenant. For example, if the name of your tenant was contoso.onmicrosoft.com then a valid App ID URI would be `https://contoso.onmicrosoft.com/myapp`. If your tenant had a verified domain of `contoso.com`, then a valid App ID URI would also be `https://contoso.com/myapp`. Setting an application as multi-tenant will fail if the App ID URI doesn’t follow this pattern.
4242

4343
Native client registrations are multi-tenant by default. You don’t need to take any action to make a native client application registration multi-tenant.
4444

articles/active-directory/develop/active-directory-devquickstarts-dotnet.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Azure AD .NET Getting Started | Microsoft Docs
2+
title: Azure AD .NET getting started | Microsoft Docs
33
description: How to build a .NET Windows Desktop application that integrates with Azure AD for sign in and calls Azure AD protected APIs using OAuth.
44
services: active-directory
55
documentationcenter: .net
@@ -13,7 +13,7 @@ ms.workload: identity
1313
ms.tgt_pltfrm: na
1414
ms.devlang: dotnet
1515
ms.topic: article
16-
ms.date: 01/07/2017
16+
ms.date: 01/23/2017
1717
ms.author: dastrock
1818

1919
---

articles/active-directory/develop/active-directory-devquickstarts-headless-java.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Azure AD Java Getting Started | Microsoft Docs
2+
title: Azure AD Java command line getting started | Microsoft Docs
33
description: How to build a Java command line app that signs users in to access an API.
44
services: active-directory
55
documentationcenter: java
@@ -13,7 +13,7 @@ ms.workload: identity
1313
ms.tgt_pltfrm: na
1414
ms.devlang: java
1515
ms.topic: article
16-
ms.date: 09/16/2016
16+
ms.date: 01/23/2017
1717
ms.author: brandwe
1818

1919
---

articles/active-directory/develop/active-directory-devquickstarts-webapi-dotnet.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Azure AD .NET Getting Started | Microsoft Docs
2+
title: Azure AD .NET web API getting started | Microsoft Docs
33
description: How to build a .NET MVC Web API that integrates with Azure AD for authentication and authorization.
44
services: active-directory
55
documentationcenter: .net
@@ -13,7 +13,7 @@ ms.workload: identity
1313
ms.tgt_pltfrm: na
1414
ms.devlang: dotnet
1515
ms.topic: article
16-
ms.date: 01/07/2017
16+
ms.date: 01/23/2017
1717
ms.author: dastrock
1818

1919
---

articles/active-directory/develop/active-directory-devquickstarts-webapp-dotnet.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Azure AD .NET Getting Started | Microsoft Docs
2+
title: Azure AD .NET web app getting started | Microsoft Docs
33
description: How to build a .NET MVC Web App that integrates with Azure AD for sign in.
44
services: active-directory
55
documentationcenter: .net
@@ -13,7 +13,7 @@ ms.workload: identity
1313
ms.tgt_pltfrm: na
1414
ms.devlang: dotnet
1515
ms.topic: article
16-
ms.date: 01/07/2017
16+
ms.date: 01/23/2017
1717
ms.author: dastrock
1818

1919
---

0 commit comments

Comments
 (0)