Skip to content

Commit c4700ac

Browse files
Merge pull request #93690 from MicrosoftDocs/master
Merge master to live 3 AM
2 parents 4c3d6c2 + b7f815e commit c4700ac

File tree

103 files changed

+1420
-766
lines changed

Some content is hidden

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

103 files changed

+1420
-766
lines changed

.openpublishing.redirection.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3040,6 +3040,21 @@
30403040
"redirect_url": "/azure/iot-edge/how-to-install-iot-edge-linux",
30413041
"redirect_document_id": false
30423042
},
3043+
    {
3044+
      "source_path": "articles/iot-edge/how-to-register-device-portal.md",
3045+
      "redirect_url": "/azure/iot-edge/how-to-register-device",
3046+
      "redirect_document_id": false
3047+
    },
3048+
    {
3049+
      "source_path": "articles/iot-edge/how-to-register-device-vscode.md",
3050+
      "redirect_url": "/azure/iot-edge/how-to-register-device",
3051+
      "redirect_document_id": false
3052+
    },
3053+
        {
3054+
      "source_path": "articles/iot-edge/how-to-register-device-cli.md",
3055+
      "redirect_url": "/azure/iot-edge/how-to-register-device",
3056+
      "redirect_document_id": false
3057+
    },
30433058
{
30443059
"source_path": "articles/cognitive-services/cognitive-services-recommendations-quick-start.md",
30453060
"redirect_url": "/azure/cognitive-services/recommendations/overview",

articles/active-directory/develop/quickstart-v2-android.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.tgt_pltfrm: na
1515
ms.workload: identity
1616
ms.date: 09/16/2019
1717
ms.author: twhitney
18-
ms.custom: aaddev, identityplatformtop40
18+
ms.custom: aaddev, identityplatformtop40, scenarios:getting-started, languages:Android
1919
#Customer intent: As an application developer, I want to learn how Android native apps can call protected APIs that require login and access tokens using the Microsoft identity platform endpoint.
2020
ms.collection: M365-identity-device-management
2121
---

articles/active-directory/develop/quickstart-v2-aspnet-webapp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.tgt_pltfrm: na
1616
ms.workload: identity
1717
ms.date: 04/11/2019
1818
ms.author: jmprieur
19-
ms.custom: aaddev, identityplatformtop40
19+
ms.custom: aaddev, identityplatformtop40, scenarios:getting-started, languages:ASP.NET
2020
#Customer intent: As an application developer, I want to know how to write an ASP.NET web app that can sign in personal accounts, as well as work and school accounts from any Azure Active Directory instance.
2121
ms.collection: M365-identity-device-management
2222
---

articles/active-directory/develop/quickstart-v2-ios.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.workload: identity
1616
ms.date: 09/24/2019
1717
ms.author: twhitney
1818
ms.reviewer: jmprieur, saeeda
19-
ms.custom: aaddev, identityplatformtop40
19+
ms.custom: aaddev, identityplatformtop40, scenarios:getting-started, languages:iOS
2020
#Customer intent: As an application developer, I want to learn how to sign in users and call Microsoft Graph from my iOS or macOS application.
2121
ms.collection: M365-identity-device-management
2222
---

articles/active-directory/develop/quickstart-v2-java-webapp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.tgt_pltfrm: na
1515
ms.workload: identity
1616
ms.date: 10/09/2019
1717
ms.author: sagonzal
18-
ms.custom: aaddev
18+
ms.custom: aaddev, scenarios:getting-started, languages:Java
1919
---
2020

2121
# Quickstart: Add sign-in with Microsoft to a Java web app

articles/active-directory/develop/quickstart-v2-javascript.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.tgt_pltfrm: na
1616
ms.workload: identity
1717
ms.date: 04/11/2019
1818
ms.author: nacanuma
19-
ms.custom: aaddev, identityplatformtop40
19+
ms.custom: aaddev, identityplatformtop40, scenarios:getting-started, languages:JavaScript
2020

2121
#Customer intent: As an app developer, I want to learn how to get access tokens by using the Microsoft identity platform endpoint so that my JavaScript app can sign in users of personal accounts, work accounts, and school accounts.
2222
ms.collection: M365-identity-device-management

articles/active-directory/develop/quickstart-v2-python-daemon.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.tgt_pltfrm: na
1616
ms.workload: identity
1717
ms.date: 10/22/2019
1818
ms.author: jmprieur
19-
ms.custom: aaddev, identityplatformtop40
19+
ms.custom: aaddev, identityplatformtop40, scenarios:getting-started, languages:Python
2020
#Customer intent: As an application developer, I want to learn how my Python app can get an access token and call an API that's protected by an Microsoft identity platform endpoint using client credentials flow.
2121
ms.collection: M365-identity-device-management
2222
---

articles/active-directory/develop/quickstart-v2-uwp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.tgt_pltfrm: na
1616
ms.workload: identity
1717
ms.date: 07/16/2019
1818
ms.author: jmprieur
19-
ms.custom: aaddev, identityplatformtop40
19+
ms.custom: aaddev, identityplatformtop40, scenarios:getting-started, languages:UWP
2020
#Customer intent: As an application developer, I want to learn how my Universal Windows Platform (XAML) application can get an access token and call an API that's protected by an Microsoft identity platform endpoint.
2121
ms.collection: M365-identity-device-management
2222
---
@@ -180,4 +180,4 @@ Try out the Windows desktop tutorial for a complete step-by-step guide on buildi
180180
Help us improve the Microsoft identity platform. Tell us what you think by completing a short two-question survey.
181181

182182
> [!div class="nextstepaction"]
183-
> [Microsoft identity platform survey](https://forms.office.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbRyKrNDMV_xBIiPGgSvnbQZdUQjFIUUFGUE1SMEVFTkdaVU5YT0EyOEtJVi4u)
183+
> [Microsoft identity platform survey](https://forms.office.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbRyKrNDMV_xBIiPGgSvnbQZdUQjFIUUFGUE1SMEVFTkdaVU5YT0EyOEtJVi4u)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ title: Administrator role descriptions and permissions - Azure Active Directory
33
description: An admin role can add users, assign administrative roles, reset user passwords, manage user licenses, or manage domains.
44
services: active-directory
55
author: curtand
6-
manager: mtillman
6+
manager: daveba
77
search.appverid: MET150
88

99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.subservice: users-groups-roles
1212
ms.topic: article
13-
ms.date: 10/18/2019
13+
ms.date: 10/25/2019
1414
ms.author: curtand
1515
ms.reviewer: vincesm
1616
ms.custom: it-pro
@@ -147,7 +147,7 @@ In | Can do
147147
----- | ----------
148148
[Microsoft 365 compliance center](https://protection.office.com) | Monitor compliance-related policies across Microsoft 365 services<br>Manage compliance alerts
149149
[Compliance Manager](https://docs.microsoft.com/office365/securitycompliance/meet-data-protection-and-regulatory-reqs-using-microsoft-cloud) | Track, assign, and verify your organization's regulatory compliance activities
150-
[Office 365 Security & Compliance Center](https://support.office.com/article/About-Office-365-admin-roles-da585eea-f576-4f55-a1e0-87090b6aaa9d) | Manage data governance<br>Perform legal and data investigation<br>Manage Data Subject Request
150+
[Office 365 Security & Compliance Center](https://support.office.com/article/About-Office-365-admin-roles-da585eea-f576-4f55-a1e0-87090b6aaa9d) | Manage data governance<br>Perform legal and data investigation<br>Manage Data Subject Request<br><br>This role has the same permissions as the [Compliance Data Administrator RoleGroup](https://docs.microsoft.com/microsoft-365/security/office-365-security/permissions-in-the-security-and-compliance-center#permissions-needed-to-use-features-in-the-security--compliance-center) in Office 365 Security and Compliance Center role-based access control.
151151
[Intune](https://docs.microsoft.com/intune/role-based-access-control) | View all Intune audit data
152152
[Cloud App Security](https://docs.microsoft.com/cloud-app-security/manage-admins) | Has read-only permissions and can manage alerts<br>Can create and modify file policies and allow file governance actions<br> Can view all the built-in reports under Data Management
153153

articles/advisor/index.yml

Lines changed: 45 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,51 @@
1-
### YamlMime:YamlDocument
2-
documentType: LandingData
3-
title: Azure Advisor Documentation
1+
### YamlMime:Landing
2+
3+
title: Azure Advisor documentation
4+
summary: Azure Advisor scans your Azure configuration and recommends changes to optimize deployments, increase security, and save you money.
5+
46
metadata:
5-
title: Azure Advisor Documentation | Microsoft Docs
6-
description:
7+
title: Azure Advisor documentation
8+
description: Azure Advisor is a personalized cloud consultant that helps you follow best practices to optimize your Azure deployments. It analyzes your resource configuration and usage telemetry. It then recommends solutions to help improve the performance, security, and high availability of your resources while looking for opportunities to reduce your overall Azure spend.
79
services: advisor
8-
author: rboucher
9-
layout: LandingPage
1010
ms.service: advisor
11-
ms.tgt_pltfrm: na
1211
ms.topic: landing-page
13-
ms.date: 02/01/2019
12+
author: rboucher
1413
ms.author: robb
15-
abstract:
16-
description: Azure Advisor is a personalized cloud consultant that helps you follow best practices to optimize your Azure deployments. It analyzes your resource configuration and usage telemetry. It then recommends solutions to help improve the performance, security, and high availability of your resources while looking for opportunities to reduce your overall Azure spend.
17-
sections:
18-
- title:
19-
items:
20-
- type: list
21-
style: cards
22-
className: cardsFTitle
23-
items:
24-
- title: Learn about Azure Advisor
25-
href: /azure/advisor/advisor-overview
26-
image:
27-
src: media/index/advisor.svg
28-
href: /azure/advisor/advisor-overview
29-
- title: Get started with Azure Advisor
30-
href: /azure/advisor/advisor-get-started
31-
image:
32-
src: media/index/get-started.svg
33-
href: /azure/advisor/advisor-get-started
34-
- title: Reference
35-
items:
36-
- type: list
37-
style: cards
38-
className: cardsD
39-
items:
40-
- title: REST
41-
html: <p><a href="https://docs.microsoft.com/rest/api/advisor/">REST API Reference</a></p>
42-
- title: Command-Line
43-
html: <p><a href="https://docs.microsoft.com/cli/azure/advisor?view=azure-cli-latest">Common Language Interface (CLI)</a></p>
44-
- title: PowerShell
45-
html: <p><a href="https://docs.microsoft.com/powershell/module/az.advisor/?view=azps-1.2.0">Azure PowerShell</a></p>
14+
ms.date: 10/16/2019
15+
16+
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
17+
18+
landingContent:
19+
# Cards and links should be based on top customer tasks or top subjects
20+
# Start card title with a verb
21+
# Card
22+
- title: About Azure Advisor
23+
linkLists:
24+
- linkListType: overview
25+
links:
26+
- text: Learn about Azure Advisor
27+
url: advisor-overview.md
28+
- linkListType: video
29+
links:
30+
- text: Azure Advisor videos
31+
url: https://azure.microsoft.com/resources/videos/index/?services=advisor
32+
# Card
33+
- title: Get started
34+
linkLists:
35+
- linkListType: get-started
36+
links:
37+
- text: Get started with Azure Advisor
38+
url: advisor-get-started.md
39+
40+
# Card
41+
- title: Reference
42+
linkLists:
43+
- linkListType: reference
44+
links:
45+
- text: Common Language Interface (CLI)
46+
url: /cli/azure/advisor?view=azure-cli-latest
47+
- text: PowerShell
48+
url: /powershell/module/az.advisor/?view=azps-1.2.0"
49+
- text: REST API
50+
url: /rest/api/advisor/
4651

0 commit comments

Comments
 (0)