Skip to content

Commit 69d7423

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into aug-whats-new
2 parents c7ec85e + 01d85ec commit 69d7423

File tree

1,158 files changed

+11628
-9611
lines changed

Some content is hidden

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

1,158 files changed

+11628
-9611
lines changed

.openpublishing.redirection.json

Lines changed: 67 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,12 @@
165165
"redirect_url": "/azure/iot-fundamentals/iot-introduction",
166166
"redirect_document_id": false
167167
},
168+
169+
{
170+
"source_path": "articles/iot-hub/iot-hub-create-using-cli-nodejs.md",
171+
"redirect_url": "/azure/iot-hub/iot-hub-create-using-cli",
172+
"redirect_document_id": true
173+
},
168174
{
169175
"source_path": "articles/cognitive-services/custom-decision-service/custom-decision-service-tutorial-analytics.md",
170176
"redirect_url": "/azure/cognitive-services/custom-decision-service",
@@ -2735,6 +2741,16 @@
27352741
"redirect_url": "/azure/logic-apps/logic-apps-create-deploy-template",
27362742
"redirect_document_id": true
27372743
},
2744+
{
2745+
"source_path": "articles/connectors/connectors-create-api-sharepointserver.md",
2746+
"redirect_url": "/azure/connectors/connectors-create-api-sharepoint",
2747+
"redirect_document_id": true
2748+
},
2749+
{
2750+
"source_path": "articles/connectors/connectors-create-api-sharepointonline.md",
2751+
"redirect_url": "/azure/connectors/connectors-create-api-sharepoint",
2752+
"redirect_document_id": false
2753+
},
27382754
{
27392755
"source_path": "articles/logic-apps/custom-connector-build-web-api-app-tutorial.md",
27402756
"redirect_url": "https://docs.microsoft.com/connectors/custom-connectors/create-web-api-connector",
@@ -9227,6 +9243,11 @@
92279243
"redirect_url": "https://docs.microsoft.com/azure/log-analytics/log-analytics-quick-collect-azurevm",
92289244
"redirect_document_id": false
92299245
},
9246+
{
9247+
"source_path": "articles/log-analytics/log-analytics-log-search-transition.md",
9248+
"redirect_url": "https://docs.microsoft.com/azure/log-analytics/query-language/get-started-queries",
9249+
"redirect_document_id": false
9250+
},
92309251
{
92319252
"source_path": "articles/machine-learning/machine-learning-apps-text-analytics.md",
92329253
"redirect_url": "/azure/cognitive-services/cognitive-services-text-analytics-quick-start",
@@ -21131,9 +21152,19 @@
2113121152
"redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-autoscale-powershell",
2113221153
"redirect_document_id": false
2113321154
},
21155+
{
21156+
"source_path": "articles/security-center/security-center-platform-migration.md",
21157+
"redirect_url": "/azure/security-center/security-center-enable-data-collection",
21158+
"redirect_document_id": false
21159+
},
21160+
{
21161+
"source_path": "articles/security-center/security-center-platform-migration-faq.md",
21162+
"redirect_url": "/azure/security-center/security-center-enable-data-collection",
21163+
"redirect_document_id": false
21164+
},
2113421165
{
2113521166
"source_path": "articles/security-center/security-center-resolve-endpoint-protection-health-alerts.md",
21136-
"redirect_url": "/azure/security-center",
21167+
"redirect_url": "/azure/security-center-faq.md",
2113721168
"redirect_document_id": false
2113821169
},
2113921170
{
@@ -25616,6 +25647,11 @@
2561625647
"redirect_url": "/azure/storage/queues/storage-queues-introduction",
2561725648
"redirect_document_id": false
2561825649
},
25650+
{
25651+
"source_path": "articles/storage/data-lake-storage/index.md",
25652+
"redirect_url": "/azure/storage/data-lake-storage/introduction",
25653+
"redirect_document_id": false
25654+
},
2561925655
{
2562025656
"source_path": "articles/dev-spaces/index.md",
2562125657
"redirect_url": "/azure/dev-spaces/azure-dev-spaces",
@@ -26461,6 +26497,26 @@
2646126497
"redirect_url": "/azure/azure-stack/azure-stack-powershell-download",
2646226498
"redirect_document_id": false
2646326499
},
26500+
{
26501+
"source_path": "articles/azure-stack/azure-stack-extension-host-prepare.md",
26502+
"redirect_url": "/azure/azure-stack",
26503+
"redirect_document_id": false
26504+
},
26505+
{
26506+
"source_path": "articles/azure-stack/user/azure-stack-metrics-azure-data.md",
26507+
"redirect_url": "/azure/azure-stack",
26508+
"redirect_document_id": false
26509+
},
26510+
{
26511+
"source_path": "articles/azure-stack/user/azure-stack-metrics-monitor.md",
26512+
"redirect_url": "/azure/azure-stack",
26513+
"redirect_document_id": false
26514+
},
26515+
{
26516+
"source_path": "articles/azure-stack/user/azure-stack-metrics-supported.md",
26517+
"redirect_url": "/azure/azure-stack",
26518+
"redirect_document_id": false
26519+
},
2646426520
{
2646526521
"source_path": "articles/active-directory/application-proxy-teams.md",
2646626522
"redirect_url": "/azure/active-directory/manage-apps/application-proxy-integrate-with-teams",
@@ -27330,10 +27386,20 @@
2733027386
"redirect_url": "/azure/virtual-machines/linux/ansible-create-vm",
2733127387
"redirect_document_id": true
2733227388
},
27389+
{
27390+
"source_path": "articles/networking/networking-virtual-datacenter.md",
27391+
"redirect_url": "/azure/architecture/vdc/networking-virtual-datacenter",
27392+
"redirect_document_id": true
27393+
},
2733327394
{
2733427395
"source_path": "articles/security-center/security-center-disk-encryption.md",
2733527396
"redirect_url": "/azure/security/azure-security-disk-encryption-overview",
2733627397
"redirect_document_id": false
27398+
},
27399+
{
27400+
"source_path": "articles/cognitive-services/LUIS/luis-reference-gdpr.md",
27401+
"redirect_url": "/azure/cognitive-services/LUIS/luis-user-privacy",
27402+
"redirect_document_id": true
2733727403
}
2733827404
]
2733927405
}

