Skip to content

Commit 7bd7b2a

Browse files
Merge branch 'MicrosoftDocs:main' into main
2 parents e51b4e9 + d6026ea commit 7bd7b2a

File tree

128 files changed

+763
-4436
lines changed

Some content is hidden

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

128 files changed

+763
-4436
lines changed

articles/active-directory-domain-services/tutorial-create-replica-set.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ The replica set reports as *Provisioning* as deployment continues, as shown in t
100100

101101
## Delete a replica set
102102

103-
A managed domain is currently limited to four replicas - the initial replica set, and three additional replica sets. If you don't need a replica set anymore, or if you want to create a replica set in another region, you can delete unneeded replica sets.
103+
A managed domain is currently limited to five replicas - the initial replica set, and four additional replica sets. If you don't need a replica set anymore, or if you want to create a replica set in another region, you can delete unneeded replica sets.
104104

105105
> [!IMPORTANT]
106106
> You can't delete either the last replica set or the initial replica set in a managed domain.

articles/active-directory/app-provisioning/export-import-provisioning-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ You can use the Microsoft Graph API and the Microsoft Graph Explorer to export y
5252
### Step 2: Sign into Microsoft Graph Explorer
5353

5454
1. Launch [Microsoft Graph Explorer](https://developer.microsoft.com/graph/graph-explorer)
55-
1. Click on the "Sign-In with Microsoft" button and sign-in using Azure AD Global Admin or App Admin credentials.
55+
1. Click on the "Sign-In with Microsoft" button and sign-in using Azure AD Global Administrator or App Admin credentials.
5656

5757
![Microsoft Graph Sign-in](./media/export-import-provisioning-configuration/wd_export_02.png)
5858

articles/active-directory/app-provisioning/skip-out-of-scope-deletions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Because this configuration is widely used with the *Workday to Active Directory
3232
## Step 2: Sign into Microsoft Graph Explorer
3333

3434
1. Launch [Microsoft Graph Explorer](https://developer.microsoft.com/graph/graph-explorer)
35-
1. Click on the "Sign-In with Microsoft" button and sign-in using Azure AD Global Admin or App Admin credentials.
35+
1. Click on the "Sign-In with Microsoft" button and sign-in using Azure AD Global Administrator or App Admin credentials.
3636

3737
![Screenshot of Microsoft Graph Explorer Sign-in.](./media/skip-out-of-scope-deletions/wd_export_02.png)
3838

articles/active-directory/app-proxy/application-proxy-faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ sections:
102102
- question: |
103103
Should I create a dedicated account to register the connector with Azure AD Application Proxy?
104104
answer: |
105-
There's no reason to. Any global admin or application administrator account will work. The credentials entered during installation aren't used after the registration process. Instead, a certificate is issued to the connector, which is used for authentication from that point on.
105+
There's no reason to. Any Global Administrator or application administrator account will work. The credentials entered during installation aren't used after the registration process. Instead, a certificate is issued to the connector, which is used for authentication from that point on.
106106
107107
- question: |
108108
How can I monitor the performance of the Azure AD Application Proxy connector?

articles/active-directory/authentication/howto-authentication-passwordless-troubleshoot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ To view the Azure AD Kerberos Server Objects and verify they are in good order,
122122
# Specify the on-premises AD DS domain.
123123
$domain = "corp.contoso.com"
124124
125-
# Enter an Azure Active Directory Global Admin username and password.
125+
# Enter an Azure Active Directory Global Administrator username and password.
126126
$cloudCred = Get-Credential
127127
128128
# Enter a Domain Admin username and password.

articles/active-directory/authentication/howto-mfa-reporting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ The following additional information and reports are available for MFA events, i
143143
| Report | Location | Description |
144144
|:--- |:--- |:--- |
145145
| Blocked User History | Azure AD > Security > MFA > Block/unblock users | Shows the history of requests to block or unblock users. |
146-
| Usage for on-premises components | Azure AD > Security > MFA > Activity Report | Provides information on overall usage for MFA Server through the NPS extension, AD FS, and MFA Server. |
146+
| Usage for on-premises components | Azure AD > Security > MFA > Activity Report | Provides information on overall usage for MFA Server. NPS extension and AD FS logs for cloud MFA activity are now included in the [Sign-in logs](../reports-monitoring/concept-sign-ins.md), and no longer published on this report. |
147147
| Bypassed User History | Azure AD > Security > MFA > One-time bypass | Provides a history of MFA Server requests to bypass MFA for a user. |
148148
| Server status | Azure AD > Security > MFA > Server status | Displays the status of MFA Servers associated with your account. |
149149

articles/active-directory/authentication/troubleshoot-sspr-writeback.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ If restarting the Azure AD Connect Sync service doesn't resolve your problem, tr
8181
To continue to troubleshoot issues, complete the following steps to disable and then re-enable the password writeback feature:
8282

8383
1. As an administrator on the server that runs Azure AD Connect, open the **Azure AD Connect Configuration wizard**.
84-
1. In **Connect to Azure AD**, enter your Azure AD global admin credentials.
84+
1. In **Connect to Azure AD**, enter your Azure AD Global Administrator credentials.
8585
1. In **Connect to AD DS**, enter your on-premises Active Directory Domain Services admin credentials.
8686
1. In **Uniquely identifying your users**, select the **Next** button.
8787
1. In **Optional features**, clear the **Password writeback** check box.
@@ -191,7 +191,7 @@ A best practice when you troubleshoot problems with password writeback is to ins
191191
| 31014| OffboardingEventFail| This event indicates that the offboarding process wasn't successful. This might be due to a permissions error on the cloud or on-premises administrator account specified during configuration. The error can also occur if you're attempting to use a federated cloud global administrator when disabling password writeback. To fix this problem, check your administrative permissions and ensure that you're not using a federated account while configuring the password writeback capability.|
192192
| 31015| WriteBackServiceStarted| This event indicates that the password writeback service has started successfully. It is ready to accept password management requests from the cloud.|
193193
| 31016| WriteBackServiceStopped| This event indicates that the password writeback service has stopped. Any password management requests from the cloud won't be successful.|
194-
| 31017| AuthTokenSuccess| This event indicates that we successfully retrieved an authorization token for the global admin specified during Azure AD Connect setup to start the offboarding or onboarding process.|
194+
| 31017| AuthTokenSuccess| This event indicates that we successfully retrieved an authorization token for the Global Administrator specified during Azure AD Connect setup to start the offboarding or onboarding process.|
195195
| 31018| KeyPairCreationSuccess| This event indicates that we successfully created the password encryption key. This key is used to encrypt passwords from the cloud to be sent to your on-premises environment.|
196196
| 31034| ServiceBusListenerError| This event indicates that there was an error connecting to your tenant's Service Bus listener. If the error message includes "The remote certificate is invalid", check to make sure that your Azure AD Connect server has all the required Root CAs as described in [Azure TLS certificate changes](../../security/fundamentals/tls-certificate-changes.md). |
197197
| 31044| PasswordResetService| This event indicates that password writeback is not working. The Service Bus listens for requests on two separate relays for redundancy. Each relay connection is managed by a unique Service Host. The writeback client returns an error if either Service Host is not running.|
@@ -203,7 +203,7 @@ A best practice when you troubleshoot problems with password writeback is to ins
203203
| 32005| ConfigurationError| During onboarding, we save tenant-specific information in a configuration file in your on-premises environment. This event indicates that there was an error saving this file or that when the service was started, there was an error reading the file. To fix this problem, try disabling and then re-enabling password writeback to force a rewrite of the configuration file.|
204204
| 32007| OnBoardingConfigUpdateError| During onboarding, we send data from the cloud to the on-premises password-reset service. That data is then written to an in-memory file before it is sent to the sync service to be stored securely on disk. This event indicates that there's a problem with writing or updating that data in memory. To fix this problem, try disabling and then re-enabling password writeback to force a rewrite of this configuration file.|
205205
| 32008| ValidationError| This event indicates we received an invalid response from the password-reset web service. To fix this problem, try disabling and then re-enabling password writeback.|
206-
| 32009| AuthTokenError| This event indicates that we couldn't get an authorization token for the global administrator account specified during Azure AD Connect setup. This error can be caused by a bad username or password specified for the global admin account. This error can also occur if the global admin account specified is federated. To fix this problem, rerun the configuration with the correct username and password and ensure that the administrator is a managed (cloud-only or password-synchronized) account.|
206+
| 32009| AuthTokenError| This event indicates that we couldn't get an authorization token for the global administrator account specified during Azure AD Connect setup. This error can be caused by a bad username or password specified for the Global Administrator account. This error can also occur if the Global Administrator account specified is federated. To fix this problem, rerun the configuration with the correct username and password and ensure that the administrator is a managed (cloud-only or password-synchronized) account.|
207207
| 32010| CryptoError| This event indicates there was an error generating the password encryption key or decrypting a password that arrives from the cloud service. This error likely indicates a problem with your environment. Look at the details of your event log to learn more about how to resolve this problem. You can also try disabling and then re-enabling the password writeback service.|
208208
| 32011| OnBoardingServiceError| This event indicates that the on-premises service couldn't properly communicate with the password-reset web service to initiate the onboarding process. This can happen as a result of a firewall rule or if there's a problem getting an authentication token for your tenant. To fix this problem, ensure that you're not blocking outbound connections over TCP 443 and TCP 9350-9354 or to https://ssprdedicatedsbprodncu.servicebus.windows.net. Also ensure that the Azure AD admin account you're using to onboard isn't federated.|
209209
| 32013| OffBoardingError| This event indicates that the on-premises service couldn't properly communicate with the password-reset web service to initiate the offboarding process. This can happen as a result of a firewall rule or if there's a problem getting an authorization token for your tenant. To fix this problem, ensure that you're not blocking outbound connections over 443 or to https://ssprdedicatedsbprodncu.servicebus.windows.net, and that the Azure Active Directory admin account you're using to offboard isn't federated.|

articles/active-directory/cloud-infrastructure-entitlement-management/faqs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Integration with ITMS tools, such as ServiceNow, is in the future roadmap.
112112

113113
## How is Permissions Management being deployed?
114114

115-
Customers with Global Admin role have first to onboard Permissions Management on their Azure AD tenant, and then onboard their AWS accounts, GCP projects, and Azure subscriptions. More details about onboarding can be found in our product documentation.
115+
Customers with Global Administrator role have first to onboard Permissions Management on their Azure AD tenant, and then onboard their AWS accounts, GCP projects, and Azure subscriptions. More details about onboarding can be found in our product documentation.
116116

117117
## How long does it take to deploy Permissions Management?
118118

@@ -136,7 +136,7 @@ If a customer initiates a free Permissions Management 45-day trial, but does not
136136

137137
If a customer decides to discontinue licensing the service, we will also delete all previously collected data within 45 days of license termination.
138138

139-
We also have the ability to remove, export or modify specific data should the Global Admin using the Entra Permissions Management service file an official Data Subject Request. This can be initiated by opening a ticket in the Azure portal [New support request - Microsoft Entra admin center](https://entra.microsoft.com/#blade/Microsoft_Azure_Support/NewSupportRequestV3Blade/callerName/ActiveDirectory/issueType/technical), or alternately contacting your local Microsoft representative.
139+
We also have the ability to remove, export or modify specific data should the Global Administrator using the Entra Permissions Management service file an official Data Subject Request. This can be initiated by opening a ticket in the Azure portal [New support request - Microsoft Entra admin center](https://entra.microsoft.com/#blade/Microsoft_Azure_Support/NewSupportRequestV3Blade/callerName/ActiveDirectory/issueType/technical), or alternately contacting your local Microsoft representative.
140140

141141
## Do I require a license to use Entra Permissions Management?
142142

articles/active-directory/cloud-infrastructure-entitlement-management/permissions-management-trial-user-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ Use the **Activity triggers** dashboard to view information and set alerts and t
195195

196196
![Diagram, Alert for monitoring any action on Azure resources.](media/permissions-management-trial-user-guide/custom-alerts-3.png)
197197

198-
- Use of break glass accounts like root in AWS, global admin in Azure AD accessing subscriptions, etc.
198+
- Use of break glass accounts like root in AWS, Global Administrator in Azure AD accessing subscriptions, etc.
199199

200200
Example: BreakGlass users should be used for emergency access only.
201201

articles/active-directory/cloud-sync/how-to-troubleshoot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ If you need to repair the cloud sync service account, you can use the `Repair-AA
222222
Connect-AADCloudSyncTools
223223
```
224224
225-
1. Enter your Azure AD global admin credentials.
225+
1. Enter your Azure AD Global Administrator credentials.
226226
227227
1. Type, or copy and paste, the following:
228228

0 commit comments

Comments
 (0)