Skip to content

Commit f6a2708

Browse files
authored
Merge pull request #97726 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 4d05e56 + b635114 commit f6a2708

File tree

7 files changed

+52
-55
lines changed

7 files changed

+52
-55
lines changed

articles/active-directory/cloud-provisioning/tutorial-existing-forest.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,25 @@ In this scenario, there is an existing forest synced using Azure AD Connect sync
4848
- For certificate validation, unblock the following URLs: **mscrl.microsoft.com:80**, **crl.microsoft.com:80**, **ocsp.msocsp.com:80**, and **www\.microsoft.com:80**. Since these URLs are used for certificate validation with other Microsoft products you may already have these URLs unblocked.
4949

5050
## Install the Azure AD Connect provisioning agent
51-
1. Sign in to the server you will use with enterprise admin permissions. If you are using the [Basic AD and Azure environment](tutorial-basic-ad-azure.md) tutorial, it would be DC1.
52-
2. Download the Azure AD Connect provisioning agent [here](https://go.microsoft.com/fwlink/?linkid=2109037).
53-
3. Run the Azure AD Connect provisioning agent (AADConnectProvisioningAgent.Installer)
54-
3. On the splash screen, **Accept** the licensing terms and click **Install**.</br>
51+
1. Sign in to the domain joined server. If you are using the [Basic AD and Azure environment](tutorial-basic-ad-azure.md) tutorial, it would be DC1.
52+
2. Sign in to the Azure portal using cloud-only global admin credentials.
53+
3. On the left, select **Azure Active Directory**, click **Azure AD Connect** and in the center select **Manage provisioning (preview)**.</br>
54+
![Azure portal](media/how-to-install/install6.png)</br>
55+
4. Click on "Download agent"
56+
5. Run the Azure AD Connect provisioning agent
57+
6. On the splash screen, **Accept** the licensing terms and click **Install**.</br>
5558
![Welcome screen](media/how-to-install/install1.png)</br>
5659

57-
4. Once this operation completes, the configuration wizard will launch. Sign in with your Azure AD global administrator account. Note that if you have IE enhanced security enabled this will block the sign-in. If this is the case, close the installation, disable IE enhanced security in Server Manager, and click the **AAD Connect Provisioning Agent Wizard** to restart the installation.
58-
5. On the **Connect Active Directory** screen, click **Add directory** and then sign in with your Active Directory domain administrator account. NOTE: The domain administrator account should not have password change requirements. In case the password expires or changes, you will need to re-configure the agent with the new credentials. This operation will add your on-premises directory. Click **Next**.</br>
60+
7. Once this operation completes, the configuration wizard will launch. Sign in with your Azure AD global administrator account. Note that if you have IE enhanced security enabled this will block the sign-in. If this is the case, close the installation, disable IE enhanced security in Server Manager, and click the **AAD Connect Provisioning Agent Wizard** to restart the installation.
61+
8. On the **Connect Active Directory** screen, click **Add directory** and then sign in with your Active Directory domain administrator account. NOTE: The domain administrator account should not have password change requirements. In case the password expires or changes, you will need to re-configure the agent with the new credentials. This operation will add your on-premises directory. Click **Next**.</br>
5962
![Welcome screen](media/how-to-install/install3.png)</br>
6063

61-
6. On the **Configuration complete** screen, click **Confirm**. This operation will register and restart the agent.</br>
64+
9. On the **Configuration complete** screen, click **Confirm**. This operation will register and restart the agent.</br>
6265
![Welcome screen](media/how-to-install/install4.png)</br>
6366

64-
7. Once this operation completes you should see a notice: **Your agent configuration was successfully verified.** You can click **Exit**.</br>
67+
10. Once this operation completes you should see a notice: **Your agent configuration was successfully verified.** You can click **Exit**.</br>
6568
![Welcome screen](media/how-to-install/install5.png)</br>
66-
8. If you still see the initial splash screen, click **Close**.
69+
11. If you still see the initial splash screen, click **Close**.
6770

6871

6972
## Verify agent installation

articles/active-directory/cloud-provisioning/tutorial-pilot-aadc-aadccp.md

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -128,37 +128,25 @@ Azure AD Connect sync synchronizes changes occurring in your on-premises directo
128128
3. Run `Start-ADSyncSyncCycle`. Hit Enter.
129129

130130
## Install the Azure AD Connect provisioning agent
131-
1. Sign in to the server you will use with enterprise admin permissions. If you are using the [Basic AD and Azure environment](tutorial-basic-ad-azure.md) tutorial it would be CP1.
132-
2. Download the Azure AD Connect cloud provisioning agent [here](https://go.microsoft.com/fwlink/?linkid=2109037).
133-
3. Run the Azure AD Connect cloud provisioning (AADConnectProvisioningAgent.Installer)
134-
3. On the splash screen, **Accept** the licensing terms and click **Install**.</br>
135-
![Welcome screen](media/how-to-install/install1.png)</br>
136-
137-
4. Once this operation completes, the configuration wizard will launch. Sign in with your Azure AD global administrator account.
138-
5. On the **Connect Active Directory** screen, click **Add directory** and then sign in with your Active Directory administrator account. This operation will add your on-premises directory. Click **Next**.</br>
139-
![Welcome screen](media/how-to-install/install3.png)</br>
140-
141-
6. On the **Configuration complete** screen, click **Confirm**. This operation will register and restart the agent.</br>
142-
![Welcome screen](media/how-to-install/install4.png)</br>
143-
144-
7. Once this operation completes you should see a notice **Your was successfully verified.** You can click **Exit**.</br>
145-
![Welcome screen](media/how-to-install/install5.png)</br>
146-
8. If you still see the initial splash screen, click **Close**.1. Sign in to the server you will use with enterprise admin permissions.
147-
2. Download the Azure AD Connect cloud provisioning agent [here](https://go.microsoft.com/fwlink/?linkid=2109037).
148-
3. Run the Azure AD Connect cloud provisioning (AADConnectProvisioningAgent.Installer)
149-
3. On the splash screen, **Accept** the licensing terms and click **Install**.</br>
131+
1. Sign in to the domain joined server. If you are using the [Basic AD and Azure environment](tutorial-basic-ad-azure.md) tutorial, it would be DC1.
132+
2. Sign in to the Azure portal using cloud-only global admin credentials.
133+
3. On the left, select **Azure Active Directory**, click **Azure AD Connect** and in the center select **Manage provisioning (preview)**.</br>
134+
![Azure portal](media/how-to-install/install6.png)</br>
135+
4. Click on "Download agent"
136+
5. Run the Azure AD Connect provisioning agent
137+
6. On the splash screen, **Accept** the licensing terms and click **Install**.</br>
150138
![Welcome screen](media/how-to-install/install1.png)</br>
151139

152-
4. Once this operation completes, the configuration wizard will launch. Sign in with your Azure AD global administrator account.
153-
5. On the **Connect Active Directory** screen, click **Add directory** and then sign in with your Active Directory administrator account. This operation will add your on-premises directory. Click **Next**.</br>
140+
7. Once this operation completes, the configuration wizard will launch. Sign in with your Azure AD global administrator account. Note that if you have IE enhanced security enabled this will block the sign-in. If this is the case, close the installation, disable IE enhanced security in Server Manager, and click the **AAD Connect Provisioning Agent Wizard** to restart the installation.
141+
8. On the **Connect Active Directory** screen, click **Add directory** and then sign in with your Active Directory domain administrator account. NOTE: The domain administrator account should not have password change requirements. In case the password expires or changes, you will need to re-configure the agent with the new credentials. This operation will add your on-premises directory. Click **Next**.</br>
154142
![Welcome screen](media/how-to-install/install3.png)</br>
155143

156-
6. On the **Configuration complete** screen, click **Confirm**. This operation will register and restart the agent.</br>
144+
9. On the **Configuration complete** screen, click **Confirm**. This operation will register and restart the agent.</br>
157145
![Welcome screen](media/how-to-install/install4.png)</br>
158146

159-
7. Once this operation completes you should see a notice **Your was successfully verified.** You can click **Exit**.</br>
147+
10. Once this operation completes you should see a notice: **Your agent configuration was successfully verified.** You can click **Exit**.</br>
160148
![Welcome screen](media/how-to-install/install5.png)</br>
161-
8. If you still see the initial splash screen, click **Close**.
149+
11. If you still see the initial splash screen, click **Close**.
162150

163151
## Verify agent installation
164152
Agent verification occurs in the Azure portal and on the local server that is running the agent.

articles/active-directory/cloud-provisioning/tutorial-single-forest.md

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,30 @@ You can use the environment you create in this tutorial for testing or for getti
4646
- For certificate validation, unblock the following URLs: **mscrl.microsoft.com:80**, **crl.microsoft.com:80**, **ocsp.msocsp.com:80**, and **www\.microsoft.com:80**. Since these URLs are used for certificate validation with other Microsoft products you may already have these URLs unblocked.
4747

4848
## Install the Azure AD Connect provisioning agent
49-
1. Sign in to the server you will use with enterprise admin permissions. If you are using the [Basic AD and Azure environment](tutorial-basic-ad-azure.md) tutorial, it would be DC1.
50-
2. Download the Azure AD Connect provisioning agent [here](https://go.microsoft.com/fwlink/?linkid=2109037).
51-
3. Run the Azure AD Connect provisioning agent (AADConnectProvisionin
52-
4. gAgent.Installer)
53-
3. On the splash screen, **Accept** the licensing terms and click **Install**.</br>
54-
![Welcome screen](media/how-to-install/install1.png)</br>
49+
1. Sign in to the domain joined server. If you are using the [Basic AD and Azure environment](tutorial-basic-ad-azure.md) tutorial, it would be DC1.
50+
2. Sign in to the Azure portal using cloud-only global admin credentials.
51+
3. On the left, select **Azure Active Directory**, click **Azure AD Connect**, and in the center select **Manage provisioning (preview)**.
5552

56-
4. Once this operation completes, the configuration wizard will launch. Sign in with your Azure AD global administrator account. Note that if you have IE enhanced security enabled this will block the sign-in. If this is the case, close the installation, disable IE enhanced security in Server Manager, and click the **AAD Connect Provisioning Agent Wizard** to restart the installation.
57-
5. On the **Connect Active Directory** screen, click **Add directory** and then sign in with your Active Directory domain administrator account. NOTE: The domain administrator account should not have password change requirements. In case the password expires or changes, you will need to re-configure the agent with the new credentials. This operation will add your on-premises directory. Click **Next**.</br>
58-
![Welcome screen](media/how-to-install/install3.png)</br>
53+
![Azure portal](media/how-to-install/install6.png)
5954

60-
6. On the **Configuration complete** screen, click **Confirm**. This operation will register and restart the agent.</br>
61-
![Welcome screen](media/how-to-install/install4.png)</br>
55+
4. Click **Download agent**.
56+
5. Run the Azure AD Connect provisioning agent.
57+
6. On the splash screen, **Accept** the licensing terms and click **Install**.
6258

63-
7. Once this operation completes you should see a notice: **Your agent configuration was successfully verified.** You can click **Exit**.</br>
59+
![Welcome screen](media/how-to-install/install1.png)
60+
61+
7. Once this operation completes, the configuration wizard will launch. Sign in with your Azure AD global administrator account. Note that if you have IE enhanced security enabled this will block the sign-in. If this is the case, close the installation, disable IE enhanced security in Server Manager, and click the **AAD Connect Provisioning Agent Wizard** to restart the installation.
62+
8. On the **Connect Active Directory** screen, click **Add directory** and then sign in with your Active Directory domain administrator account. NOTE: The domain administrator account should not have password change requirements. In case the password expires or changes, you will need to re-configure the agent with the new credentials. This operation will add your on-premises directory. Click **Next**.
63+
64+
![Welcome screen](media/how-to-install/install3.png)
65+
66+
9. On the **Configuration complete** screen, click **Confirm**. This operation will register and restart the agent.
67+
68+
![Welcome screen](media/how-to-install/install4.png)
69+
70+
10. Once this operation completes you should see a notice: **Your agent configuration was successfully verified.** You can click **Exit**.</br>
6471
![Welcome screen](media/how-to-install/install5.png)</br>
65-
8. If you still see the initial splash screen, click **Close**.
72+
11. If you still see the initial splash screen, click **Close**.
6673

6774

6875
## Verify agent installation

articles/active-directory/hybrid/how-to-connect-password-hash-synchronization.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,14 @@ To support temporary passwords in Azure AD for synchronized users, you can enabl
122122

123123
`Set-ADSyncAADCompanyFeature  -ForcePasswordResetOnLogonFeature $true`
124124

125-
Caveat: Forcing a user to change their password on next logon requires a password change at the same time. AD Connect will not pick up the force password change flag by itself, it is supplemental to the detected password change that occurs during password hash sync.
125+
> [!NOTE]
126+
> Forcing a user to change their password on next logon requires a password change at the same time. AD Connect will not pick up the force password change flag by itself; it is supplemental to the detected password change that occurs during password hash sync.
126127
127128
> [!CAUTION]
128129
> If you do not enable Self-service Password Reset (SSPR) in Azure AD users will have a confusing experience when they reset their password in Azure AD and then attempt to sign in in Active Directory with the new password, as the new password isn’t valid in Active Directory. You should only use this feature when SSPR and Password Writeback is enabled on the tenant.
129130
130131
> [!NOTE]
131-
> This feature is in Public Preview right now.
132+
> This feature is in public preview right now.
132133
133134
#### Account expiration
134135

articles/cognitive-services/Speech-Service/how-to-custom-speech-test-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Whether you're testing to see how accurate Microsoft speech recognition is or tr
2020

2121
This table lists accepted data types, when each data type should be used, and the recommended quantity. Not every data type is required to create a model. Data requirements will vary depending on whether you're creating a test or training a model.
2222

23-
| Data type | Used of testing | Quantity | Used for training | Quantity |
23+
| Data type | Used of testing | Recommended quantity | Used for training | Recommended quantity |
2424
|-----------|-----------------|----------|-------------------|----------|
2525
| [Audio](#audio-data-for-testing) | Yes<br>Used for visual inspection | 5+ audio files | No | N/a |
2626
| [Audio + Human-labeled transcripts](#audio--human-labeled-transcript-data-for-testingtraining) | Yes<br>Used to evaluate accuracy | 0.5 - 5 hours of audio | Yes | 1 - 1,000 hours of audio |

articles/cosmos-db/how-to-time-to-live.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ To set the time to live on a container, you need to provide a non-zero positive
8181
DocumentCollection collectionDefinition = new DocumentCollection();
8282
collectionDefinition.Id = "myContainer";
8383
collectionDefinition.PartitionKey.Paths.Add("/myPartitionKey");
84-
collectionDefinition.DefaultTimeToLive = 90 * 60 * 60 * 24; // expire all documents after 90 days
84+
collectionDefinition.DefaultTimeToLive = 90 * 60 * 60 * 24 // expire all documents after 90 days
8585
8686
DocumentCollection ttlEnabledCollection = await client.CreateDocumentCollectionAsync(
8787
UriFactory.CreateDatabaseUri("myDatabaseName"),

articles/sql-data-warehouse/create-data-warehouse-portal.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,14 @@ Follow these steps to create a SQL Data Warehouse that contains the AdventureWor
4545

4646
| Setting | Suggested value | Description |
4747
| :------ | :-------------- | :---------- |
48-
| **Database name** | mySampleDataWarehouse | For valid database names, see [Database Identifiers](/sql/relational-databases/databases/database-identifiers). Note, a data warehouse is a type of database.|
4948
| **Subscription** | Your subscription | For details about your subscriptions, see [Subscriptions](https://account.windowsazure.com/Subscriptions). |
5049
| **Resource group** | myResourceGroup | For valid resource group names, see [Naming rules and restrictions](/azure/architecture/best-practices/resource-naming). |
51-
| **Select source** | Sample | Specifies to load a sample database. Note, a data warehouse is one type of database. |
52-
| **Select sample** | AdventureWorksDW | Specifies to load the AdventureWorksDW sample database. |
50+
| **Data warehouse name** | mySampleDataWarehouse | For valid database names, see [Database Identifiers](/sql/relational-databases/databases/database-identifiers). Note, a data warehouse is one type of database.|
5351
||||
5452

5553
![create data warehouse](media/create-data-warehouse-portal/select-sample.png)
5654

57-
4. Click **Server** to create and configure a new server for your new database. Fill out the **New server form** with the following information:
55+
4. Select an existing **Server** or click **Create new** to create and configure a new server for your new database. Fill out the **New server form** with the following information:
5856

5957
| Setting | Suggested value | Description |
6058
| :------ | :-------------- | :---------- |
@@ -76,7 +74,7 @@ Follow these steps to create a SQL Data Warehouse that contains the AdventureWor
7674

7775
8. Click **Apply**.
7876

79-
9. Now that you've completed the SQL Data Warehouse form, click **Create** to provision the database. Provisioning takes a few minutes.
77+
9. Now that you've completed the Basics tab of the SQL Data Warehouse form, click **Review + Create** to provision the database. Provisioning takes a few minutes.
8078

8179
![click create](media/load-data-from-azure-blob-storage-using-polybase/click-create.png)
8280

0 commit comments

Comments
 (0)