Skip to content

Commit 80e650c

Browse files
authored
Merge pull request #48450 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents de119b3 + 9e5e569 commit 80e650c

File tree

5 files changed

+27
-31
lines changed

5 files changed

+27
-31
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The primary use case for Durable Functions is simplifying complex, stateful coor
3939

4040
Durable Functions allows you to implement this pattern concisely in code.
4141

42-
#### C#
42+
#### C# script
4343

4444
```cs
4545
public static async Task<object> Run(DurableOrchestrationContext ctx)
@@ -57,6 +57,8 @@ public static async Task<object> Run(DurableOrchestrationContext ctx)
5757
}
5858
}
5959
```
60+
> [!NOTE]
61+
> There are subtle differences while writing a precompiled durable function in C# vs the C# script sample shown before. A C# precompiled function would require durable parameters to be decorated with respective attributes. An example is `[OrchestrationTrigger]` attribute for `DurableOrchestrationContext` parameter. If the parameters are not properly decorated, the runtime would not be able to inject the variables to the function and would give error. Please visit [sample](https://github.com/Azure/azure-functions-durable-extension/blob/master/samples) for more examples.
6062
6163
#### JavaScript (Functions v2 only)
6264

@@ -83,7 +85,7 @@ The `ctx` parameter ([DurableOrchestrationContext](https://azure.github.io/azure
8385

8486
With normal functions, fanning out can be done by having the function send multiple messages to a queue. However, fanning back in is much more challenging. You'd have to write code to track when the queue-triggered functions end and store function outputs. The Durable Functions extension handles this pattern with relatively simple code.
8587

86-
#### C#
88+
#### C# script
8789

8890
```cs
8991
public static async Task Run(DurableOrchestrationContext ctx)
@@ -198,7 +200,7 @@ An example would be reversing the earlier async HTTP API scenario. Instead of ex
198200

199201
Using Durable Functions, multiple monitors that observe arbitrary endpoints can be created in a few lines of code. The monitors can end execution when some condition is met, or be terminated by the [DurableOrchestrationClient](durable-functions-instance-management.md), and their wait interval can be changed based on some condition (i.e. exponential backoff.) The following code implements a basic monitor.
200202

201-
#### C#
203+
#### C# script
202204

203205
```cs
204206
public static async Task Run(DurableOrchestrationContext ctx)
@@ -266,7 +268,7 @@ One example of a business process that involves human interaction is an approval
266268

267269
This pattern can be implemented using an orchestrator function. The orchestrator would use a [durable timer](durable-functions-timers.md) to request approval and escalate in case of timeout. It would wait for an [external event](durable-functions-external-events.md), which would be the notification generated by some human interaction.
268270

269-
#### C#
271+
#### C# script
270272

271273
```cs
272274
public static async Task Run(DurableOrchestrationContext ctx)

articles/hdinsight/interactive-query/apache-interactive-query-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.topic: conceptual
1111
ms.date: 02/22/2018
1212
---
1313
# Use Interactive Query with HDInsight
14-
Interactive Query (also called Hive LLAP, or [Live Long and Process](https://cwiki.apache.org/confluence/display/Hive/LLAP)) is an Azure HDInsight [cluster type](../hdinsight-hadoop-provision-linux-clusters.md#cluster-types). Interactive Query supports in-memory caching, which makes Hive queries faster and much more interactive.
14+
Interactive Query (also called Hive LLAP, or [Low Latency Analytical Processing](https://cwiki.apache.org/confluence/display/Hive/LLAP)) is an Azure HDInsight [cluster type](../hdinsight-hadoop-provision-linux-clusters.md#cluster-types). Interactive Query supports in-memory caching, which makes Hive queries faster and much more interactive.
1515

1616
[!INCLUDE [hdinsight-price-change](../../../includes/hdinsight-enhancements.md)]
1717

articles/iot-dps/quick-setup-auto-provision-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ az group create --name my-sample-resource-group --location westus
4242
4343
## Create an IoT hub
4444

45-
Create an IoT IoT hub with the [az iot hub create](/cli/azure/iot/hub#az-iot-hub-create) command.
45+
Create an IoT hub with the [az iot hub create](/cli/azure/iot/hub#az-iot-hub-create) command.
4646

4747
The following example creates an IoT hub named *my-sample-hub* in the *westus* location.
4848

articles/key-vault/toc.yml

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -44,30 +44,24 @@
4444
href: key-vault-ovw-throttling.md
4545
- name: How-to guides
4646
items:
47-
- name: Manage
48-
items:
49-
- name: Azure Key Vault logging
50-
href: key-vault-logging.md
51-
- name: Access behind firewalls
52-
href: key-vault-access-behind-firewall.md
53-
- name: Availability and redundancy
54-
href: key-vault-disaster-recovery-guidance.md
55-
- name: Change tenant ID
56-
href: key-vault-subscription-move-fix.md
57-
- name: Create and manage using Azure CLI
58-
href: key-vault-manage-with-cli2.md
59-
- name: Use Key Vault soft-delete with CLI
60-
href: key-vault-soft-delete-cli.md
61-
- name: Use Key Vault soft-delete with Azure PowerShell
62-
href: key-vault-soft-delete-powershell.md
63-
- name: Use groups to grant access
64-
href: key-vault-group-permissions-for-apps.md
65-
- name: Secure your key vault
66-
href: key-vault-secure-your-key-vault.md
67-
- name: Automate
68-
items:
69-
- name: Azure automation
70-
href: automation-manage-key-vault.md
47+
- name: Azure Key Vault logging
48+
href: key-vault-logging.md
49+
- name: Access behind firewalls
50+
href: key-vault-access-behind-firewall.md
51+
- name: Availability and redundancy
52+
href: key-vault-disaster-recovery-guidance.md
53+
- name: Change tenant ID
54+
href: key-vault-subscription-move-fix.md
55+
- name: Create and manage using Azure CLI
56+
href: key-vault-manage-with-cli2.md
57+
- name: Use Key Vault soft-delete with CLI
58+
href: key-vault-soft-delete-cli.md
59+
- name: Use Key Vault soft-delete with Azure PowerShell
60+
href: key-vault-soft-delete-powershell.md
61+
- name: Use groups to grant access
62+
href: key-vault-group-permissions-for-apps.md
63+
- name: Secure your key vault
64+
href: key-vault-secure-your-key-vault.md
7165
- name: Reference
7266
items:
7367
- name: Azure PowerShell

articles/sql-database/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
items:
143143
- name: Long-term backup retention
144144
href: sql-database-long-term-retention.md
145-
- name: Configure using Axure blob storage
145+
- name: Configure using Azure blob storage
146146
href: sql-database-long-term-backup-retention-configure.md
147147
- name: Configure using Azure vault (deprecated)
148148
href: sql-database-long-term-backup-retention-configure-vault.md

0 commit comments

Comments
 (0)