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

Author: cherylmc

.openpublishing.redirection.json

@@ -24605,6 +24605,16 @@
       "redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-java",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/storage/blobs/storage-quickstart-blobs-nodejs-v10.md",
+      "redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-nodejs-legacy",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/storage/blobs/storage-quickstart-blobs-javascript-client-libraries-v10.md",
+      "redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-javascript-client-libraries-legacy",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/storage/blobs/storage-nodejs-how-to-use-blob-storage.md",
       "redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-nodejs",

CODEOWNERS

@@ -1,24 +1,17 @@
 # Testing the new code owners feature in GitHub. Please contact Cory Fowler if you have questions.
-# articles/storage/  @tamram @robinsh
-# articles/virtual-machines/  @iainfoulds @cynthn
-# articles/virtual-machines/linux/  @iainfoulds @cynthn
-# articles/virtual-machines/windows/  @iainfoulds @cynthn
-# articles/application-insights/  @SergeyKanzhelev
-# articles/cosmos-db/ @mimig1
-
-# All Articles
-articles/ @apex-docs-pr-reviewers
-
 # Cognitive Services
 articles/cognitive-services/ @diberry @erhopf, @nitinme
 
 # DevOps
-
 articles/ansible/ @TomArcherMsft
 articles/chef/ @TomArcherMsft
 articles/jenkins/ @TomArcherMsft
 articles/terraform/ @TomArcherMsft
 
 # Governance
-
 articles/governance/ @DCtheGeek
+
+# Configuration
+*.json @SyntaxC4 @snoviking @arob98
+.acrolinx-config.edn @MonicaRush @arob98
+articles/zone-pivot-groups.yml @SyntaxC4 @snoviking @arob98

articles/azure-functions/functions-create-cosmos-db-triggered-function.md

@@ -59,20 +59,20 @@ Next, you create a function in the new function app.
     | Setting      | Suggested value  | Description                                |
     | ------------ | ---------------- | ------------------------------------------ |
     | **Name** | Default | Use the default function name suggested by the template.|
