Skip to content

Commit

Permalink
Merge branch 'master' into patch-4
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jak-MS
Jak-MS authored Apr 15, 2019
2 parents c343203 + 877de9d commit bc5f592
Show file tree
Hide file tree
Showing 5,099 changed files with 121,968 additions and 86,377 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
16 changes: 10 additions & 6 deletions .openpublishing.publish.config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
"version": 0
}
],
"notification_subscribers": [],
"notification_subscribers": [
"[email protected]"
],
"sync_notification_subscribers": [
"[email protected]"
],
Expand Down Expand Up @@ -74,11 +76,13 @@
"path_to_root": "policy-templates",
"url": "https://github.com/Azure/azure-policy",
"branch": "master",
"branch_mapping": {
"release-build-mysql": "release-build",
"release-build-postgresql": "release-build",
"release-build-stellar": "release-build"
}
"branch_mapping": {}
},
{
"path_to_root": "blueprints-templates",
"url": "https://github.com/Azure/azure-blueprints",
"branch": "master",
"branch_mapping": {}
},
{
"path_to_root": "azure-docs-json-samples",
Expand Down
171 changes: 164 additions & 7 deletions .openpublishing.redirection.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -855,6 +855,11 @@
"redirect_url": "/azure/avere-vfxt/avere-vfxt-additional-resources",
"redirect_document_id": true
},
{
"source_path": "articles/avere-vfxt/avere-vfxt-controller-role.md",
"redirect_url": "/azure/avere-vfxt/avere-vfxt-deploy-plan#vm-access-roles",
"redirect_document_id": true
},
{
"source_path": "articles/machine-learning/service/how-to-choose-a-dev-environment.md",
"redirect_url": "/azure/machine-learning/service/how-to-configure-environment",
Expand Down Expand Up @@ -1250,6 +1255,16 @@
"redirect_url": "/azure/iot-fundamentals/iot-introduction",
"redirect_document_id": false
},
{
"source_path": "articles/iot-hub/iot-hub-auto-device-config.md",
"redirect_url": "/azure/iot-hub/iot-hub-automatic-device-management",
"redirect_document_id": true
},
{
"source_path": "articles/iot-hub/iot-hub-auto-device-config-cli.md",
"redirect_url": "/azure/iot-hub/iot-hub-automatic-device-management-cli",
"redirect_document_id": true
},
{
"source_path": "articles/iot-hub/iot-hub-create-using-cli-nodejs.md",
"redirect_url": "/azure/iot-hub/iot-hub-create-using-cli",
Expand Down Expand Up @@ -1635,6 +1650,11 @@
"redirect_url": "/azure/active-directory/managed-service-identity/how-to-use-vm-sdk",
"redirect_document_id": false
},
{
"source_path": "articles/machine-learning/service/support-for-aml-services.md",
"redirect_url": "https://aka.ms/aml-forum-service",
"redirect_document_id": true
},
{
"source_path": "articles/machine-learning/preview/model-management-service-deploy.md",
"redirect_url": "/azure/machine-learning/desktop-workbench/model-management-service-deploy",
Expand Down Expand Up @@ -2850,6 +2870,11 @@
"redirect_url": "/azure/azure-portal/azure-portal-dashboards",
"redirect_document_id": false
},
{
"source_path": "articles/azure-resource-manager/resource-manager-tutorial-move-resources.md",
"redirect_url": "/azure/azure-resource-manager/resource-group-move-resources",
"redirect_document_id": false
},
{
"source_path": "articles/azure-resource-manager/resource-manager-templates-parameters.md",
"redirect_url": "/azure/azure-resource-manager/resource-group-authoring-templates#parameters",
Expand Down Expand Up @@ -4655,6 +4680,12 @@
"redirect_url": "/azure/automation/source-control-integration",
"redirect_document_id": false
},

