Skip to content

Commit 9aa8981

Browse files
committed
Resolving conflics with numbering change.
2 parents 5b51d2e + 4794efb commit 9aa8981

File tree

627 files changed

+8909
-5156
lines changed

Some content is hidden

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

627 files changed

+8909
-5156
lines changed

.openpublishing.redirection.json

Lines changed: 61 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8190,6 +8190,11 @@
81908190
"redirect_url": "/azure/event-hubs/event-hubs-quickstart-powershell",
81918191
"redirect_document_id": false
81928192
},
8193+
{
8194+
"source_path": "articles/active-directory/active-directory-saml-protocol-reference.md",
8195+
"redirect_url": "/azure/active-directory/develop/active-directory-saml-protocol-reference",
8196+
"redirect_document_id": false
8197+
},
81938198
{
81948199
"source_path": "articles/event-hubs/event-hubs-overview.md",
81958200
"redirect_url": "/azure/event-hubs/event-hubs-what-is-event-hubs",
@@ -11595,11 +11600,6 @@
1159511600
"redirect_url": "/azure/traffic-manager/traffic-manager-manage-endpoints",
1159611601
"redirect_document_id": false
1159711602
},
11598-
{
11599-
"source_path": "articles/traffic-manager/traffic-manager-how-traffic-manager-works.md",
11600-
"redirect_url": "/azure/traffic-manager/traffic-manager-overview",
11601-
"redirect_document_id": false
11602-
},
1160311603
{
1160411604
"source_path": "articles/virtual-machine-scale-sets/virtual-machine-scale-sets-advanced-autoscale.md",
1160511605
"redirect_url": "/azure/monitoring-and-diagnostics/insights-advanced-autoscale-virtual-machine-scale-sets",
@@ -14370,14 +14370,19 @@
1437014370
"redirect_url": "/azure/active-directory/active-directory-reporting-risk-events",
1437114371
"redirect_document_id": false
1437214372
},
14373+
{
14374+
"source_path": "articles/active-directory/active-directory-reporting-activity-sign-ins-mfa.md",
14375+
"redirect_url": "/azure/active-directory/authentication/howto-mfa-reporting",
14376+
"redirect_document_id": false
14377+
},
1437314378
{
1437414379
"source_path": "articles/active-directory/active-directory-reporting-api-audit-reference.md",
1437514380
"redirect_url": "https://developer.microsoft.com/en-us/graph/docs/api-reference/beta/resources/directoryaudit",
1437614381
"redirect_document_id": false
1437714382
},
1437814383
{
1437914384
"source_path": "articles/active-directory/active-directory-reporting-api-sign-in-activity-reference.md",
14380-
"redirect_url": "https://developer.microsoft.com/en-us/graph/docs/api-reference/beta/resources/directoryaudit",
14385+
"redirect_url": "https://developer.microsoft.com/en-us/graph/docs/api-reference/beta/resources/signin",
1438114386
"redirect_document_id": false
1438214387
},
1438314388
{
@@ -26491,9 +26496,59 @@
2649126496
"redirect_document_id": true
2649226497
},
2649326498
{
26499+
"source_path": "articles/powerbi-embedded/create-capacity.md",
26500+
"redirect_url": "https://docs.microsoft.com/power-bi/developer/azure-pbie-create-capacity",
26501+
"redirect_document_id": true
26502+
},
26503+
{
26504+
"source_path": "articles/powerbi-embedded/get-started.md",
26505+
"redirect_url": "https://docs.microsoft.com/power-bi/developer/embedding",
26506+
"redirect_document_id": true
26507+
},
26508+
{
26509+
"source_path": "articles/powerbi-embedded/pause-start.md",
26510+
"redirect_url": "https://docs.microsoft.com/power-bi/developer/azure-pbie-pause-start",
26511+
"redirect_document_id": true
26512+
},
26513+
{
26514+
"source_path": "articles/powerbi-embedded/scale-capacity.md",
26515+
"redirect_url": "https://docs.microsoft.com/power-bi/developer/azure-pbie-scale-capacity",
26516+
"redirect_document_id": true
26517+
},
26518+
{
26519+
"source_path": "articles/powerbi-embedded/what-is-power-bi-embedded.md",
26520+
"redirect_url": "https://docs.microsoft.com/power-bi/developer/azure-pbie-what-is-power-bi-embedded",
26521+
"redirect_document_id": true
26522+
},
26523+
{
26524+
"source_path": "articles/powerbi-embedded/migrate-from-power-bi-workspace-collections.md",
26525+
"redirect_url": "https://docs.microsoft.com/en-us/power-bi/developer/migrate-from-powerbi-embedded",
26526+
"redirect_document_id": true
26527+
},
26528+
{
26529+
"source_path": "articles/power-bi-embedded/migrate-tool.md",
26530+
"redirect_url": "https://docs.microsoft.com/en-us/power-bi/developer/migrate-tool",
26531+
"redirect_document_id": true
26532+
},
26533+
{
26534+
"source_path": "articles/powerbi-embedded/migrate-code-snippets.md",
26535+
"redirect_url": "https://docs.microsoft.com/en-us/power-bi/developer/migrate-code-snippets",
26536+
"redirect_document_id": true
26537+
},
26538+
{
2649426539
"source_path": "articles/cognitive-services/video-indexer/video-indexer-output-json.md",
2649526540
"redirect_url": "/azure/cognitive-services/video-indexer/video-indexer-output-json-v2",
2649626541
"redirect_document_id": true
26542+
},
26543+
{
26544+
"source_path": "articles/security/azure-security-disk-encryption.md",
26545+
"redirect_url": "/azure/security/azure-security-disk-encryption-overview",
26546+
"redirect_document_id": true
26547+
},
26548+
{
26549+
"source_path": "articles/active-directory/device-management-hybrid-azuread-joined-devices-setup.md",
26550+
"redirect_url": "/azure/active-directory/devices/hybrid-azuread-join-manual-steps",
26551+
"redirect_document_id": true
2649726552
}
2649826553
]
2649926554
}

