Skip to content

Commit 702df70

Browse files
authored
Merge pull request #178471 from MicrosoftDocs/master
Merge Master to Live, 4 AM
2 parents 0f5bda0 + 2d9afaa commit 702df70

File tree

334 files changed

+2996
-1554
lines changed

Some content is hidden

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

334 files changed

+2996
-1554
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26616,6 +26616,11 @@
2661626616
"redirect_url": "/azure/spatial-anchors/how-tos/create-locate-anchors-unity",
2661726617
"redirect_document_id": false
2661826618
},
26619+
{
26620+
"source_path_from_root": "/articles/spring-cloud/how-to-provision-azure-spring-cloud-instance-terraform.md",
26621+
"redirect_url": "/azure/spring-cloud/quickstart-deploy-infrastructure-vnet-terraform",
26622+
"redirect_document_id": false
26623+
},
2661926624
{
2662026625
"source_path_from_root": "/articles/spring-cloud/spring-cloud-vnet-customer-responsibilities.md",
2662126626
"redirect_url": "/azure/spring-cloud/vnet-customer-responsibilities",

ISSUE_TEMPLATE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ If you would like to contact Microsoft about other things, such as product feedb
2828

2929
- If you need technical support using Azure, the paid and free support options are described here: https://azure.microsoft.com/support/options/.
3030

31-
- Each article in the Azure technical documentation contains a product feedback button - it's best to submit product feedback directly from a relevant article. Otherwise, you can submit product feedback for most Azure products in the following product feedback forum: https://feedback.azure.com/forums/34192--general-feedback.
31+
- Each article in the Azure technical documentation contains a product feedback button - it's best to submit product feedback directly from a relevant article. Otherwise, you can submit product feedback for most Azure products in the following product feedback forum: https://feedback.azure.com/d365community/forum/79b1327d-d925-ec11-b6e6-000d3a4f06a4.

articles/active-directory-b2c/TOC.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,7 @@
633633
href: https://azure.microsoft.com/roadmap/?category=security-identity
634634
- name: Frequently asked questions
635635
href: ./faq.yml
636+
displayName: FAQ
636637
- name: Getting help
637638
href: ../active-directory/develop/developer-support-help-options.md
638639
- name: Pricing

articles/active-directory-b2c/custom-policy-developer-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ The following table summarizes the Security Assertion Markup Language (SAML) app
105105
|[Azure AD B2C](identity-provider-azure-ad-b2c.md) | GA | GA | |
106106
|[eBay](identity-provider-ebay.md) | NA | Preview | |
107107
|[Facebook](identity-provider-facebook.md) | GA | GA | |
108-
|[GitHub](identity-provider-github.md) | GA | GA | |
108+
|[GitHub](identity-provider-github.md) | Preview | GA | |
109109
|[Google](identity-provider-google.md) | GA | GA | |
110110
|[ID.me](identity-provider-id-me.md) | GA | GA | |
111111
|[LinkedIn](identity-provider-linkedin.md) | GA | GA | |

articles/active-directory-b2c/faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ sections:
149149
- question: |
150150
Can I use my own URLs on my sign-up and sign-in pages that are served by Azure AD B2C? For instance, can I change the URL from contoso.b2clogin.com to login.contoso.com?
151151
answer: |
152-
This feature is available in public preview. For details, see [Azure AD B2C custom domains](./custom-domain.md?pivots=b2c-user-flow).
152+
Yes, you can use your own domain. For details, see [Azure AD B2C custom domains](./custom-domain.md?pivots=b2c-user-flow).
153153
154154
- question: |
155155
How do I delete my Azure AD B2C tenant?

articles/active-directory-domain-services/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,6 @@
167167
- name: Pricing
168168
href: https://azure.microsoft.com/pricing/details/active-directory-ds/
169169
- name: Azure AD feedback forum
170-
href: https://feedback.azure.com/forums/169401-azure-active-directory
170+
href: https://feedback.azure.com/d365community/forum/22920db1-ad25-ec11-b6e6-000d3a4f0789
171171
- name: Use Azure AD Domain Services in Azure CSP subscriptions
172172
href: csp.md

articles/active-directory-domain-services/delete-aadds.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ Consider [sharing feedback][feedback] for the features that you would like to se
4646
If you want to get started with Azure AD DS again, see [Create and configure an Azure Active Directory Domain Services managed domain][create-instance].
4747

4848
<!-- INTERNAL LINKS -->
49-
[feedback]: https://feedback.azure.com/forums/169401-azure-active-directory?category_id=160593%3fcategory_id%3d160593
50-
[create-instance]: tutorial-create-instance.md
49+
[feedback]: https://feedback.azure.com/d365community/forum/22920db1-ad25-ec11-b6e6-000d3a4f0789?c=5d63b5b7-ae25-ec11-b6e6-000d3a4f0789
50+
[create-instance]: tutorial-create-instance.md

articles/active-directory/app-provisioning/scim-graph-scenarios.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ My application creates information about a user that customers need in Azure AD.
110110
**Recommendation** The Microsoft graph exposes /Users and /Groups endpoints that you can integrate with today to provision users into Azure AD. Please note that Azure Active Directory doesn't support writing those users back into Active Directory.
111111

112112
> [!NOTE]
113-
> Microsoft has a provisioning service that pulls in data from HR applications such as Workday and SuccessFactors. These integrations are built and managed by Microsoft. For onboarding a new HR application to our service, you can request it on [UserVoice](https://feedback.azure.com/forums/374982-azure-active-directory-application-requests).
113+
> Microsoft has a provisioning service that pulls in data from HR applications such as Workday and SuccessFactors. These integrations are built and managed by Microsoft. For onboarding a new HR application to our service, you can request it on [UserVoice](https://feedback.azure.com/d365community/forum/22920db1-ad25-ec11-b6e6-000d3a4f0789).
114114
115115
## Related articles
116116

117117
- [Review the synchronization Microsoft Graph documentation](/graph/api/resources/synchronization-overview)
118-
- [Integrating a custom SCIM app with Azure AD](use-scim-to-provision-users-and-groups.md)
118+
- [Integrating a custom SCIM app with Azure AD](use-scim-to-provision-users-and-groups.md)

articles/active-directory/authentication/howto-authentication-passwordless-security-key-on-premises.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -118,27 +118,27 @@ $domain = "contoso.corp.com"
118118
Set-AzureADKerberosServer -Domain $domain -CloudCredential $cloudCred -DomainCredential $domainCred
119119
```
120120

121-
> [!NOTE]
122-
> If you're working on a domain-joined machine with an account that has domain administrator privileges, you can skip the "-DomainCredential" parameter. If the "-DomainCredential" parameter isn't provided, the current Windows login credential is used to access your on-premises Active Directory Domain Controller.
121+
> [!NOTE]
122+
> If you're working on a domain-joined machine with an account that has domain administrator privileges, you can skip the "-DomainCredential" parameter. If the "-DomainCredential" parameter isn't provided, the current Windows login credential is used to access your on-premises Active Directory Domain Controller.
123123
124-
```powershell
125-
# Specify the on-premises Active Directory domain. A new Azure AD
126-
# Kerberos Server object will be created in this Active Directory domain.
127-
$domain = "contoso.corp.com"
124+
```powershell
125+
# Specify the on-premises Active Directory domain. A new Azure AD
126+
# Kerberos Server object will be created in this Active Directory domain.
127+
$domain = "contoso.corp.com"
128128
129-
# Enter an Azure Active Directory global administrator username and password.
130-
$cloudCred = Get-Credential
129+
# Enter an Azure Active Directory global administrator username and password.
130+
$cloudCred = Get-Credential
131131
132-
# Create the new Azure AD Kerberos Server object in Active Directory
133-
# and then publish it to Azure Active Directory.
134-
# Use the current windows login credential to access the on-prem AD.
135-
Set-AzureADKerberosServer -Domain $domain -CloudCredential $cloudCred
136-
```
132+
# Create the new Azure AD Kerberos Server object in Active Directory
133+
# and then publish it to Azure Active Directory.
134+
# Use the current windows login credential to access the on-prem AD.
135+
Set-AzureADKerberosServer -Domain $domain -CloudCredential $cloudCred
136+
```
137137

138-
> [!NOTE]
139-
> If your organization protects password-based sign-in and enforces modern authentication methods such as MFA, FIDO2, or Smart Card, you must use the "-UserPrincipalName" parameter with the User Principal Name of a Global administrator.
140-
> - Replace `contoso.corp.com` in the following example with your on-premises Active Directory domain name.
141-
> - Replace `[email protected]` in the following example with the User Principal Name of a Global administrator.
138+
> [!NOTE]
139+
> If your organization protects password-based sign-in and enforces modern authentication methods such as multifactor authentication, FIDO2, or smart card technology, you must use the `-UserPrincipalName` parameter with the User Principal Name (UPN) of a global administrator.
140+
> - Replace `contoso.corp.com` in the following example with your on-premises Active Directory domain name.
141+
> - Replace `[email protected]` in the following example with the UPN of a global administrator.
142142
143143
```powershell
144144
# Specify the on-premises Active Directory domain. A new Azure AD
@@ -151,11 +151,11 @@ $domain = "contoso.corp.com"
151151
# Enter a domain administrator username and password.
152152
$domainCred = Get-Credential
153153
154-
# Create the new Azure AD Kerberos Server object in Active Directory
155-
# and then publish it to Azure Active Directory.
156-
# Open an interactive sign-in prompt with given username to access the Azure AD.
157-
Set-AzureADKerberosServer -Domain $domain -UserPrincipalName $userPrincipalName -DomainCredential $domainCred
158-
```
154+
# Create the new Azure AD Kerberos Server object in Active Directory
155+
# and then publish it to Azure Active Directory.
156+
# Open an interactive sign-in prompt with given username to access the Azure AD.
157+
Set-AzureADKerberosServer -Domain $domain -UserPrincipalName $userPrincipalName -DomainCredential $domainCred
158+
```
159159

160160
### View and verify the Azure AD Kerberos Server
161161

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

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

2020
Azure Active Directory (Azure AD) self-service password reset (SSPR) lets users reset their passwords in the cloud.
2121

22-
If you have problems with SSPR, the following troubleshooting steps and common errors may help. You can also watch this short video on the [How ot resolve the six most common SSPR end-user error messages](https://www.youtube.com/watch?v=9RPrNVLzT8I&list=PL3ZTgFEc7LyuS8615yo39LtXR7j1GCerW&index=1).
22+
If you have problems with SSPR, the following troubleshooting steps and common errors may help. You can also watch this short video on the [How to resolve the six most common SSPR end-user error messages](https://www.youtube.com/watch?v=9RPrNVLzT8I&list=PL3ZTgFEc7LyuS8615yo39LtXR7j1GCerW&index=1).
2323

2424
If you can't find the answer to your problem, [our support teams are always available](#contact-microsoft-support) to assist you further.
2525

@@ -156,4 +156,4 @@ To properly assist you, we ask that you provide as much detail as possible when
156156

157157
## Next steps
158158

159-
To learn more about SSPR, see [How it works: Azure AD self-service password reset](concept-sspr-howitworks.md) or [How does self-service password reset writeback work in Azure AD?](concept-sspr-writeback.md).
159+
To learn more about SSPR, see [How it works: Azure AD self-service password reset](concept-sspr-howitworks.md) or [How does self-service password reset writeback work in Azure AD?](concept-sspr-writeback.md).

0 commit comments

Comments
 (0)