{
"source_path": "articles/automation/automation-credentials.md",
"redirect_url": "/azure/automation/shared-resources/credentials",
"redirect_document_id": false
},
{
"source_path": "articles/automation/automation-certificates.md",
"redirect_url": "/azure/automation/shared-resources/certificates",
Expand Down Expand Up @@ -10853,6 +10884,11 @@
"redirect_url": "https://azure.microsoft.com/services/data-factory/",
"redirect_document_id": false
},
{
"source_path": "articles/hdinsight/hdinsight-hadoop-install-mono.md",
"redirect_url": "/azure/hdinsight/hdinsight-hadoop-migrate-dotnet-to-linux",
"redirect_document_id": false
},
{
"source_path": "articles/hdinsight/hdinsight-hadoop-r-scripts.md",
"redirect_url": "/azure/hdinsight/r-server/r-server-get-started",
Expand Down Expand Up @@ -27598,9 +27634,14 @@
},
{
"source_path": "articles/active-directory/active-directory-tou.md",
"redirect_url": "/azure/active-directory/governance/active-directory-tou",
"redirect_url": "/azure/active-directory/conditional-access/terms-of-use",
"redirect_document_id": true
},
{
"source_path": "articles/active-directory/governance/active-directory-tou.md",
"redirect_url": "/azure/active-directory/conditional-access/terms-of-use",
"redirect_document_id": false
},
{
"source_path": "articles/cosmos-db/troubleshoot-azure-cosmosdb.md",
"redirect_url": "/azure/cosmos-db/storage-explorer",
Expand Down Expand Up @@ -30516,6 +30557,11 @@
"redirect_url": "/azure/active-directory/saas-apps/ms-confluence-jira-plugin-adminguide",
"redirect_document_id": false
},
{
"source_path": "articles/active-directory/saas-apps/alibaba-cloud-service-(role-based-sso)-tutorial.md",
"redirect_url": "/azure/active-directory/saas-apps/alibaba-cloud-service-role-based-sso-tutorial",
"redirect_document_id": false
},
{
"source_path": "articles/active-directory/saas-apps/index.md",
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
Expand Down Expand Up @@ -30621,6 +30667,11 @@
"redirect_url": "/azure/active-directory/b2b/what-is-b2b",
"redirect_document_id": true
},
{
"source_path": "articles/active-directory/b2b/b2b-tutorial-bulk-invite.md",
"redirect_url": "/azure/active-directory/b2b/tutorial-bulk-invite",
"redirect_document_id": false
},
{
"source_path": "articles/security/manage-personal-data-azure.md",
"redirect_url": "/azure/security",
Expand Down Expand Up @@ -35365,6 +35416,11 @@
"redirect_url": "/azure/storage/common/storage-lifecycle-management-concepts",
"redirect_document_id": true
},
{
"source_path": "articles/storage/common/storage-enable-and-view-metrics.md",
"redirect_url": "/azure/storage/common/storage-metrics-in-azure-monitor",
"redirect_document_id": true
},
{
"source_path": "articles/azure-stack/partner/azure-stack-vaas-set-up-account.md",
"redirect_url": "/azure/azure-stack/partner/azure-stack-vaas-set-up-resources",
Expand Down Expand Up @@ -36746,8 +36802,6 @@
"redirect_url": "/azure/hdinsight/hbase/apache-hbase-overview",
"redirect_document_id": false
},


{
"source_path": "articles/spatial-anchors/concepts/create-locate-anchors-unity.md",
"redirect_url": "/azure/spatial-anchors/how-tos/create-locate-anchors-unity",
Expand All @@ -36763,17 +36817,120 @@
"redirect_url": "/azure/spatial-anchors/how-tos/create-locate-anchors-cpp-ndk",
"redirect_document_id": false
},