articles/active-directory-b2c/active-directory-b2c-user-migration.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,6 @@ You can view and monitor logging information in near-real time.
351351

352352
6. Check the output of the RESTful API.
353353

354-
For more information, see [Streaming logs and the console][AppService-Log].
355-
356354
> [!IMPORTANT]
357355
> Use the diagnostics logs only during development and testing. The RESTful API output might contain confidential information that should not be exposed in production.
358356
>
@@ -363,7 +361,6 @@ After you complete the [Get started with custom policies][B2C-GetStartedCustom]
363361
[AD-PasswordPolicies]: https://docs.microsoft.com/azure/active-directory/active-directory-passwords-policy
364362
[AD-Powershell]: https://docs.microsoft.com/en-us/powershell/azure/active-directory/install-adv2
365363
[AppService-Deploy]: https://docs.microsoft.com/aspnet/core/tutorials/publish-to-azure-webapp-using-vs
366-
[AppService-Log]: https://docs.microsoft.com/azure/active-directory-b2c/app-service-web/web-sites-streaming-logs-and-console
367364
[B2C-AppRegister]: https://docs.microsoft.com/azure/active-directory-b2c/active-directory-b2c-app-registration
368365
[B2C-GetStarted]: https://docs.microsoft.com/azure/active-directory-b2c/active-directory-b2c-get-started
369366
[B2C-GetStartedCustom]: https://docs.microsoft.com/azure/active-directory-b2c/active-directory-b2c-get-started-custom

articles/active-directory/TOC.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@
131131
#### [Latencies](active-directory-reporting-latencies-azure-portal.md)
132132
#### [Audit activity reference](active-directory-reporting-activity-audit-reference.md)
133133
#### [Sign-in activity error codes](active-directory-reporting-activity-sign-ins-errors.md)
134-
#### [Multi-factor authentication](active-directory-reporting-activity-sign-ins-mfa.md)
135134
#### [Interpret the audit log schema in Azure Monitor](reporting-azure-monitor-diagnostics-audit-log-schema.md)
136135
#### [Interpret the sign-in log schema in Azure Monitor](reporting-azure-monitor-diagnostics-sign-in-log-schema.md)
137136

