Skip to content

Commit 9d77f3e

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-ar-enable-updates
2 parents 73156ee + 506d2ae commit 9d77f3e

29 files changed

+286
-1918
lines changed

.openpublishing.redirection.json

Lines changed: 66 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4889,7 +4889,7 @@
48894889
"source_path": "articles/azure-functions/functions-bindings-external-file.md",
48904890
"redirect_url": "/azure/azure-functions/functions-triggers-bindings#supported-bindings",
48914891
"redirect_document_id": false
4892-
},
4892+
},
48934893
{
48944894
"source_path": "articles/azure-functions/functions-create-vnet-old.md",
48954895
"redirect_url": "/azure/azure-functions/functions-create-vnet",
@@ -13769,12 +13769,12 @@
1376913769
"source_path": "articles/sql-data-warehouse/sql-data-warehouse-restore-database-portal.md",
1377013770
"redirect_url": "/azure/sql-data-warehouse/sql-data-warehouse-restore",
1377113771
"redirect_document_id": false
13772-
},
13772+
},
1377313773
{
1377413774
"source_path": "articles/sql-data-warehouse/sql-data-warehouse-restore-database-powershell.md",
1377513775
"redirect_url": "/azure/sql-data-warehouse/sql-data-warehouse-restore",
1377613776
"redirect_document_id": false
13777-
},
13777+
},
1377813778
{
1377913779
"source_path": "articles/sql-data-warehouse/sql-data-warehouse-restore-database-rest-api.md",
1378013780
"redirect_url": "/azure/sql-data-warehouse/sql-data-warehouse-restore",
@@ -27685,7 +27685,7 @@
2768527685
"redirect_document_id": false
2768627686
},
2768727687
{
27688-
"source_path": "articles/sql-data-warehouse/release-notes.md",
27688+
"source_path": "articles/sql-data-warehouse/release-notes.md",
2768927689
"redirect_url": "/azure/sql-data-warehouse/release-notes-10-0-10106-0",
2769027690
"redirect_document_id": false
2769127691
},
@@ -36472,7 +36472,7 @@
3647236472
"source_path": "articles/cognitive-services/personalizer/personalizer-container-howto.md",
3647336473
"redirect_url": "/azure/cognitive-services/personalizer/what-is-personalizer",
3647436474
"redirect_document_id": false
36475-
},
36475+
},
3647636476
{
3647736477
"source_path": "articles/cognitive-services/LUIS/luis-quickstart-intent-and-key-phrase.md",
3647836478
"redirect_url": "/azure/cognitive-services/LUIS/luis-reference-prebuilt-keyphrase",
@@ -39558,10 +39558,70 @@
3955839558
"redirect_url": "/azure/active-directory-domain-services/troubleshoot",
3955939559
"redirect_document_id": false
3956039560
},
39561+
{
39562+
"source_path": "articles/cognitive-services/translator/quickstart-ruby-detect.md",
39563+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-Ruby",
39564+
"redirect_document_id": false
39565+
},
39566+
{
39567+
"source_path": "articles/cognitive-services/translator/quickstart-ruby-dictionary.md",
39568+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-Ruby",
39569+
"redirect_document_id": false
39570+
},
39571+
{
39572+
"source_path": "articles/cognitive-services/translator/quickstart-ruby-languages.md",
39573+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-Ruby",
39574+
"redirect_document_id": false
39575+
},
39576+
{
39577+
"source_path": "articles/cognitive-services/translator/quickstart-ruby-sentences.md",
39578+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-Ruby",
39579+
"redirect_document_id": false
39580+
},
39581+
{
39582+
"source_path": "articles/cognitive-services/translator/quickstart-ruby-translate.md",
39583+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-Ruby",
39584+
"redirect_document_id": false
39585+
},
39586+
{
39587+
"source_path": "articles/cognitive-services/translator/quickstart-ruby-transliterate.md",
39588+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-Ruby",
39589+
"redirect_document_id": false
39590+
},
39591+
{
39592+
"source_path": "articles/cognitive-services/translator/quickstart-php-detect.md",
39593+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-PHP",
39594+
"redirect_document_id": false
39595+
},
39596+
{
39597+
"source_path": "articles/cognitive-services/translator/quickstart-php-dictionary.md",
39598+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-PHP",
39599+
"redirect_document_id": false
39600+
},
39601+
{
39602+
"source_path": "articles/cognitive-services/translator/quickstart-php-languages.md",
39603+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-PHP",
39604+
"redirect_document_id": false
39605+
},
39606+
{
39607+
"source_path": "articles/cognitive-services/translator/quickstart-php-sentences.md",
39608+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-PHP",
39609+
"redirect_document_id": false
39610+
},
39611+
{
39612+
"source_path": "articles/cognitive-services/translator/quickstart-php-translate.md",
39613+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-PHP",
39614+
"redirect_document_id": false
39615+
},
39616+
{
39617+
"source_path": "articles/cognitive-services/translator/quickstart-php-transliterate.md",
39618+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-PHP",
39619+
"redirect_document_id": false
39620+
},
3956139621
{
3956239622
"source_path": "articles/backup/backup-azure-upgrade-backup-to-recovery-services.md",
3956339623
"redirect_url": "/azure/backup/backup-create-rs-vault",
3956439624
"redirect_document_id": true
39565-
}
39625+
}
3956639626
]
3956739627
}