articles/active-directory/TOC.md

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -128,31 +128,6 @@
128128
#### [Register for self-service password reset](user-help/active-directory-passwords-reset-register.md)
129129

130130

131-
## Manage devices
132-
### [Overview](devices/overview.md)
133-
134-
### Quickstarts
135-
#### [Set up Azure AD registered Windows 10 devices](user-help/device-management-azuread-registered-devices-windows10-setup.md)
136-
#### [Set up Azure AD joined devices](user-help/device-management-azuread-joined-devices-setup.md)
137-
138-
### Tutorials
139-
#### [Configure hybrid Azure AD join for managed domains](devices/hybrid-azuread-join-managed-domains.md)
140-
#### [Configure hybrid Azure AD join for federated domains](devices/hybrid-azuread-join-federated-domains.md)
141-
#### [Configure hybrid Azure AD join manually](devices/hybrid-azuread-join-manual-steps.md)
142-
#### [Configure Azure AD join during Windows 10 first-run experience](devices/azuread-joined-devices-frx.md)
143-
144-
### How-to-guides
145-
#### [Plan Azure AD join](devices/azureadjoin-plan.md)
146-
#### [Plan your hybrid Azure AD join implementation](devices/hybrid-azuread-join-plan.md)
147-
#### [Control the hybrid Azure AD join of your devices](devices/hybrid-azuread-join-control.md)
148-
#### [Assign local admins to Azure AD joined devices](devices/assign-local-admin.md)
149-
#### [Troubleshoot hybrid Azure AD joined Windows current devices](devices/troubleshoot-hybrid-join-windows-current.md)
150-
#### [Troubleshoot hybrid Azure AD joined legacy Windows devices](devices/troubleshoot-hybrid-join-windows-legacy.md)
151-
152-
### Concepts
153-
#### [Manage devices using the Azure portal](devices/device-management-azure-portal.md)
154-
#### [FAQs](devices/faq.md)
155-
156131
## Manage apps
157132
### [Overview](manage-apps/what-is-application-management.md)
158133
### [Getting started](manage-apps/plan-an-application-integration.md)

