Skip to content

Commit 9ba191b

Browse files
committed
i
merging from origin -- INSERT --
2 parents 2697d4d + cf493e9 commit 9ba191b

File tree

391 files changed

+5480
-5077
lines changed

Some content is hidden

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

391 files changed

+5480
-5077
lines changed

.openpublishing.redirection.json

Lines changed: 132 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6241,14 +6241,9 @@
62416241
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
62426242
"redirect_document_id": false
62436243
},
6244-
{
6245-
"source_path": "articles/cloud-partner-portal/cloud-partner-portal-manage-publisher-profile.md",
6246-
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
6247-
"redirect_document_id": false
6248-
},
62496244
{
62506245
"source_path": "articles/cloud-partner-portal/cloud-partner-portal-manage-users.md",
6251-
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
6246+
"redirect_url": "/azure/marketplace/partner-center-portal/manage-account",
62526247
"redirect_document_id": false
62536248
},
62546249
{
@@ -20525,6 +20520,56 @@
2052520520
"redirect_url": "https://docs.microsoft.com/legal/marketplace/terms",
2052620521
"redirect_document_id": false
2052720522
},
20523+
{
20524+
"source_path": "articles/marketplace/cloud-partner-portal-orig/setup-your-application-in-the-publishing-portal.md",
20525+
"redirect_url": "/azure/marketplace/partner-center-portal/create-new-customer-engagement-offer",
20526+
"redirect_document_id": true
20527+
},
20528+
{
20529+
"source_path": "articles/marketplace/enable-lead-sharing.md",
20530+
"redirect_url": "/azure/marketplace/partner-center-portal/commercial-marketplace-get-customer-leads",
20531+
"redirect_document_id": true
20532+
},
20533+
{
20534+
"source_path": "articles/marketplace/listing-type-requirements.md",
20535+
"redirect_url": "/azure/marketplace/publisher-guide-by-offer-type",
20536+
"redirect_document_id": true
20537+
},
20538+
{
20539+
"source_path": "articles/marketplace/promote-your-business-with-microsoft.md",
20540+
"redirect_url": "/azure/marketplace/gtm-your-marketplace-benefits",
20541+
"redirect_document_id": false
20542+
},
20543+
{
20544+
"source_path": "articles/marketplace/publishing-checklist-appsource.md",
20545+
"redirect_url": "/azure/marketplace/appsource-offer-publishing-guide",
20546+
"redirect_document_id": false
20547+
},
20548+
{
20549+
"source_path": "articles/marketplace/publishing-checklist-azure-marketplace.md",
20550+
"redirect_url": "/azure/marketplace/publisher-guide-by-offer-type",
20551+
"redirect_document_id": false
20552+
},
20553+
{
20554+
"source_path": "articles/marketplace/support-appsource.md",
20555+
"redirect_url": "/azure/marketplace/partner-center-portal/support",
20556+
"redirect_document_id": true
20557+
},
20558+
{
20559+
"source_path": "articles/marketplace/cloud-partner-portal-orig/store-your-appSource-package-to-azure-storage-and-generate-sas-key.md",
20560+
"redirect_url": "/azure/marketplace/marketplace-publishers-guide",
20561+
"redirect_document_id": false
20562+
},
20563+
{
20564+
"source_path": "articles/marketplace/cloud-partner-portal-orig/dynamics-365-solution-preparation.md",
20565+
"redirect_url": "/azure/marketplace/appsource-offer-publishing-guide",
20566+
"redirect_document_id": false
20567+
},
20568+
{
20569+
"source_path": "articles/marketplace/cloud-partner-portal-orig/request-to-publish-the-app.md",
20570+
"redirect_url": "/azure/marketplace/partner-center-portal/create-new-customer-engagement-offer",
20571+
"redirect_document_id": false
20572+
},
2052820573
{
2052920574
"source_path": "articles/marketplace/marketplace-participation-policy.md",
2053020575
"redirect_url": "https://docs.microsoft.com/legal/marketplace/participation-policy",
@@ -20587,7 +20632,12 @@
2058720632
},
2058820633
{
2058920634
"source_path": "articles/marketplace/cloud-partner-portal/cloud-partner-portal-manage-publisher-profile.md",
20590-
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
20635+
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
20636+
"redirect_document_id": false
20637+
},
20638+
{
20639+
"source_path": "articles/cloud-partner-portal/cloud-partner-portal-manage-publisher-profile.md",
20640+
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
2059120641
"redirect_document_id": false
2059220642
},
2059320643
{
@@ -20596,10 +20646,15 @@
2059620646
"redirect_document_id": false
2059720647
},
2059820648
{
20599-
"source_path": "articles/marketplace/cloud-partner-portal/cloud-partner-portal-manage-users.md",
20600-
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
20649+
"source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-manage-users.md",
20650+
"redirect_url": "/azure/marketplace/partner-center-portal/manage-account",
2060120651
"redirect_document_id": false
2060220652
},
20653+
{
20654+
"source_path": "articles/marketplace/cloud-partner-portal/cloud-partner-portal-manage-users.md",
20655+
"redirect_url": "/azure/marketplace/partner-center-portal/manage-account",
20656+
"redirect_document_id": true
20657+
},
2060320658
{
2060420659
"source_path": "articles/marketplace/cloud-partner-portal/cloud-partner-portal-publish-cortana-intelligence-app.md",
2060520660
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
@@ -31685,29 +31740,64 @@
3168531740
"redirect_url": "/azure/service-fabric/service-fabric-tutorial-deploy-app-with-cicd-vsts",
3168631741
"redirect_document_id": false
3168731742
},
31743+
{
31744+
"source_path": "articles/marketplace/add-bank-tax-info.md",
31745+
"redirect_url": "/azure/marketplace/partner-center-portal/manage-account#payout-account",
31746+
"redirect_document_id": false
31747+
},
31748+
{
31749+
"source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-automate-offer-publishing.md",
31750+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-vm-create-offer",
31751+
"redirect_document_id": true
31752+
},
31753+
{
31754+
"source_path": "articles/marketplace/cloud-partner-portal-orig/appsource-package-preparation.md",
31755+
"redirect_url": "/azure/marketplace/marketplace-publishers-guide",
31756+
"redirect_document_id": false
31757+
},
3168831758
{
3168931759
"source_path": "articles/marketplace/enable-trial-using-azure-ad.md",
3169031760
"redirect_url": "/azure/marketplace/enable-appsource-marketplace-using-azure-ad",
3169131761
"redirect_document_id": true
3169231762
},
3169331763
{
3169431764
"source_path": "articles/marketplace/gtm-promote-your-business.md",
31695-
"redirect_url": "/azure/marketplace/gtm-your-marketplace-benefits",
31765+
"redirect_url": "/azure/marketplace/gtm-marketing-best-practices",
3169631766
"redirect_document_id": false
3169731767
},
3169831768
{
3169931769
"source_path": "articles/marketplace/become-publisher.md",
3170031770
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
31701-
"redirect_document_id": true
31771+
"redirect_document_id": false
31772+
},
31773+
{
31774+
"source_path": "articles/marketplace/deprecated/gtm-promote-your-business.md",
31775+
"redirect_url": "/azure/marketplace/gtm-marketing-best-practices",
31776+
"redirect_document_id": false
31777+
},
31778+
{
31779+
"source_path": "articles/marketplace/deprecated/become-publisher.md",
31780+
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
31781+
"redirect_document_id": false
3170231782
},
3170331783
{
3170431784
"source_path": "articles/marketplace/guidelines.md",
31705-
"redirect_url": "/azure/marketplace/partner-center-portal/manage-account",
31706-
"redirect_document_id": true
31785+
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
31786+
"redirect_document_id": false
31787+
},
31788+
{
31789+
"source_path": "articles/marketplace/deprecated/guidelines.md",
31790+
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
31791+
"redirect_document_id": false
3170731792
},
3170831793
{
3170931794
"source_path": "articles/marketplace/register-dev-center.md",
31710-
"redirect_url": "/azure/marketplace/partner-center-portal/manage-account",
31795+
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
31796+
"redirect_document_id": false
31797+
},
31798+
{
31799+
"source_path": "articles/marketplace/deprecated/register-dev-center.md",
31800+
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
3171131801
"redirect_document_id": false
3171231802
},
3171331803
{
@@ -31723,7 +31813,7 @@
3172331813
{
3172431814
"source_path": "articles/marketplace/grow-your-business-with-appsource.md",
3172531815
"redirect_url": "/azure/marketplace/marketplace-publishers-guide",
31726-
"redirect_document_id": true
31816+
"redirect_document_id": false
3172731817
},
3172831818
{
3172931819
"source_path": "articles/marketplace/billing-options-azure-marketplace.md",
@@ -31797,7 +31887,22 @@
3179731887
},
3179831888
{
3179931889
"source_path": "articles/marketplace-publishing/marketplace-publishing-accounts-creation-registration.md",
31800-
"redirect_url": "https://docs.microsoft.com/azure/marketplace/cloud-partner-portal-orig/cloud-partner-portal-dev-center-accounts-registration",
31890+
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
31891+
"redirect_document_id": true
31892+
},
31893+
{
31894+
"source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-dev-center-accounts-registration.md",
31895+
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
31896+
"redirect_document_id": false
31897+
},
31898+
{
31899+
"source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-management-solution-publish.md",
31900+
"redirect_url": "/azure/marketplace",
31901+
"redirect_document_id": false
31902+
},
31903+
{
31904+
"source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-manage-publisher-profile.md",
31905+
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
3180131906
"redirect_document_id": false
3180231907
},
3180331908
{
@@ -42742,9 +42847,14 @@
4274242847
},
4274342848
{
4274442849
"source_path": "articles/storage/common/storage-enable-and-view-metrics.md",
42745-
"redirect_url": "/azure/storage/common/storage-metrics-in-azure-monitor",
42850+
"redirect_url": "/azure/storage/common/monitor-storage",
4274642851
"redirect_document_id": true
4274742852
},
42853+
{
42854+
"source_path": "articles/storage/common/storage-metrics-in-azure-monitor.md",
42855+
"redirect_url": "/azure/storage/common/monitor-storage",
42856+
"redirect_document_id": false
42857+
},
4274842858
{
4274942859
"source_path": "articles/azure-stack/partner/azure-stack-vaas-set-up-account.md",
4275042860
"redirect_url": "/azure/azure-stack/partner/azure-stack-vaas-set-up-resources",
@@ -52078,6 +52188,11 @@
5207852188
"source_path": "articles/media-services/azure-media-player/azure-media-player-license.md",
5207952189
"redirect_url": "/legal/azure-media-player/azure-media-player-license",
5208052190
"redirect_document_id": false
52191+
},
52192+
{
52193+
"source_path": "articles/load-balancer/azure-media-player/components-limitations.md",
52194+
"redirect_url": "/articles/load-balancer/concepts",
52195+
"redirect_document_id": false
5208152196
}
5208252197
]
5208352198
}

