Skip to content

Commit 2527f16

Browse files
authored
Merge branch 'master' into fxl---Private-Endpoint-Document-for-Azure-Cache-for-Redis
2 parents e45ec14 + 42061f5 commit 2527f16

File tree

1,475 files changed

+19926
-11671
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,475 files changed

+19926
-11671
lines changed

.github/workflows/stale.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ jobs:
1919
close-pr-label: auto-close
2020
exempt-pr-labels: keep-open
2121
operations-per-run: 1200
22-
ascending: false
22+
ascending: true
23+
start-date: '2021-08-10'
2324
stale-pr-message: >
2425
This pull request has been inactive for at least 14 days.
2526
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.publish.config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -833,6 +833,7 @@
833833
".openpublishing.redirection.security-benchmark.json",
834834
".openpublishing.redirection.synapse-analytics.json",
835835
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
836+
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
836837
"articles/azure-relay/.openpublishing.redirection.relay.json",
837838
"articles/communication-services/.openpublishing.redirection.communication-services.json",
838839
"articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",

.openpublishing.redirection.active-directory.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/active-directory/manage-apps/common-scenarios.md",
5+
"redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/active-directory/manage-apps/application-management-fundamentals.md",
10+
"redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
11+
"redirect_document_id": false
12+
},
313
{
414
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-limitations.md",
515
"redirect_url": "/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",

.openpublishing.redirection.iot-hub.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,6 @@
938938
"redirect_url": "/azure/iot-hub/tutorial-x509-scripts",
939939
"redirect_document_id": false
940940
},
941-
942941
{
943942
"source_path_from_root": "/articles/iot-hub/iot-hub-gateway-kit-c-iot-gateway-connect-device-to-cloud.md",
944943
"redirect_url": "https://github.com/Azure/iot-edge/tree/master/v1/doc/commercial_gateway_kit/iot-hub-gateway-kit-c-iot-gateway-connect-device-to-cloud.md",
@@ -1005,7 +1004,11 @@
10051004
"redirect_url": "https://github.com/Azure/iot-edge/tree/master/v1/samples/simulated_device_cloud_upload/iot-hub-windows-iot-edge-simulated-device.md",
10061005
"redirect_document_id": false
10071006
},
1008-
1007+
{
1008+
"source_path_from_root": "/articles/iot-hub/tutorial-firmware-update.md",
1009+
"redirect_url": "/azure/iot-hub-device-update/device-update-raspberry-pi",
1010+
"redirect_document_id": false
1011+
}
10091012

10101013
]
10111014
}

.openpublishing.redirection.json

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10068,6 +10068,31 @@
1006810068
"redirect_url": "/azure/azure-resource-manager/management/extension-resource-types",
1006910069
"redirect_document_id": false
1007010070
},
10071+
{
10072+
"source_path_from_root": "/articles/azure-resource-manager/bicep/loop-modules.md",
10073+
"redirect_url": "/azure/azure-resource-manager/bicep/loops",
10074+
"redirect_document_id": false
10075+
},
10076+
{
10077+
"source_path_from_root": "/articles/azure-resource-manager/bicep/loop-outputs.md",
10078+
"redirect_url": "/azure/azure-resource-manager/bicep/loops",
10079+
"redirect_document_id": false
10080+
},
10081+
{
10082+
"source_path_from_root": "/articles/azure-resource-manager/bicep/loop-properties.md",
10083+
"redirect_url": "/azure/azure-resource-manager/bicep/loops",
10084+
"redirect_document_id": false
10085+
},
10086+
{
10087+
"source_path_from_root": "/articles/azure-resource-manager/bicep/loop-resources.md",
10088+
"redirect_url": "/azure/azure-resource-manager/bicep/loops",
10089+
"redirect_document_id": false
10090+
},
10091+
{
10092+
"source_path_from_root": "/articles/azure-resource-manager/bicep/loop-variables.md",
10093+
"redirect_url": "/azure/azure-resource-manager/bicep/loops",
10094+
"redirect_document_id": false
10095+
},
1007110096
{
1007210097
"source_path_from_root": "/articles/azure-resource-manager/templates/compare-template-syntax.md",
1007310098
"redirect_url": "/azure/azure-resource-manager/bicep/compare-template-syntax",
@@ -44243,6 +44268,31 @@
4424344268
"redirect_url": "/azure/azure-monitor/logs/log-powerbi",
4424444269
"redirect_document_id": false
4424544270
},
44271+
{
44272+
"source_path_from_root": "/articles/azure-monitor/deploy.md",
44273+
"redirect_url": "/azure/azure-monitor/best-practices",
44274+
"redirect_document_id": false
44275+
},
44276+
{
44277+
"source_path_from_root": "/articles/azure-monitor/deploy-scale.md",
44278+
"redirect_url": "/azure/azure-monitor/best-practices",
44279+
"redirect_document_id": false
44280+
},
44281+
{
44282+
"source_path_from_root": "/articles/azure-monitor/visualizations.md",
44283+
"redirect_url": "/azure/azure-monitor/best-practices-analysis",
44284+
"redirect_document_id": false
44285+
},
44286+
{
44287+
"source_path_from_root": "/articles/azure-monitor/logs/powershell-sample-create-workspace.md",
44288+
"redirect_url": "/azure/azure-monitor/logs/powershell-workspace-configuration",
44289+
"redirect_document_id": false
44290+
},
44291+
{
44292+
"source_path_from_root": "/articles/azure-monitor/logs/examples.md",
44293+
"redirect_url": "/azure/data-explorer/kusto/query/samples?pivots=azuremonitor",
44294+
"redirect_document_id": false
44295+
},
4424644296
{
4424744297
"source_path_from_root": "/articles/load-balancer/tutorial-load-balancer-standard-manage-portal.md",
4424844298
"redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-portal",
@@ -46517,6 +46567,11 @@
4651746567
"source_path_from_root": "/articles/azure-monitor/app/how-do-i.md",
4651846568
"redirect_url": "/azure/azure-monitor/faq",
4651946569
"redirect_document_id": false
46570+
},
46571+
{
46572+
"source_path_from_root": "/articles/app-service/web-sites-integrate-with-vnet.md",
46573+
"redirect_url": "/azure/app-service/overview-vnet-integration",
46574+
"redirect_document_id": false
4652046575
}
4652146576
]
4652246577
}

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-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: 1 addition & 1 deletion
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

0 commit comments

Comments
 (0)