Merge pull request #100738 from MicrosoftDocs/master

Merge Master to Live, 3 AM

Author: PMEds28

.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

@@ -12,6 +12,6 @@ articles/terraform/ @TomArcherMsft
 articles/governance/ @DCtheGeek
 
 # Configuration
-*.json @SyntaxC4
-.acrolinx-config.edn @MonicaRush
-articles/zone-pivot-groups.yml @SyntaxC4
+*.json @SyntaxC4 @snoviking @arob98
+.acrolinx-config.edn @MonicaRush @arob98
+articles/zone-pivot-groups.yml @SyntaxC4 @snoviking @arob98

articles/azure-australia/azure-key-vault.md

@@ -28,7 +28,7 @@ This article will focus on management of keys using Key Vault.
 
 ### Deployment options
 
-There are two options for creating Azure Key Vaults. Both options use the Thales nShield family of Hardware Security Modules (HSM), are Federal Information Processing Standards (FIPS) validated, and are approved to store keys in PROTECTED environments. The options are:
+There are two options for creating Azure Key Vaults. Both options use the nCipher nShield family of Hardware Security Modules (HSM), are Federal Information Processing Standards (FIPS) validated, and are approved to store keys in PROTECTED environments. The options are:
 
 - **Software-protected vaults:** FIPS 140-2 level 1 validated. Keys stored on an HSM. Encryption and decryption operations are performed in compute resources on Azure.
 - **HSM-protected vaults:** FIPS 140-2 level 2 validated. Keys stored on an HSM. Encryption and decryption operations are performed on the HSM.
@@ -65,7 +65,14 @@ Access to Key Vaults should be explicitly restricted to the minimum set of netwo
 
 ### Bring Your Own Key (BYOK)
 
-Key Vault supports BYOK.  BYOK enables users to import keys from their existing key infrastructures.  Thales provides an [Australian toolset](https://www.microsoft.com/download/details.aspx?id=45345) to support the secure transfer and import of keys from an external HSM (for example, keys generated with an offline workstation) into Key Vault.
+Key Vault supports BYOK.  BYOK enables users to import keys from their existing key infrastructures. The BYOK toolset supports the secure transfer and import of keys from an external HSM (for example, keys generated with an offline workstation) into Key Vault.
+
+Go to the Microsoft Download Center and [download the Azure Key Vault BYOK toolset](https://www.microsoft.com/download/details.aspx?id=45345) for Australia. The package name to download and its corresponding SHA-256 package hash are:
+
+|Package Name|SHA-256 Hash|
+|---|---|
+|KeyVault-BYOK-Tools-Australia.zip|CD0FB7365053DEF8C35116D7C92D203C64A3D3EE2452A025223EEB166901C40A|
+|
 
 ### Key Vault auditing and logging
 

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",