Merge pull request #268035 from chez-charlie/release-branch-1

Release branch 1

Author: prmerger-automator[bot]

articles/data-factory/control-flow-until-activity.md

@@ -15,22 +15,22 @@ ms.custom: devx-track-azurepowershell, synapse
 # Until activity in Azure Data Factory and Synapse Analytics
 [!INCLUDE[appliesto-adf-asa-md](includes/appliesto-adf-asa-md.md)]
 
-The Until activity provides the same functionality that a do-until looping structure provides in programming languages. It executes a set of activities in a loop until the condition associated with the activity evaluates to true. If an inner activity fails, the Until activity does not stop. You can specify a timeout value for the until activity. 
+The Until activity provides the same functionality that a do-until looping structure provides in programming languages. It executes a set of activities in a loop until the condition associated with the activity evaluates to true. If an inner activity fails, the Until activity doesn't stop. You can specify a timeout value for the until activity. 
 
 ## Create an Until activity with UI
 
 To use an Until activity in a pipeline, complete the following steps:
 
-1. Search for _Until_ in the pipeline Activities pane, and drag a Until activity to the pipeline canvas.  
-1. Select the Until activity on the canvas if it is not already selected, and its  **Settings** tab, to edit its details.
+1. Search for _Until_ in the pipeline Activities pane, and drag a Until activity to the pipeline canvas. 
+1. Select the Until activity on the canvas if it isn't already selected, and its  **Settings** tab, to edit its details.
 
    :::image type="content" source="media/control-flow-until-activity/until-activity.png" alt-text="Shows the Settings tab of the Until activity in the pipeline canvas.":::
 
-1. Enter an expression that will be evaluated after all child activities defined in the Until activity are executed.  If the expression evaluates to false, the Until activity will execute all its child activities again.  When it evaluates to true, the Until activity will complete.  The expression can be a literal string expression, or any combination of dynamic [expressions, functions](control-flow-expression-language-functions.md), [system variables](control-flow-system-variables.md), or [outputs from other activities](how-to-expression-language-functions.md#examples-of-using-parameters-in-expressions).  The example below checks the value of a previously defined pipeline array variable called TestVariable to see if it evaluates to ['done'].
+1. Enter an expression that will be evaluated after all child activities defined in the Until activity is executed. If the expression evaluates to false, the Until activity executes all its child activities again. When it evaluates to true, the Until activity completes. The expression can be a literal string expression, or any combination of dynamic [expressions, functions](control-flow-expression-language-functions.md), [system variables](control-flow-system-variables.md), or [outputs from other activities](how-to-expression-language-functions.md#examples-of-using-parameters-in-expressions). The example below checks the value of a previously defined pipeline array variable called TestVariable to see if it evaluates to ['done'].
 
    :::image type="content" source="media/control-flow-until-activity/dynamic-content-to-check-variable-value.png" alt-text="Shows the  Add dynamic content  pane with an expression to check a variable for a defined value.":::
 
-1. Define activities that the Until activity will execute by selecting the Edit Activities button on the Until activity directly, or by selecting the Activities tab to select it there.  A new activities editor pane will be displayed where you can add any activities for the Until activity to execute.  In this example, a Set Variable activity simply sets the value of the variable referenced in the expression above to ['done'], so the Until activity's expression will be true the first time it is executed, and the Until activity will stop.  In your real-world use, you can check any conditions required and the Until activity will continue to execute its child activities each time the expression is evaluated, until the conditions are met.
+2. Define activities that the Until activity executes by selecting the Edit Activities button on the Until activity directly, or by selecting the Activities tab to select it there. A new activities editor pane is displayed where you can add any activities for the Until activity to execute. In this example, a Set Variable activity simply sets the value of the variable referenced in the aforementioned expression to ['done'], so the Until activity's expression will be true the first time it's executed, and the Until activity will stop. In your real-world use, you can check any conditions required and the Until activity will continue to execute its child activities each time the expression is evaluated, until the conditions are met.
 
    :::image type="content" source="media/control-flow-until-activity/child-activities-editor.png" alt-text="Shows the activities editor for an Until activity with a Set Variable activity defined.":::
 
@@ -44,7 +44,7 @@ To use an Until activity in a pipeline, complete the following steps:
             "value":  "<expression that evaluates to true or false>", 
             "type": "Expression"
         },
-        "timeout": "<time out for the loop. for example: 00:01:00 (1 minute)>",
+        "timeout": "<time out for the loop. for example: 00:10:00 (10 minute)>",
         "activities": [
             {
                 "<Activity 1 definition>"
@@ -68,8 +68,8 @@ Property | Description | Allowed values | Required
 -------- | ----------- | -------------- | --------
 name | Name of the `Until` activity. | String | Yes
 type | Must be set to **Until**. | String | Yes
-expression | Expression that must evaluate to true or false | Expression.  | Yes
-timeout | The do-until loop times out after the specified time here. | String. `d.hh:mm:ss` (or) `hh:mm:ss`. The default value is 7 days. Maximum value is: 90 days. | No
+expression | Expression that must evaluate to true or false | Expression. | Yes
+timeout | The do-until loop times out after the specified time here. | String. `d.hh:mm:ss` (or) `hh:mm:ss`. The default value is seven days. Maximum value is: 90 days. | No
 Activities | Set of activities that are executed until expression evaluates to `true`. | Array of activities. |  Yes
 
 ## Example 1
@@ -92,7 +92,7 @@ In this example, the pipeline has two activities: **Until** and **Wait**. The Wa
                         "value": "@equals('Failed', coalesce(body('MyUnauthenticatedActivity')?.status, actions('MyUnauthenticatedActivity')?.status, 'null'))",
                         "type": "Expression"
                     },
-                    "timeout": "00:00:01",
+                    "timeout": "00:10:00",
                     "activities": [
                         {
                             "name": "MyUnauthenticatedActivity",
@@ -129,7 +129,7 @@ In this example, the pipeline has two activities: **Until** and **Wait**. The Wa
 ```
 
 ## Example 2 
-The pipeline in this sample copies data from an input folder to an output folder in a loop. The loop terminates when the value for the repeat parameter is set to false or it times out after one minute.   
+The pipeline in this sample copies data from an input folder to an output folder in a loop. The loop terminates when the value for the repeat parameter is set to false or it times out after one minute.  
 
 ### Pipeline with Until activity (Adfv2QuickStartPipeline.json)
 
@@ -145,7 +145,7 @@ The pipeline in this sample copies data from an input folder to an output folder
                         "value":  "@equals('false', pipeline().parameters.repeat)", 
                         "type": "Expression"
                     },
-                    "timeout": "00:01:00",
+                    "timeout": "00:10:00",
                     "activities": [
                         {
                             "name": "CopyFromBlobToBlob",

articles/data-factory/control-flow-wait-activity.md

@@ -68,7 +68,7 @@ In this example, the pipeline has two activities: **Until** and **Wait**. The Wa
                         "value": "@equals('Failed', coalesce(body('MyUnauthenticatedActivity')?.status, actions('MyUnauthenticatedActivity')?.status, 'null'))",
                         "type": "Expression"
                     },
-                    "timeout": "00:00:01",
+                    "timeout": "00:10:00",
                     "activities": [
                         {
                             "name": "MyUnauthenticatedActivity",

articles/data-factory/control-flow-webhook-activity.md

@@ -49,7 +49,7 @@ To use a Webhook activity in a pipeline, complete the following steps:
         "body": {
             "key": "value"
         },
-        "timeout": "00:03:00",
+        "timeout": "00:10:00",
         "reportStatusOnCallBack": false,
         "authentication": {
             "type": "ClientCertificate",