articles/active-directory/devices/concept-primary-refresh-token.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,11 @@ When a user initiates a browser interaction, the browser (or extension) invokes
107107
A PRT can get a multi-factor authentication (MFA) claim in specific scenarios. When an MFA-based PRT is used to request tokens for applications, the MFA claim is transferred to those app tokens. This functionality provides a seamless experience to users by preventing MFA challenge for every app that requires it. A PRT can get an MFA claim in the following ways:
108108

109109
* **Sign in with Windows Hello for Business**: Windows Hello for Business replaces passwords and uses cryptographic keys to provide strong two-factor authentication. Windows Hello for Business is specific to a user on a device, and itself requires MFA to provision. When a user logs in with Windows Hello for Business, the user’s PRT gets an MFA claim. This scenario also applies to users logging in with smartcards if smartcard authentication produces an MFA claim from ADFS.
110+
* As Windows Hello for Business is considered multi-factor authentication, the MFA claim is updated when the PRT itself is refreshed, so the MFA duration will continually extend when users sign in with WIndows Hello for Business
110111
* **MFA during WAM interactive sign in**: During a token request through WAM, if a user is required to do MFA to access the app, the PRT that is renewed during this interaction is imprinted with an MFA claim.
112+
* In this case, the MFA claim is not updated continuously, so the MFA duration is based on the lifetime set on the directory.
111113
* **MFA during device registration**: If an admin has configured their device settings in Azure AD to [require MFA to register devices](device-management-azure-portal.md#configure-device-settings), the user needs to do MFA to complete the registration. During this process, the PRT that is issued to the user has the MFA claim obtained during the registration. This capability only applies to the user who did the join operation, not to other users who sign in to that device.
114+
* Similar to the WAM interactive sign in, the MFA claim is not updated continuously, so the MFA duration is based on the lifetime set on the directory.
112115

113116
Windows 10 maintains a partitioned list of PRTs for each credential. So, there’s a PRT for each of Windows Hello for Business, password, or smartcard. This partitioning ensures that MFA claims are isolated based on the credential used, and not mixed up during token requests.
114117

articles/aks/operator-best-practices-cluster-security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ This article focused on how to secure your AKS cluster. To implement some of the
214214
<!-- EXTERNAL LINKS -->
215215
[kured]: https://github.com/weaveworks/kured
216216
[k8s-apparmor]: https://kubernetes.io/docs/tutorials/clusters/apparmor/
217-
[seccomp]: https://docs.docker.com/engine/security/seccomp/
217+
[seccomp]: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#seccomp
218218
[kubectl-apply]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#apply
219219
[kubectl-exec]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#exec
220220
[kubectl-get]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#get

articles/aks/operator-best-practices-multi-region.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ The typical strategy is to provide a common storage point where applications can
112112

113113
If you use Azure Managed Disks, you can choose replication and DR solutions such as these:
114114

115-
* [Ark on Azure](https://github.com/heptio/ark/blob/master/docs/azure-config.md)
115+
* [Velero on Azure](https://github.com/heptio/velero/blob/master/site/docs/master/azure-config.md)
116116
* [Azure Site Recovery](https://azure.microsoft.com/blog/asr-managed-disks-between-azure-regions/)
117117

118118
### Application-based asynchronous replication

articles/cognitive-services/Translator/quickstart-php-detect.md

Lines changed: 0 additions & 135 deletions
This file was deleted.

0 commit comments

Comments
 (0)