Skip to content

Commit cd667ce

Browse files
author
Ankita Dutta
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into whnew
2 parents 9136f10 + 33a90bb commit cd667ce

File tree

4,983 files changed

+40328
-34748
lines changed

Some content is hidden

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

4,983 files changed

+40328
-34748
lines changed
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: "📄 Azure Kubernetes Services - Feedback control template"
2+
title: "Feedback"
3+
description: >-
4+
🛈 FYI - This issue template is intended for use by the feedback control on the bottom of Azure Kubernetes Services pages on the
5+
https://learn.microsoft.com/azure/aks site.
6+
labels:
7+
- "azure-kubernetes-services/svc"
8+
body:
9+
- type: markdown
10+
attributes:
11+
value: "## Enter your feedback"
12+
- type: markdown
13+
attributes:
14+
value: Select the issue type, and describe the issue in the text box below. Add as much detail as needed to help us resolve the issue.
15+
- type: dropdown
16+
id: issue-type
17+
attributes:
18+
label: Type of issue
19+
options:
20+
- Typo
21+
- Code doesn't work
22+
- Missing information
23+
- Outdated article
24+
- Other (describe below)
25+
validations:
26+
required: true
27+
- type: textarea
28+
id: userfeedback
29+
validations:
30+
required: true
31+
attributes:
32+
label: Feedback
33+
description: >-
34+
If possible, please provide extended details that will add context and help the team update
35+
the documentation. Additional details may not be useful for typos, grammar, formatting, etc.
36+
For technical or factual errors, please include code snippets and output to show how the
37+
documentation is incorrect.
38+
- type: markdown
39+
attributes:
40+
value: "## 🚧 Article information 🚧"
41+
- type: markdown
42+
attributes:
43+
value: "*Don't modify the following fields*. They are automatically filled in for you. Doing so will disconnect your issue from the affected article. *Don't edit them*."
44+
- type: input
45+
id: pageUrl
46+
validations:
47+
required: true
48+
attributes:
49+
label: Page URL
50+
- type: input
51+
id: contentSourceUrl
52+
validations:
53+
required: true
54+
attributes:
55+
label: Content source URL
56+
- type: input
57+
id: author
58+
validations:
59+
required: true
60+
attributes:
61+
label: Author
62+
description: GitHub Id of the author
63+
- type: input
64+
id: documentVersionIndependentId
65+
validations:
66+
required: true
67+
attributes:
68+
label: Document Id

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
"redirect_url": "/azure/azure-monitor/vm/scom-managed-instance-overview",
1111
"redirect_document_id": false
1212
},
13+
{
14+
"source_path_from_root": "/articles/azure-monitor/vm/scom-managed-instance-overview.md",
15+
"redirect_url": "/azure/azure-monitor/scom-manage-instance/overview",
16+
"redirect_document_id": false
17+
},
1318
{
1419
"source_path_from_root": "/articles/azure-monitor/best-practices.md",
1520
"redirect_url": "/azure/azure-monitor/getting-started",

.openpublishing.redirection.azure-resource-manager.json

Lines changed: 1943 additions & 1938 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.json

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1649,6 +1649,11 @@
16491649
"source_path_from_root": "/articles/dns/dns-getstarted-create-recordset.md",
16501650
"redirect_url": "/azure/dns/dns-getstarted-powershell",
16511651
"redirect_document_id": false
1652+
},
1653+
{
1654+
"source_path_from_root": "/articles/time-series-insights/migration-to-adx.md",
1655+
"redirect_url": "/azure/time-series-insights/migration-to-fabric.md",
1656+
"redirect_document_id": false
16521657
},
16531658
{
16541659
"source_path_from_root": "/articles/dns/dns-operations-dnszones-cli-nodejs.md",
@@ -4059,14 +4064,35 @@
40594064
"redirect_document_id": false
40604065
},
40614066
{
4062-
"source_path_from_root": "/articles/cosmos-dbcreate-websitemd",
4067+
"source_path_from_root": "/articles/cosmos-db/create-website.md",
40634068
"redirect_url": "/azure/cosmos-db/sql/create-website",
40644069
"redirect_document_id": true
40654070
},
40664071
{
40674072
"source_path_from_root": "/articles/virtual-machines-linux-nodejs-deploy.md",
40684073
"redirect_url": "/azure",
40694074
"redirect_document_id": false
4075+
},
4076+
{
4077+
"source_path_from_root": "/articles/event-grid/move-system-topics-across-regions.md",
4078+
"redirect_url": "/azure",
4079+
"redirect_document_id": false
4080+
},
4081+
{
4082+
"source_path_from_root": "/articles/event-grid/move-custom-topics-across-regions.md",
4083+
"redirect_url": "/azure",
4084+
"redirect_document_id": false
4085+
},
4086+
{
4087+
"source_path_from_root": "/articles/event-grid/move-domains-across-regions.md",
4088+
"redirect_url": "/azure",
4089+
"redirect_document_id": false
4090+
},
4091+
{
4092+
"source_path_from_root": "/articles/data-factory/continuous-integration-delivery-automate-github-actions.md",
4093+
"redirect_url": "/azure",
4094+
"redirect_document_id": false
40704095
}
4096+
40714097
]
40724098
}

