Skip to content

Commit 7359e49

Browse files
authored
Merge pull request #99939 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 164eab0 + 889c205 commit 7359e49

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

articles/azure-functions/durable/durable-functions-event-publishing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Add `eventGridTopicEndpoint` and `eventGridKeySettingName` in a `durableTask` pr
8181

8282
The possible Azure Event Grid configuration properties can be found in the [host.json documentation](../functions-host-json.md#durabletask). After you configure the `host.json` file, your function app sends lifecycle events to the event grid topic. This works when you run your function app both locally and in Azure.```
8383

84-
Set the app setting for the topic key in the Function App and `local.setting.json`. The following JSON is a sample of the `local.settings.json` for local debugging. Replace `<topic_key>` with the topic key.
84+
Set the app setting for the topic key in the Function App and `local.settings.json`. The following JSON is a sample of the `local.settings.json` for local debugging. Replace `<topic_key>` with the topic key.
8585

8686
```json
8787
{
@@ -280,4 +280,4 @@ To test locally, use [ngrok](../functions-bindings-event-grid.md#local-testing-w
280280
> [Learn instance management in Durable Functions](durable-functions-instance-management.md)
281281
282282
> [!div class="nextstepaction"]
283-
> [Learn versioning in Durable Functions](durable-functions-versioning.md)
283+
> [Learn versioning in Durable Functions](durable-functions-versioning.md)

articles/azure-functions/functions-consumption-costs.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.topic: conceptual
88

99
# Estimating Consumption plan costs
1010

11-
There are currently three types of hosting plans for an app that run in Azure Functions, with each plan having its own pricing model:
11+
There are currently three types of hosting plans for an app that runs in Azure Functions, with each plan having its own pricing model:
1212

1313
| Plan | Description |
1414
| ---- | ----------- |
@@ -81,11 +81,11 @@ Use [Azure Monitor metrics explorer](../azure-monitor/platform/metrics-getting-s
8181

8282
1. Select **Apply** to choose your function app as the resource to monitor.
8383

84-
1. From **Metric**, choose **Function execution count** and **Sum** for **Aggregation**. This adds the sum of the execution counts during chosen period to the chart.
84+
1. From **Metric**, choose **Function Execution Count** and **Sum** for **Aggregation**. This adds the sum of the execution counts during chosen period to the chart.
8585

8686
![Define a functions app metric to add to the chart](media/functions-consumption-costing/monitor-metrics-add-metric.png)
8787

88-
1. Select **Add metric** and repeat steps 2-4 to add **Function execution units** to the chart.
88+
1. Select **Add metric** and repeat steps 2-4 to add **Function Execution Units** to the chart.
8989

9090
The resulting chart contains the totals for both execution metrics in the chosen time range, which in this case is two hours.
9191

@@ -184,7 +184,7 @@ This command returns a JSON payload that looks like the following example:
184184
]
185185
}
186186
```
187-
This particular response shows that from `2019-09-11T21:46` to `2019-09-11T23:18`, during which the app consumed 1110000000 MB-milliseconds (1083.98 GB-seconds).
187+
This particular response shows that from `2019-09-11T21:46` to `2019-09-11T23:18`, the app consumed 1110000000 MB-milliseconds (1083.98 GB-seconds).
188188

189189
## Determine memory usage
190190

articles/azure-functions/functions-develop-vs-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ Following are example prompts to define a new storage output binding:
140140
| **Select binding with direction** | `Azure Queue Storage` | The binding is an Azure Storage queue binding. |
141141
| **The name used to identify this binding in your code** | `msg` | Name that identifies the binding parameter referenced in your code. |
142142
| **The queue to which the message will be sent** | `outqueue` | The name of the queue that the binding writes to. When the *queueName* doesn't exist, the binding creates it on first use. |
143-
| **Select setting from "local.setting.json"** | `MyStorageConnection` | The name of an application setting that contains the connection string for the storage account. The `AzureWebJobsStorage` setting contains the connection string for the storage account you created with the function app. |
143+
| **Select setting from "local.settings.json"** | `MyStorageConnection` | The name of an application setting that contains the connection string for the storage account. The `AzureWebJobsStorage` setting contains the connection string for the storage account you created with the function app. |
144144

145145
In this example, the following binding is added to the `bindings` array in your function.json file:
146146

articles/azure-functions/ip-addresses.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@ For example, this is what the Western Europe JSON fragment might look like:
7676

7777
For information about when this file is updated and when the IP addresses change, expand the **Details** section of the [Download Center page](https://www.microsoft.com/en-us/download/details.aspx?id=56519).
7878

79-
## Inbound IP address changes
79+
## <a name="inbound-ip-address-changes"></a>Inbound IP address changes
8080

8181
The inbound IP address **might** change when you:
8282

8383
- Delete a function app and recreate it in a different resource group.
8484
- Delete the last function app in a resource group and region combination, and re-create it.
85-
- Delete an SSL binding, such as during [certificate renewal](../app-service/configure-ssl-certificate.md#renew-certificate)).
85+
- Delete an SSL binding, such as during [certificate renewal](../app-service/configure-ssl-certificate.md#renew-certificate).
8686

87-
When your function app runs in a [Consumption plan](functions-scale.md#consumption-plan), the inbound IP address might also change when you haven't taken any actions such as the ones listed.
87+
When your function app runs in a [Consumption plan](functions-scale.md#consumption-plan), the inbound IP address might also change even when you haven't taken any actions such as the ones [listed above](#inbound-ip-address-changes).
8888

8989
## Outbound IP address changes
9090

@@ -93,7 +93,7 @@ The set of available outbound IP addresses for a function app might change when
9393
* Take any action that can change the inbound IP address.
9494
* Change your App Service plan pricing tier. The list of all possible outbound IP addresses your app can use, for all pricing tiers, is in the `possibleOutboundIPAddresses` property. See [Find outbound IPs](#find-outbound-ip-addresses).
9595

96-
When your function app runs in a [Consumption plan](functions-scale.md#consumption-plan), the outbound IP address might also change when you haven't taken any actions such as the ones listed.
96+
When your function app runs in a [Consumption plan](functions-scale.md#consumption-plan), the outbound IP address might also change even when you haven't taken any actions such as the ones [listed above](#inbound-ip-address-changes).
9797

9898
To deliberately force an outbound IP address change:
9999

0 commit comments

Comments
 (0)