Skip to content

Commit 378d21e

Browse files
authored
Merge pull request #253298 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 3802bb7 + 7aae649 commit 378d21e

File tree

5 files changed

+8
-3
lines changed

5 files changed

+8
-3
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,9 @@ Microsoft Entra ID combines the encrypted client key and message buffer into the
248248
| tgt_key_type | int | The on-premises AD DS key type used for both the client key and the Kerberos session key included in the KERB_MESSAGE_BUFFER. |
249249
| tgt_message_buffer | string | Base64 encoded KERB_MESSAGE_BUFFER. |
250250

251+
### Do users need to be a member of the Domain Users Active Directory group?
252+
Yes. A user must be in the Domain Users group to be able to sign-in using Azure AD Kerberos.
253+
251254
## Next steps
252255

253256
To get started with FIDO2 security keys and hybrid access to on-premises resources, see the following articles:

articles/active-directory/authentication/howto-authentication-sms-signin.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ First, let's enable SMS-based authentication for your Microsoft Entra tenant.
6666

6767

6868
1. Click **Enable** and select **Target users**. You can choose to enable SMS-based authentication for *All users* or *Select users* and groups.
69+
> [!NOTE]
70+
> To configure SMS-based authentication for first-factor (that is, to allow users to sign in with this method), check the **Use for sign-in** checkbox. Leaving this unchecked makes SMS-based authentication available for multifactor authentication and Self-Service Password Reset only.
6971
7072
![Enable SMS authentication in the authentication method policy window](./media/howto-authentication-sms-signin/enable-sms-authentication-method.png)
7173

articles/active-directory/manage-apps/admin-consent-workflow-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ As an admin, the following options exist for you to determine how users consent
3232
- Disable user consent. For example, a high school may want to turn off user consent so that the school IT administration has full control over all the applications that are used in their tenant.
3333
- Allow users to consent to the required permissions. It's NOT recommended to keep user consent open if you have sensitive data in your tenant.
3434
- If you still want to retain admin-only consent for certain permissions but want to assist your end-users in onboarding their application, you can use the admin consent workflow to evaluate and respond to admin consent requests. This way, you can have a queue of all the requests for admin consent for your tenant and can track and respond to them directly through the Microsoft Entra admin center.
35-
To learn how to configure the admin consent workflow, see [configure-admin-consent-workflow.md](configure-admin-consent-workflow.md).
35+
To learn how to configure the admin consent workflow, see [Configure the admin consent workflow](configure-admin-consent-workflow.md).
3636

3737
## How the admin consent workflow works
3838

articles/ai-services/openai/tutorials/embeddings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ In this tutorial, you learn how to:
3333
## Prerequisites
3434

3535
* An Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services?azure-portal=true)
36-
* Access granted to Azure OpenAI in the desired Azure subscription
36+
* Access granted to Azure OpenAI in the desired Azure subscription.
3737
Currently, access to this service is granted only by application. You can apply for access to Azure OpenAI by completing the form at <a href="https://aka.ms/oai/access" target="_blank">https://aka.ms/oai/access</a>. Open an issue on this repo to contact us if you have an issue.
3838
* <a href="https://www.python.org/" target="_blank">Python 3.7.1 or later version</a>
3939
* The following Python libraries: openai, num2words, matplotlib, plotly, scipy, scikit-learn, pandas, tiktoken.

articles/storage/file-sync/file-sync-deployment-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ if ($osver.Equals([System.Version]::new(10, 0, 20348, 0))) {
306306
-Uri https://aka.ms/afs/agent/Server2012R2 `
307307
-OutFile "StorageSyncAgent.msi"
308308
} else {
309-
throw [System.PlatformNotSupportedException]::new("Azure File Sync is only supported on Windows Server 2012 R2, Windows Server 2016, and Windows Server 2019")
309+
throw [System.PlatformNotSupportedException]::new("Azure File Sync is only supported on Windows Server 2012 R2, Windows Server 2016, Windows Server 2019 and Windows Server 2022")
310310
}
311311
312312
# Install the MSI. Start-Process is used to PowerShell blocks until the operation is complete.

0 commit comments

Comments
 (0)