Skip to content

Commit ebcd84b

Browse files
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into us1679050e
2 parents 564ebe0 + 602cd57 commit ebcd84b

File tree

291 files changed

+3174
-1460
lines changed

Some content is hidden

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

291 files changed

+3174
-1460
lines changed

.openpublishing.publish.config.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
"url": "https://github.com/Azure-Samples/functions-python-pytorch-tutorial",
158158
"branch": "master",
159159
"branch_mapping": {}
160-
},
160+
},
161161
{
162162
"path_to_root": "functions-quickstart-templates",
163163
"url": "https://github.com/Azure/azure-functions-templates",
@@ -187,7 +187,8 @@
187187
"path_to_root": "functions-docs-powershell",
188188
"url": "https://github.com/Azure-Samples/functions-docs-powershell",
189189
"branch": "master"
190-
}, {
190+
},
191+
{
191192
"path_to_root": "samples-personalizer",
192193
"url": "https://github.com/Azure-Samples/cognitive-services-personalizer-samples",
193194
"branch": "master"
@@ -366,7 +367,7 @@
366367
"path_to_root": "azure-sdk-for-java-script-event-hubs",
367368
"url": "https://github.com/Azure/azure-sdk-for-js/",
368369
"branch": "master"
369-
},
370+
},
370371
{
371372
"path_to_root": "azure-sdk-for-net-event-hubs",
372373
"url": "https://github.com/Azure/azure-sdk-for-net/",
@@ -376,7 +377,7 @@
376377
"path_to_root": "azure-sdk-for-python-event-hubs",
377378
"url": "https://github.com/Azure/azure-sdk-for-python/",
378379
"branch": "master"
379-
},
380+
},
380381
{
381382
"path_to_root": "cosmos-dotnet-getting-started",
382383
"url": "https://github.com/Azure-Samples/cosmos-dotnet-getting-started",
@@ -510,5 +511,8 @@
510511
"Pdf": {
511512
"template_folder": "_themes.pdf"
512513
}
514+
},
515+
"docs_build_engine": {
516+
"name": "docfx_v3"
513517
}
514518
}

.openpublishing.redirection.json

