Skip to content

Commit 8fc2ca9

Browse files
committed
Merge branch 'master' of https://github.com/microsoftdocs/azure-docs-pr into akv-throt
2 parents 5c2d018 + a6ce79d commit 8fc2ca9

File tree

569 files changed

+8179
-4872
lines changed

Some content is hidden

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

569 files changed

+8179
-4872
lines changed

.openpublishing.redirection.json

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15622,6 +15622,11 @@
1562215622
"redirect_url": "/azure/monitoring-and-diagnostics/insights-advanced-autoscale-virtual-machine-scale-sets",
1562315623
"redirect_document_id": false
1562415624
},
15625+
{
15626+
"source_path": "articles/virtual-machine-scale-sets/virtual-machine-scale-sets-use-low-priority.md",
15627+
"redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-use-spot",
15628+
"redirect_document_id": true
15629+
},
1562515630
{
1562615631
"source_path": "articles/virtual-machine-scale-sets/virtual-machine-scale-sets-cli-quick-create-cli-nodejs.md",
1562715632
"redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-create",
@@ -29511,9 +29516,54 @@
2951129516
"redirect_url": "/azure/cognitive-services/speech/concepts",
2951229517
"redirect_document_id": false
2951329518
},
29519+
{
29520+
"source_path": "articles/cognitive-services/Bing-Image-Search/index.yml",
29521+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
29522+
"redirect_document_id": false
29523+
},
29524+
{
29525+
"source_path": "articles/cognitive-services/Bing-Autosuggest/index.yml",
29526+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
29527+
"redirect_document_id": false
29528+
},
29529+
{
29530+
"source_path": "articles/cognitive-services/Bing-Custom-Search/index.yml",
29531+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
29532+
"redirect_document_id": false
29533+
},
29534+
{
29535+
"source_path": "articles/cognitive-services/Bing-Entities-Search/index.yml",
29536+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
29537+
"redirect_document_id": false
29538+
},
29539+
{
29540+
"source_path": "articles/cognitive-services/bing-local-business-search/index.yml",
29541+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
29542+
"redirect_document_id": false
29543+
},
29544+
{
29545+
"source_path": "articles/cognitive-services/Bing-News-Search/index.yml",
29546+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
29547+
"redirect_document_id": false
29548+
},
29549+
{
29550+
"source_path": "articles/cognitive-services/Bing-Spell-Check/index.yml",
29551+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
29552+
"redirect_document_id": false
29553+
},
29554+
{
29555+
"source_path": "articles/cognitive-services/Bing-Video-Search/index.yml",
29556+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
29557+
"redirect_document_id": false
29558+
},
29559+
{
29560+
"source_path": "articles/cognitive-services/bing-visual-search/index.yml",
29561+
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
29562+
"redirect_document_id": false
29563+
},
2951429564
{
2951529565
"source_path": "articles/cognitive-services/Bing-Image-Search/search-the-web.md",
29516-
"redirect_url": "/azure/cognitive-services/bing-image-search",
29566+
"redirect_url": "/azure/cognitive-services/Bing-Image-Search/overview",
2951729567
"redirect_document_id": false
2951829568
},
2951929569
{
@@ -29523,7 +29573,7 @@
2952329573
},
2952429574
{
2952529575
"source_path": "articles/cognitive-services/Bing-Web-Search/search-the-web.md",
29526-
"redirect_url": "/azure/cognitive-services/bing-web-search",
29576+
"redirect_url": "/azure/cognitive-services/bing-web-search/overview",
2952729577
"redirect_document_id": false
2952829578
},
2952929579
{
@@ -43851,6 +43901,11 @@
4385143901
"source_path": "articles/service-bus-messaging/migrate-java-apps-wild-fly.md",
4385243902
"redirect_url": "/azure/app-service/containers/configure-language-java#use-service-bus-as-a-message-broker",
4385343903
"redirect_document_id": false
43904+
},
43905+
{
43906+
"source_path": "articles/mysql/howto-redirection.md",
43907+
"redirect_url": "/azure/mysql/concepts-connectivity-architecture",
43908+
"redirect_document_id": false
4385443909
}
4385543910
]
4385643911
}

articles/active-directory/authentication/howto-authentication-passwordless-security-key-windows.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: conceptual
9-
ms.date: 11/21/2019
9+
ms.date: 12/02/2019
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -53,7 +53,7 @@ Azure AD joined devices that you will be piloting with must be running Windows 1
5353
Organizations may choose to use one or more of the following methods to enable the use of security keys for Windows sign-in based on their organization's requirements.
5454

