Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into adfssismove

Author: markingmyname

articles/active-directory/hybrid/how-to-connect-migrate-groups.md

@@ -105,7 +105,7 @@ if ($group -eq $null)
 }
 
 $csvFile = Import-Csv -Path $inputCsv -ErrorAction Stop
-$msDSConsistencyGuid = [GUID] $csvFile.'mS-DS-ConsistencyGuid'
+$msDSConsistencyGuid = $csvFile.'mS-DS-ConsistencyGuid'
 $objectGuid = [GUID] $csvFile.'objectGUID'
 $targetGuid = $msDSConsistencyGuid
 

articles/active-directory/manage-apps/manage-self-service-access.md

@@ -12,7 +12,7 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 10/23/2018
+ms.date: 04/20/2020
 ms.author: mimart
 
 ms.collection: M365-identity-device-management
@@ -38,6 +38,9 @@ Using this feature, you can:
 
 -   Optionally automatically assign self-service assigned users to an application role directly.
 
+> [!NOTE]
+> An Azure Active Directory Premium (P1 or P2) license is required for users to request to join a self-service app and for owners to approve or deny requests. Without an Azure Active Directory Premium license, users cannot add self-service apps.
+
 ## Enable self-service application access to allow users to find their own applications
 
 Self-service application access is a great way to allow users to self-discover applications, and optionally allow the business group to approve access to those applications. For password single-sign on applications, you can also allow the business group to manage the credentials assigned to those users from their own My Apps access panels.

articles/app-service/app-service-web-get-started-java.md

@@ -119,10 +119,10 @@ Once deployment has completed, browse to the deployed application using the foll
 > [Connect to Azure SQL database with Java](/azure/sql-database/sql-database-connect-query-java?toc=%2Fazure%2Fjava%2Ftoc.json)
 
 > [!div class="nextstepaction"]
-> [Connect to Azure DB for MySQL with Java](/azure/mysql/connect-java?toc=/azure/java/toc.json)
+> [Connect to Azure DB for MySQL with Java](/azure/mysql/connect-java)
 
 > [!div class="nextstepaction"]
-> [Connect to Azure DB for PostgreSQL with Java](/azure/postgresql/connect-java?toc=/azure/java/toc.json)
+> [Connect to Azure DB for PostgreSQL with Java](/azure/postgresql/connect-java)
 
 > [!div class="nextstepaction"]
 > [Azure for Java Developers Resources](/java/azure/)

articles/app-service/configure-language-java.md

@@ -314,7 +314,7 @@ Azure's supported Java Development Kit (JDK) is [Zulu](https://www.azul.com/down
 
 Major version updates will be provided through new runtime options in Azure App Service for Windows. Customers update to these newer versions of Java by configuring their App Service deployment and are responsible for testing and ensuring the major update meets their needs.
 
