Skip to content

Commit 0f93895

Browse files
authored
Merge pull request #91070 from MicrosoftDocs/master
Merge Master to Live, 3 AM
2 parents aef6040 + 5140a59 commit 0f93895

File tree

120 files changed

+1761
-4014
lines changed

Some content is hidden

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

120 files changed

+1761
-4014
lines changed

.openpublishing.publish.config.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,11 +302,16 @@
302302
"url": "https://github.com/Azure-Samples/cosmos-dotnet-todo-app",
303303
"branch": "master"
304304
},
305-
{
305+
{
306306
"path_to_root": "samples-cosmosdb-dotnet-v3",
307307
"url": "https://github.com/Azure/azure-cosmos-dotnet-v3",
308308
"branch": "master"
309309
},
310+
{
311+
"path_to_root": "samples-cosmosdb-dotnet-v2",
312+
"url": "https://github.com/Azure/azure-cosmos-dotnet-v2",
313+
"branch": "master"
314+
},
310315
{
311316
"path_to_root": "samples-cosmosdb-dotnet-change-feed-processor",
312317
"url": "https://github.com/Azure-Samples/cosmos-dotnet-change-feed-processor",

.openpublishing.redirection.json

Lines changed: 131 additions & 86 deletions
Large diffs are not rendered by default.

articles/active-directory/hybrid/how-to-connect-pta-security-deep-dive.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ Pass-through Authentication handles a user sign-in request as follows:
143143

144144
> [!NOTE]
145145
> If the Authentication Agent fails during the sign-in process, the whole sign-in request is dropped. There is no hand-off of sign-in requests from one Authentication Agent to another Authentication Agent on-premises. These agents only communicate with the cloud, and not with each other.
146+
146147
13. The Authentication Agent forwards the result back to Azure AD STS over an outbound mutually authenticated HTTPS channel over port 443. Mutual authentication uses the certificate previously issued to the Authentication Agent during registration.
147148
14. Azure AD STS verifies that this result correlates with the specific sign-in request on your tenant.
148149
15. Azure AD STS continues with the sign-in procedure as configured. For example, if the password validation was successful, the user might be challenged for Multi-Factor Authentication or redirected back to the application.
54.2 KB
Loading
74 KB
Loading
-20.9 KB
Loading
37.2 KB
Loading
60.6 KB
Loading
-78.4 KB
Loading

articles/active-directory/users-groups-roles/users-bulk-add.md

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

2020
Azure Active Directory (Azure AD) supports bulk user create and delete operations, bulk invite for guests, and supports downloading lists of users, groups, and group members.
2121

22-
## Bulk import service limits
23-
24-
Each bulk activity to create users can run for up to one hour. This enables bulk creation of at least 50,000 users.
25-
2622
## Required permissions
2723

2824
In order to bulk create users in the administration portal, you must be signed in as a Global administrator or User administrator.
2925

30-
## To bulk import users
26+
## To create users in bulk
3127

3228
1. [Sign in to your Azure AD organization](https://aad.portal.azure.com) with an account that is a User administrator in the organization.
3329
1. In Azure AD, select **Users** > **Bulk create**.
34-
1. On the **Bulk create user** page, select **Download** to receive a valid comma-separated values (CSV) file of user properties, and then add your new users.
30+
1. On the **Bulk create user** page, select **Download** to receive a valid comma-separated values (CSV) file of user properties, and then add add users you want to create.
3531

36-
![The CSV file contains names and IDs of the users to create](./media/users-bulk-add/add-csv-file.png)
32+
![Select a local CSV file in which you list the users you want to add](./media/users-bulk-add/upload-button.png)
3733

38-
1. When you finish editing the CSV file or if you have one of your own ready to upload, select the file under **Upload your CSV file** to be validated.
34+
1. Open the CSV file and add a line for each user you want to create. The only required values are **Name**, **User principal name**, **Initial password** and **Block sign in (Yes/No)**. Then save the file.
3935

40-
![Select a local CSV file in which you list the users you want to add](./media/users-bulk-add/upload-button.png)
36+
![The CSV file contains names and IDs of the users to create](./media/users-bulk-add/add-csv-file.png)
37+
38+
1. On the **Bulk create user (Preview)** page, under Upload your CSV file, browse to the file. When you select the file and click **Submit**, validation of the CSV file starts.
39+
1. After the file contents are validated, you’ll see **File uploaded successfully**. If there are errors, you must fix them before you can submit the job.
40+
1. When your file passes validation, select **Submit** to start the Azure bulk operation that imports the new users.
41+
1. When the import operation completes, you'll see a notification of the bulk operation job status.
4142

42-
1. When the file contents are validated, you must fix any errors before you can start the upload job.
43-
1. When your file passes validation, select **Submit** to start the Azure batch job that adds the new user information. If there are errors, you can download and view the results file on the Bulk operation results page. The file contains the reason for each error.
43+
If there are errors, you can download and view the results file on the **Bulk operation results** page. The file contains the reason for each error.
4444

4545
## Check status
4646

@@ -67,6 +67,10 @@ Get-AzureADUser -Filter "UserType eq 'Member'"
6767

6868
You should see that the users that you created are listed.
6969

70+
## Bulk import service limits
71+
72+
Each bulk activity to create users can run for up to one hour. This enables bulk creation of at least 50,000 users.
73+
7074
## Next steps
7175

7276
- [Bulk delete users](users-bulk-delete.md)

0 commit comments

Comments
 (0)