Skip to content

Commit f9e3687

Browse files
authored
Merge pull request #161824 from MicrosoftDocs/master
Merge master to live, 4AM
2 parents 34feb2a + ec1446b commit f9e3687

File tree

163 files changed

+1856
-1080
lines changed

Some content is hidden

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

163 files changed

+1856
-1080
lines changed

.openpublishing.redirection.json

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28737,7 +28737,7 @@
2873728737
{
2873828738
"source_path_from_root": "/articles/machine-learning/concept-managed-endpoints.md",
2873928739
"redirect_url": "/azure/machine-learning/concept-endpoints",
28740-
"redireect_document_id": false
28740+
"redirect_document_id": false
2874128741
},
2874228742
{
2874328743
"source_path_from_root": "/articles/notebooks/use-machine-learning-services-jupyter-notebooks.md",
@@ -37045,6 +37045,21 @@
3704537045
"redirect_url": "/azure/storage/common/storage-auth-aad-rbac-portal",
3704637046
"redirect_document_id": true
3704737047
},
37048+
{
37049+
"source_path_from_root": "/articles/storage/common/storage-auth-aad-rbac-cli.md",
37050+
"redirect_url": "/azure/storage/blobs/assign-azure-role-data-access",
37051+
"redirect_document_id": false
37052+
},
37053+
{
37054+
"source_path_from_root": "/articles/storage/common/storage-auth-aad-rbac-portal.md",
37055+
"redirect_url": "/azure/storage/blobs/assign-azure-role-data-access",
37056+
"redirect_document_id": true
37057+
},
37058+
{
37059+
"source_path_from_root": "/articles/storage/common/storage-auth-aad-rbac-powershell.md",
37060+
"redirect_url": "/azure/storage/blobs/assign-azure-role-data-access",
37061+
"redirect_document_id": false
37062+
},
3704837063
{
3704937064
"source_path_from_root": "/articles/storage/storage-azure-cli.md",
3705037065
"redirect_url": "/azure/storage/common/storage-azure-cli",
@@ -67074,6 +67089,16 @@
6707467089
"source_path_from_root": "/articles/iot-develop/quickstart-device-development.md",
6707567090
"redirect_url": "/azure/iot-develop/",
6707667091
"redirect_document_id": false
67092+
},
67093+
{
67094+
"source_path_from_root": "/articles/machine-learning/team-data-science-process/move-data-to-azure-blob-using-azure-storage-explorer.md",
67095+
"redirect_url": "/azure/vs-azure-tools-storage-manage-with-storage-explorer",
67096+
"redirect_document_id": false
67097+
},
67098+
{
67099+
"source_path_from_root": "/articles/machine-learning/team-data-science-process/move-data-to-azure-blob-using-ssis.md",
67100+
"redirect_url": "/sql/integration-services/azure-feature-pack-for-integration-services-ssis",
67101+
"redirect_document_id": false
6707767102
}
6707867103
]
6707967104
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ The following samples illustrate web applications that sign in users. Some sampl
5959
> | Java </p> Servlets |[GitHub repo](https://github.com/Azure-Samples/ms-identity-java-servlet-webapp-authentication) | Spring-less Servlet Series <br/> &#8226; [Sign in users](https://github.com/Azure-Samples/ms-identity-java-servlet-webapp-authentication/tree/main/1-Authentication/sign-in) <br/> &#8226; [Sign in users (B2C)](https://github.com/Azure-Samples/ms-identity-java-servlet-webapp-authentication/tree/main/1-Authentication/sign-in-b2c) <br/> &#8226; [Call Microsoft Graph](https://github.com/Azure-Samples/ms-identity-java-servlet-webapp-authentication/tree/main/2-Authorization-I/call-graph) <br/> &#8226; [Use App Roles for access control](https://github.com/Azure-Samples/ms-identity-java-servlet-webapp-authentication/tree/main/3-Authorization-II/roles) <br/> &#8226; [Use Security Groups for access control](https://github.com/Azure-Samples/ms-identity-java-servlet-webapp-authentication/tree/main/3-Authorization-II/groups) <br/> &#8226; [Deploy to Azure App Service](https://github.com/Azure-Samples/ms-identity-java-servlet-webapp-authentication/tree/main/4-Deployment/deploy-to-azure-app-service) | MSAL Java | [Auth code flow](https://docs.microsoft.com/azure/active-directory/develop/v2-oauth2-auth-code-flow) |
6060
> | Java |[GitHub repo](https://github.com/Azure-Samples/ms-identity-java-webapp) | Sign in users, call Microsoft Graph | MSAL Java | [Auth code flow](https://docs.microsoft.com/azure/active-directory/develop/v2-oauth2-auth-code-flow) |
6161
> | Java </p> Spring|[GitHub repo](https://github.com/Azure-Samples/ms-identity-java-webapi) | Sign in users & call Microsoft Graph via OBO </p> &#8226; web API | MSAL Java | &#8226; [Auth code flow](https://docs.microsoft.com/azure/active-directory/develop/v2-oauth2-auth-code-flow) <br/> &#8226; [On-Behalf-Of (OBO) flow](https://docs.microsoft.com/azure/active-directory/develop/v2-oauth2-on-behalf-of-flow) |
62-
> | Node.js </p> Express |[GitHub repo](https://github.com/Azure-Samples/ms-identity-node) | Express web app sample <br/> &#8226; Sign in users <br/> &#8226; Call Microsoft Graph | MSAL Node | [Auth code flow](https://docs.microsoft.com/azure/active-directory/develop/v2-oauth2-auth-code-flow) |
62+
> | Node.js </p> Express |[GitHub repo](https://github.com/Azure-Samples/ms-identity-node) | Express web app sample <br/> &#8226; Sign in users | MSAL Node | [Auth code flow](https://docs.microsoft.com/azure/active-directory/develop/v2-oauth2-auth-code-flow) |
63+
> | Node.js </p> Express |[GitHub repo](https://github.com/Azure-Samples/ms-identity-node) | Express web app series <br/> &#8226; [Sign in users](https://github.com/Azure-Samples/ms-identity-javascript-nodejs-tutorial/blob/main/1-Authentication/1-sign-in/README.md)<br/> &#8226; [Sign in users (B2C)](https://github.com/Azure-Samples/ms-identity-javascript-nodejs-tutorial/blob/main/1-Authentication/2-sign-in-b2c/README.md)<br/> &#8226; [Call Microsoft Graph](https://github.com/Azure-Samples/ms-identity-javascript-nodejs-tutorial/blob/main/2-Authorization/1-call-graph/README.md)<br/> &#8226; [Deploy to Azure App Service](https://github.com/Azure-Samples/ms-identity-javascript-nodejs-tutorial/blob/main/3-Deployment/README.md) | MSAL Node | [Auth code flow](https://docs.microsoft.com/azure/active-directory/develop/v2-oauth2-auth-code-flow) |
6364
> | Python </p> Flask |[GitHub repo](https://github.com/Azure-Samples/ms-identity-python-flask-tutorial) | Flask Series <br/> &#8226; Sign in users <br/> &#8226; Sign in users (B2C) <br/> &#8226; Call Microsoft Graph <br/> &#8226; Deploy to Azure App Service | MSAL Python | [Auth code flow](https://docs.microsoft.com/azure/active-directory/develop/v2-oauth2-auth-code-flow) |
6465
> | Python </p> Django |[GitHub repo](https://github.com/Azure-Samples/ms-identity-python-django-tutorial) | Django Series <br/> &#8226; [Sign in users](https://github.com/Azure-Samples/ms-identity-python-django-tutorial/tree/main/1-Authentication/sign-in) <br/> &#8226; [Sign in users (B2C)](https://github.com/Azure-Samples/ms-identity-python-django-tutorial/tree/main/1-Authentication/sign-in-b2c) <br/> &#8226; [Call Microsoft Graph](https://github.com/Azure-Samples/ms-identity-python-django-tutorial/tree/main/2-Authorization-I/call-graph) <br/> &#8226; [Deploy to Azure App Service](https://github.com/Azure-Samples/ms-identity-python-django-tutorial/tree/main/3-Deployment/deploy-to-azure-app-service)| MSAL Python | [Auth code flow](https://docs.microsoft.com/azure/active-directory/develop/v2-oauth2-auth-code-flow) |
6566
> | Python </p> Flask |[GitHub repo](https://github.com/Azure-Samples/ms-identity-python-webapp) | Flask standalone sample <br/> [Sign in users and call Microsoft Graph](https://github.com/Azure-Samples/ms-identity-python-webapp) | MSAL Python | [Auth code flow](https://docs.microsoft.com/azure/active-directory/develop/v2-oauth2-auth-code-flow) |

articles/active-directory/saas-apps/github-enterprise-managed-user-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ In this section, you'll take the information provided from AAD above and enter t
116116
1. Go to https://github.com
117117
1. Click on Sign In at the top-right corner
118118
1. Enter the credentials for the first administrator user account. The login handle should be in the format: `<your enterprise short code>_admin`
119-
1. Navigate to https://github.com/enterprises/ `<your enterprise name>`. This information should be provided by your Solutions Engineering contact.
119+
1. Navigate to `https://github.com/enterprises/` `<your enterprise name>`. This information should be provided by your Solutions Engineering contact.
120120
1. On the navigation menu on the left, select **Settings**, then **Security**.
121121
1. Click on the checkbox **Enable SAML authentication**
122122
1. Enter the Sign on URL. This URL is the Login URL that you copied from AAD above.

0 commit comments

Comments
 (0)