Merge pull request #111981 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit 9e80987f5fc6 · 2020-04-20T14:51:18.000-07:00
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
diff --git a/articles/active-directory/authentication/active-directory-certificate-based-authentication-android.md b/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.
 
diff --git a/articles/active-directory/hybrid/plan-connect-userprincipalname.md b/articles/active-directory/hybrid/plan-connect-userprincipalname.md
@@ -88,7 +88,7 @@ On-Premises user object:
 - mailNickName		: &lt;not set&gt;
 - proxyAddresses		: {SMTP:us1@contoso.com}
 - mail			: us2@contoso.com
-- userPrincipalName	: us3@contoso.com`
+- userPrincipalName	: us3@contoso.com
 
 Synchronized the user object to Azure AD Tenant for the first time
 - Set Azure AD MailNickName attribute to primary SMTP address prefix.
diff --git a/articles/active-directory/saas-apps/ally-tutorial.md b/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:contact@ally.io) 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
 
diff --git a/articles/azure-monitor/app/asp-net-core.md b/articles/azure-monitor/app/asp-net-core.md
@@ -158,11 +158,11 @@ The preceding steps are enough to help you start collecting server-side telemetr
     
 Alternatively to using the `FullScript` the `ScriptBody` is available starting in SDK v2.14. Use this if you need to control the `<script>` tag to set a Content Security Policy:
 
-    ```cshtml
-        <script> // apply custom changes to this script tag.
-            @Html.Raw(JavaScriptSnippet.ScriptBody)
-        </script>
-    ```
+```cshtml
+ <script> // apply custom changes to this script tag.
+     @Html.Raw(JavaScriptSnippet.ScriptBody)
+ </script>
+```
 
 The `.cshtml` file names referenced earlier are from a default MVC application template. Ultimately, if you want to properly enable client-side monitoring for your application, the JavaScript snippet must appear in the `<head>` section of each page of your application that you want to monitor. You can accomplish this goal for this application template by adding the JavaScript snippet to `_Layout.cshtml`. 
 
diff --git a/articles/cognitive-services/Translator/language-support.md b/articles/cognitive-services/Translator/language-support.md
@@ -58,6 +58,7 @@ The V3 Translator API is neural by default and statistical systems are only avai
 |French|	`fr`	|	Neural|
 |German|	`de`	|	Neural|
 |Greek|	`el`	|	Neural|
+|Gujarati|	`gu`	|	Neural|
 |Haitian Creole|	`ht`		|Statistical|
 |Hebrew	|`he`	|Neural
 |Hindi|	`hi`	|	Neural|
@@ -80,6 +81,7 @@ The V3 Translator API is neural by default and statistical systems are only avai
 |Malayalam| `ml` | Neural
 |Maltese|	`mt`	|	Statistical|
 |Maori| `mi`  | Neural|
+|Marathi| `mr`  | Neural|
 |Norwegian|	`nb`	|	Neural|
 |Persian|	`fa`	|	Neural|
 |Polish|	`pl`	|	Neural|

-Original file line number
+Diff line change
 - mailNickName		: &lt;not set&gt;
 - 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.