articles/active-directory/app-provisioning/scim-graph-scenarios.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ My application is built into Microsoft Teams and relies on message data. In addi
9999
I need to be able to track changes to Teams and Outlook messages and react to them in real time. How can I get these changes pushed to my application?
100100

101101
**Recommendation:** The Microsoft Graph provides [change notifications](https://docs.microsoft.com/graph/webhooks) and [change tracking](https://docs.microsoft.com/graph/delta-query-overview) for various resources. Note the following limitations of change notifications:
102-
- If an event receiver acknowledges an event, but fails to act on it for any reason, the event may be lost
103-
- If an event receiver acknowledges an event, but fails to act on it for any reason, the event may be lost
102+
- If an event receiver acknowledges an event, but fails to act on it for any reason, the event may be lost.
103+
- The order in which changes are received are not guaranteed to be chronological.
104104
- Change notifications don't always contain the [resource data](https://docs.microsoft.com/graph/webhooks-with-resource-data)
105105
For the reasons above, developers often use change notifications along with change tracking for synchronization scenarios.
106106

articles/active-directory/conditional-access/concept-conditional-access-report-only.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: conditional-access
88
ms.topic: conceptual
9-
ms.date: 03/25/2020
9+
ms.date: 05/01/2020
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -23,7 +23,7 @@ Report-only mode is a new Conditional Access policy state that allows administra
2323

2424
- Conditional Access policies can be enabled in report-only mode.
2525
- During sign-in, policies in report-only mode are evaluated but not enforced.
26-
- Results are logged in the **Conditional Access** and **Report-only (Preview)** tabs of the Sign-in log details.
26+
- Results are logged in the **Conditional Access** and **Report-only** tabs of the Sign-in log details.
2727
- Customers with an Azure Monitor subscription can monitor the impact of their Conditional Access policies using the Conditional Access insights workbook.
2828

2929
> [!WARNING]

articles/active-directory/conditional-access/howto-conditional-access-insights-reporting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: conditional-access
88
ms.topic: article
9-
ms.date: 04/30/2020
9+
ms.date: 05/01/2020
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo

articles/active-directory/conditional-access/howto-conditional-access-report-only.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: conditional-access
88
ms.topic: conceptual
9-
ms.date: 03/25/2020
9+
ms.date: 05/01/2020
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -15,7 +15,7 @@ ms.reviewer: dawoo
1515

1616
ms.collection: M365-identity-device-management
1717
---
18-
# Configure a Conditional Access policy in report-only mode (Preview)
18+
# Configure a Conditional Access policy in report-only mode
1919

2020
To configure a Conditional Access policy in report-only mode:
2121

@@ -39,7 +39,7 @@ To view the result of a report-only policy for a particular sign-in:
3939
1. Sign into the **Azure portal** as a reports reader, security reader, security administrator, or global administrator.
4040
1. Browse to **Azure Active Directory** > **Sign-ins**.
4141
1. Select a sign-in or add filters to narrow results.
42-
1. In the **Details** drawer, select the **Report-only (Preview)** tab to view the policies evaluated during sign-in.
42+
1. In the **Details** drawer, select the **Report-only** tab to view the policies evaluated during sign-in.
4343

4444
> [!NOTE]
4545
> When downloading the Sign-ins logs, choose JSON format to include Conditional Access report-only result data.
@@ -59,7 +59,7 @@ Once you've integrated your Azure AD logs with Azure Monitor, you can monitor th
5959

6060
1. Sign into the **Azure portal** as a security administrator or global administrator.
6161
1. Browse to **Azure Active Directory** > **Workbooks**.
62-
1. Select **Conditional Access Insights (Preview)**.
62+
1. Select **Conditional Access Insights**.
6363
1. Select one or more policies from the **Conditional Access Policy** dropdown. All enabled policies are selected by default.
6464
1. Select a time range (if the time range exceeds the available dataset, the report will show all available data). Once you have set the **Conditional Access Policy** and **Time Range** parameters, the report will load.
6565
1. Optionally, search for individual **Users** or **Apps** to narrow the scope of the report.
Loading
Loading
Loading
Loading

articles/active-directory/develop/access-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Microsoft identity platform access tokens reference | Azure
33
description: Learn about access tokens emitted by the Azure AD v1.0 and Microsoft identity platform (v2.0) endpoints.
44
services: active-directory
5-
author: rwike77
5+
author: hpsin
66
manager: CelesteDG
77

88
ms.service: active-directory

0 commit comments

Comments
 (0)