{
"source_path": "articles/cognitive-services/LUIS/luis-how-to-review-endoint-utt.md",
"redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-review-endpoint-utterances",
"redirect_document_id": true
},
{
"source_path": "articles/cognitive-services/Custom-Vision-Service/rest-api-tutorial.md",
"redirect_url": "/azure/cognitive-services/Custom-Vision-Service/getting-started-build-a-classifier",
"redirect_url": "/azure/cognitive-services/Custom-Vision-Service/getting-started-build-a-classifier",
"redirect_document_id": false
},
{
"source_path": "articles/data-catalog/data-catalog-prerequisites.md",
"redirect_url": "/azure/data-catalog/data-catalog-get-started",
"redirect_document_id": false
},
{
"source_path": "articles/data-catalog/data-catalog-release-notes.md",
"redirect_url": "/azure/data-catalog/data-catalog-get-started",
"redirect_document_id": false
},
{
"source_path": "articles/data-catalog/data-catalog-whats-new.md",
"redirect_url": "/azure/data-catalog/data-catalog-get-started",
"redirect_document_id": false
},
{
"source_path": "articles/data-catalog/data-catalog-what-is-data-catalog.md",
"redirect_url": "/azure/data-catalog/overview",
"redirect_document_id": true
},
{
"source_path": "articles/biztalk-services/biztalk-backup-restore.md",
"redirect_url": "/azure/logic-apps/logic-apps-move-from-mabs",
"redirect_document_id": false
},
{
"source_path": "articles/biztalk-services/biztalk-dashboard-monitor-scale-tabs.md",
"redirect_url": "/azure/logic-apps/logic-apps-move-from-mabs",
"redirect_document_id": false
},
{
"source_path": "articles/biztalk-services/biztalk-editions-feature-chart.md",
"redirect_url": "/azure/logic-apps/logic-apps-move-from-mabs",
"redirect_document_id": false
},
{
"source_path": "articles/biztalk-services/biztalk-issuer-name-issuer-key.md",
"redirect_url": "/azure/logic-apps/logic-apps-move-from-mabs",
"redirect_document_id": false
},
{
"source_path": "articles/biztalk-services/biztalk-migrating-to-edi-guide.md",
"redirect_url": "/azure/logic-apps/logic-apps-move-from-mabs",
"redirect_document_id": false
},
{
"source_path": "articles/biztalk-services/biztalk-process-edifact-invoice.md",
"redirect_url": "/azure/logic-apps/logic-apps-move-from-mabs",
"redirect_document_id": false
},
{
"source_path": "articles/biztalk-services/biztalk-provision-services.md",
"redirect_url": "/azure/logic-apps/logic-apps-move-from-mabs",
"redirect_document_id": false
},
{
"source_path": "articles/biztalk-services/biztalk-release-notes.md",
"redirect_url": "/azure/logic-apps/logic-apps-move-from-mabs",
"redirect_document_id": false
},
{
"source_path": "articles/biztalk-services/biztalk-services-administration-and-development-task-list.md",
"redirect_url": "/azure/logic-apps/logic-apps-move-from-mabs",
"redirect_document_id": false
},
{
"source_path": "articles/biztalk-services/biztalk-service-state-chart.md",
"redirect_url": "/azure/logic-apps/logic-apps-move-from-mabs",
"redirect_document_id": false
},
{
"source_path": "articles/biztalk-services/biztalk-throttling-thresholds.md",
"redirect_url": "/azure/logic-apps/logic-apps-move-from-mabs",
"redirect_document_id": false
},
{
"source_path": "articles/biztalk-services/biztalk-troubleshoot-using-ops-logs.md",
"redirect_url": "/azure/logic-apps/logic-apps-move-from-mabs",
"redirect_document_id": false
},
{
"source_path": "articles/biztalk-services/index.md",
"redirect_url": "/azure/logic-apps/logic-apps-move-from-mabs",
"redirect_document_id": false
}
},
{
"source_path": "articles/biztalk-services/integration-hybrid-connection-create-manage.md",
"redirect_url": "/azure/logic-apps/logic-apps-move-from-mabs",
"redirect_document_id": false
},
{
"source_path": "articles/biztalk-services/integration-hybrid-connection-overview.md",
"redirect_url": "/azure/logic-apps/logic-apps-move-from-mabs",
"redirect_document_id": false
},
{
"source_path": "articles/cognitive-services/QnAMaker/How-To/publish-knowledge-base.md",
"redirect_url": "/azure/cognitive-services/QnAMaker/quickstarts/create-publish-knowledge-base",
"redirect_document_id": true
},
{
"source_path": "articles/cognitive-services/LUIS/luis-quickstart-intent-and-hier-entity.md",
"redirect_url": "/azure/cognitive-services/LUIS/tutorial-entity-roles",
"redirect_document_id": true
}
]
}
2 changes: 1 addition & 1 deletion ...cles/active-directory-b2c/active-directory-b2c-reference-password-complexity.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Azure Active Directory (Azure AD) B2C supports changing the complexity requireme

## Password rule enforcement