5555
- [Enable with Intune](#enable-with-intune)
56-
- [Targeted Intune deployment](#targeted-intune-deployment)
56+
- [Targeted Intune deployment](#targeted-intune-deployment)
5757
- [Enable with a provisioning package](#enable-with-a-provisioning-package)
5858

5959
### Enable with Intune
@@ -64,7 +64,7 @@ Organizations may choose to use one or more of the following methods to enable t
6464

6565
Configuration of security keys for sign-in, is not dependent on configuring Windows Hello for Business.
6666

67-
#### Targeted Intune deployment
67+
### Targeted Intune deployment
6868

6969
To target specific device groups to enable the credential provider, use the following custom settings via Intune.
7070

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
- name: Cloud provisioning
2+
href: index.yml
3+
- name: Overview
4+
items:
5+
- name: What is identity provisioning?
6+
href: what-is-provisioning.md
7+
- name: What is Azure AD Connect cloud provisioning?
8+
href: what-is-cloud-provisioning.md
9+
maintainContext: true
10+
- name: Tutorials
11+
expanded: true
12+
items:
13+
- name: Integrate a single AD forest with a single Azure AD tenant
14+
href: tutorial-single-forest.md
15+
- name: Integrate an existing forest and a new forest with a single Azure AD tenant
16+
href: tutorial-existing-forest.md
17+
- name: Pilot cloud provisioning for an existing synced AD forest
18+
href: tutorial-pilot-aadc-aadccp.md
19+
20+
21+
22+
23+
24+
- name: Concepts
25+
items:
26+
- name: What is password hash sync?
27+
href: /azure/active-directory/hybrid/whatis-phs?context=azure/active-directory/cloud-provisioning/context/cloud-provisioning-context
28+
- name: Understanding the Azure AD schema, attributes, and expressions
29+
href: concept-attributes.md
30+
- name: Writing Expressions for Attribute Mappings in Azure Active Directory
31+
href: reference-expressions.md
32+
33+
34+
35+
- name: How-to guides
36+
items:
37+
- name: Installation and upgrade
38+
items:
39+
- name: Installation Prerequisites
40+
href: how-to-prerequisites.md
41+
- name: Install the Azure AD Connect cloud provisioning agent
42+
href: how-to-install.md
43+
- name: Cloud provisioning configuration
44+
href: how-to-configure.md
45+
- name: Plan and design
46+
items:
47+
- name: Topologies and scenarios for Azure AD Connect cloud provisioning
48+
href: plan-cloud-provisioning-topologies.md
49+
50+
51+
- name: Manage
52+
items:
53+
- name: Agent automatic upgrade
54+
href: how-to-automatic-upgrade.md
55+
- name: Develop
56+
items:
57+
- name: Transformations
58+
href: how-to-transformation.md
59+
- name: Azure AD synchronization API
60+
href: https://docs.microsoft.com/graph/api/resources/synchronization-overview
61+
62+
- name: Troubleshoot
63+
items:
64+
- name: Troubleshoot cloud provisioning
65+
href: how-to-troubleshoot.md
66+
- name: Duplicate attributes
67+
href: https://docs.microsoft.com/office365/troubleshoot/administration/duplicate-attributes-prevent-dirsync
68+
69+
- name: Reference
70+
items:
71+
- name: Azure AD Connect cloud provisioning agent version history
72+
href: /azure/active-directory/manage-apps/provisioning-agent-release-version-history?context=azure/active-directory/cloud-provisioning/context/cp-context
73+
- name: Azure AD Connect cloud provisioning FAQ
74+
href: reference-cloud-provisioning-faq.md
75+
- name: Attributes that are synchronized
76+
href: /azure/active-directory/hybrid/reference-connect-sync-attributes-synchronized?context=azure/active-directory/cloud-provisioning/context/cp-context
77+
- name: Basic Active Directory and Azure AD environment
78+
href: tutorial-basic-ad-azure.md
79+
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
- name: Azure
2+
tocHref: /azure/
3+
topicHref: /azure/index
4+
items:
5+
- name: Active Directory
6+
tocHref: /azure/active-directory/manage-apps/
7+
topicHref: /azure/active-directory/index
8+
items:
9+
- name: Cloud provisioning
10+
tocHref: /azure/active-directory/manage-apps/
11+
topicHref: /azure/active-directory/cloud-provisioning/index
12+
13+
- name: Azure
14+
tocHref: /azure/
15+
topicHref: /azure/index
16+
items:
17+
- name: Active Directory
18+
tocHref: /azure/active-directory/hybrid/
19+
topicHref: /azure/active-directory/index
20+
items:
21+
- name: Cloud provisioning
22+
tocHref: /azure/active-directory/hybrid/
23+
topicHref: /azure/active-directory/cloud-provisioning/index
24+

0 commit comments

Comments
 (0)