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

Author: asudbring

articles/active-directory/conditional-access/howto-baseline-protect-azure.md

@@ -47,7 +47,7 @@ If the CLI can open your default browser, it will do so and load a sign-in page.
 
 ## Deployment considerations
 
-Because the **Require MFA for service management** policy applies to all Azure Resource Manager users, several considerations need to be made to ensure a smooth deployment. These considerations include identifying users and service principles in Azure AD that cannot or should not perform MFA, as well as applications and clients used by your organization that do not support modern authentication.
+The **Require MFA for service management** policy applies to all Azure Resource Manager users.
 
 ## Enable the baseline policy
 
@@ -67,4 +67,4 @@ For more information, see:
 
 * [Conditional Access baseline protection policies](concept-baseline-protection.md)
 * [Five steps to securing your identity infrastructure](../../security/fundamentals/steps-secure-identity.md)
-* [What is Conditional Access in Azure Active Directory?](overview.md)
+* [What is Conditional Access in Azure Active Directory?](overview.md)

articles/active-directory/conditional-access/technical-reference.md

@@ -123,7 +123,7 @@ This setting works with all browsers. However, to satisfy a device policy, like
 | Android                | Microsoft Edge, Intune Managed Browser, Chrome  |
 | Windows Phone          | Microsoft Edge, Internet Explorer               |
 | Windows Server 2019    | Microsoft Edge, Internet Explorer, Chrome       |
-| Windows Server 2016    | Microsoft Edge, Internet Explorer               |
+| Windows Server 2016    | Internet Explorer |
 | Windows Server 2012 R2 | Internet Explorer                       |
 | Windows Server 2008 R2 | Internet Explorer                       |
 | macOS                  | Chrome, Safari                                  |

articles/chef/index.yml

@@ -1,57 +1,53 @@
-### YamlMime:YamlDocument
-documentType: LandingData
+### YamlMime:Landing
+
 title: Chef Software on Azure documentation
+summary: Learn how to use Chef Software products to deploy and manage Azure resources.
+
 metadata:
-  title: Chef Software on Azure documentation - Tutorials, samples, reference, and resources
-  description: Chef Software provides a DevOps automation platform for Linux and Windows that enables the management of both physical and virtual server configurations. Learn how to use Chef Software products to automate infrastructure as code (IaC) recipes and manage and deploy virtual machines on Azure with quickstarts and tutorials.
+  title: Chef Software on Azure documentation
+  description: Learn how to use Chef Software products to deploy and manage Azure resources.
+  services: azure
   ms.service: chef
-  keywords: chef, azure, devops, tutorials, samples, reference
-  author: tomarchermsft
-  manager: jeconnoc
+  ms.topic: landing-page
+  author: TomArcherMsft
   ms.author: tarcher
