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

Author: v-alje

.openpublishing.redirection.json

@@ -355,7 +355,7 @@
       "redirect_url": "/azure/machine-learning/data-science-virtual-machine/reference-deprecation",
       "redirect_document_id": true
     },
-    
+
     {
       "source_path": "articles/machine-learning/service/how-to-understand-accuracy-metrics.md",
       "redirect_url": "/azure/machine-learning/service/how-to-understand-automated-ml",
@@ -50683,6 +50683,16 @@
       "source_path": "articles/chef/index.yml",
       "redirect_url": "/azure/developer/chef/",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/fundamentals/database-security-overview.md",
+      "redirect_url": "/azure/sql-database/sql-database-security-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/fundamentals/database-best-practices.md",
+      "redirect_url": "/azure/sql-database/sql-database-security-best-practice",
+      "redirect_document_id": false
     }
   ]
 }

articles/active-directory/develop/msal-js-initializing-client-applications.md

@@ -32,7 +32,7 @@ Before initializing an application, you first need to [register it with the Azur
 
 You can use MSAL.js as follows in a plain JavaScript/Typescript application. Initialize MSAL authentication context by instantiating `UserAgentApplication` with a configuration object. The minimum required config to initialize MSAL.js is the clientID of your application which you should get from the application registration portal.
 
-For authentication methods with redirect flows (`loginRedirect` and `acquireTokenRedirect`), you will need to explicitly register a callback for success or error through `handleRedirectCallback()` method. This is needed since redirect flows do not return promises as the methods with a pop-up experience do.
+For authentication methods with redirect flows (`loginRedirect` and `acquireTokenRedirect`), in MSAL.js 1.2.x or earlier, you will need to explicitly register a callback for success or error through `handleRedirectCallback()` method. This is needed since redirect flows do not return promises as the methods with a pop-up experience do. This became optional in MSAL.js version 1.3.0.
 
 ```javascript
 // Configuration object constructed

articles/active-directory/develop/quickstart-v2-netcore-daemon.md

@@ -193,7 +193,6 @@ app = ConfidentialClientApplicationBuilder.Create(config.ClientId)
                                           .WithClientSecret(config.ClientSecret)
                                           .WithAuthority(new Uri(config.Authority))
                                           .Build();
-);
 ```
 
 > | Where: ||

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

@@ -67,12 +67,16 @@ In the Cloud Shell, create a web app in the `myAppServicePlan` App Service plan
 
 In the following example, replace `<app_name>` with a globally unique app name (valid characters are `a-z`, `0-9`, and `-`). The runtime is set to `PHP|7.0`. To see all supported runtimes, run [`az webapp list-runtimes`](/cli/azure/webapp?view=azure-cli-latest#az-webapp-list-runtimes). 
 
+
 ```azurecli-interactive
 # Bash
 az webapp create --resource-group myResourceGroup --plan myAppServicePlan --name <app_name> --runtime "PHP|7.0" --deployment-local-git
 # PowerShell
 az --% webapp create --resource-group myResourceGroup --plan myAppServicePlan --name <app_name> --runtime "PHP|7.0" --deployment-local-git
 ```
+> [!NOTE]
+> The stop-parsing symbol `(--%)`, introduced in PowerShell 3.0, directs PowerShell to refrain from interpreting input as PowerShell commands or expressions. 
+>
 
 When the web app has been created, the Azure CLI shows output similar to the following example:
 

articles/app-service/environment/create-ilb-ase.md

@@ -56,6 +56,9 @@ To create an ILB ASE:
 
     ![ASE creation](media/creating_and_using_an_internal_load_balancer_with_app_service_environment/createilbase.png)
 
+> [!NOTE]
+> The App Service Environment name must be no more than 37 characters.
+
 6. Select Networking
 
 7. Select or create a Virtual Network. If you create a new VNet here, it will be defined with an address range of 192.168.250.0/23. To create a VNet with a different address range or in a different resource group than the ASE, use the Azure Virtual Network creation portal. 
@@ -66,6 +69,7 @@ To create an ILB ASE:
 
 7. Select **Review and Create** then select **Create**.
 
+
 ## Create an app in an ILB ASE ##
 
 You create an app in an ILB ASE in the same way that you create an app in an ASE normally.

articles/automation/TOC.yml

@@ -262,7 +262,7 @@
         href: /powershell/scripting/dsc/overview/overview
   - name: Quickstarts
     items:
-    - name: Getting Started
+    - name: Get Started
       href: automation-dsc-getting-started.md
       displayName: DSC
     - name: Manage the configuration of a machine
@@ -278,31 +278,28 @@
     - name: Configure servers to a desired state and manage drift with State Configuration
       href: tutorial-configure-servers-desired-state.md
       displayName: DSC, compliance
-    - name: Onboarding machines for management
-      href: automation-dsc-onboarding.md
-      displayName: DSC, state configuration
-    - name: Compiling DSC configurations
+    - name: Compile DSC configurations
       href: automation-dsc-compile.md
       displayName: state configuration, composite resources, configurationData
     - name: Remediate non-compliant DSC servers
       href: automation-dsc-remediate.md
       displayName: state configuration, DSC, remediate
-    - name: Composing DSC Configurations using Composite Resources
+    - name: Compose DSC configurations using composite resources
       href: compose-configurationwithcompositeresources.md
-    - name: Continuous deployment using Chocolatey
+    - name: Provide continuous deployment using Chocolatey
       href: automation-dsc-cd-chocolatey.md
       displayName: dsc, state configuration
     - name: Forward State Configuration reporting data to Azure Monitor logs
       href: automation-dsc-diagnostics.md
       displayName: DSC
   - name: Troubleshoot
     items:
-    - name: Onboarding
+    - name: Troubleshoot onboarding
       href: troubleshoot/onboarding.md
       displayName: troubleshoot
     - name: Troubleshoot State Configuration (DSC)
       href: troubleshoot/desired-state-configuration.md
-      displayName: Desired State Configuration, troubleshoot
+      displayName: state configuration, DSC, troubleshoot
   - name: Reference
     items:
     - name: Community Solutions