@@ -159,9 +158,16 @@
159158
### [Plan Azure AD Join](active-directory-azureadjoin-deployment-aadjoindirect.md)
160159
### [FAQs](device-management-faq.md)
161160
### Tasks
161+
#### [How to plan your hybrid Azure Active Directory join implementation](devices/hybrid-azuread-join-plan.md)
162+
#### [Configure hybrid Azure Active Directory join for managed domains](devices/hybrid-azuread-join-managed-domains.md)
163+
#### [Configure hybrid Azure Active Directory join for federated domains](devices/hybrid-azuread-join-federated-domains.md)
164+
#### [How to control the hybrid Azure AD join of your devices](devices/hybrid-azuread-join-control.md)
165+
166+
167+
162168
#### [Set up Azure AD registered Windows 10 devices](user-help/device-management-azuread-registered-devices-windows10-setup.md)
163169
#### [Set up Azure AD joined devices](user-help/device-management-azuread-joined-devices-setup.md)
164-
#### [Set up hybrid Azure AD joined devices](device-management-hybrid-azuread-joined-devices-setup.md)
170+
#### [Set up hybrid Azure AD joined devices](devices/hybrid-azuread-join-manual-steps.md)
165171
#### [Deploy on-premises](active-directory-device-registration-on-premises-setup.md)
166172
#### [Azure AD join during Windows 10 first-run experience](device-management-azuread-joined-devices-frx.md)
167173
### Troubleshoot

articles/active-directory/active-directory-device-registration-on-premises-setup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ There are many different ways to communicate this URL to your users. For example
160160
### Join a Windows 7 device by using Azure Active Directory device registration
161161
To register Windows 7 domain-joined devices, you need to deploy the [device registration software package](https://www.microsoft.com/download/details.aspx?id=53554).
162162

163-
For instructions about how to use the package, see [Windows Installer packages for non-Windows 10 computers](device-management-hybrid-azuread-joined-devices-setup.md#windows-installer-packages-for-non-windows-10-computers).
163+
For instructions about how to use the package, see [Windows Installer packages for non-Windows 10 computers](devices/hybrid-azuread-join-manual-steps.md#windows-installer-packages-for-non-windows-10-computers).
164164

165165
## Verify that registered devices are written back to Active Directory
166166
You can view and verify that your device objects have been written back to your Active Directory by using LDP.exe or ADSI Edit. Both are available with the Active Directory administrator tools.

articles/active-directory/active-directory-reporting-activity-sign-ins-mfa.md

Lines changed: 0 additions & 195 deletions
This file was deleted.

articles/active-directory/active-directory-reporting-api-getting-started-azure-portal.md

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ To access the reporting API, even if you are planning on accessing the API using
4040
3. Grant permissions
4141
4. Gather configuration settings
4242

43-
44-
4543
For detailed instructions, see the [prerequisites to access the Azure Active Directory reporting API](active-directory-reporting-api-prerequisites-azure-portal.md).
4644

4745
## APIs with Graph Explorer
@@ -52,29 +50,25 @@ You can use the [MSGraph explorer](https://developer.microsoft.com/en-us/graph/g
5250

5351
![Modify permissions UI](./media/active-directory-reporting-api-getting-started-azure-portal/modify-permissions.png)
5452

55-
## Recommendation
53+
## Use certificates to access the Azure AD reporting API
5654

57-
If you are planning on retrieving reporting data without user intervention, you should consider using the Azure AD Reporting API with certificates.
55+
Consider using the Azure AD Reporting API with certificates if you plan to retrieve reporting data without user intervention.
5856

59-
For detailed instructions, see [get data using the Azure AD Reporting API with certificates](active-directory-reporting-api-with-certificates.md).
57+
For detailed instructions, see [Get data using the Azure AD Reporting API with certificates](active-directory-reporting-api-with-certificates.md).
6058

6159

6260
## Explore
6361

6462
Get a first impression of the reporting APIs:
6563

6664
- [Using the samples for the audit API](active-directory-reporting-api-audit-samples.md)
67-
6865
- [Using the samples for the sign-in activity report API](active-directory-reporting-api-sign-in-activity-samples.md)
6966

7067

71-
## Customize
72-
73-
Create your own solution:
74-
75-
- [Using the audit API reference](https://developer.microsoft.com/graph/docs/api-reference/beta/resources/directoryaudit)
76-
77-
- [Using the sign-in activity report API reference](https://developer.microsoft.com/graph/docs/api-reference/beta/resources/signin)
68+
## Next steps
7869

70+
* [Audit API reference](https://developer.microsoft.com/graph/docs/api-reference/beta/resources/directoryaudit)
71+
* [Sign-in activity report API reference](https://developer.microsoft.com/graph/docs/api-reference/beta/resources/signin)
72+
* [Troubleshoot errors in Azure AD reporting API](active-directory-reporting-troubleshoot-graph-api.md)
7973

8074

0 commit comments

Comments
 (0)