During sign-up or password reset, an end user must supply a password that meets the complexity rules. Password complexity rules are enforced per user flow. It is possible to have one user flow require a four-digit pin during sign-up while another user flow requires a eight character string during sign-up. For example, you may use a user flow with different password complexity for adults than for children.
During sign-up or password reset, an end user must supply a password that meets the complexity rules. Password complexity rules are enforced per user flow. It is possible to have one user flow require a four-digit pin during sign-up while another user flow requires an eight character string during sign-up. For example, you may use a user flow with different password complexity for adults than for children.

Password complexity is never enforced during sign-in. Users are never prompted during sign-in to change their password because it doesn't meet the current complexity requirement.

Expand Down
2 changes: 1 addition & 1 deletion articles/active-directory-b2c/active-directory-b2c-ui-customization-custom.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ To create a public container in Blob storage, do the following:
Configure Blob storage for Cross-Origin Resource Sharing by doing the following:

1. In the menu, select **CORS**.
2. For **Allowed origins**, enter `your-tenant-name.b2clogin.com`. Replace `your-tenant-name` with the name of your Azure AD B2C tenant. For example, `fabrikam.b2clogin.com`. You need to use all lowercase letters when entering your tenant name.
2. For **Allowed origins**, enter `https://your-tenant-name.b2clogin.com`. Replace `your-tenant-name` with the name of your Azure AD B2C tenant. For example, `https://fabrikam.b2clogin.com`. You need to use all lowercase letters when entering your tenant name.
3. For **Allowed Methods**, select both `GET` and `OPTIONS`.
4. For **Allowed Headers**, enter an asterisk (*).
5. For **Exposed Headers**, enter an asterisk (*).
Expand Down
4 changes: 2 additions & 2 deletions articles/active-directory-b2c/tutorial-register-applications.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ If you haven't already created your own [Azure AD B2C Tenant](tutorial-create-te

## Create a client secret

If you’re application exchanges a code for a token, you need to create an application secret.
If your application exchanges a code for a token, you need to create an application secret.

1. Select **Keys** and then click **Generate key**.
2. Select **Save** to view the key. Make note of the **App key** value. You use the value as the application secret in your application's code.
Expand All @@ -58,4 +58,4 @@ In this article, you learned how to:
> * Create a client secret
> [!div class="nextstepaction"]
> [Create user flows in Azure Active Directory B2C](tutorial-create-user-flows.md)
> [Create user flows in Azure Active Directory B2C](tutorial-create-user-flows.md)
2 changes: 1 addition & 1 deletion articles/active-directory-b2c/userjourneys.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ The **ClaimsProviderSelection** element contains the following attributes:

### ClaimsProviderSelection example

In the following orchestration step, the user can choose to sign in with, Facebook, LinkIn, Twitter, Google, or a local account. If the user selects one of the social identity providers, the second orchestration step executes with the selected claim exchange specified in the `TargetClaimsExchangeId` attribute. The second orchestration step redirects the user to the social identity provider to complete the sign-in process. If the user chooses to sign in with the local account, Azure AD B2C stays on the same orchestration step (the same sign-up page or sign-in page) and skips the second orchestration step.
In the following orchestration step, the user can choose to sign in with, Facebook, LinkedIn, Twitter, Google, or a local account. If the user selects one of the social identity providers, the second orchestration step executes with the selected claim exchange specified in the `TargetClaimsExchangeId` attribute. The second orchestration step redirects the user to the social identity provider to complete the sign-in process. If the user chooses to sign in with the local account, Azure AD B2C stays on the same orchestration step (the same sign-up page or sign-in page) and skips the second orchestration step.

```XML
<OrchestrationStep Order="1" Type="CombinedSignInAndSignUp" ContentDefinitionReferenceId="api.signuporsignin">
Expand Down
4 changes: 2 additions & 2 deletions ...cles/active-directory/authentication/active-directory-passwords-troubleshoot.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ The most common point of failure is that firewall and or proxy ports and idle ti

For Azure AD Connect version 1.1.443.0 and above, you need outbound HTTPS access to the following:

* passwordreset.microsoftonline.com
* servicebus.windows.net
* \*.passwordreset.microsoftonline.com
* \*.servicebus.windows.net

For more granularity, reference the updated list of [Microsoft Azure Datacenter IP Ranges](https://www.microsoft.com/download/details.aspx?id=41653) updated every Wednesday and put into effect the next Monday.

Expand Down
Loading

0 comments on commit bc5f592

Please sign in to comment.