Skip to content

Commit dadd298

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into myazurebranch
2 parents 537913d + 810f214 commit dadd298

File tree

1,498 files changed

+17918
-7491
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,498 files changed

+17918
-7491
lines changed

.openpublishing.redirection.json

Lines changed: 72 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2877,7 +2877,27 @@
28772877
},
28782878
{
28792879
"source_path": "articles/automation/automation-sec-configure-azure-runas-account.md",
2880-
"redirect_url": "/azure/automation/automation-create-runas-account",
2880+
"redirect_url": "/azure/automation/manage-runas-account",
2881+
"redirect_document_id": false
2882+
},
2883+
{
2884+
"source_path": "articles/automation/automation-create-runas-account.md",
2885+
"redirect_url": "/azure/automation/manage-runas-account",
2886+
"redirect_document_id": false
2887+
},
2888+
{
2889+
"source_path": "articles/automation/automation-manage-account.md",
2890+
"redirect_url": "/azure/automation/manage-runas-account",
2891+
"redirect_document_id": false
2892+
},
2893+
{
2894+
"source_path": "articles/automation/automation-create-aduser-account.md",
2895+
"redirect_url": "/azure/automation/automation-credentials",
2896+
"redirect_document_id": false
2897+
},
2898+
{
2899+
"source_path": "articles/automation/automation-verify-runas-authentication.md",
2900+
"redirect_url": "/azure/automation/manage-runas-account",
28812901
"redirect_document_id": false
28822902
},
28832903
{
@@ -8377,6 +8397,11 @@
83778397
"redirect_url": "https://docs.microsoft.com/azure/cosmos-db/cli-samples",
83788398
"redirect_document_id": false
83798399
},
8400+
{
8401+
"source_path": "articles/cosmos-db/access-control.md",
8402+
"redirect_url": "https://docs.microsoft.com/azure/cosmos-db/secure-access-to-data",
8403+
"redirect_document_id": false
8404+
},
83808405
{
83818406
"source_path": "articles/documentdb/documentdb-automation-resource-manager-cli-nodejs.md",
83828407
"redirect_url": "https://docs.microsoft.com/azure/cosmos-db/cli-samples",
@@ -8394,7 +8419,7 @@
83948419
},
83958420
{
83968421
"source_path": "articles/documentdb/table-powershell.md",
8397-
"redirect_url": "https://docs.microsoft.com/en-us/azure/cosmos-db/table-introduction",
8422+
"redirect_url": "https://docs.microsoft.com/azure/cosmos-db/table-introduction",
83988423
"redirect_document_id": false
83998424
},
84008425
{
@@ -23981,6 +24006,11 @@
2398124006
"redirect_url": "/azure/active-directory/authentication/howto-mfa-userdevicesettings",
2398224007
"redirect_document_id": true
2398324008
},
24009+
{
24010+
"source_path": "articles/network-watcher/prepare-flow-log.md",
24011+
"redirect_url": "/azure/network-watcher/network-watcher-nsg-flow-logging-overview",
24012+
"redirect_document_id": true
24013+
},
2398424014
{
2398524015
"source_path": "articles/network-watcher/network-watcher-nsg-flow-logging-cli-nodejs.md",
2398624016
"redirect_url": "/azure/network-watcher/network-watcher-nsg-flow-logging-cli",
@@ -26996,6 +27026,21 @@
2699627026
"redirect_url": "/azure/active-directory/user-help/active-directory-saas-access-panel-user-help",
2699727027
"redirect_document_id": true
2699827028
},
27029+
{
27030+
"source_path": "articles/active-directory/user-help/microsoft-authenticator-app-phone-signin-faq.md",
27031+
"redirect_url": "/azure/active-directory/user-help/microsoft-authenticator-app-how-to",
27032+
"redirect_document_id": false
27033+
},
27034+
{
27035+
"source_path": "articles/active-directory/user-help/device-management-azuread-registered-devices-windows10-setup.md",
27036+
"redirect_url": "/azure/active-directory/user-help/user-help-register-device-on-network",
27037+
"redirect_document_id": true
27038+
},
27039+
{
27040+
"source_path": "articles/active-directory/user-help/device-management-azuread-joined-devices-setup.md",
27041+
"redirect_url": "/azure/active-directory/user-help/user-help-join-device-on-network",
27042+
"redirect_document_id": true
27043+
},
2699927044
{
2700027045
"source_path": "articles/hdinsight/kafka/apache-kafka-azure-functions.md",
2700127046
"redirect_url": "/azure/hdinsight/kafka/apache-kafka-introduction",
@@ -27254,7 +27299,31 @@
2725427299
"source_path": "articles/active-directory/active-directory-conditional-access-no-modern-authentication.md",
2725527300
"redirect_url": "/azure/active-directory/conditional-access/conditional-access-for-exo-and-spo",
2725627301
"redirect_document_id": true
27302+
},
27303+
{
27304+
"source_path": "articles/cognitive-services/speech-service/speech-scenarios.md",
27305+
"redirect_url": "/azure/cognitive-services/speech-service/overview",
27306+
"redirect_document_id": true
27307+
},
27308+
{
27309+
"source_path": "articles/aks/aks-ssh.md",
27310+
"redirect_url": "/azure/aks/ssh",
27311+
"redirect_document_id": true
27312+
},
27313+
{
27314+
"source_path": "articles/cognitive-services/luis/Home.md",
27315+
"redirect_url": "/azure/cognitive-services/luis/what-is-luis",
27316+
"redirect_document_id": true
27317+
},
27318+
{
27319+
"source_path": "articles/data-factory/data-factory-monitor-oms.md",
27320+
"redirect_url": "/azure/data-factory/monitor-using-azure-monitor",
27321+
"redirect_document_id": true
27322+
},
27323+
{
27324+
"source_path": "articles/virtual-machines/linux/ansible-create-complete-vm.md",
27325+
"redirect_url": "/azure/virtual-machines/linux/ansible-create-vm",
27326+
"redirect_document_id": true
2725727327
}
27258-
2725927328
]
2726027329
}