articles/active-directory/active-directory-saas-app-provisioning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ For scenario-based guidance on how to troubleshoot automatic user provisioning,
230230

231231
> [!VIDEO https://www.youtube.com/embed/MAy8s5WSe3A]
232232
233-
For an example step-by-step deployment plan for outbound user provisioning to an application, see the [Identity Deployment Guide for User Provisioning](https://aka.ms/userprovisioningdeploymentplan)/
233+
For an example step-by-step deployment plan for outbound user provisioning to an application, see the [Identity Deployment Guide for User Provisioning](https://aka.ms/userprovisioningdeploymentplan).
234234

235235

236236
## Related articles

articles/active-directory/active-directory-tou.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ The following procedure describes how to add a Terms of use language.
160160

161161
1. Select the Terms of use you want to edit.
162162

163-
1. In the the details pane, click the **Languages** tab.
163+
1. In the details pane, click the **Languages** tab.
164164

165165
![Add TOU](media/active-directory-tou/languages-tou.png)
166166

articles/active-directory/conditional-access/controls.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.devlang: na
1515
ms.topic: article
1616
ms.tgt_pltfrm: na
1717
ms.workload: identity
18-
ms.date: 06/13/2018
18+
ms.date: 08/28/2018
1919
ms.author: markvi
2020
ms.reviewer: calebb
2121

@@ -118,10 +118,13 @@ Providers currently offering a compatible service include:
118118

119119
- [Duo Security](https://duo.com/docs/azure-ca)
120120

121+
- [Entrust Datacard](https://www.entrustdatacard.com/products/authentication/intellitrust)
122+
121123
- RSA
122124

123125
- [Trusona](https://www.trusona.com/docs/azure-ad-integration-guide)
124126

127+
125128
For more information on those services, contact the providers directly.
126129

127130
### Creating custom controls

articles/active-directory/connect/active-directory-aadconnect-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ If you need help upgrading to a newer version of Azure AD Connect, open a suppor
185185
## Troubleshooting
186186
**Q: How can I get help with Azure AD Connect?**
187187

188-
[Search the Microsoft Knowledge Base (KB)](https://www.microsoft.com/Search/result.aspx?q=azure%20active%20directory%20connect&form=mssupport)
188+
[Search the Microsoft Knowledge Base (KB)](https://www.microsoft.com/en-us/search/result.aspx?q=azure+active+directory+connect)
189189

190190
* Search the KB for technical solutions to common break-fix issues about support for Azure AD Connect.
191191

articles/active-directory/connect/active-directory-aadconnect-upgrade-previous-version.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ These steps also work to move from Azure AD Sync or a solution with FIM + Azure
6363

6464
### Use a swing migration to upgrade
6565
1. If you use Azure AD Connect on both servers and plan to only make a configuration change, make sure that your active server and staging server are both using the same version. That makes it easier to compare differences later. If you're upgrading from Azure AD Sync, then these servers have different versions. If you're upgrading from an older version of Azure AD Connect, it's a good idea to start with the two servers that are using the same version, but it's not required.
66-
2. If you've made a custom configuration and your staging server doesn't have it, follow the steps under [Move a custom configuration from the active server to the staging server](#move-custom-configuration-from-active-to-staging-server).
66+
2. If you've made a custom configuration and your staging server doesn't have it, follow the steps under [Move a custom configuration from the active server to the staging server](#move-a-custom-configuration-from-the-active-server-to-the-staging-server).
6767
3. If you're upgrading from an earlier release of Azure AD Connect, upgrade the staging server to the latest version. If you're moving from Azure AD Sync, then install Azure AD Connect on your staging server.
6868
4. Let the sync engine run full import and full synchronization on your staging server.
6969
5. Verify that the new configuration didn't cause any unexpected changes by using the steps under "Verify" in [Verify the configuration of a server](active-directory-aadconnectsync-operations.md#verify-the-configuration-of-a-server). If something isn't as expected, correct it, run the import and sync, and verify the data until it looks good, by following the steps.

0 commit comments

Comments
 (0)