-    | **Azure Cosmos DB account connection** | New setting | Select **New**, then choose your **Subscription**, the **Database account** you created earlier, and **Select**. This creates an application setting for your account connection. This setting is used by the binding to connect to the database. |
-    | **Collection name** | Items | Name of collection to be monitored. |
-    | **Create lease collection if it doesn't exist** | Checked | The collection doesn't already exist, so create it. |
-    | **Database name** | Tasks | Name of database with the collection to be monitored. |
+    | **Azure Cosmos DB account connection** | New setting | Select **New**, then choose your **Subscription**, the **Database account** you created earlier, and **Select**. This creates an application setting for your account connection. This setting is used by the binding to connection to the database. |
+    | **Container name** | Items | Name of container to be monitored. |
+    | **Create lease container if it doesn't exist** | Checked | The container doesn't already exist, so create it. |
+    | **Database name** | Tasks | Name of database with the container to be monitored. |
 
 1. Click **Create** to create your Azure Cosmos DB triggered function. After the function is created, the template-based function code is displayed.  
 
     ![Cosmos DB function template in C#](./media/functions-create-cosmos-db-triggered-function/function-cosmosdb-template.png)
 
     This function template writes the number of documents and the first document ID to the logs.
 
-Next, you connect to your Azure Cosmos DB account and create the `Items` collection in the `Tasks` database.
+Next, you connect to your Azure Cosmos DB account and create the `Items` container in the `Tasks` database.
 
-## Create the Items collection
+## Create the Items container
 
 1. Open a second instance of the [Azure portal](https://portal.azure.com) in a new tab in the browser.
 
@@ -82,33 +82,32 @@ Next, you connect to your Azure Cosmos DB account and create the `Items` collect
 
 1. Choose your Azure Cosmos DB account, then select the **Data Explorer**. 
 
-1. In **Collections**, choose **taskDatabase** and select **New Collection**.
+1. Under **SQL API**, choose **Tasks** database and select **New Container**.
 
-    ![Create a collection](./media/functions-create-cosmos-db-triggered-function/cosmosdb-create-collection.png)
+    ![Create a container](./media/functions-create-cosmos-db-triggered-function/cosmosdb-create-container.png)
 
-1. In **Add Collection**, use the settings shown in the table below the image. 
+1. In **Add Container**, use the settings shown in the table below the image. 
 
-    ![Define the taskCollection](./media/functions-create-cosmos-db-triggered-function/cosmosdb-create-collection2.png)
+    ![Define the Tasks container](./media/functions-create-cosmos-db-triggered-function/cosmosdb-create-container2.png)
 
     | Setting|Suggested value|Description |
     | ---|---|--- |
     | **Database ID** | Tasks |The name for your new database. This must match the name defined in your function binding. |
-    | **Collection ID** | Items | The name for the new collection. This must match the name defined in your function binding.  |
-    | **Storage capacity** | Fixed (10 GB)|Use the default value. This value is the storage capacity of the database. |
-    | **Throughput** |400 RU| Use the default value. If you want to reduce latency, you can scale up the throughput later. |
-    | **[Partition key](../cosmos-db/partition-data.md)** | /category|A partition key that distributes data evenly to each partition. Selecting the correct partition key is important in creating a performant collection. | 
+    | **Container ID** | Items | The name for the new container. This must match the name defined in your function binding.  |
+    | **[Partition key](../cosmos-db/partition-data.md)** | /category|A partition key that distributes data evenly to each partition. Selecting the correct partition key is important in creating a performant container. | 
+    | **Throughput** |400 RU| Use the default value. If you want to reduce latency, you can scale up the throughput later. |    
 
-1. Click **OK** to create the Items collection. It may take a short time for the collection to get created.
+1. Click **OK** to create the Items container. It may take a short time for the container to get created.
 
-After the collection specified in the function binding exists, you can test the function by adding documents to this new collection.
+After the container specified in the function binding exists, you can test the function by adding items to this new container.
 
 ## Test the function
 
-1. Expand the new **taskCollection** collection in Data Explorer, choose **Documents**, then select **New Document**.
+1. Expand the new **Items** container in Data Explorer, choose **Items**, then select **New Item**.
 
-    ![Create a document in taskCollection](./media/functions-create-cosmos-db-triggered-function/create-document-in-collection.png)
+    ![Create an item in Items container](./media/functions-create-cosmos-db-triggered-function/create-item-in-container.png)
 
-1. Replace the contents of the new document with the following content, then choose **Save**.
+1. Replace the contents of the new item with the following content, then choose **Save**.
 
         {
             "id": "task1",

articles/azure-functions/functions-how-to-azure-devops.md

@@ -25,7 +25,7 @@ To create a YAML-based pipeline, first build your app, and then deploy the app.
 
 How you build your app in Azure Pipelines depends on your app's programming language. Each language has specific build steps that create a deployment artifact. A deployment artifact is used to deploy your function app in Azure.
 
-#### .NET
+# [C\#](#tab/csharp)
 
 You can use the following sample to create a YAML file to build a .NET app:
 
@@ -56,7 +56,7 @@ steps:
     artifactName: 'drop'
 ```
 
-#### JavaScript
+# [JavaScript](#tab/javascript)
 
 You can use the following sample to create a YAML file to build a JavaScript app:
 
@@ -84,13 +84,44 @@ steps:
     artifactName: 'drop'
 ```
 
-#### Python
+# [Python](#tab/python)
 
-You can use the following sample to create a YAML file to build a Python app. Python is supported only for Linux Azure Functions. The YAML for Python 3.7 can be built by replacing all the instances of 3.6 with 3.7 in this YAML.
+You can use one of the following samples to create a YAML file to build an app for a specific Python version. Python is supported only for function apps running on Linux.
+
+**Version 3.7**
+
+```yaml
+pool:
+  vmImage: ubuntu-16.04
+steps:
+- task: UsePythonVersion@0
+  displayName: "Setting python version to 3.7 as required by functions"
+  inputs:
+    versionSpec: '3.7'
+    architecture: 'x64'
+- bash: |
+    if [ -f extensions.csproj ]
+    then
+        dotnet build extensions.csproj --output ./bin
+    fi
+    pip install --target="./.python_packages/lib/site-packages" -r ./requirements.txt
+- task: ArchiveFiles@2
+  displayName: "Archive files"
+  inputs:
+    rootFolderOrFile: "$(System.DefaultWorkingDirectory)"
+    includeRootFolder: false
+    archiveFile: "$(System.DefaultWorkingDirectory)/build$(Build.BuildId).zip"
+- task: PublishBuildArtifacts@1
+  inputs:
+    PathtoPublish: '$(System.DefaultWorkingDirectory)/build$(Build.BuildId).zip'
+    artifactName: 'drop'
+```
+
+**Version 3.6**
 
 ```yaml
 pool:
-      vmImage: ubuntu-16.04
+  vmImage: ubuntu-16.04
 steps:
 - task: UsePythonVersion@0
   displayName: "Setting python version to 3.6 as required by functions"
@@ -102,10 +133,7 @@ steps:
     then
         dotnet build extensions.csproj --output ./bin
     fi
-    python3.6 -m venv worker_venv
-    source worker_venv/bin/activate
-    pip3.6 install setuptools
-    pip3.6 install -r requirements.txt
+    pip install --target="./.python_packages/lib/python3.6/site-packages" -r ./requirements.txt
 - task: ArchiveFiles@2
   displayName: "Archive files"
   inputs:
@@ -117,7 +145,8 @@ steps:
     PathtoPublish: '$(System.DefaultWorkingDirectory)/build$(Build.BuildId).zip'
     artifactName: 'drop'
 ```
-#### PowerShell
+
+# [PowerShell](#tab/powershell)
 
 You can use the following sample to create a YAML file to package a PowerShell app. PowerShell is supported only for Windows Azure Functions.
 
@@ -137,6 +166,8 @@ steps:
     artifactName: 'drop'
 ```
 
+---
+
 ### Deploy your app
 
 You must include one of the following YAML samples in your YAML file, depending on the hosting OS.