Lines changed: 54 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1745,6 +1745,26 @@
17451745
"redirect_url": "/azure/cognitive-services/bing-entity-search/quickstarts/client-libraries?pivots=programming-language-python",
17461746
"redirect_document_id": false
17471747
},
1748+
{
1749+
"source_path": "articles/cognitive-services/Bing-News-Search/news-search-sdk-quickstart.md",
1750+
"redirect_url": "/azure/cognitive-services/bing-news-search/quickstarts/client-libraries?pivots=programming-language-csharp",
1751+
"redirect_document_id": false
1752+
},
1753+
{
1754+
"source_path": "articles/cognitive-services/Bing-News-Search/news-sdk-java-quickstart.md",
1755+
"redirect_url": "/azure/cognitive-services/bing-news-search/quickstarts/client-libraries?pivots=programming-language-java",
1756+
"redirect_document_id": false
1757+
},
1758+
{
1759+
"source_path": "articles/cognitive-services/Bing-News-Search/news-search-sdk-node-quickstart.md",
1760+
"redirect_url": "/azure/cognitive-services/bing-news-search/quickstarts/client-libraries?pivots=programming-language-javascript",
1761+
"redirect_document_id": false
1762+
},
1763+
{
1764+
"source_path": "articles/cognitive-services/Bing-News-Search/news-sdk-python-quickstart.md",
1765+
"redirect_url": "/azure/cognitive-services/bing-news-search/quickstarts/client-libraries?pivots=programming-language-python",
1766+
"redirect_document_id": false
1767+
},
17481768
{
17491769
"source_path": "articles/virtual-machines/linux/classic/rdma-cluster.md",
17501770
"redirect_url": "/azure/virtual-machines/linux/sizes-hpc#rdma-capable-instances",
@@ -4483,7 +4503,7 @@
44834503
{
44844504
"source_path": "articles/azure-supportability/create-manage-support-requests-using-access-control.md",
44854505
"redirect_url": "/azure/azure-portal/supportability/how-to-create-azure-support-request#role-based-access-control",
4486-
"redirect_document_id": true
4506+
"redirect_document_id": false
44874507
},
44884508
{
44894509
"source_path": "articles/azure-supportability/how-to-create-azure-support-request.md",
@@ -15299,16 +15319,6 @@
1529915319
"redirect_url": "/azure/machine-learning/tutorial-train-models-with-aml",
1530015320
"redirect_document_id": true
1530115321
},
15302-
{
15303-
"source_path": "articles/machine-learning/algorithm-module-reference/pca-based-anomaly-detection.md",
15304-
"redirect_url": "/azure/machine-learning/algorithm-module-reference/module-reference",
15305-
"redirect_document_id": false
15306-
},
15307-
{
15308-
"source_path": "articles/machine-learning/algorithm-module-reference/train-anomaly-detection-model.md",
15309-
"redirect_url": "/azure/machine-learning/algorithm-module-reference/module-reference",
15310-
"redirect_document_id": false
15311-
},
1531215322
{
1531315323
"source_path": "articles/machine-learning/how-to-ui-sample-regression-predict-automobile-price-basic.md",
1531415324
"redirect_url": "/azure/machine-learning/how-to-designer-sample-regression-automobile-price-basic",
@@ -17034,6 +17044,31 @@
1703417044
"redirect_url": "/azure/sql-data-warehouse/maintenance-scheduling#change-a-maintenance-schedule",
1703517045
"redirect_document_id": false
1703617046
},
17047+
{
17048+
"source_path": "articles/sql-data-warehouse/backup-and-restore.md",
17049+
"redirect_url": "/azure/synapse-analytics/sql-data-warehouse/backup-and-restore",
17050+
"redirect_document_id": true
17051+
},
17052+
{
17053+
"source_path": "articles/sql-data-warehouse/cheat-sheet.md",
17054+
"redirect_url": "/azure/synapse-analytics/sql-data-warehouse/cheat-sheet",
17055+
"redirect_document_id": true
17056+
},
17057+
{
17058+
"source_path": "articles/sql-data-warehouse/column-level-security.md",
17059+
"redirect_url": "/azure/synapse-analytics/sql-data-warehouse/column-level-security",
17060+
"redirect_document_id": true
17061+
},
17062+
{
17063+
"source_path": "articles/sql-data-warehouse/create-data-warehouse-portal.md",
17064+
"redirect_url": "/azure/synapse-analytics/sql-data-warehouse/create-data-warehouse-portal",
17065+
"redirect_document_id": true
17066+
},
17067+
{
17068+
"source_path": "articles/sql-data-warehouse/create-data-warehouse-powershell.md",
17069+
"redirect_url": "/azure/synapse-analytics/sql-data-warehouse/create-data-warehouse-powershell",
17070+
"redirect_document_id": true
17071+
},
1703717072
{
1703817073
"source_path": "articles/sql-data-warehouse/viewing-maintenance-schedule.md",
1703917074
"redirect_url": "/azure/sql-data-warehouse/maintenance-scheduling#view-a-maintenance-schedule",
@@ -48184,11 +48219,6 @@
4818448219
"redirect_url": "/azure/app-service/containers/configure-language-java#use-service-bus-as-a-message-broker",
4818548220
"redirect_document_id": false
4818648221
},
48187-
{
48188-
"source_path": "articles/mysql/howto-redirection.md",
48189-
"redirect_url": "/azure/mysql/concepts-connectivity-architecture",
48190-
"redirect_document_id": false
48191-
},
4819248222
{
4819348223
"source_path": "articles/active-directory/managed-identities-azure-resources/tutorial-windows-vm-access-storage.md",
4819448224
"redirect_url": "/azure/active-directory/managed-identities-azure-resources/overview",
@@ -49404,19 +49434,19 @@
4940449434
"redirect_url": "/azure/media-services/latest/create-account-howto",
4940549435
"redirect_document_id": false
4940649436
},
49407-
{
49408-
"source_path": "articles/mariadb/howto-tls-configurations.md",
49409-
"redirect_url": "/azure/mariadb/howto-configure-ssl",
49410-
"redirect_document_id": false
49437+
{
49438+
"source_path": "articles/mariadb/howto-tls-configurations.md",
49439+
"redirect_url": "/azure/mariadb/howto-configure-ssl",
49440+
"redirect_document_id": false
4941149441
},
4941249442
{
49413-
"source_path": "articles/mysql/howto-tls-configurations.md",
49414-
"redirect_url": "/azure/mysql/howto-configure-ssl",
49443+
"source_path": "articles/mysql/howto-tls-configurations.md",
49444+
"redirect_url": "/azure/mysql/howto-configure-ssl",
4941549445
"redirect_document_id": false
4941649446
},
4941749447
{
49418-
"source_path": "articles/postgresql/howto-tls-configurations.md",
49419-
"redirect_url": "/azure/postgresql/concepts-ssl-connection-security",
49448+
"source_path": "articles/postgresql/howto-tls-configurations.md",
49449+
"redirect_url": "/azure/postgresql/concepts-ssl-connection-security",
4942049450
"redirect_document_id": false
4942149451
}
4942249452
]

articles/active-directory/develop/sample-v2-code.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ These samples show how to write a single-page application secured with Microsoft
4444
| -------- | --------------------- | -------- |
4545
| ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls Microsoft Graph |[javascript-graphapi-v2](https://github.com/Azure-Samples/active-directory-javascript-graphapi-v2) |
4646
| ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls B2C |[b2c-javascript-msal-singlepageapp](https://github.com/Azure-Samples/active-directory-b2c-javascript-msal-singlepageapp) |
47-
| ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls own web API |[javascript-singlepageapp-dotnet-webapi-v2](https://github.com/Azure-Samples/active-directory-javascript-singlepageapp-dotnet-webapi-v2) |
4847
| ![This image shows the Angular JS logo](media/sample-v2-code/logo_angular.png) [JavaScript (MSAL AngularJS)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angularjs)| Calls Microsoft Graph | [MsalAngularjsDemoApp](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples/MsalAngularjsDemoApp)
4948
| ![This image shows the Angular logo](media/sample-v2-code/logo_angular.png) [JavaScript (MSAL Angular)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular)| Calls Microsoft Graph | [javascript-singlepageapp-angular](https://github.com/Azure-Samples/active-directory-javascript-singlepageapp-angular) |
49+
| ![This image shows the Angular logo](media/sample-v2-code/logo_angular.png) [JavaScript (MSAL Angular)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls B2C |[active-directory-b2c-javascript-angular-spa](https://github.com/Azure-Samples/active-directory-b2c-javascript-angular-spa) |
5050

5151
## Web applications
5252

@@ -58,7 +58,6 @@ The following samples illustrate web applications that sign in users. Some sampl
5858
| ![This image shows the ASP.NET logo](media/sample-v2-code/logo_NETframework.png)</p> ASP.NET | [ASP.NET Quickstart](https://github.com/AzureAdQuickstarts/AppModelv2-WebApp-OpenIDConnect-DotNet) </p> [dotnet-webapp-openidconnect-v2](https://github.com/azure-samples/active-directory-dotnet-webapp-openidconnect-v2) | [dotnet-admin-restricted-scopes-v2](https://github.com/azure-samples/active-directory-dotnet-admin-restricted-scopes-v2) </p> |[msgraph-training-aspnetmvcapp](https://github.com/microsoftgraph/msgraph-training-aspnetmvcapp)
5959
| ![This image shows the Java logo](media/sample-v2-code/logo_java.png) | | [ms-identity-java-webapp](https://github.com/Azure-Samples/ms-identity-java-webapp) |
6060
| ![This image shows the Python logo](media/sample-v2-code/logo_python.png) | | [ms-identity-python-webapp](https://github.com/Azure-Samples/ms-identity-python-webapp) |
61-
| ![This image shows the Node.js logo](media/sample-v2-code/logo_nodejs.png) | | [Node.js Quickstart](https://github.com/azureadquickstarts/appmodelv2-webapp-openidconnect-nodejs) |
6261
| ![This image shows the Ruby logo](media/sample-v2-code/logo_ruby.png) | | [msgraph-training-rubyrailsapp](https://github.com/microsoftgraph/msgraph-training-rubyrailsapp) |
6362

6463
## Desktop and mobile public client apps
@@ -111,6 +110,7 @@ The following samples show how to protect a web API with the Microsoft identity
111110
| ![This image shows the ASP.NET logo](media/sample-v2-code/logo_NET.png)</p>ASP.NET MVC | Web API (service) of [ms-identity-aspnet-webapi-onbehalfof](https://github.com/Azure-Samples/ms-identity-aspnet-webapi-onbehalfof) |
112111
| ![This image shows the Java logo](media/sample-v2-code/logo_java.png) | Web API (service) of [ms-identity-java-webapi](https://github.com/Azure-Samples/ms-identity-java-webapi) |
113112
| ![This image shows the Node.js logo](media/sample-v2-code/logo_nodejs.png) | Web API (service) of [active-directory-javascript-nodejs-webapi-v2](https://github.com/Azure-Samples/active-directory-javascript-nodejs-webapi-v2) |
113+
| ![This image shows the Node.js logo](media/sample-v2-code/logo_nodejs.png) | B2C Web API (service) of [active-directory-b2c-javascript-nodejs-webapi](https://github.com/Azure-Samples/active-directory-b2c-javascript-nodejs-webapi) |
114114

115115
## Azure Functions as web APIs
116116

articles/active-directory/devices/faq.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.collection: M365-identity-device-management
1919

2020
## General FAQ
2121

22-
### Q: I registered the device recently. Why cant I see the device under my user info in the Azure portal? Or why is the device owner marked as N/A for hybrid Azure Active Directory (Azure AD) joined devices?
22+
### Q: I registered the device recently. Why can't I see the device under my user info in the Azure portal? Or why is the device owner marked as N/A for hybrid Azure Active Directory (Azure AD) joined devices?
2323

2424
**A:** Windows 10 devices that are hybrid Azure AD joined don't show up under **USER devices**.
2525
Use the **All devices** view in the Azure portal. You can also use a PowerShell [Get-MsolDevice](/powershell/module/msonline/get-msoldevice?view=azureadps-1.0) cmdlet.
@@ -126,7 +126,7 @@ See below on how these actions can be rectified.
126126
**A:** It takes up to an hour for a revoke to be applied from the time the Azure AD device is marked as disabled.
127127

128128
>[!NOTE]
129-
>For enrolled devices, we recommend that you wipe the device to make sure users can't access the resources. For more information, see [What is device enrollment?](/intune/deploy-use/enroll-devices-in-microsoft-intune).
129+
>For enrolled devices, we recommend that you wipe the device to make sure users can't access the resources. For more information, see [What is device enrollment?](/mem/intune/user-help/use-managed-devices-to-get-work-done).
130130
131131
---
132132

@@ -188,7 +188,7 @@ Deleted or disabled users who didn't sign in previously can't access a device. T
188188

189189
---
190190

191-
### Q: Why do my users see *You cant get there from here*?
191+
### Q: Why do my users see *You can't get there from here*?
192192

193193
**A:** Did you configure certain Conditional Access rules to require a specific device state? If the device doesn't meet the criteria, users are blocked, and they see that message.
194194
Evaluate the Conditional Access policy rules. Make sure the device meets the criteria to avoid the message.
@@ -309,8 +309,8 @@ Enable the following registry to block your users from adding additional work ac
309309

310310
**A:** Take the following steps:
311311

312-
1. [Create a compliance policy](/intune/compliance-policy-create-mac-os)
313-
1. [Define a Conditional Access policy for macOS devices](../active-directory-conditional-access-azure-portal.md)
312+
1. [Create a compliance policy](/intune/compliance-policy-create-mac-os)
313+
1. [Define a Conditional Access policy for macOS devices](../active-directory-conditional-access-azure-portal.md)
314314

315315
**Remarks:**
316316

0 commit comments

Comments
 (0)