Skip to content

Commit 6932af4

Browse files
Merge pull request #78778 from MicrosoftDocs/master
Merge master to live 3:36 AM
2 parents adb6c98 + acc97b6 commit 6932af4

File tree

49 files changed

+1368
-674
lines changed

Some content is hidden

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

49 files changed

+1368
-674
lines changed

.openpublishing.redirection.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15400,6 +15400,11 @@
1540015400
"redirect_url": "/azure/stream-analytics/stream-analytics-troubleshoot-query",
1540115401
"redirect_document_id": false
1540215402
},
15403+
{
15404+
"source_path": "articles/backup/backup-introduction-to-azure-backup.md",
15405+
"redirect_url": "/azure/backup/backup-overview",
15406+
"redirect_document_id": false
15407+
},
1540315408
{
1540415409
"source_path": "articles/backup/backup-azure-backup-ibiza-faq.md",
1540515410
"redirect_url": "/azure/backup/backup-azure-backup-faq",
@@ -26479,6 +26484,11 @@
2647926484
"redirect_url": "/azure/marketplace/enable-appsource-marketplace-using-azure-ad",
2648026485
"redirect_document_id": true
2648126486
},
26487+
{
26488+
"source_path": "articles/marketplace/gtm-promote-your-business.md",
26489+
"redirect_url": "/azure/marketplace/gtm-your-marketplace-benefits",
26490+
"redirect_document_id": false
26491+
},
2648226492
{
2648326493
"source_path": "articles/marketplace/become-publisher.md",
2648426494
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
@@ -37403,11 +37413,21 @@
3740337413
"redirect_url": "/azure/cognitive-services/content-moderator/review-api#workflows",
3740437414
"redirect_document_id": true
3740537415
},
37416+
{
37417+
"source_path": "articles/cognitive-services/Content-Moderator/FAQs.md",
37418+
"redirect_url": "/azure/cognitive-services/content-moderator/overview",
37419+
"redirect_document_id": false
37420+
},
3740637421
{
3740737422
"source_path": "articles/cognitive-services/Content-Moderator/sdk-and-samples.md",
3740837423
"redirect_url": "/azure/cognitive-services/content-moderator/samples-dotnet",
3740937424
"redirect_document_id": false
3741037425
},
37426+
{
37427+
"source_path": "articles/cognitive-services/Content-Moderator/Review-Tool-User-Guide/Sign-up.md",
37428+
"redirect_url": "/azure/cognitive-services/content-moderator/overview",
37429+
"redirect_document_id": false
37430+
},
3741137431
{
3741237432
"source_path": "articles/cognitive-services/Computer-vision/Vision-API-How-to-Topics/HowToSubscribe.md",
3741337433
"redirect_url": "/azure/cognitive-services/cognitive-services-apis-create-account#single-service-subscription",
@@ -37473,6 +37493,11 @@
3747337493
"redirect_url": "/azure/cognitive-services/Custom-Vision-Service/getting-started-build-a-classifier",
3747437494
"redirect_document_id": false
3747537495
},
37496+
{
37497+
"source_path": "articles/cognitive-services/Custom-Vision-Service/glossary-of-terms.md",
37498+
"redirect_url": "/azure/cognitive-services/Custom-Vision-Service/home",
37499+
"redirect_document_id": false
37500+
},
3747637501
{
3747737502
"source_path": "articles/data-catalog/data-catalog-prerequisites.md",
3747837503
"redirect_url": "/azure/data-catalog/data-catalog-get-started",

articles/active-directory/develop/active-directory-how-applications-are-added.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.devlang: na
1414
ms.topic: article
1515
ms.tgt_pltfrm: na
1616
ms.workload: identity
17-
ms.date: 04/18/2018
17+
ms.date: 06/04/2019
1818
ms.author: ryanwi
1919
ms.custom: aaddev
2020
ms.reviewer: elisol, lenalepa
@@ -29,9 +29,9 @@ There are two representations of applications in Azure AD:
2929
Service principals generally reference an application object, and one application object can be referenced by multiple service principals across directories.
3030

3131
## What are application objects and where do they come from?
32-
You can manage [application objects](app-objects-and-service-principals.md#application-object) in the Azure portal through the [App Registrations](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ApplicationsListBlade) experience. Application objects describe the application to Azure AD and can be considered the definition of the application, allowing the service to know how to issue tokens to the application based on its settings. The application object will only exist in its home directory, even if it's a multi-tenant application supporting service principals in other directories. The application object may include any of the following (as well as additional information not mentioned here):
32+
You can manage [application objects](app-objects-and-service-principals.md#application-object) in the Azure portal through the [App Registrations](https://aka.ms/appregistrations) experience. Application objects describe the application to Azure AD and can be considered the definition of the application, allowing the service to know how to issue tokens to the application based on its settings. The application object will only exist in its home directory, even if it's a multi-tenant application supporting service principals in other directories. The application object may include any of the following (as well as additional information not mentioned here):
3333
* Name, logo, and publisher
34-
* Reply URLs
34+
* Redirect URIs
3535
* Secrets (symmetric and/or asymmetric keys used to authenticate the application)
3636
* API dependencies (OAuth)
3737
* Published APIs/resources/scopes (OAuth)
@@ -71,7 +71,7 @@ Like application objects, service principals can also be created through multipl
7171
* When you subscribe to Office 365 or begin a trial, one or more service principals are created in the directory representing the various services that are used to deliver all of the functionality associated with Office 365.
7272
* Some Office 365 services like SharePoint create service principals on an ongoing basis to allow secure communication between components including workflows.
7373
* When an admin adds an application from the app gallery (this will also create an underlying app object)
74-
* Add an application to use the [Azure AD Application Proxy](https://msdn.microsoft.com/library/azure/dn768219.aspx)
74+
* Add an application to use the [Azure AD Application Proxy](/azure/active-directory/manage-apps/application-proxy)
7575
* Connect an application for single sign on using SAML or password single sign-on (SSO)
7676
* Programmatically via the Azure AD Graph API or PowerShell
7777

@@ -98,8 +98,8 @@ Applications that you add yourself (represented as **App (yours)** in the diagra
9898
* Claims transformation rules
9999
* Attribute mappings (User provisioning)
100100
* For more detailed information on the service principal and application objects, see the Azure AD Graph REST API reference documentation:
101-
* [Application](https://msdn.microsoft.com/library/azure/ad/graph/api/entity-and-complex-type-reference#application-entity)
102-
* [Service Principal](https://msdn.microsoft.com/library/azure/ad/graph/api/entity-and-complex-type-reference#serviceprincipal-entity)
101+
* [Application](/previous-versions/azure/ad/graph/api/entity-and-complex-type-reference#application-entity)
102+
* [Service Principal](/previous-versions/azure/ad/graph/api/entity-and-complex-type-reference#serviceprincipal-entity)
103103

104104
## Why do applications integrate with Azure AD?
105105
Applications are added to Azure AD to leverage one or more of the services it provides including:

0 commit comments

Comments
 (0)