-Supported JDKs are automatically patched on a quarterly basis in January, April, July, and October of each year. For more information on Java on Azure, please see [this support document](https://docs.microsoft.com/azure/java/jdk/).
+Supported JDKs are automatically patched on a quarterly basis in January, April, July, and October of each year. For more information on Java on Azure, please see [this support document](https://docs.microsoft.com/azure/developer/java/fundamentals/java-jdk-long-term-support).
 
 ### Security updates
 

articles/app-service/containers/quickstart-java.md

@@ -137,10 +137,10 @@ This command may take a minute to run.
 > [Connect to Azure SQL database with Java](/azure/sql-database/sql-database-connect-query-java?toc=%2Fazure%2Fjava%2Ftoc.json)
 
 > [!div class="nextstepaction"]
-> [Connect to Azure DB for MySQL with Java](/azure/mysql/connect-java?toc=/azure/java/toc.json)
+> [Connect to Azure DB for MySQL with Java](/azure/mysql/connect-java)
 
 > [!div class="nextstepaction"]
-> [Connect to Azure DB for PostgreSQL with Java](/azure/postgresql/connect-java?toc=/azure/java/toc.json)
+> [Connect to Azure DB for PostgreSQL with Java](/azure/postgresql/connect-java)
 
 > [!div class="nextstepaction"]
 > [Configure Java app](configure-custom-container.md)

articles/azure-functions/functions-create-first-azure-function-azure-cli.md

@@ -16,7 +16,7 @@ There is also a [Visual Studio Code-based version](functions-create-first-functi
 
 ::: zone pivot="programming-language-java"  
 > [!NOTE]
-> If Maven is not your prefered development tool, check out our similar tutorials for Java developers using [Gradle](/azure/azure-functions/functions-create-first-java-gradle), [IntelliJ IDEA](/azure/java/intellij/azure-toolkit-for-intellij-quickstart-functions) and [VS Code](/azure/azure-functions/functions-create-first-function-vs-code?pivots=programming-language-java).
+> If Maven is not your prefered development tool, check out our similar tutorials for Java developers using [Gradle](/azure/azure-functions/functions-create-first-java-gradle), [IntelliJ IDEA](/azure/developer/java/toolkit-for-intellij/quickstart-functions) and [VS Code](/azure/azure-functions/functions-create-first-function-vs-code?pivots=programming-language-java).
 ::: zone-end  
 
 [!INCLUDE [functions-requirements-cli](../../includes/functions-requirements-cli.md)]

articles/azure-functions/functions-create-first-function-vs-code.md

@@ -17,7 +17,7 @@ There's also a [CLI-based version](functions-create-first-azure-function-azure-c
 
 ::: zone pivot="programming-language-java"  
 > [!NOTE]
-> If VS Code is not your prefered development tool, check out our similar tutorials for Java developers using [Maven](/azure/azure-functions/functions-create-first-azure-function-azure-cli?pivots=programming-language-java), [Gradle](/azure/azure-functions/functions-create-first-java-gradle) and [IntelliJ IDEA](/azure/java/intellij/azure-toolkit-for-intellij-quickstart-functions).
+> If VS Code is not your prefered development tool, check out our similar tutorials for Java developers using [Maven](/azure/azure-functions/functions-create-first-azure-function-azure-cli?pivots=programming-language-java), [Gradle](/azure/azure-functions/functions-create-first-java-gradle) and [IntelliJ IDEA](/azure/developer/java/toolkit-for-intellij/quickstart-functions).
 ::: zone-end  
 
 ## Configure your environment

articles/azure-functions/functions-create-first-java-gradle.md

@@ -12,7 +12,7 @@ ms.date: 04/08/2020
 This article shows you how to build and publish a Java function project to Azure Functions with the Gradle command-line tool. When you're done, your function code runs in Azure in a [serverless hosting plan](functions-scale.md#consumption-plan) and is triggered by an HTTP request. 
 
 > [!NOTE]
-> If Gradle is not your prefered development tool, check out our similar tutorials for Java developers using [Maven](/azure/azure-functions/functions-create-first-azure-function-azure-cli?pivots=programming-language-java), [IntelliJ IDEA](/azure/java/intellij/azure-toolkit-for-intellij-quickstart-functions) and [VS Code](/azure/azure-functions/functions-create-first-function-vs-code?pivots=programming-language-java).
+> If Gradle is not your prefered development tool, check out our similar tutorials for Java developers using [Maven](/azure/azure-functions/functions-create-first-azure-function-azure-cli?pivots=programming-language-java), [IntelliJ IDEA](/azure/developer/java/toolkit-for-intellij/quickstart-functions) and [VS Code](/azure/azure-functions/functions-create-first-function-vs-code?pivots=programming-language-java).
 
 ## Prerequisites
 

articles/azure-monitor/platform/stream-monitoring-data-event-hubs.md

@@ -51,7 +51,7 @@ Routing your monitoring data to an event hub with Azure Monitor enables you to e
 | ArcSight | No | The ArcSight Azure Event Hub smart connector is available as part of [the ArcSight smart connector collection](https://community.softwaregrp.com/t5/Discussions/Announcing-General-Availability-of-ArcSight-Smart-Connectors-7/m-p/1671852). |
 | Syslog server | No | If you want to stream Azure Monitor data directly to a syslog server, you can use a [solution based on an Azure function](https://github.com/miguelangelopereira/azuremonitor2syslog/).
 | LogRhythm | No| Instructions to set up LogRhythm to collect logs from an event hub are available [here](https://logrhythm.com/six-tips-for-securing-your-azure-cloud-environment/). 
-|Logz.io | Yes | For more information, see [Getting started with monitoring and logging using Logz.io for Java apps running on Azure](https://docs.microsoft.com/azure/java/java-get-started-with-logzio)
+|Logz.io | Yes | For more information, see [Getting started with monitoring and logging using Logz.io for Java apps running on Azure](https://docs.microsoft.com/azure/developer/java/fundamentals/java-get-started-with-logzio)
 
 
 ## Next Steps

articles/bastion/bastion-nsg.md

@@ -6,7 +6,7 @@ author: charwen
 
 ms.service: bastion
 ms.topic: conceptual
-ms.date: 02/03/2020
+ms.date: 04/20/2020
 ms.author: charwen
 ---
 # Working with NSG access and Azure Bastion
@@ -27,9 +27,9 @@ In this diagram:
 
 This section shows you the network traffic between the user and Azure Bastion, and through to target VMs in your virtual network:
 
-### AzureBastionSubnet
+### <a name="apply"></a>AzureBastionSubnet
 
-Azure Bastion is deployed specifically to the AzureBastionSubnet.
+Azure Bastion is deployed specifically to ***AzureBastionSubnet***.
 
 * **Ingress Traffic:**
 
@@ -41,19 +41,11 @@ Azure Bastion is deployed specifically to the AzureBastionSubnet.
    * **Egress Traffic to target VMs:** Azure Bastion will reach the target VMs over private IP. The NSGs need to allow egress traffic to other target VM subnets for port 3389 and 22.
    * **Egress Traffic to other public endpoints in Azure:** Azure Bastion needs to be able to connect to various public endpoints within Azure (for example, for storing diagnostics logs and metering logs). For this reason, Azure Bastion needs outbound to 443 to **AzureCloud** service tag.
 
-* **Target VM Subnet:** This is the subnet that contains the target virtual machine that you want to RDP/SSH to.
+### Target VM Subnet
+This is the subnet that contains the target virtual machine that you want to RDP/SSH to.
 
    * **Ingress Traffic from Azure Bastion:** Azure Bastion will reach to the target VM over private IP. RDP/SSH ports (ports 3389/22 respectively) need to be opened on the target VM side over private IP. As a best practice, you can add the Azure Bastion Subnet IP address range in this rule to allow only Bastion to be able to open these ports on the target VMs in your target VM subnet.
 
-## <a name="apply"></a>Apply NSGs to AzureBastionSubnet
-
-If you create and apply an NSG to ***AzureBastionSubnet***, make sure you have added the following rules in your NSG. If you do not add these rules, the NSG creation/update will fail:
-
-* **Control plane connectivity:** Inbound on 443 from GatewayManager
-* **Diagnostics logging and others:** Outbound on 443 to AzureCloud. Regional tags within this service tag are not supported yet.
-* **Target VM:** Outbound for 3389 and 22 to VirtualNetwork
-
-An NSG rule example is available for reference in this [quickstart template](https://github.com/Azure/azure-quickstart-templates/tree/master/101-azure-bastion-nsg).
 
 ## Next steps