Merge pull request #185323 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)

Author: huypub

articles/azure-functions/durable/durable-functions-orchestrations.md

@@ -158,7 +158,7 @@ A few notes on the column values:
 
 * **PartitionKey**: Contains the instance ID of the orchestration.
 * **EventType**: Represents the type of the event. May be one of the following types:
-  * **OrchestrationStarted**: The orchestrator function resumed from an await or is running for the first time. The `Timestamp` column is used to populate the deterministic value for the `CurrentUtcDateTime` (.NET), `currentUtcDateTime` (JavaScript), and `current_utc_datetime` (Python) APIs.
+  * **OrchestratorStarted**: The orchestrator function resumed from an await or is running for the first time. The `Timestamp` column is used to populate the deterministic value for the `CurrentUtcDateTime` (.NET), `currentUtcDateTime` (JavaScript), and `current_utc_datetime` (Python) APIs.
   * **ExecutionStarted**: The orchestrator function started executing for the first time. This event also contains the function input in the `Input` column.
   * **TaskScheduled**: An activity function was scheduled. The name of the activity function is captured in the `Name` column.
   * **TaskCompleted**: An activity function completed. The result of the function is in the `Result` column.

articles/azure-sql/managed-instance/scripts/restore-geo-backup.md

@@ -70,7 +70,7 @@ This script uses the following commands. Each command in the table links to comm
 | Command | Notes |
 |---|---|
 | [New-AzResourceGroup](/powershell/module/az.resources/New-AzResourceGroup) | Creates a resource group in which all resources are stored. |
-| [Get-AzSqlInstanceDatabaseGeoBackup](/powershell/module/az.sql/Get-AzSqlInstanceDatabaseGeoBackup) | Creates a geo-redundant backup of a SQL Managed Instance database. |
+| [Get-AzSqlInstanceDatabaseGeoBackup](/powershell/module/az.sql/Get-AzSqlInstanceDatabaseGeoBackup) | Gets one or more geo-backups from a database within an Azure SQL Managed Instance. |
 | [Restore-AzSqlInstanceDatabase](/powershell/module/az.sql/Restore-AzSqlInstanceDatabase) | Creates a database on SQL Managed Instance from geo-backup. |
 | [Remove-AzResourceGroup](/powershell/module/az.resources/remove-azresourcegroup) | Deletes a resource group, including all nested resources. |
 

articles/service-bus-messaging/service-bus-dotnet-get-started-with-queues.md

@@ -302,7 +302,7 @@ In this section, you'll add code to retrieve messages from the queue.
         string body = args.Message.Body.ToString();
         Console.WriteLine($"Received: {body}");
 
-        // complete the message. messages is deleted from the queue. 
+        // complete the message. message is deleted from the queue. 
         await args.CompleteMessageAsync(args.Message);
     }
 

articles/storage/blobs/network-file-system-protocol-known-issues.md

@@ -25,6 +25,8 @@ This article describes limitations and known issues of Network File System (NFS)
 
 - GRS, GZRS, and RA-GRS redundancy options aren't supported when you create an NFS 3.0 storage account.
 
+- NFS 3.0 and SSH File Transfer Protocol (SFTP) can't be enabled on the same storage account.
+
 ## NFS 3.0 features
 
 The following NFS 3.0 features aren't yet supported.

articles/storage/blobs/secure-file-transfer-protocol-support-how-to.md

@@ -125,7 +125,9 @@ To learn more about the SFTP permissions model, see [SFTP Permissions model](sec
    If you enabled password authentication, then the Azure generated password appears in a dialog box after the local user has been added. 
 
    > [!IMPORTANT]
-   > You can't retrieve this password later, so make sure to copy the password, and then store it in a place where you can find it.
+   > You can't retrieve this password later, so make sure you copy the password, and then store it in a place where you can find it.
+   > 
+   > If you do lose your password, you can generate a new password.
 
    If you chose to generate a new key pair, then you'll be prompted to download the private key of that key pair after the local user has been added.