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

Author: BethWilke

articles/active-directory/authentication/active-directory-certificate-based-authentication-android.md

@@ -24,7 +24,7 @@ Android devices can use certificate-based authentication (CBA) to authenticate t
 
 Configuring this feature eliminates the need to enter a username and password combination into certain mail and Microsoft Office applications on your mobile device.
 
-This topic provides you with the requirements and the supported scenarios for configuring CBA on an iOS(Android) device for users of tenants in Office 365 Enterprise, Business, Education, US Government, China, and Germany plans.
+This topic provides you with the requirements and the supported scenarios for configuring CBA on an Android device for users of tenants in Office 365 Enterprise, Business, Education, US Government, China, and Germany plans.
 
 This feature is available in preview in Office 365 US Government Defense and Federal plans.
 

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/hybrid/plan-connect-userprincipalname.md

@@ -88,7 +88,7 @@ On-Premises user object:
 - mailNickName		: <not set>
 - proxyAddresses		: {SMTP:us1@contoso.com}
 - mail			: [email protected]
-- userPrincipalName	: [email protected]`
+- userPrincipalName	: [email protected]
 
 Synchronized the user object to Azure AD Tenant for the first time
 - Set Azure AD MailNickName attribute to primary SMTP address prefix.

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/active-directory/saas-apps/ally-tutorial.md

@@ -89,7 +89,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
 1. Click **Set additional URLs** and perform the following step if you wish to configure the application in **SP** initiated mode:
 
     In the **Sign-on URL** text box, type a URL:
-    `https://app.ally.io/`
+    `https://app.ally.io/saml/consume/<CUSTOM_GUID>`
 
 	> [!NOTE]
 	> These values are not real. Update these values with the actual Identifier and Reply URL. Contact [Ally Client support team](mailto:[email protected]) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
@@ -145,7 +145,7 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
 
 ## Configure Ally SSO
 
-To configure single sign-on on **Ally** side, you need to send the downloaded **Certificate (Base64)** and appropriate copied URLs from Azure portal to [Ally support team](mailto:contact@ally.io). They set this setting to have the SAML SSO connection set properly on both sides.
+To configure single sign-on on **Ally** side, you need to send the downloaded **Certificate (Base64)** and appropriate copied URLs from Azure portal to [Ally support team](mailto:support@ally.io). They set this setting to have the SAML SSO connection set properly on both sides.
 
 ### Create Ally test user
 

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