Skip to content

Commit e65b690

Browse files
authored
Merge pull request #116399 from SyntaxC4/microsoft/azure-docs/Migrations
Migrating PRs from Microsoft/azure-docs
2 parents 125c084 + 21b7c7e commit e65b690

File tree

7 files changed

+23
-10
lines changed

7 files changed

+23
-10
lines changed

articles/active-directory/users-groups-roles/domains-manage.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ You can add up to 900 managed domain names. If you're configuring all your domai
4646

4747
If you want to add a third-level domain name such as ‘europe.contoso.com’ to your directory, you should first add and verify the second-level domain, such as contoso.com. The subdomain is automatically verified by Azure AD. To see that the subdomain you added is verified, refresh the domain list in the browser.
4848

49+
Note
50+
51+
If you have already added a contoso.com domain to an Azure AD tenant, you can also add the subdomain europe.contoso.com to a second Azure AD tenant. When adding the subdomain, you will be prompted to add a TXT record in the DNS hosting provider.
52+
4953
## What to do if you change the DNS registrar for your custom domain name
5054

5155
If you change the DNS registrars, there are no additional configuration tasks in Azure AD. You can continue using the domain name with Azure AD without interruption. If you use your custom domain name with Office 365, Intune, or other services that rely on custom domain names in Azure AD, see the documentation for those services.

articles/azure-resource-manager/management/lock-resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ In the request, include a JSON object that specifies the properties for the lock
235235
}
236236

237237
## Next steps
238-
* To learn about logically organizing your resources, see [Using tags to organize your resources](tag-resources.md)
238+
* To learn about logically organizing your resources, see [Using tags to organize your resources](tag-resources.md).
239239
* You can apply restrictions and conventions across your subscription with customized policies. For more information, see [What is Azure Policy?](../../governance/policy/overview.md).
240240
* For guidance on how enterprises can use Resource Manager to effectively manage subscriptions, see [Azure enterprise scaffold - prescriptive subscription governance](/azure/architecture/cloud-adoption-guide/subscription-governance).
241241

articles/cognitive-services/LUIS/luis-migration-api-v3.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,4 +279,4 @@ The V2 API will not be deprecated for at least 9 months after the V3 preview.
279279

280280
## Next steps
281281

