Skip to content

Commit d129f84

Browse files
authored
Merge branch 'master' into cm-linkfix-20211021-7
2 parents 01a764c + 71944cc commit d129f84

File tree

1,662 files changed

+16415
-9323
lines changed

Some content is hidden

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

1,662 files changed

+16415
-9323
lines changed

.github/workflows/stale.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ jobs:
1919
close-pr-label: auto-close
2020
exempt-pr-labels: keep-open
2121
operations-per-run: 1200
22-
ascending: true
23-
start-date: '2020-07-09'
22+
ascending: false
2423
stale-pr-message: >
2524
This pull request has been inactive for at least 14 days.
2625
If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.docs.microsoft.com/help/contribute/contribute-how-to-write-pull-request-automation) for instructions.

.openpublishing.redirection.json

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5483,11 +5483,6 @@
54835483
"redirect_url": "/azure/partner-solutions/overview",
54845484
"redirect_document_id": false
54855485
},
5486-
{
5487-
"source_path_from_root": "/articles/partner-solutions/apache-kafka-confluent-cloud/index.md",
5488-
"redirect_url": "/azure/partner-solutions/apache-kafka-confluent-cloud/overview",
5489-
"redirect_document_id": false
5490-
},
54915486
{
54925487
"source_path_from_root": "/articles/fxt-edge-filer/fxt-add-nodes.md",
54935488
"redirect_url": "/azure/fxt-edge-filer/add-nodes",
@@ -20329,29 +20324,54 @@
2032920324
"redirect_document_id": true
2033020325
},
2033120326
{
20332-
"source_path_from_root": "/articles/machine-learning/studio/data-science-for-beginners-ask-a-question-you-can-answer-with-data.md",
20333-
"redirect_url": "/azure/machine-learning/classic/data-science-for-beginners-ask-a-question-you-can-answer-with-data",
20327+
"source_path_from_root": "/articles/machine-learning/classic/data-science-for-beginners-ask-a-question-you-can-answer-with-data.md",
20328+
"redirect_url": "/azure/machine-learning/classic/retired-data-science-for-beginners-videos",
20329+
"redirect_document_id": false
20330+
},
20331+
{
20332+
"source_path_from_root": "/articles/machine-learning/classic/data-science-for-beginners-copy-other-peoples-work-to-do-data-science.md",
20333+
"redirect_url": "/azure/machine-learning/classic/retired-data-science-for-beginners-videos",
20334+
"redirect_document_id": false
20335+
},
20336+
{
20337+
"source_path_from_root": "/articles/machine-learning/classic/data-science-for-beginners-is-your-data-ready-for-data-science.md",
20338+
"redirect_url": "/azure/machine-learning/classic/retired-data-science-for-beginners-videos",
20339+
"redirect_document_id": false
20340+
},
20341+
{
20342+
"source_path_from_root": "/articles/machine-learning/classic/data-science-for-beginners-predict-an-answer-with-a-simple-model.md",
20343+
"redirect_url": "/azure/machine-learning/classic/retired-data-science-for-beginners-videos",
20344+
"redirect_document_id": false
20345+
},
20346+
{
20347+
"source_path_from_root": "/articles/machine-learning/classic/data-science-for-beginners-the-5-questions-data-science-answers.md",
20348+
"redirect_url": "/azure/machine-learning/classic/retired-data-science-for-beginners-videos",
2033420349
"redirect_document_id": true
2033520350
},
20351+
{
20352+
"source_path_from_root": "/articles/machine-learning/studio/data-science-for-beginners-ask-a-question-you-can-answer-with-data.md",
20353+
"redirect_url": "/azure/machine-learning/classic/retired-data-science-for-beginners-videos",
20354+
"redirect_document_id": false
20355+
},
2033620356
{
2033720357
"source_path_from_root": "/articles/machine-learning/studio/data-science-for-beginners-copy-other-peoples-work-to-do-data-science.md",
20338-
"redirect_url": "/azure/machine-learning/classic/data-science-for-beginners-copy-other-peoples-work-to-do-data-science",
20339-
"redirect_document_id": true
20358+
"redirect_url": "/azure/machine-learning/classic/retired-data-science-for-beginners-videos",
20359+
"redirect_document_id": false
2034020360
},
2034120361
{
2034220362
"source_path_from_root": "/articles/machine-learning/studio/data-science-for-beginners-is-your-data-ready-for-data-science.md",
20343-
"redirect_url": "/azure/machine-learning/classic/data-science-for-beginners-is-your-data-ready-for-data-science",
20344-
"redirect_document_id": true
20363+
"redirect_url": "/azure/machine-learning/classic/retired-data-science-for-beginners-videos",
20364+
"redirect_document_id": false
2034520365
},
2034620366
{
2034720367
"source_path_from_root": "/articles/machine-learning/studio/data-science-for-beginners-predict-an-answer-with-a-simple-model.md",
20348-
"redirect_url": "/azure/machine-learning/classic/data-science-for-beginners-predict-an-answer-with-a-simple-model",
20349-
"redirect_document_id": true
20368+
"redirect_url": "/azure/machine-learning/classic/retired-data-science-for-beginners-videos",
20369+
"redirect_document_id": false
2035020370
},
2035120371
{
2035220372
"source_path_from_root": "/articles/machine-learning/studio/data-science-for-beginners-the-5-questions-data-science-answers.md",
20353-
"redirect_url": "/azure/machine-learning/classic/data-science-for-beginners-the-5-questions-data-science-answers",
20354-
"redirect_document_id": true
20373+
"redirect_url": "/azure/machine-learning/classic/retired-data-science-for-beginners-videos",
20374+
"redirect_document_id": false
2035520375
},
2035620376
{
2035720377
"source_path_from_root": "/articles/machine-learning/studio/convert-training-experiment-to-scoring-experiment.md",

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Thank you for taking the time to contribute to the Microsoft Azure documentation.
44

5-
This guide covers some general topics related to contribution and refers to the [contributors guide](https://docs.microsoft.com/contribute) for more detailed explanations when required.
5+
This guide covers some general topics related to contribution and refers to the [contributors guide](/contribute) for more detailed explanations when required.
66

77
## Code of Conduct
88

@@ -21,8 +21,8 @@ Please use the Feedback tool at the bottom of any article to submit bugs and sug
2121

2222
### Editing in GitHub
2323

24-
Follow the guidance for [Quick edits to existing documents](https://docs.microsoft.com/contribute/#quick-edits-to-existing-documents) in our contributors guide.
24+
Follow the guidance for [Quick edits to existing documents](/contribute/#quick-edits-to-existing-documents) in our contributors guide.
2525

2626
### Pull Request
2727

28-
Review the guidance for [Pull Requests](https://docs.microsoft.com/contribute/how-to-write-workflows-major#pull-request-processing) in our contributors guide.
28+
Review the guidance for [Pull Requests](/contribute/how-to-write-workflows-major#pull-request-processing) in our contributors guide.

README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
21
# Microsoft Azure Documentation
32

4-
Welcome to the open-source [documentation](https://docs.microsoft.com/azure) of [Microsoft Azure](https://azure.microsoft.com). Please review this README file to understand how you can assist in contributing to the Microsoft Azure documentation.
3+
Welcome to the open-source [documentation](/azure) of [Microsoft Azure](https://azure.microsoft.com). Please review this README file to understand how you can assist in contributing to the Microsoft Azure documentation.
54

65
## Getting Started
76

@@ -11,7 +10,7 @@ Contributing to open source is more than just providing updates, it's also about
1110

1211
You've decided to contribute, that's great! To contribute to the documentation, you need a few tools.
1312

14-
Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for the [GitHub account setup](https://docs.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
13+
Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for the [GitHub account setup](/contribute/get-started-setup-github) from our contributor guide.
1514

1615
#### Download
1716

@@ -23,7 +22,7 @@ Install the following tools:
2322

2423
#### Install
2524

26-
Follow the instructions provided in the [Install content authoring tools](https://docs.microsoft.com/contribute/get-started-setup-tools) from our contributor guide.
25+
Follow the instructions provided in the [Install content authoring tools](/contribute/get-started-setup-tools) from our contributor guide.
2726

2827
## License
2928

@@ -32,4 +31,4 @@ Please refer to [LICENSE](LICENSE), [LICENSE-CODE](LICENSE-CODE) and [ThirdParty
3231
## Code of Conduct
3332

3433
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
35-
For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
34+
For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.

articles/active-directory-b2c/TOC.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,10 @@
309309
href: partner-bloksec.md
310310
- name: HYPR
311311
href: partner-hypr.md
312+
- name: IDEMIA
313+
href: partner-idemia.md
314+
- name: itsme
315+
href: partner-itsme.md
312316
- name: Keyless
313317
href: partner-keyless.md
314318
- name: Nevis

articles/active-directory-b2c/add-api-connector-token-enrichment.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,5 +412,3 @@ To learn how to secure your APIs, see the following articles:
412412
- [Reference: RESTful technical profile](restful-technical-profile.md)
413413

414414
::: zone-end
415-
416-

articles/active-directory-b2c/add-sign-up-and-sign-in-policy.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: how-to
12-
ms.date: 08/24/2021
12+
ms.date: 10/21/2021
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
ms.custom: "b2c-support"
@@ -66,7 +66,7 @@ The sign-up and sign-in user flow handles both sign-up and sign-in experiences w
6666

6767
* Under **Local accounts**, select one of the following: **Email signup**, **User ID signup**, **Phone signup**, **Phone/Email signup**, or **None**. [Learn more](sign-in-options.md).
6868
* Under **Social identity providers**, select any of the external social or enterprise identity providers you've set up. [Learn more](add-identity-provider.md).
69-
1. Under **Multifactor authentication**, if you want to require users to verify their identity with a second authentication method, choose the method type and when to enforce multi-factor authentication (MFA). [Learn more](multi-factor-authentication.md).
69+
1. Under **Multifactor authentication**, if you want to require users to verify their identity with a second authentication method, choose the method type and when to enforce multifactor authentication (MFA). [Learn more](multi-factor-authentication.md).
7070
1. Under **Conditional access**, if you've configured Conditional Access policies for your Azure AD B2C tenant and you want to enable them for this user flow, select the **Enforce conditional access policies** check box. You don't need to specify a policy name. [Learn more](conditional-access-user-flow.md?pivots=b2c-user-flow).
7171
1. Under **User attributes and token claims**, choose the attributes you want to collect from the user during sign-up and the claims you want returned in the token. For the full list of values, select **Show more**, choose the values, and then select **OK**.
7272

@@ -78,6 +78,10 @@ The sign-up and sign-in user flow handles both sign-up and sign-in experiences w
7878
1. Select **Create** to add the user flow. A prefix of *B2C_1* is automatically prepended to the name.
7979
1. Follow the steps to [handle the flow for "Forgot your password?"](add-password-reset-policy.md?pivots=b2c-user-flow.md#self-service-password-reset-recommended) within the sign-up or sign-in policy.
8080

81+
82+
### Re-order the sign up form
83+
Learn [how to re-order user flow input fields for local accounts](customize-ui.md#re-order-input-fields-in-the-sign-up-form)
84+
8185
### Test the user flow
8286

8387
1. Select the user flow you created to open its overview page, then select **Run user flow**.

articles/active-directory-b2c/app-registrations-training-guide.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The Azure AD B2C App registrations experience is based on the general [App Regis
4141

4242
- The **Endpoints** pane lets you quickly identify the relevant endpoints for your scenario, including OpenID connect configuration, SAML metadata, Microsoft Graph API, and [OAuth 2.0 user flow endpoints](tokens-overview.md#endpoints).
4343

44-
- **API permissions** and **Expose an API** provide more extensive scope, permission, and consent management. You can now also assign MS Graph and Azure AD Graph permissions to an app.
44+
- **API permissions** and **Expose an API** provide more extensive scope, permission, and consent management. You can now also assign MS Graph permissions to an app.
4545

4646
- **Owners** and **Manifest** are now available for apps that authenticate with Azure AD B2C. You can add owners for your registrations and directly edit application properties [using the manifest editor](../active-directory/develop/reference-app-manifest.md).
4747

@@ -75,7 +75,7 @@ The **openid** scope is necessary so that Azure AD B2C can sign users in to an a
7575
Learn more about [permissions and consent](../active-directory/develop/v2-permissions-and-consent.md).
7676

7777
## Platforms/Authentication: Reply URLs/redirect URIs
78-
In the legacy experience, the various platform types were managed under **Properties** as reply urls for web apps/APIs and Redirect URI for Native clients. "Native clients" are also known as "Public clients" and include apps for iOS, macOS, Android, and other mobile and desktop application types.
78+
In the legacy experience, the various platform types were managed under **Properties** as reply URLs for web apps/APIs and Redirect URI for Native clients. "Native clients" are also known as "Public clients" and include apps for iOS, macOS, Android, and other mobile and desktop application types.
7979

8080
In the new experience, reply URLs and redirect URIs are both referred to as Redirect URIs and can be found in an app's **Authentication** section. App registrations aren't limited to being either a web app or a native application. You can use the same app registration for all of these platform types by registering the respective redirect URIs.
8181

@@ -114,4 +114,4 @@ To get started with the new app registration experience:
114114
* Learn [how to register a native client application](add-native-application.md).
115115
* Learn [how register a Microsoft Graph application to manage Azure AD B2C resources](microsoft-graph-get-started.md).
116116
* Learn [how to use Azure AD B2C as a SAML Service Provider.](identity-provider-adfs.md)
117-
* Learn about [application types](application-types.md).
117+
* Learn about [application types](application-types.md).

articles/active-directory-b2c/customize-ui-with-html.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ Validate that you're ready by performing the following steps:
269269
The result should be `XHR status: 200`.
270270
If you receive an error, make sure that your CORS settings are correct. You might also need to clear your browser cache or open an in-private browsing session by pressing Ctrl+Shift+P.
271271

272-
Learn more about [how to create and manage Azure storage accounts](/azure/storage/common/storage-account-create).
272+
Learn more about [how to create and manage Azure storage accounts](../storage/common/storage-account-create.md).
273273

274274
::: zone pivot="b2c-user-flow"
275275

@@ -445,4 +445,4 @@ To use [company branding](customize-ui.md#configure-company-branding) assets in
445445

446446
## Next steps
447447

448-
Learn how to enable [client-side JavaScript code](javascript-and-page-layout.md).
448+
Learn how to enable [client-side JavaScript code](javascript-and-page-layout.md).

articles/active-directory-b2c/customize-ui.md

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: how-to
12-
ms.date: 09/15/2021
12+
ms.date: 10/21/2021
1313
ms.custom: "project-no-code, b2c-support"
1414
ms.author: kengaderdus
1515
ms.subservice: B2C
@@ -223,7 +223,7 @@ Once you've configured company branding, enable it in your user flows.
223223

224224
If you'd like to brand all pages in the user flow, set the page layout version for each page layout in the user flow.
225225

226-
![Page layout selection in Azure AD B2C in the Azure portal](media/customize-ui/portal-02-page-layout-select.png)
226+
:::image type="content" source="media/customize-ui/portal-02-page-layout-select.png" alt-text="Page layout selection in Azure AD B2C in the Azure portal.":::
227227

228228
::: zone-end
229229

@@ -278,6 +278,25 @@ The following example shows the content definitions with their corresponding the
278278

279279
::: zone-end
280280

281+
::: zone pivot="b2c-user-flow"
282+
283+
## Re-order input fields in the sign-up form
284+
To re-order the input fields on the sign-up page for local accounts form, follow these steps:
285+
1. Sign in to the [Azure portal](https://portal.azure.com).
286+
1. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directories + subscriptions** icon in the portal toolbar.
287+
1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
288+
1. In the Azure portal, search for and select **Azure AD B2C**.
289+
1. In the left menu, select **User flows**.
290+
1. Select a user flow (for local accounts only) that you want to re-order its input fields.
291+
1. In the left menu, select **Page layouts**
292+
1. In the table, select the row **Local account sign up page**.
293+
1. Under **User attributes**, select the input field you want to re-order, and drag (up or down) and drop or use use the **Move Up** or **Move down** controls to achieve the desired order.
294+
1. At the top of the page, select **Save**.
295+
296+
:::image type="content" source="media/customize-ui/portal-02-page-layout-fields.png" alt-text="Template selection drop-down in user flow page of Azure portal.":::
297+
298+
::: zone-end
299+
281300
## Next steps
282301

283302
Find more information about how you can customize the user interface of your applications in [Customize the user interface of your application in Azure Active Directory B2C](customize-ui-with-html.md).

0 commit comments

Comments
 (0)