.openpublishing.redirection.virtual-desktop.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,16 @@
419419
"source_path_from_root": "/articles/virtual-desktop/troubleshoot-getting-started.md",
420420
"redirect_url": "/azure/virtual-desktop/troubleshoot-quickstart",
421421
"redirect_document_id": true
422+
},
423+
{
424+
"source_path_from_root": "/articles/virtual-desktop/fslogix-containers-azure-files.md",
425+
"redirect_url": "/azure/virtual-desktop/fslogix-profile-containers",
426+
"redirect_document_id": true
427+
},
428+
{
429+
"source_path_from_root": "/articles/virtual-desktop/host-pool-load-balancing.md",
430+
"redirect_url": "/azure/virtual-desktop/configure-host-pool-load-balancing",
431+
"redirect_document_id": false
422432
}
423433
]
424434
}

articles/active-directory-b2c/TOC.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -824,8 +824,6 @@
824824
href: user-flow-versions-legacy.md
825825
- name: Resources
826826
items:
827-
- name: Azure Roadmap
828-
href: https://azure.microsoft.com/updates/?status=nowavailable,inpreview,indevelopment&category=identity,security&query=b2c
829827
- name: Frequently asked questions
830828
href: ./faq.yml
831829
displayName: FAQ

articles/active-directory-b2c/localization-string-ids.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ The following IDs are used for an [Microsoft Entra ID multifactor authentication
532532
| `UserMessageIfMaxAllowedCodeRetryReached` | Wrong code entered too many times, please try again later.|
533533
| `UserMessageIfServerError` | Cannot use MFA service, please try again later.|
534534
| `UserMessageIfThrottled` | Your request has been throttled, please try again later.|
535-
| `UserMessageIfWrongCodeEntered` |Wrong code entered, please try again.|
535+
| `UserMessageIfIncorrectOTPCodeEntered` |Wrong code entered, please try again.|
536536

537537
<a name='azure-ad-mfa-example'></a>
538538

@@ -684,4 +684,4 @@ This example shows localized messages for CAPTCHA display control.
684684
See the following articles for localization examples:
685685

686686
- [Language customization with custom policy in Azure AD B2C](language-customization.md)
687-
- [Language customization with user flows in Azure AD B2C](language-customization.md)
687+
- [Language customization with user flows in Azure AD B2C](language-customization.md)

articles/active-directory-b2c/manage-user-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ms.custom: fasttrack-edit
2222

2323
This article discusses how you can manage the user data in Azure Active Directory B2C (Azure AD B2C) by using the operations that are provided by the [Microsoft Graph API](/graph/use-the-api). Managing user data includes deleting or exporting data from audit logs.
2424

25-
[!INCLUDE [gdpr-intro-sentence.md](~/reusable-content/ce-skilling/azure/includes/gdpr-intro-sentence.md)]
25+
[!INCLUDE [gdpr-intro-sentence.md](../../includes/gdpr-intro-sentence.md)]
2626

2727
## Delete user data
2828

articles/active-directory-b2c/partner-strata.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ ms.subservice: B2C
1717

1818
# Tutorial to configure Azure Active Directory B2C with Strata
1919

20-
> [!CAUTION]
21-
> This article references CentOS, a Linux distribution that is nearing End Of Life (EOL) status. Please consider your use and planning accordingly. For more information, see the [CentOS End Of Life guidance](~/articles/virtual-machines/workloads/centos/centos-end-of-life.md).
22-
2320
In this tutorial, learn how to integrate Azure Active Directory B2C (Azure AD B2C) with Strata [Maverics Identity Orchestrator](https://www.strata.io/), which helps protect on-premises applications. It connects to identity systems, migrates users and credentials, synchronizes policies and configurations, and abstracts authentication and session management. Use Strata to transition from legacy, to Azure AD B2C, without rewriting applications.
2421

2522
The solution has the following benefits:
@@ -98,7 +95,7 @@ Use the instructions in the following sections to configure an Orchestrator inst
9895

9996
You can run your Orchestrator instance on any server, whether on-premises or in a public cloud infrastructure by provider such as Azure, AWS, or GCP.
10097

101-
- **Operating System**: REHL 7.7 or higher, CentOS 7+
98+
- **Operating System**: RHEL 7.7 or higher
10299
- **Disk**: 10 GB (small)
103100
- **Memory**: 16 GB
104101
- **Ports**: 22 (SSH/SCP), 443, 80

articles/active-directory-b2c/quickstart-native-app-desktop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ms.subservice: B2C
2121

2222
Azure Active Directory B2C (Azure AD B2C) provides cloud identity management to keep your application, business, and customers protected. Azure AD B2C enables your applications to authenticate to social accounts and enterprise accounts using open standard protocols. In this quickstart, you use a Windows Presentation Foundation (WPF) desktop application to sign in using a social identity provider and call an Azure AD B2C protected web API.
2323

24-
[!INCLUDE [quickstarts-free-trial-note](~/reusable-content/ce-skilling/azure/includes/quickstarts-free-trial-note.md)]
24+
[!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
2525

2626
## Prerequisites
2727

0 commit comments

Comments
 (0)