282-
Use the V3 API documentation to update existing REST calls to LUIS [endpoint](https://aka.ms/luis-api-v3) APIs.
282+
Use the V3 API documentation to update existing REST calls to LUIS [endpoint](https://westcentralus.dev.cognitive.microsoft.com/docs/services/luis-endpoint-api-v3-0/operations/5cb0a9459a1fe8fa44c28dd8) APIs.

articles/data-factory/control-flow-expression-language-functions.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ Expressions can appear anywhere in a JSON string value and always result in anot
6060

6161
## Examples
6262

63+
### Complex expression example
64+
The below example shows a complex example that references a deep sub-field of activity output. To reference a pipeline parameter that evaluates to a sub-field, use [] syntax instead of dot(.) operator (as in case of subfield1 and subfield2)
65+
66+
@activity('{activityName}').output.{subfield1}.{subfield2}[pipeline().parameters.subfield3].{subfield4}
67+
6368
### A dataset with a parameter
6469
In the following example, the BlobDataset takes a parameter named **path**. Its value is used to set a value for the **folderPath** property by using the expression: `dataset().path`.
6570

articles/hdinsight/hdinsight-component-versioning.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,16 @@ The component versions associated with HDInsight cluster versions are listed in
3838
| Apache Storm | - | 1.1.0 |
3939
| Apache Mahout | - | 0.9.0+ |
4040
| Apache Phoenix | 5 | 4.7.0 |
41-
| Apache Spark | 2.4, 2.3.1* | 2.3.0, 2.2.0, 2.1.0 |
41+
| Apache Spark | 2.4 | 2.3.0, 2.2.0, 2.1.0 |
4242
| Apache Livy | 0.5 | 0.4, 0.4, 0.3 |
43-
| Apache Kafka | 1.1.1, 2.1 | 1.1, 1.0* (See the note.) |
43+
| Apache Kafka | 2.1 | 1.1 |
4444
| Apache Ambari | 2.7.0 | 2.6.0 |
4545
| Apache Zeppelin | 0.8.0 | 0.7.3 |
4646
| Mono | 4.2.1 | 4.2.1 |
4747

4848
> [!NOTE]
49-
> Support for Kafka version 0.10 expired in March 2019 because of system performance considerations.
49+
> HDInsight 4.0: Spark 2.4 and Kafka 2.1 are fully supported. However, Spark 2.3 and Kafka 1.1 are not serviced.
50+
> HDInsight 3.6: Spark 2.3 and Kafka 1.1 are fully supported.
5051
5152
## Check for current Apache component version information
5253

articles/hdinsight/hdinsight-release-notes.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.reviewer: jasonh
77
ms.custom: hdinsightactive
88
ms.service: hdinsight
99
ms.topic: conceptual
10-
ms.date: 05/08/2020
10+
ms.date: 05/12/2020
1111
---
1212
# Release notes
1313

@@ -42,13 +42,13 @@ No behavior changes for this release. To get ready for upcoming changes, see [Up
4242
## Upcoming changes
4343
The following changes will happen in upcoming releases.
4444

45-
### Deprecate Spark 2.1 and 2.2 in HDInsight 3.6 Spark cluster
45+
### Deprecation of Spark 2.1 and 2.2 in HDInsight 3.6 Spark cluster
4646
Starting from July 1 2020, customers will not be able to create new Spark clusters with Spark 2.1 and 2.2 on HDInsight 3.6. Existing clusters will run as is without the support from Microsoft. Consider to move to Spark 2.3 on HDInsight 3.6 by June 30 2020 to avoid potential system/support interruption.
4747

48-
### Deprecate Spark 2.3 in HDInsight 4.0 Spark cluster
48+
### Deprecation of Spark 2.3 in HDInsight 4.0 Spark cluster
4949
Starting from July 1 2020, customers will not be able to create new Spark clusters with Spark 2.3 on HDInsight 4.0. Existing clusters will run as is without the support from Microsoft. Consider moving to Spark 2.4 on HDInsight 4.0 by June 30 2020 to avoid potential system/support interruption.
5050

51-
### Deprecate Kafka 1.1 in HDInsight 4.0 Kafka cluster
51+
### Deprecation of Kafka 1.1 in HDInsight 4.0 Kafka cluster
5252
Starting from July 1 2020, customers will not be able to create new Kafka clusters with Kafka 1.1 on HDInsight 4.0. Existing clusters will run as is without the support from Microsoft. Consider moving to Kafka 2.1 on HDInsight 4.0 by June 30 2020 to avoid potential system/support interruption.
5353

5454
### HBase 2.0 to 2.1.6
@@ -57,6 +57,9 @@ In the upcoming HDInsight 4.0 release, HBase version will be upgraded from versi
5757
### Spark 2.4.0 to 2.4.4
5858
In the upcoming HDInsight 4.0 release, Spark version will be upgraded from version 2.4.0 to 2.4.4
5959

60+
### Kafka 2.1.0 to 2.1.1
61+
In the upcoming HDInsight 4.0 release, Kafka version will be upgraded from version 2.1.0 to 2.1.1
62+
6063
### A minimum 4-core VM is required for Head Node
6164
A minimum 4-core VM is required for Head Node to ensure the high availability and reliability of HDInsight clusters. Starting from April 6 2020, customers can only choose 4-core or above VM as Head Node for the new HDInsight clusters. Existing clusters will continue to run as expected.
6265

includes/virtual-machines-common-spot-vms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Users can opt-in to receive in-VM notifications through [Azure Scheduled Events]
3030
| Price for the VM has gone up and is now > the max price. | The VM gets evicted. You get a 30s notification before actual eviction. |
3131
| After eviction the price for the VM goes back to being < the max price. | The VM will not be automatically re-started. You can restart the VM yourself, and it will be charged at the current price. |
3232
| If the max price is set to `-1` | The VM will not be evicted for pricing reasons. The max price will be the current price, up to the price for standard VMs. You will never be charged above the standard price.|
33-
| Changing the max price | You need to deallocate the VM to change the max price. Deallocate the VM, set t a new max price, then update the VM. |
33+
| Changing the max price | You need to deallocate the VM to change the max price. Deallocate the VM, set a new max price, then update the VM. |
3434

3535
## Limitations
3636

0 commit comments

Comments
 (0)