articles/active-directory-b2c/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,8 @@
261261
href: https://azure.microsoft.com/roadmap/?category=security-identity
262262
- name: Frequently asked questions
263263
href: active-directory-b2c-faqs.md
264+
- name: Getting help
265+
href: /azure/active-directory/develop/developer-support-help-options
264266
- name: Pricing
265267
href: https://azure.microsoft.com/pricing/details/active-directory-b2c/
266268
- name: Pricing calculator

articles/active-directory-b2c/active-directory-b2c-reference-threat-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ Azure AD B2C uses detection and mitigation techniques like SYN cookies, and rate
2424

2525
Azure AD B2C also has mitigation techniques in place for password attacks. Mitigation includes brute-force password attacks and dictionary password attacks. Passwords that are set by users are required to be reasonably complex. By using various signals, Azure AD B2C analyzes the integrity of requests. Azure AD B2C is designed to intelligently differentiate intended users from hackers and botnets. Azure AD B2C provides a sophisticated strategy to lock accounts based on the passwords entered, in the likelihood of an attack.
2626

27-
For more information, visit the [Microsoft Trust Center](https://www.microsoft.com/en-us/trustcenter/default.aspx).
27+
For more information, visit the [Microsoft Trust Center](https://www.microsoft.com/trustcenter/default.aspx).

articles/active-directory-b2c/active-directory-b2c-user-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ You can view and monitor logging information in near-real time.
359359
After you complete the [Get started with custom policies][B2C-GetStartedCustom] walkthrough, we recommend that you build your scenario by using your own custom policy files. For your reference, we have provided [Sample policy files][UserMigrationSample].
360360

361361
[AD-PasswordPolicies]: https://docs.microsoft.com/azure/active-directory/active-directory-passwords-policy
362-
[AD-Powershell]: https://docs.microsoft.com/en-us/powershell/azure/active-directory/install-adv2
362+
[AD-Powershell]: https://docs.microsoft.com/powershell/azure/active-directory/install-adv2
363363
[AppService-Deploy]: https://docs.microsoft.com/aspnet/core/tutorials/publish-to-azure-webapp-using-vs
364364
[B2C-AppRegister]: https://docs.microsoft.com/azure/active-directory-b2c/active-directory-b2c-app-registration
365365
[B2C-GetStarted]: https://docs.microsoft.com/azure/active-directory-b2c/active-directory-b2c-get-started

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Depending on application regulation, parental consent might need to be granted b
4242

4343
The following is an example of a user flow for gathering parental consent:
4444

45-
1. An [Azure Active Directory Graph API](https://msdn.microsoft.com/en-us/library/azure/ad/graph/api/api-catalog) operation identifies the user as a minor and returns the user data to the application in the form of an unsigned JSON token.
45+
1. An [Azure Active Directory Graph API](https://msdn.microsoft.com/library/azure/ad/graph/api/api-catalog) operation identifies the user as a minor and returns the user data to the application in the form of an unsigned JSON token.
4646

4747
2. The application processes the JSON token and shows a screen to the minor, notifying him or her that parental consent is required and requesting the consent of a parent online.
4848

@@ -52,7 +52,7 @@ The following is an example of a user flow for gathering parental consent:
5252

5353
5. When either the minor or the adult revokes consent, the Azure AD Graph API can be used to change **consentProvidedForMinor** to **denied**. Alternatively, the application may choose to delete a minor whose consent has been revoked. It is optionally possible to customize the user flow so that the authenticated minor (or parent that is using the minor’s account) can revoke consent. Azure AD B2C records **consentProvidedForMinor** as **denied**.
5454

55-
For more information about **legalAgeGroupClassification**, **consentProvidedForMinor**, and **ageGroup**, see [User resource type](https://developer.microsoft.com/en-us/graph/docs/api-reference/beta/resources/user). For more information about custom attributes, see [Use custom attributes to collect information about your consumers](active-directory-b2c-reference-custom-attr.md). When you address extended attributes by using the Azure AD Graph API, you must use the long version of the attribute, such as *extension_18b70cf9bb834edd8f38521c2583cd86_dateOfBirth*: *2011-01-01T00:00:00Z*.
55+
For more information about **legalAgeGroupClassification**, **consentProvidedForMinor**, and **ageGroup**, see [User resource type](https://developer.microsoft.com/graph/docs/api-reference/beta/resources/user). For more information about custom attributes, see [Use custom attributes to collect information about your consumers](active-directory-b2c-reference-custom-attr.md). When you address extended attributes by using the Azure AD Graph API, you must use the long version of the attribute, such as *extension_18b70cf9bb834edd8f38521c2583cd86_dateOfBirth*: *2011-01-01T00:00:00Z*.
5656

5757
## Gather date of birth and country data
5858

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.component: B2C
1515

1616
# Manage user data in Azure Active Directory B2C
1717

18-
This article discusses how you can manage the user data in Azure Active Directory (Azure AD) B2C by using the operations that are provided by the [Azure Active Directory Graph API](https://msdn.microsoft.com/en-us/library/azure/ad/graph/api/api-catalog). Managing user data includes deleting or exporting data from audit logs.
18+
This article discusses how you can manage the user data in Azure Active Directory (Azure AD) B2C by using the operations that are provided by the [Azure Active Directory Graph API](https://msdn.microsoft.com/library/azure/ad/graph/api/api-catalog). Managing user data includes deleting or exporting data from audit logs.
1919

2020
[!INCLUDE [gdpr-intro-sentence.md](../../includes/gdpr-intro-sentence.md)]
2121

articles/active-directory-domain-services/active-directory-ds-troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ If one or more users in your Azure AD tenant are unable to sign in to the newly
135135
* **External accounts:** Ensure that the affected user account is not an external account in the Azure AD tenant. Examples of external accounts include Microsoft accounts (for example, '[email protected]') or user accounts from an external Azure AD directory. Since Azure AD Domain Services does not have credentials for such user accounts, these users cannot sign in to the managed domain.
136136
* **Synced accounts:** If the affected user accounts are synchronized from an on-premises directory, verify that:
137137

138-
* You have deployed or updated to the [latest recommended release of Azure AD Connect](https://www.microsoft.com/en-us/download/details.aspx?id=47594).
138+
* You have deployed or updated to the [latest recommended release of Azure AD Connect](https://www.microsoft.com/download/details.aspx?id=47594).
139139
* You have configured Azure AD Connect to [perform a full synchronization](active-directory-ds-getting-started-password-sync.md).
140140
* Depending on the size of your directory, it may take a while for user accounts and credential hashes to be available in Azure AD Domain Services. Ensure you wait long enough before retrying authentication.
141141
* If the issue persists after verifying the preceding steps, try restarting the Microsoft Azure AD Sync Service. From your sync machine, launch a command prompt and execute the following commands:

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,22 @@ sections:
2626
- href: active-directory-ds-overview.md
2727
html: <p>Read about what Azure AD Domain Services can do for you.</p>
2828
image:
29-
src: https://docs.microsoft.com/en-us/media/common/i_investigate.svg
29+
src: https://docs.microsoft.com/media/common/i_investigate.svg
3030
title: What is Azure AD Domain Services?
3131
- href: active-directory-ds-getting-started.md
3232
html: <p>Create your own managed domain with this simple walkthrough.</p>
3333
image:
34-
src: https://docs.microsoft.com/en-us/media/common/i_deploy.svg
34+
src: https://docs.microsoft.com/media/common/i_deploy.svg
3535
title: Get started
3636
- href: active-directory-ds-contact-us.md
3737
html: <p>Receive help when you need it.</p>
3838
image:
39-
src: https://docs.microsoft.com/en-us/media/common/i_support.svg
39+
src: https://docs.microsoft.com/media/common/i_support.svg
4040
title: Get support
41-
- href: https://azure.microsoft.com/en-us/updates/?product=active-directory-ds
41+
- href: https://azure.microsoft.com/updates/?product=active-directory-ds
4242
html: <p>See new features in Azure AD Domain Services.</p>
4343
image:
44-
src: https://docs.microsoft.com/en-us/media/common/i_whats-new.svg
44+
src: https://docs.microsoft.com/media/common/i_whats-new.svg
4545
title: What's new
4646

4747
- title: Videos
@@ -58,7 +58,7 @@ sections:
5858
- html: <a href="active-directory-ds-features.md">Features of Azure AD Domain Services</a>
5959
- html: <a href="active-directory-ds-scenarios.md">How can you use the service?</a>
6060
- html: <a href="active-directory-ds-synchronization.md">Understand how synchronization works in Azure AD Domain Services</a>
61-
- html: <a href="https://azure.microsoft.com/en-us/pricing/details/active-directory-ds/">Pricing of Azure AD Domain Services</a>
61+
- html: <a href="https://azure.microsoft.com/pricing/details/active-directory-ds/">Pricing of Azure AD Domain Services</a>
6262

6363
- title: Applications and Azure AD Domain Services
6464
items:
@@ -90,13 +90,13 @@ sections:
9090
- html: <a href="active-directory-ds-troubleshooting.md">Troubleshooting guide</a>
9191
- html: <a href="active-directory-ds-troubleshoot-alerts.md">Troubleshooting alerts on your managed domain</a>
9292
- html: <a href="active-directory-ds-faqs.md">Frequently Asked Questions</a>
93-
- html: <a href="https://azure.microsoft.com/en-us/support/options/">Get support</a>
93+
- html: <a href="https://azure.microsoft.com/support/options/">Get support</a>
9494

9595
- title: Other resources
9696
items:
9797
- type: list
9898
style: unordered
9999
items:
100100
- html: <a href="https://feedback.azure.com/forums/169401-azure-active-directory/">Give feedback on Azure AD Domain Services at UserVoice</a>
101-
- html: <a href="https://azure.microsoft.com/en-us/roadmap/?category=security-identity">Azure Roadmap</a>
102-
- html: <a href="https://docs.microsoft.com/en-us/azure/active-directory-domain-services/active-directory-ds-contact-us">Contact Us</a>
101+
- html: <a href="https://azure.microsoft.com/roadmap/?category=security-identity">Azure Roadmap</a>
102+
- html: <a href="https://docs.microsoft.com/azure/active-directory-domain-services/active-directory-ds-contact-us">Contact Us</a>

0 commit comments

Comments
 (0)