Merge pull request #79285 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit e068e2b575c7 · 2019-06-11T14:24:23.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/conditional-access/howto-conditional-access-session-lifetime.md b/articles/active-directory/conditional-access/howto-conditional-access-session-lifetime.md
@@ -50,7 +50,7 @@ The Azure AD default for browser session persistence allows users on personal de
 Conditional access is an Azure AD Premium capability and requires a premium license. If you would like to learn more about conditional access, see [What is conditional access in Azure Active Directory?](overview.md#license-requirements)
 
 > [!WARNING]
-> If you are using the [configurable token lifetime](../develop/active-directory-configurable-token-lifetimes.md) feature currently in public preview, please note that we don’t support creating two different policies for the same user or app combination: one with this feature and another one with configurable token lifetime feature. Microsoft plans to retire the configurable token lifetime feature on October 15 and replace it with the conditional access authentication session management feature.  
+> If you are using the [configurable token lifetime](../develop/active-directory-configurable-token-lifetimes.md) feature currently in public preview, please note that we don’t support creating two different policies for the same user or app combination: one with this feature and another one with configurable token lifetime feature. Microsoft plans to retire the configurable token lifetime feature on November 1 and replace it with the conditional access authentication session management feature.  
 
 ### Policy 1: Sign-in frequency control
 
diff --git a/articles/application-gateway/application-gateway-autoscaling-zone-redundant.md b/articles/application-gateway/application-gateway-autoscaling-zone-redundant.md
@@ -80,6 +80,9 @@ Capacity unit price = 744(hours) * Max (25/50 compute unit for connections/sec,
 
 Total price = $148.8+23.81 = $172.61
 
+> [!NOTE]
+> The Max function returns the largest value in a pair of values.
+
 **Example 3**
 
 An Application Gateway WAF_v2 is provisioned for a month. During this time, it receives 25 new SSL connections/sec, average of 8.88-Mbps data transfer and does 80 request per second. Assuming connections are short lived, and that compute unit calculation for the application supports 10 RPS per compute unit, your price would be:
@@ -90,6 +93,9 @@ Capacity unit price = 744(hours) * Max (compute unit Max(25/50 for connections/s
 
 Total price = $267.84 + $85.71 = $353.55
 
+> [!NOTE]
+> The Max function returns the largest value in a pair of values.
+
 ## Scaling Application Gateway and WAF v2
 
 Application Gateway and WAF can be configured to scale in two modes:
diff --git a/articles/azure-app-configuration/quickstart-aspnet-core-app.md b/articles/azure-app-configuration/quickstart-aspnet-core-app.md
@@ -128,8 +128,6 @@ Add the [Secret Manager tool](https://docs.microsoft.com/aspnet/core/security/ap
     @using Microsoft.Extensions.Configuration
     @inject IConfiguration Configuration
 
-    <!DOCTYPE html>
-    <html lang="en">
     <style>
         body {
             background-color: @Configuration["TestApp:Settings:BackgroundColor"]
@@ -139,13 +137,8 @@ Add the [Secret Manager tool](https://docs.microsoft.com/aspnet/core/security/ap
             font-size: @Configuration["TestApp:Settings:FontSize"];
         }
     </style>
-    <head>
-        <title>Index View</title>
-    </head>
-    <body>
-        <h1>@Configuration["TestApp:Settings:Message"]</h1>
-    </body>
-    </html>
+
+    <h1>@Configuration["TestApp:Settings:Message"]</h1>
     ```
 
 7. Open *_Layout.cshtml* in the Views > Shared directory, and replace its content with the following code:
diff --git a/articles/iot-edge/tutorial-store-data-sql-server.md b/articles/iot-edge/tutorial-store-data-sql-server.md
@@ -66,7 +66,7 @@ The following steps show you how to create an IoT Edge function using Visual Stu
    | Provide a solution name | Enter a descriptive name for your solution, like **SqlSolution**, or accept the default. |
    | Select module template | Choose **Azure Functions - C#**. |
    | Provide a module name | Name your module **sqlFunction**. |
-   | Provide Docker image repository for the module | An image repository includes the name of your container registry and the name of your container image. Your container image is prepopulated from the last step. Replace **localhost:5000** with the login server value from your Azure container registry. You can retrieve the login server from the Overview page of your container registry in the Azure portal. <br><br>The final string looks like \<registry name\>.azurecr.io/sqlFunction. |
+   | Provide Docker image repository for the module | An image repository includes the name of your container registry and the name of your container image. Your container image is prepopulated from the last step. Replace **localhost:5000** with the login server value from your Azure container registry. You can retrieve the login server from the Overview page of your container registry in the Azure portal. <br><br>The final string looks like \<registry name\>.azurecr.io/sqlfunction. |
 
    The VS Code window loads your IoT Edge solution workspace. 
    
