Skip to content

Commit 3c3cdae

Browse files
authored
Merge pull request #109096 from julieMSFT/release-ignite-arcadia
Dirty PR to resolve merge conflicts with master in release-ignite-arcadia
2 parents ecf50d8 + f492f2e commit 3c3cdae

File tree

597 files changed

+9607
-3164
lines changed

Some content is hidden

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

597 files changed

+9607
-3164
lines changed

.openpublishing.redirection.json

Lines changed: 48 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -800,6 +800,11 @@
800800
"redirect_url": "/azure/machine-learning",
801801
"redirect_document_id": false
802802
},
803+
{
804+
"source_path": "articles/notebooks/use-machine-learning-services-jupyter-notebooks.md",
805+
"redirect_url": "/azure/machine-learning/samples-notebooks",
806+
"redirect_document_id": false
807+
},
803808
{
804809
"source_path": "articles/cognitive-services/QnAMaker/Tutorials/create-publish-query-in-portal.md",
805810
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/create-publish-knowledge-base",
@@ -1970,6 +1975,26 @@
19701975
"redirect_url": "/azure/cognitive-services/bing-news-search/quickstarts/client-libraries?pivots=programming-language-python",
19711976
"redirect_document_id": false
19721977
},
1978+
{
1979+
"source_path": "articles/cognitive-services/Bing-Video-Search/quickstarts/sdk-csharp-quickstart.md",
1980+
"redirect_url": "/azure/cognitive-services/bing-video-search/quickstarts/client-libraries?pivots=programming-language-csharp",
1981+
"redirect_document_id": false
1982+
},
1983+
{
1984+
"source_path": "articles/cognitive-services/Bing-Video-Search/quickstarts/sdk-java-quickstart.md",
1985+
"redirect_url": "/azure/cognitive-services/bing-video-search/quickstarts/client-libraries?pivots=programming-language-java",
1986+
"redirect_document_id": false
1987+
},
1988+
{
1989+
"source_path": "articles/cognitive-services/Bing-Video-Search/quickstarts/sdk-node-quickstart.md",
1990+
"redirect_url": "/azure/cognitive-services/bing-video-search/quickstarts/client-libraries?pivots=programming-language-javascript",
1991+
"redirect_document_id": false
1992+
},
1993+
{
1994+
"source_path": "articles/cognitive-services/Bing-Video-Search/quickstarts/sdk-python-quickstart.md",
1995+
"redirect_url": "/azure/cognitive-services/bing-video-search/quickstarts/client-libraries?pivots=programming-language-python",
1996+
"redirect_document_id": false
1997+
},
19731998
{
19741999
"source_path": "articles/virtual-machines/linux/classic/rdma-cluster.md",
19752000
"redirect_url": "/azure/virtual-machines/linux/sizes-hpc#rdma-capable-instances",
@@ -31855,11 +31880,6 @@
3185531880
"redirect_url": "/azure/security/fundamentals/abstract-serverless-platform-security",
3185631881
"redirect_document_id": true
3185731882
},
31858-
{
31859-
"source_path": "articles/security/azure-ad-choose-authn.md",
31860-
"redirect_url": "/azure/security/fundamentals/choose-ad-authn",
31861-
"redirect_document_id": true
31862-
},
3186331883
{
3186431884
"source_path": "articles/active-directory/authentication/howto-authentication-passwordless-enable.md",
3186531885
"redirect_url": "/azure/active-directory/authentication/concept-authentication-passwordless",
@@ -33077,47 +33097,47 @@
3307733097
},
3307833098
{
3307933099
"source_path": "articles/cognitive-services/Bing-Image-Search/index.yml",
33080-
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
33100+
"redirect_url": "/azure/cognitive-services/Bing-Image-Search/overview",
3308133101
"redirect_document_id": false
3308233102
},
3308333103
{
3308433104
"source_path": "articles/cognitive-services/Bing-Autosuggest/index.yml",
33085-
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
33105+
"redirect_url": "/azure/cognitive-services/bing-autosuggest/get-suggested-search-terms",
3308633106
"redirect_document_id": false
3308733107
},
3308833108
{
3308933109
"source_path": "articles/cognitive-services/Bing-Custom-Search/index.yml",
33090-
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
33110+
"redirect_url": "/azure/cognitive-services/Bing-Custom-Search/overview",
3309133111
"redirect_document_id": false
3309233112
},
3309333113
{
3309433114
"source_path": "articles/cognitive-services/Bing-Entities-Search/index.yml",
33095-
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
33115+
"redirect_url": "/azure/cognitive-services/bing-entities-search/overview",
3309633116
"redirect_document_id": false
3309733117
},
3309833118
{
3309933119
"source_path": "articles/cognitive-services/bing-local-business-search/index.yml",
33100-
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
33120+
"redirect_url": "/azure/cognitive-services/bing-local-business-search/overview",
3310133121
"redirect_document_id": false
3310233122
},
3310333123
{
3310433124
"source_path": "articles/cognitive-services/Bing-News-Search/index.yml",
33105-
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
33125+
"redirect_url": "/azure/cognitive-services/bing-news-search/search-the-web",
3310633126
"redirect_document_id": false
3310733127
},
3310833128
{
3310933129
"source_path": "articles/cognitive-services/Bing-Spell-Check/index.yml",
33110-
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
33130+
"redirect_url": "/azure/cognitive-services/bing-spell-check/overview",
3311133131
"redirect_document_id": false
3311233132
},
3311333133
{
3311433134
"source_path": "articles/cognitive-services/Bing-Video-Search/index.yml",
33115-
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
33135+
"redirect_url": "/azure/cognitive-services/bing-video-search/overview",
3311633136
"redirect_document_id": false
3311733137
},
3311833138
{
3311933139
"source_path": "articles/cognitive-services/bing-visual-search/index.yml",
33120-
"redirect_url": "/azure/cognitive-services/Bing-Web-Search",
33140+
"redirect_url": "/azure/cognitive-services/bing-visual-search/overview",
3312133141
"redirect_document_id": false
3312233142
},
3312333143
{
@@ -38842,8 +38862,8 @@
3884238862
},
3884338863
{
3884438864
"source_path": "articles/cognitive-services/Bing-Video-Search/sdk.md",
38845-
"redirect_url": "/azure/cognitive-services/Bing-Video-Search/quickstarts/sdk-csharp-quickstart",
38846-
"redirect_document_id": true
38865+
"redirect_url": "/azure/cognitive-services/bing-video-search/quickstarts/client-libraries?pivots=programming-language-csharp",
38866+
"redirect_document_id": false
3884738867
},
3884838868
{
3884938869
"source_path": "articles/cognitive-services/Bing-Video-Search/quick-start.md",
@@ -38877,22 +38897,22 @@
3887738897
},
3887838898
{
3887938899
"source_path": "articles/cognitive-services/Bing-Video-Search/video-sdk-java-quickstart.md",
38880-
"redirect_url": "/azure/cognitive-services/Bing-Video-Search/quickstarts/sdk-java-quickstart",
38881-
"redirect_document_id": true
38900+
"redirect_url": "/azure/cognitive-services/bing-video-search/quickstarts/client-libraries?pivots=programming-language-java",
38901+
"redirect_document_id": false
3888238902
},
3888338903
{
3888438904
"source_path": "articles/cognitive-services/Bing-Video-Search/video-sdk-python-quickstart.md",
38885-
"redirect_url": "/azure/cognitive-services/Bing-Video-Search/quickstarts/sdk-python-quickstart",
38886-
"redirect_document_id": true
38905+
"redirect_url": "/azure/cognitive-services/bing-video-search/quickstarts/client-libraries?pivots=programming-language-python",
38906+
"redirect_document_id": false
3888738907
},
3888838908
{
3888938909
"source_path": "articles/cognitive-services/Bing-Video-Search/video-search-sdk-node-quickstart.md",
38890-
"redirect_url": "/azure/cognitive-services/Bing-Video-Search/quickstarts/sdk-node-quickstart",
38891-
"redirect_document_id": true
38910+
"redirect_url": "/azure/cognitive-services/bing-video-search/quickstarts/client-libraries?pivots=programming-language-javascript",
38911+
"redirect_document_id": false
3889238912
},
3889338913
{
3889438914
"source_path": "articles/cognitive-services/Bing-Video-Search/video-search-sdk-quickstart.md",
38895-
"redirect_url": "/azure/cognitive-services/Bing-Video-Search/quickstarts/sdk-csharp-quickstart",
38915+
"redirect_url": "/azure/cognitive-services/bing-video-search/quickstarts/client-libraries?pivots=programming-language-csharp",
3889638916
"redirect_document_id": false
3889738917
},
3889838918
{
@@ -50362,6 +50382,11 @@
5036250382
{
5036350383
"source_path": "articles/cognitive-services/speech-service/quickstart-voice-assistant-java-jre.md",
5036450384
"redirect_url": "/azure/cognitive-services/speech-service/quickstarts/voice-assistants?pivots=programming-language-java&tabs=jre"
50385+
},
50386+
{
50387+
"source_path": "articles/security/fundamentals/choose-ad-authn.md",
50388+
"redirect_url": "/azure/active-directory/hybrid/choose-ad-authn",
50389+
"redirect_document_id": true
5036550390
},
5036650391
{
5036750392
"source_path": "articles/cognitive-services/Speech-Service/quickstart-voice-assistant-csharp-uwp.md",

articles/active-directory/app-provisioning/check-status-user-account-provisioning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.collection: M365-identity-device-management
1919

2020
# Tutorial: Reporting on automatic user account provisioning
2121

22-
Azure Active Directory (Azure AD) includes a [user account provisioning service](user-provisioning.md) that helps automate the provisioning de-provisioning of user accounts in SaaS apps and other systems, for the purpose of end-to-end identity lifecycle management. Azure AD supports pre-integrated user provisioning connectors for all of the applications and systems in the "Featured" section of the [Azure AD application gallery](https://azuremarketplace.microsoft.com/marketplace/apps/category/azure-active-directory-apps?page=1&subcategories=featured).
22+
Azure Active Directory (Azure AD) includes a [user account provisioning service](user-provisioning.md) that helps automate the provisioning de-provisioning of user accounts in SaaS apps and other systems, for the purpose of end-to-end identity lifecycle management. Azure AD supports pre-integrated user provisioning connectors for all of the applications and systems with user provisioning tutorials [here](https://docs.microsoft.com/azure/active-directory/saas-apps/tutorial-list).
2323

2424
This article describes how to check the status of provisioning jobs after they have been set up, and how to troubleshoot the provisioning of individual users and groups.
2525

articles/active-directory/authentication/howto-mfa-nps-extension-errors.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ If you encounter errors with the NPS extension for Azure Multi-Factor Authentica
2727
| **CLIENT_CERT_INSTALL_ERROR** | There may be an issue with how the client certificate was installed or associated with your tenant. Follow the instructions in [Troubleshooting the MFA NPS extension](howto-mfa-nps-extension.md#troubleshooting) to investigate client cert problems. |
2828
| **ESTS_TOKEN_ERROR** | Follow the instructions in [Troubleshooting the MFA NPS extension](howto-mfa-nps-extension.md#troubleshooting) to investigate client cert and ADAL token problems. |
2929
| **HTTPS_COMMUNICATION_ERROR** | The NPS server is unable to receive responses from Azure MFA. Verify that your firewalls are open bidirectionally for traffic to and from https://adnotifications.windowsazure.com |
30-
| **HTTP_CONNECT_ERROR** | On the server that runs the NPS extension, verify that you can reach https://adnotifications.windowsazure.com and https://login.microsoftonline.com/. If those sites don't load, troubleshoot connectivity on that server. |
31-
| **NPS Extension for Azure MFA:** <br> NPS Extension for Azure MFA only performs Secondary Auth for Radius requests in AccessAccept State. Request received for User username with response state AccessReject, ignoring request. | This error usually reflects an authentication failure in AD or that the NPS server is unable to receive responses from Azure AD. Verify that your firewalls are open bidirectionally for traffic to and from https://adnotifications.windowsazure.com and https://login.microsoftonline.com using ports 80 and 443. It is also important to check that on the DIAL-IN tab of Network Access Permissions, the setting is set to "control access through NPS Network Policy". This error can also trigger if the user is not assigned a license. |
30+
| **HTTP_CONNECT_ERROR** | On the server that runs the NPS extension, verify that you can reach `https://adnotifications.windowsazure.com` and `https://login.microsoftonline.com/`. If those sites don't load, troubleshoot connectivity on that server. |
31+
| **NPS Extension for Azure MFA:** <br> NPS Extension for Azure MFA only performs Secondary Auth for Radius requests in AccessAccept State. Request received for User username with response state AccessReject, ignoring request. | This error usually reflects an authentication failure in AD or that the NPS server is unable to receive responses from Azure AD. Verify that your firewalls are open bidirectionally for traffic to and from `https://adnotifications.windowsazure.com` and `https://login.microsoftonline.com` using ports 80 and 443. It is also important to check that on the DIAL-IN tab of Network Access Permissions, the setting is set to "control access through NPS Network Policy". This error can also trigger if the user is not assigned a license. |
3232
| **REGISTRY_CONFIG_ERROR** | A key is missing in the registry for the application, which may be because the [PowerShell script](howto-mfa-nps-extension.md#install-the-nps-extension) wasn't run after installation. The error message should include the missing key. Make sure you have the key under HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\AzureMfa. |
3333
| **REQUEST_FORMAT_ERROR** <br> Radius Request missing mandatory Radius userName\Identifier attribute.Verify that NPS is receiving RADIUS requests | This error usually reflects an installation issue. The NPS extension must be installed in NPS servers that can receive RADIUS requests. NPS servers that are installed as dependencies for services like RDG and RRAS don't receive radius requests. NPS Extension does not work when installed over such installations and errors out since it cannot read the details from the authentication request. |
3434
| **REQUEST_MISSING_CODE** | Make sure that the password encryption protocol between the NPS and NAS servers supports the secondary authentication method that you're using. **PAP** supports all the authentication methods of Azure MFA in the cloud: phone call, one-way text message, mobile app notification, and mobile app verification code. **CHAPV2** and **EAP** support phone call and mobile app notification. |

articles/active-directory/hybrid/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
href: cloud-governed-management-for-on-premises.md
2525
- name: Four steps to a strong identity foundation
2626
href: four-steps.md
27+
- name: Choose a hybrid identity authentication method
28+
href: choose-ad-authn.md
2729
- name: Azure AD Connect and Connect Health
2830
items:
2931
- name: What is Azure AD Connect and Connect Health?
File renamed without changes.

articles/active-directory/hybrid/how-to-connect-sync-feature-preferreddatalocation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Azure AD Connect supports synchronization of the **preferredDataLocation** attri
6464
By default, **preferredDataLocation** is not enabled for synchronization. This feature is intended for larger organizations. The Active Directory schema in Windows Server 2019 has an attribute **msDS-preferredDataLocation** you should use for this purpose. If you have not updated the Active Directory schema and cannot do so, then you must identify an attribute to hold the Office 365 geo for your users. This is going to be different for each organization.
6565

6666
> [!IMPORTANT]
67-
> Azure AD allows the **preferredDataLocation** attribute on **cloud User objects** to be directly configured by using Azure AD PowerShell. Azure AD no longer allows the **preferredDataLocation** attribute on **synchronized User objects** to be directly configured by using Azure AD PowerShell. To configure this attribute on **synchronized User objects**, you must use Azure AD Connect.
67+
> Azure AD allows the **preferredDataLocation** attribute on **cloud User objects** to be directly configured by using Azure AD PowerShell. To configure this attribute on **synchronized User objects**, you must use Azure AD Connect.
6868
6969
Before enabling synchronization:
7070

0 commit comments

Comments
 (0)