-  ms.topic: landing page
-  ms.date: 08/27/2018
-abstract:
-  description: Chef Software provides a DevOps automation platform for Linux and Windows that enables the management of both physical and virtual server configurations. Learn how to use Chef Software products to automate infrastructure as code (IaC) recipes and manage and deploy virtual machines on Azure with quickstarts and tutorials.
-  aside: 
-    image: 
-      alt: Chef logo
-      height: 133
-      width: 48
-      src: media/chef.png
-    title: 
-sections:
-- title: 5-Minute Quickstarts
-  items:
-  - type: paragraph
-    text: Install and configure Chef, and use it to create a Linux virtual machine in Azure.
-  - type: list
-    style: icon48
-    items:
-    - image:
-        src: /azure/media/index/azure_dev-9.svg
-      text: Install and configure Chef
-      href: ./chef-extension-portal.md
-- title: Step-by-Step Tutorials
-  items:
-  - type: paragraph
-    text: Learn how to use Chef Software tools to create and manage Azure compute and networking infrastructure.
-  - type: list
-    style: unordered
-    items:
-    - html: <a href="/azure/virtual-machines/windows/chef-automation">Automate Azure Virtual Machine deployment with Chef</a>.
-- title: Resources and Tools
-  items:
-  - type: list
-    style: cards
-    className: cardsD
-    items:
-    - title: Chef Automate
-      html: <p><a href="https://docs.chef.io/chef_automate.html">Chef Automate overview</a></p>
-            <p><a href="https://docs.chef.io/install_chef_automate.html">Chef Automate install guide</a></p>
-            <p><a href="https://azuremarketplace.microsoft.com/en-us/marketplace/apps/chef-software.chef-automate">Chef Automate on Azure Marketplace</a></p>
-    - title: Chef Software tools
-      html: <p><a href="https://marketplace.visualstudio.com/items?itemName=chef-software.vsts-chef-tasks">Chef Azure DevOps extension</a></p>
-            <p><a href="https://marketplace.visualstudio.com/items?itemName=chef-software.vsts-habitat-tasks">Habitat Azure DevOps extension</a></p>
-    - title: Chef Software news
-      html: <p><a href="https://blog.chef.io/">Chef Software blog</a></p>
+  ms.date: 09/17/2019
+
+landingContent:
+  # Card
+  - title: About Chef Software on Azure
+    linkLists:
+      - linkListType: overview
+        links:
+          - text: About Chef on Azure
+            url: chef-overview.md
+          - text: About Habitat on Azure
+            url: chef-habitat-overview.md
+          - text: About InSpec on Azure
+            url: chef-inspec-overview.md
+      - linkListType: architecture
+        links:
+          - text: Azure Chef Extension
+            url: https://docs.chef.io/azure_portal.html#azure-chef-extension
+
+  # Card
+  - title: Install and configure Chef Software products 
+    linkLists:
+      - linkListType: quickstart
+        links:
+          - text: Install Chef using the Azure portal
+            url: chef-extension-portal.md
+      - linkListType: download
+        links:
+          - text: Chef Azure DevOps Services extension
+            url: https://marketplace.visualstudio.com/items?itemName=chef-software.vsts-chef-tasks
+          - text: Habitat Azure DevOps Services Extension
+            url: https://marketplace.visualstudio.com/items?itemName=chef-software.vsts-habitat-tasks
+
+  # Card
+  - title: Manage Virtual Machines
+    linkLists:
+      - linkListType: tutorial
+        links:
+          - text: Create a Windows VM
+            url: /azure/virtual-machines/windows/chef-automation?/azure/chef/toc.json&bc=/azure/bread/toc.json

articles/data-factory/data-factory-troubleshoot-guide.md

@@ -313,6 +313,15 @@ The following table applies to Azure Batch.
 - **Recommendation**: Verify the pool name and the Batch access key in the linked service.
 
 
+### Error code:  2502
+
+- **Message**: `Cannot access user storage account; please check storage account settings.`
+
+- **Cause**: Incorrect storage account name or access key.
+
+- **Recommendation**: Verify the storage account name and the access key in the linked service.
+
+
 ### Error code:  2504
 
 - **Message**:  `Operation returned an invalid status code 'BadRequest'.` 
@@ -467,7 +476,7 @@ The following table applies to Spark, Hive, MapReduce, Pig, and Hadoop Streaming
 
 ## Web Activity
 
-### Error code:  2310
+### Error code:  2108
 
 - **Message**:  `Invalid HttpMethod: '...'.`
 

articles/hdinsight/hdinsight-for-vscode.md

@@ -15,7 +15,6 @@ Learn how to use Spark & Hive Tools for Visual Studio Code to create and submit
 
 Spark & Hive Tools can be installed on platforms that are supported by Visual Studio Code, which include Windows, Linux, and macOS. Note the following prerequisites for different platforms.
 
-
 ## Prerequisites
 
 The following items are required for completing the steps in this article:
@@ -42,7 +41,6 @@ After you meet the prerequisites, you can install Spark & Hive Tools for Visual
 
 5. Select **Reload** when necessary.
 
-
 ## Open a work folder
 
 To open a work folder and to create a file in Visual Studio Code, follow these steps:
@@ -51,14 +49,14 @@ To open a work folder and to create a file in Visual Studio Code, follow these s
 
 2. In **Explorer** view, select the **HDexample** folder, and then select the **New File** icon next to the work folder:
 
