Skip to content

Commit cb7a3ce

Browse files
committed
Merge branch 'master' of https://github.com/microsoftdocs/azure-docs-pr into asb-b4-container-instances
2 parents c0ce218 + cc0d550 commit cb7a3ce

File tree

641 files changed

+10526
-9589
lines changed

Some content is hidden

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

641 files changed

+10526
-9589
lines changed

.openpublishing.redirection.json

Lines changed: 137 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-create-vnet-classic-cli",
3636
"redirect_document_id": false
3737
},
38-
3938
{
4039
"source_path": "articles/virtual-network/virtual-networks-specifying-a-dns-settings-in-a-virtual-network-configuration-file.md",
4140
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-specifying-a-dns-settings-in-a-virtual-network-configuration-file",
@@ -6242,14 +6241,9 @@
62426241
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
62436242
"redirect_document_id": false
62446243
},
6245-
{
6246-
"source_path": "articles/cloud-partner-portal/cloud-partner-portal-manage-publisher-profile.md",
6247-
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
6248-
"redirect_document_id": false
6249-
},
62506244
{
62516245
"source_path": "articles/cloud-partner-portal/cloud-partner-portal-manage-users.md",
6252-
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
6246+
"redirect_url": "/azure/marketplace/partner-center-portal/manage-account",
62536247
"redirect_document_id": false
62546248
},
62556249
{
@@ -10536,6 +10530,11 @@
1053610530
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
1053710531
"redirect_document_id": false
1053810532
},
10533+
{
10534+
"source_path": "articles/active-directory/saas-apps/directions-microsoft-tutorial.md",
10535+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
10536+
"redirect_document_id": false
10537+
},
1053910538
{
1054010539
"source_path": "articles/active-directory/active-directory-saas-clarizen-tutorial.md",
1054110540
"redirect_url": "/azure/active-directory/saas-apps/clarizen-tutorial",
@@ -20526,6 +20525,56 @@
2052620525
"redirect_url": "https://docs.microsoft.com/legal/marketplace/terms",
2052720526
"redirect_document_id": false
2052820527
},
20528+
{
20529+
"source_path": "articles/marketplace/cloud-partner-portal-orig/setup-your-application-in-the-publishing-portal.md",
20530+
"redirect_url": "/azure/marketplace/partner-center-portal/create-new-customer-engagement-offer",
20531+
"redirect_document_id": true
20532+
},
20533+
{
20534+
"source_path": "articles/marketplace/enable-lead-sharing.md",
20535+
"redirect_url": "/azure/marketplace/partner-center-portal/commercial-marketplace-get-customer-leads",
20536+
"redirect_document_id": true
20537+
},
20538+
{
20539+
"source_path": "articles/marketplace/listing-type-requirements.md",
20540+
"redirect_url": "/azure/marketplace/publisher-guide-by-offer-type",
20541+
"redirect_document_id": true
20542+
},
20543+
{
20544+
"source_path": "articles/marketplace/promote-your-business-with-microsoft.md",
20545+
"redirect_url": "/azure/marketplace/gtm-your-marketplace-benefits",
20546+
"redirect_document_id": false
20547+
},
20548+
{
20549+
"source_path": "articles/marketplace/publishing-checklist-appsource.md",
20550+
"redirect_url": "/azure/marketplace/appsource-offer-publishing-guide",
20551+
"redirect_document_id": false
20552+
},
20553+
{
20554+
"source_path": "articles/marketplace/publishing-checklist-azure-marketplace.md",
20555+
"redirect_url": "/azure/marketplace/publisher-guide-by-offer-type",
20556+
"redirect_document_id": false
20557+
},
20558+
{
20559+
"source_path": "articles/marketplace/support-appsource.md",
20560+
"redirect_url": "/azure/marketplace/partner-center-portal/support",
20561+
"redirect_document_id": true
20562+
},
20563+
{
20564+
"source_path": "articles/marketplace/cloud-partner-portal-orig/store-your-appSource-package-to-azure-storage-and-generate-sas-key.md",
20565+
"redirect_url": "/azure/marketplace/marketplace-publishers-guide",
20566+
"redirect_document_id": false
20567+
},
20568+
{
20569+
"source_path": "articles/marketplace/cloud-partner-portal-orig/dynamics-365-solution-preparation.md",
20570+
"redirect_url": "/azure/marketplace/appsource-offer-publishing-guide",
20571+
"redirect_document_id": false
20572+
},
20573+
{
20574+
"source_path": "articles/marketplace/cloud-partner-portal-orig/request-to-publish-the-app.md",
20575+
"redirect_url": "/azure/marketplace/partner-center-portal/create-new-customer-engagement-offer",
20576+
"redirect_document_id": false
20577+
},
2052920578
{
2053020579
"source_path": "articles/marketplace/marketplace-participation-policy.md",
2053120580
"redirect_url": "https://docs.microsoft.com/legal/marketplace/participation-policy",
@@ -20588,7 +20637,12 @@
2058820637
},
2058920638
{
2059020639
"source_path": "articles/marketplace/cloud-partner-portal/cloud-partner-portal-manage-publisher-profile.md",
20591-
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
20640+
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
20641+
"redirect_document_id": false
20642+
},
20643+
{
20644+
"source_path": "articles/cloud-partner-portal/cloud-partner-portal-manage-publisher-profile.md",
20645+
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
2059220646
"redirect_document_id": false
2059320647
},
2059420648
{
@@ -20597,10 +20651,15 @@
2059720651
"redirect_document_id": false
2059820652
},
2059920653
{
20600-
"source_path": "articles/marketplace/cloud-partner-portal/cloud-partner-portal-manage-users.md",
20601-
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
20654+
"source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-manage-users.md",
20655+
"redirect_url": "/azure/marketplace/partner-center-portal/manage-account",
2060220656
"redirect_document_id": false
2060320657
},
20658+
{
20659+
"source_path": "articles/marketplace/cloud-partner-portal/cloud-partner-portal-manage-users.md",
20660+
"redirect_url": "/azure/marketplace/partner-center-portal/manage-account",
20661+
"redirect_document_id": true
20662+
},
2060420663
{
2060520664
"source_path": "articles/marketplace/cloud-partner-portal/cloud-partner-portal-publish-cortana-intelligence-app.md",
2060620665
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
@@ -20631,6 +20690,11 @@
2063120690
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
2063220691
"redirect_document_id": false
2063320692
},
20693+
{
20694+
"source_path": "articles/marketplace/partner-center-portal/billing-details.md",
20695+
"redirect_url": "https://docs.microsoft.com/azure/marketplace/marketplace-commercial-transaction-capabilities-and-considerations",
20696+
"redirect_document_id": false
20697+
},
2063420698
{
2063520699
"source_path": "articles/multi-factor-authentication/multi-factor-authentication-app-faq.md",
2063620700
"redirect_url": "./end-user/microsoft-authenticator-app-faq",
@@ -31681,29 +31745,64 @@
3168131745
"redirect_url": "/azure/service-fabric/service-fabric-tutorial-deploy-app-with-cicd-vsts",
3168231746
"redirect_document_id": false
3168331747
},
31748+
{
31749+
"source_path": "articles/marketplace/add-bank-tax-info.md",
31750+
"redirect_url": "/azure/marketplace/partner-center-portal/manage-account#payout-account",
31751+
"redirect_document_id": false
31752+
},
31753+
{
31754+
"source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-automate-offer-publishing.md",
31755+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-vm-create-offer",
31756+
"redirect_document_id": true
31757+
},
31758+
{
31759+
"source_path": "articles/marketplace/cloud-partner-portal-orig/appsource-package-preparation.md",
31760+
"redirect_url": "/azure/marketplace/marketplace-publishers-guide",
31761+
"redirect_document_id": false
31762+
},
3168431763
{
3168531764
"source_path": "articles/marketplace/enable-trial-using-azure-ad.md",
3168631765
"redirect_url": "/azure/marketplace/enable-appsource-marketplace-using-azure-ad",
3168731766
"redirect_document_id": true
3168831767
},
3168931768
{
3169031769
"source_path": "articles/marketplace/gtm-promote-your-business.md",
31691-
"redirect_url": "/azure/marketplace/gtm-your-marketplace-benefits",
31770+
"redirect_url": "/azure/marketplace/gtm-marketing-best-practices",
3169231771
"redirect_document_id": false
3169331772
},
3169431773
{
3169531774
"source_path": "articles/marketplace/become-publisher.md",
3169631775
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
31697-
"redirect_document_id": true
31776+
"redirect_document_id": false
31777+
},
31778+
{
31779+
"source_path": "articles/marketplace/deprecated/gtm-promote-your-business.md",
31780+
"redirect_url": "/azure/marketplace/gtm-marketing-best-practices",
31781+
"redirect_document_id": false
31782+
},
31783+
{
31784+
"source_path": "articles/marketplace/deprecated/become-publisher.md",
31785+
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
31786+
"redirect_document_id": false
3169831787
},
3169931788
{
3170031789
"source_path": "articles/marketplace/guidelines.md",
31701-
"redirect_url": "/azure/marketplace/partner-center-portal/manage-account",
31702-
"redirect_document_id": true
31790+
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
31791+
"redirect_document_id": false
31792+
},
31793+
{
31794+
"source_path": "articles/marketplace/deprecated/guidelines.md",
31795+
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
31796+
"redirect_document_id": false
3170331797
},
3170431798
{
3170531799
"source_path": "articles/marketplace/register-dev-center.md",
31706-
"redirect_url": "/azure/marketplace/partner-center-portal/manage-account",
31800+
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
31801+
"redirect_document_id": false
31802+
},
31803+
{
31804+
"source_path": "articles/marketplace/deprecated/register-dev-center.md",
31805+
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
3170731806
"redirect_document_id": false
3170831807
},
3170931808
{
@@ -31719,7 +31818,7 @@
3171931818
{
3172031819
"source_path": "articles/marketplace/grow-your-business-with-appsource.md",
3172131820
"redirect_url": "/azure/marketplace/marketplace-publishers-guide",
31722-
"redirect_document_id": true
31821+
"redirect_document_id": false
3172331822
},
3172431823
{
3172531824
"source_path": "articles/marketplace/billing-options-azure-marketplace.md",
@@ -31793,7 +31892,22 @@
3179331892
},
3179431893
{
3179531894
"source_path": "articles/marketplace-publishing/marketplace-publishing-accounts-creation-registration.md",
31796-
"redirect_url": "https://docs.microsoft.com/azure/marketplace/cloud-partner-portal-orig/cloud-partner-portal-dev-center-accounts-registration",
31895+
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
31896+
"redirect_document_id": true
31897+
},
31898+
{
31899+
"source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-dev-center-accounts-registration.md",
31900+
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
31901+
"redirect_document_id": false
31902+
},
31903+
{
31904+
"source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-management-solution-publish.md",
31905+
"redirect_url": "/azure/marketplace",
31906+
"redirect_document_id": false
31907+
},
31908+
{
31909+
"source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-manage-publisher-profile.md",
31910+
"redirect_url": "/azure/marketplace/partner-center-portal/create-account",
3179731911
"redirect_document_id": false
3179831912
},
3179931913
{
@@ -42738,9 +42852,14 @@
4273842852
},
4273942853
{
4274042854
"source_path": "articles/storage/common/storage-enable-and-view-metrics.md",
42741-
"redirect_url": "/azure/storage/common/storage-metrics-in-azure-monitor",
42855+
"redirect_url": "/azure/storage/common/monitor-storage",
4274242856
"redirect_document_id": true
4274342857
},
42858+
{
42859+
"source_path": "articles/storage/common/storage-metrics-in-azure-monitor.md",
42860+
"redirect_url": "/azure/storage/common/monitor-storage",
42861+
"redirect_document_id": false
42862+
},
4274442863
{
4274542864
"source_path": "articles/azure-stack/partner/azure-stack-vaas-set-up-account.md",
4274642865
"redirect_url": "/azure/azure-stack/partner/azure-stack-vaas-set-up-resources",

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ For more information, see the [Code of Conduct FAQ](https://opensource.microsoft
1111

1212
## How can I contribute?
1313

14-
There are a variety of ways to contribute to the documentation, review the sections below to find out which one is right for you.
14+
There are many ways to contribute to the documentation, review the sections below to find out which one is right for you.
1515

1616
### Reporting Bugs and Suggesting Enhancements
1717

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)