-   ![New file](./media/hdinsight-for-vscode/visual-studio-code-new-file.png)
+   ![visual studio code new file icon](./media/hdinsight-for-vscode/visual-studio-code-new-file.png)
 
 3. Name the new file by using either the `.hql` (Hive queries) or the `.py` (Spark script) file extension. This example uses **HelloWorld.hql**.
 
 ## Set the Azure environment
 
 For a national cloud user, follow these steps to set the Azure environment first, and then use the **Azure: Sign In** command to sign in to Azure:
-   
+
 1. Select **File\Preferences\Settings**.
 2. Search on the following string: **Azure: Cloud**
 3. Select the national cloud from the list:
@@ -74,7 +72,6 @@ Before you can submit scripts to your clusters from Visual Studio Code, you must
     ![Spark & Hive Tools for Visual Studio Code login](./media/hdinsight-for-vscode/hdinsight-for-vscode-extension-login.png)
 
 2. Follow the sign-in instructions to sign in to Azure. After you're connected, your Azure account name is shown on the status bar at the bottom of the Visual Studio Code window.  
-  
 
 ## Link a cluster
 
@@ -84,7 +81,7 @@ You can link a normal cluster by using an [Apache Ambari](https://ambari.apache.
 
 1. From the menu bar, go to **View** > **Command Palette**, and enter **Spark / Hive: Link a Cluster**.
 
-   ![link cluster command](./media/hdinsight-for-vscode/link-cluster-command.png)
+   ![Command Palette link cluster command](./media/hdinsight-for-vscode/link-cluster-command.png)
 
 2. Select linked cluster type **Azure HDInsight**.
 
@@ -103,7 +100,6 @@ You can link a normal cluster by using an [Apache Ambari](https://ambari.apache.
    > [!NOTE]  
    > The linked username and password are used if the cluster both logged in to the Azure subscription and linked a cluster.  
 
-
 ### Link: Generic Livy endpoint
 
 1. From the menu bar, go to **View** > **Command Palette**, and enter **Spark / Hive: Link a Cluster**.
@@ -142,7 +138,6 @@ You can link a normal cluster by using an [Apache Ambari](https://ambari.apache.
 
    ![Set default cluster configuration](./media/hdinsight-for-vscode/set-default-cluster-configuration.png)
 
-
 ## Submit interactive Hive queries and Hive batch scripts
 
 With Spark & Hive Tools for Visual Studio Code, you can submit interactive Hive queries and Hive batch scripts to your clusters.
@@ -151,7 +146,6 @@ With Spark & Hive Tools for Visual Studio Code, you can submit interactive Hive
 
 2. Select the **HelloWorld.hql** file that was created [earlier](#open-a-work-folder). It opens in the script editor.
 
-
 3. Copy and paste the following code into your Hive file, and then save it:
 
     ```hiveql
@@ -164,7 +158,7 @@ With Spark & Hive Tools for Visual Studio Code, you can submit interactive Hive
 
 6. If you haven't specified a default cluster, select a cluster. The tools also let you submit a block of code instead of the whole script file by using the context menu. After a few moments, the query results appear in a new tab:
 
-   ![Interactive Hive result](./media/hdinsight-for-vscode/interactive-hive-result.png)
+   ![Interactive Apache Hive query result](./media/hdinsight-for-vscode/interactive-hive-result.png)
 
     - **RESULTS** panel: You can save the whole result as a CSV, JSON, or Excel file to a local path or just select multiple lines.
 
@@ -179,6 +173,7 @@ To submit interactive PySpark queries, follow these steps:
 2. Create a new **HelloWorld.py** file, following the [earlier](#open-a-work-folder) steps.
 
 3. Copy and paste the following code into the script file:
+
    ```python
    from operator import add
    lines = spark.read.text("/HdiSamples/HdiSamples/FoodInspectionData/README").rdd.map(lambda r: r[0])
@@ -205,21 +200,20 @@ To submit interactive PySpark queries, follow these steps:
 
 7. Enter **%%info**, and then press Shift+Enter to view the job information (optional):
 
-   ![view job information](./media/hdinsight-for-vscode/pyspark-interactive-view-job-information.png)
+   ![pyspark interactive view job information](./media/hdinsight-for-vscode/pyspark-interactive-view-job-information.png)
 
 8. The tool also supports the **Spark SQL** query:
 
    ![Pyspark Interactive view result](./media/hdinsight-for-vscode/pyspark-ineteractive-select-result.png)
 
    The submission status appears on the left of the lower status bar when you're running queries. Don't submit other queries when the status is **PySpark Kernel (busy)**.  
 
-   > [!NOTE] 
+   > [!NOTE]
    >
    > When **Python Extension Enabled** is cleared in the settings (it's selected by default), the submitted pyspark interaction results will use the old window:
    >
    > ![pyspark interactive python extension disabled](./media/hdinsight-for-vscode/pyspark-interactive-python-extension-disabled.png)
 
-
 ## Submit PySpark batch job
 
 1. Reopen the **HDexample** folder that you discussed [earlier](#open-a-work-folder), if closed.  
@@ -251,11 +245,11 @@ To submit interactive PySpark queries, follow these steps:
 
 4. [Connect](#connect-to-an-azure-account) to your Azure account, or link a cluster if you haven't yet done so.
 
-5. Right-click the script editor, and then select **Spark: PySpark Batch**, or use the Ctrl+Alt+H keyboard shortcut. 
+5. Right-click the script editor, and then select **Spark: PySpark Batch**, or use the Ctrl+Alt+H keyboard shortcut.
 
 6. Select a cluster to submit your PySpark job to:
 
-   ![Submit Python job result](./media/hdinsight-for-vscode/submit-pythonjob-result.png) 
+   ![Submit Python job result output](./media/hdinsight-for-vscode/submit-pythonjob-result.png)
 
 After you submit a Python job, submission logs appear in the **OUTPUT** window in Visual Studio Code. The Spark UI URL and Yarn UI URL are also shown. You can open the URL in a web browser to track the job status.
 
@@ -266,27 +260,27 @@ After you submit a Python job, submission logs appear in the **OUTPUT** window i
 <a id="triggerlivyconf"></a>**How to trigger Livy configuration**
 
 Method 1  
-1. From the menu bar, go to **File** > **Preferences** > **Settings**.  
+1. From the menu bar, go to **File** > **Preferences** > **Settings**.
 2. In the **Search settings** box, enter **HDInsight Job Submission: Livy Conf**.  
 3. Select **Edit in settings.json** for the relevant search result.
 
-Method 2   
+Method 2
 Submit a file, and notice that the .vscode folder is automatically added to the work folder. You can see the Livy configuration by selecting **.vscode\settings.json**.
 
 + The project settings:
 
-    ![Livy configuration](./media/hdinsight-for-vscode/hdi-apache-livy-config.png)
+    ![HDInsight Apache Livy configuration](./media/hdinsight-for-vscode/hdi-apache-livy-config.png)
 
     >[!NOTE]
     >For the **driverMemory** and **executorMemory** settings, set the value and unit. For example: 1g or 1024m.
 
-+ Supported Livy configurations:   
++ Supported Livy configurations:
 
-    **POST /batches**   
+    **POST /batches**
     Request body
 
-    | name | description | type | 
-    | :- | :- | :- | 
+    | name | description | type |
+    | :- | :- | :- |
     | file | File containing the application to execute | Path (required) |
     | proxyUser | User to impersonate when running the job | String |
     | className | Application Java/Spark main class | String |
@@ -328,12 +322,11 @@ Submit a file, and notice that the .vscode folder is automatically added to the
 
 3. From the left pane, expand **AZURE HDINSIGHT**.  The available subscriptions and clusters (Spark, Hadoop, and HBase are supported) are listed:
 
-   ![Azure HDInsight Subscription](./media/hdinsight-for-vscode/hdi-azure-hdinsight-subscription.png)
+   ![Azure HDInsight subscription display](./media/hdinsight-for-vscode/hdi-azure-hdinsight-subscription.png)
 
 4. Expand the cluster to view hive metadata database and table schema:
 
-   ![Azure HDInsight cluster](./media/hdinsight-for-vscode/hdi-azure-hdinsight-cluster.png)
-
+   ![Azure HDInsight delete cluster](./media/hdinsight-for-vscode/hdi-azure-hdinsight-cluster.png)
 
 ## Preview Hive Table
 You can preview Hive Table in your clusters directly through the **Azure HDInsight** explorer:
@@ -352,7 +345,7 @@ You can preview Hive Table in your clusters directly through the **Azure HDInsig
 6. The **Preview Results** window opens:
 
    ![Spark & Hive for Visual Studio Code preview results window](./media/hdinsight-for-vscode/hdinsight-for-vscode-preview-results-window.png)
-   
+
 - RESULTS panel
 
    You can save the whole result as a CSV, JSON, or Excel file to a local path, or just select multiple lines.
@@ -373,7 +366,8 @@ Spark & Hive for Visual Studio Code also supports the following features:
 
 - **IntelliSense autocomplete**. Suggestions pop up for keywords, methods, variables, and other programming elements. Different icons represent different types of objects:
 
-    ![Spark & Hive Tools for Visual Studio Code IntelliSense object types](./media/hdinsight-for-vscode/hdinsight-for-vscode-auto-complete-objects.png)
+    ![Spark & Hive Tools for Visual Studio Code IntelliSense objects](./media/hdinsight-for-vscode/hdinsight-for-vscode-auto-complete-objects.png)
+
 - **IntelliSense error marker**. The language service underlines editing errors in the Hive script.     
 - **Syntax highlights**. The language service uses different colors to differentiate variables, keywords, data type, functions, and other programming elements:
 
@@ -385,16 +379,16 @@ Users who are assigned the reader-only role for the cluster can no longer submit
 
 ### Browse the HDInsight cluster  
 
-When you select the Azure HDInsight explorer to expand an HDInsight cluster, you're prompted to link the cluster if you have the reader-only role for the cluster. Use the following method to link to the cluster by using your Ambari credentials. 
+When you select the Azure HDInsight explorer to expand an HDInsight cluster, you're prompted to link the cluster if you have the reader-only role for the cluster. Use the following method to link to the cluster by using your Ambari credentials.
 
 ### Submit the job to the HDInsight cluster
 
 When submitting job to an HDInsight cluster, you're prompted to link the cluster if you're in the reader-only role for the cluster. Use the following steps to link to the cluster by using Ambari credentials.
 
 ### Link to the cluster
 
-1.	Enter a valid Ambari username.
-2.	Enter a valid password.
+1. Enter a valid Ambari username.
+2. Enter a valid password.
 
    ![Spark & Hive Tools for Visual Studio Code Username](./media/hdinsight-for-vscode/hdi-azure-hdinsight-azure-username.png)
 
@@ -416,11 +410,11 @@ When you select the Azure HDInsight explorer to expand a Data Lake Storage Gen2
 
 When you submit a job to an HDInsight cluster by using Data Lake Storage Gen2, you're prompted to enter the storage access key if your Azure account has no write access to Gen2 storage. After the access key is validated, the job will be successfully submitted.
 
-![Spark & Hive Tools for Visual Studio Code AccessKey](./media/hdinsight-for-vscode/hdi-azure-hdinsight-azure-accesskey.png)   
+![Spark & Hive Tools for Visual Studio Code AccessKey](./media/hdinsight-for-vscode/hdi-azure-hdinsight-azure-accesskey.png)
 
 > [!NOTE]
-> 
->You can get the access key for the storage account from the Azure portal. For more information, see [View and copy access keys](https://docs.microsoft.com/azure/storage/common/storage-account-manage#access-keys).
+>
+> You can get the access key for the storage account from the Azure portal. For more information, see [View and copy access keys](https://docs.microsoft.com/azure/storage/common/storage-account-manage#access-keys).
 
 ## Unlink cluster
 
@@ -434,6 +428,6 @@ When you submit a job to an HDInsight cluster by using Data Lake Storage Gen2, y
 
 From the menu bar, go to **View** > **Command Palette**, and then enter **Azure: Sign Out**.
 
-
 ## Next steps
+
 For a video that demonstrates using Spark & Hive for Visual Studio Code, see [Spark & Hive for Visual Studio Code](https://go.microsoft.com/fwlink/?linkid=858706).