Skip to content

Commit bdd342b

Browse files
Merge pull request #292726 from jonburchel/2025-01-07-public-pr-125307
2025 01 07 public pr 125307
2 parents 84b399b + c6dc160 commit bdd342b

17 files changed

+95
-95
lines changed

articles/confidential-computing/confidential-enclave-nodes-aks-get-started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,8 @@ spec:
202202
- key: agentpool
203203
operator: In
204204
values:
205-
- acc # this is the name of your confidential computing nodel pool
206-
- acc_second # this is the name of your confidential computing nodel pool
205+
- acc # this is the name of your confidential computing node pool
206+
- acc_second # this is the name of your confidential computing node pool
207207
containers:
208208
- name: oe-helloworld
209209
image: mcr.microsoft.com/acc/samples/oe-helloworld:latest

articles/connectors/built-in.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ You can use the following built-in connectors to perform general tasks, for exam
106106
:::column:::
107107
[![Request trigger icon][http-request-icon]][http-request-doc]
108108
<br><br>[**Request**][http-request-doc]
109-
<br><br>[**When a HTTP request is received**][http-request-doc]: Wait for a request from another workflow, app, or service. This trigger makes your workflow callable without having to be checked or polled on a schedule.
110-
<br><br>[**Response**][http-request-doc]: Respond to a request received by the **When a HTTP request is received** trigger in the same workflow.
109+
<br><br>[**When an HTTP request is received**][http-request-doc]: Wait for a request from another workflow, app, or service. This trigger makes your workflow callable without having to be checked or polled on a schedule.
110+
<br><br>[**Response**][http-request-doc]: Respond to a request received by the **When an HTTP request is received** trigger in the same workflow.
111111
:::column-end:::
112112
:::column:::
113113
[![Batch icon][batch-icon]][batch-doc]
@@ -209,7 +209,7 @@ You can use the following built-in connectors to access specific services and sy
209209
:::column:::
210210
[![Azure Logic Apps icon][azure-logic-apps-icon]][nested-logic-app-doc]
211211
<br><br>[**Azure Logic Apps**][nested-logic-app-doc]<br>(*Consumption workflow*) <br><br>-or-<br><br>**Workflow Operations**<br>(*Standard workflow*)
212-
<br><br>Call other workflows that start with the Request trigger named **When a HTTP request is received**.
212+
<br><br>Call other workflows that start with the Request trigger named **When an HTTP request is received**.
213213
:::column-end:::
214214
:::column:::
215215
[![Azure OpenAI icon][azure-openai-icon]][azure-openai-doc]
@@ -466,7 +466,7 @@ For more information, review the following documentation:
466466
:::column:::
467467
[![SWIFT icon][swift-icon]][swift-doc]
468468
<br><br>[**SWIFT**][swift-doc]<br>(*Standard workflow only*)
469-
<br><br>Encode and decode Society for Worldwide Interbank Financial Telecommuncation (SIWFT) transactions in flat-file XML message format.
469+
<br><br>Encode and decode Society for Worldwide Interbank Financial Telecommunication (SWIFT) transactions in flat-file XML message format.
470470
:::column-end:::
471471
:::column:::
472472
[![X12 icon][x12-icon]][x12-doc]
@@ -478,7 +478,7 @@ For more information, review the following documentation:
478478
<br><br>[**XML Operations**][xml-operations-doc]
479479
<br><br>Perform operations with XML.
480480
<br><br>**Compose XML with schema**: Create XML from JSON using a schema for a Standard workflow.
481-
<br><br>**Parse XML with schema**: Parse XML using a schema for a Standard workflow..
481+
<br><br>**Parse XML with schema**: Parse XML using a schema for a Standard workflow.
482482
<br><br>**Transform XML**: Convert XML using a map.
483483
<br><br>**Validate XML**: Validate inbound or outbound XML using a schema.
484484
:::column-end:::

articles/container-apps/authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ The token format varies slightly according to the provider. See the following ta
160160
| `microsoftaccount` | `{"access_token":"<ACCESS_TOKEN>"}` or `{"authentication_token": "<TOKEN>"`| `authentication_token` is preferred over `access_token`. The `expires_in` property is optional. <br/> When requesting the token from Live services, always request the `wl.basic` scope. |
161161
| `google` | `{"id_token":"<ID_TOKEN>"}` | The `authorization_code` property is optional. Providing an `authorization_code` value adds an access token and a refresh token to the token store. When specified, `authorization_code` can also optionally be accompanied by a `redirect_uri` property. |
162162
| `facebook`| `{"access_token":"<USER_ACCESS_TOKEN>"}` | Use a valid [user access token](https://developers.facebook.com/docs/facebook-login/access-tokens) from Facebook. |
163-
| `twitter` | `{"access_token":"<ACCESS_TOKEN>", "access_token_secret":"<ACCES_TOKEN_SECRET>"}` | |
163+
| `twitter` | `{"access_token":"<ACCESS_TOKEN>", "access_token_secret":"<ACCESS_TOKEN_SECRET>"}` | |
164164
| | | |
165165

166166
If the provider token is validated successfully, the API returns with an `authenticationToken` in the response body, which is your session token.

articles/container-apps/networking.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Different environment types have different subnet requirements:
153153
| /26 | 52 | 26 | 260 |
154154
| /27 | 20 | 10 | 100 |
155155

156-
<sup>1</sup> The available IP addresses is the size of the subnet minus the 12 IP addresses required for Azure Container Apps infrastructure.
156+
<sup>1</sup> The available IP addresses are the size of the subnet minus the 12 IP addresses required for Azure Container Apps infrastructure.
157157
<sup>2</sup> This is accounting for apps in single revision mode.
158158

159159
# [Consumption only environment](#tab/consumption-only-env)
@@ -219,7 +219,7 @@ If you're using the Azure CLI with a Consumption only environment and the [platf
219219
User Defined Routes (UDR) and controlled egress through NAT Gateway are supported in the workload profiles environment. In the Consumption only environment, these features aren't supported.
220220

221221
> [!NOTE]
222-
> When using UDR with Azure Firewall in Azure Container Apps, you need to add certain FQDN's and service tags to the allowlist for the firewall. To learn more, see [configuring UDR with Azure Firewall](./networking.md#configuring-udr-with-azure-firewall).
222+
> When using UDR with Azure Firewall in Azure Container Apps, you need to add certain FQDNs and service tags to the allowlist for the firewall. To learn more, see [configuring UDR with Azure Firewall](./networking.md#configuring-udr-with-azure-firewall).
223223
224224
- You can use UDR with workload profiles environments to restrict outbound traffic from your container app through Azure Firewall or other network appliances.
225225

@@ -231,10 +231,10 @@ Azure creates a default route table for your virtual networks upon create. By im
231231

232232
#### Configuring UDR with Azure Firewall
233233

234-
User defined routes is only supported in a workload profiles environment. The following application and network rules must be added to the allowlist for your firewall depending on which resources you're using.
234+
User defined routes are only supported in a workload profiles environment. The following application and network rules must be added to the allowlist for your firewall depending on which resources you're using.
235235

236236
> [!NOTE]
237-
> For a guide on how to setup UDR with Container Apps to restrict outbound traffic with Azure Firewall, visit the [how to for Container Apps and Azure Firewall](./user-defined-routes.md).
237+
> For a guide on how to set up UDR with Container Apps to restrict outbound traffic with Azure Firewall, visit the [how to for Container Apps and Azure Firewall](./user-defined-routes.md).
238238
239239
##### Application rules
240240

@@ -272,7 +272,7 @@ When you configure a NAT Gateway on your subnet, the NAT Gateway provides a stat
272272

273273
### <a name="public-network-access"></a>Public network access (preview)
274274

275-
The public network access setting determines whether your container apps environment is accesible from the public Internet. Whether you can change this setting after creating your environment depends on the environment's virtual IP configuration. The following table shows valid values for public network access, depending on your environment's virtual IP configuration.
275+
The public network access setting determines whether your container apps environment is accessible from the public Internet. Whether you can change this setting after creating your environment depends on the environment's virtual IP configuration. The following table shows valid values for public network access, depending on your environment's virtual IP configuration.
276276

277277
| Virtual IP | Supported public network access | Description |
278278
|--|--|--|
@@ -298,15 +298,15 @@ This feature is supported for both Consumption and Dedicated plans in workload p
298298

299299
#### Considerations
300300
- Private endpoints on Azure Container Apps only support inbound HTTP traffic. TCP traffic is not supported.
301-
- To use a private endpoint with a custom domain and an *Apex domain* as the *Hostname record type*, you must configure a private DNS zone with the same name as your public DNS. In the record set, configure your private endpoint's private IP address instead of the container app environment's IP address. When configuring your custom domain with CNAME, the setup is unchanged. For more information, see [Set up custom domain with existing certificate](custom-domains-certificates.md).
301+
- To use a private endpoint with a custom domain and an *Apex domain* as the *Hostname record type*, you must configure a private DNS zone with the same name as your public DNS. In the record set, configure your private endpoint's private IP address instead of the container app environment's IP address. When you configure your custom domain with CNAME, the setup is unchanged. For more information, see [Set up custom domain with existing certificate](custom-domains-certificates.md).
302302
- Your private endpoint's VNet can be separate from the VNet integrated with your container app.
303303
- You can add a private endpoint to both new and existing workload profile environments.
304304

305305
In order to connect to your container apps through a private endpoint, you must configure a private DNS zone.
306306

307307
| Service | subresource | Private DNS zone name |
308308
|--|--|--|
309-
| Azure Container Apps (Microsoft.App/ManagedEnvironments) | managedEnvironment | privatelink.{regionName}.azurecontainerapps.io |
309+
| Azure Container Apps (Microsoft.App/ManagedEnvironments) | managedEnvironment | private link.{regionName}.azurecontainerapps.io |
310310

311311
### Environment security
312312

articles/container-apps/sessions-tutorial-llamaindex.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ The following lines of code instantiate a *AzureCodeInterpreterToolSpec* and pro
4646

4747
```python
4848
code_interpreter_tool = AzureCodeInterpreterToolSpec(
49-
pool_managment_endpoint=pool_management_endpoint,
49+
pool_management_endpoint=pool_management_endpoint,
5050
)
5151
agent = ReActAgent.from_tools(code_interpreter_tool.to_tool_list(), llm=llm, verbose=True)
5252
```

articles/cost-management-billing/costs/ingest-azure-usage-at-scale.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Here are some of the characteristics of the service-side sync transfer used with
114114
- The transfer creates checkpoints during its progress and exposes a _TransferCheckpoint_ object. The object represents the latest checkpoint via the _TransferContext_ object. If the _TransferCheckpoint_ is saved before a transfer is cancelled/aborted, the transfer can be resumed from the checkpoint for up to seven days. The transfer can be resumed from any checkpoint, not just the latest.
115115
- If the transfer client process is killed and restarted without implementing the checkpoint feature:
116116
- Before any blob transfers complete, the transfer restarts.
117-
- After some of the blobs complete, the transfer restarts for only the incompleted blobs.
117+
- After some of the blobs complete, the transfer restarts for only the incomplete blobs.
118118
- Pausing the client execution pauses the transfers.
119119
- The blob transfer feature abstracts the client from transient failures. For instance, storage account throttling doesn't normally cause a transfer to fail but slows the transfer.
120120
- Service-side transfers have low client resource usage for CPU and memory, some network bandwidth, and connections.

articles/cost-management-billing/costs/quick-create-budget-bicep.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ One Azure resource is defined in the Bicep file:
9191
9292
You need to enter the following parameters:
9393
94-
- **startDate**: Replace **\<start-date\>** with the start date. It must be the first of the month in YYYY-MM-DD format. A future start date shouldn't be more than three months in the future. A past start date should be selected within the timegrain period.
94+
- **startDate**: Replace **\<start-date\>** with the start date. It must be the first of the month in YYYY-MM-DD format. A future start date shouldn't be more than three months in the future. A past start date should be selected within the time grain period.
9595
- **endDate**: Replace **\<end-date\>** with the end date in YYYY-MM-DD format. If not provided, it defaults to ten years from the start date.
9696
- **contactEmails**: First create a variable that holds your emails and then pass that variable. Replace the sample emails with the email addresses to send the budget notification to when the threshold is exceeded.
9797
@@ -137,7 +137,7 @@ One Azure resource is defined in the Bicep file:
137137
138138
You need to enter the following parameters:
139139
140-
- **startDate**: Replace **\<start-date\>** with the start date. It must be the first of the month in YYYY-MM-DD format. A future start date shouldn't be more than three months in the future. A past start date should be selected within the timegrain period.
140+
- **startDate**: Replace **\<start-date\>** with the start date. It must be the first of the month in YYYY-MM-DD format. A future start date shouldn't be more than three months in the future. A past start date should be selected within the time grain period.
141141
- **endDate**: Replace **\<end-date\>** with the end date in YYYY-MM-DD format. If not provided, it defaults to ten years from the start date.
142142
- **contactEmails**: First create a variable that holds your emails and then pass that variable. Replace the sample emails with the email addresses to send the budget notification to when the threshold is exceeded.
143143
- **resourceGroupFilterValues** First create a variable that holds your resource group filter values and then pass that variable. Replace the sample filter values with the set of values for your resource group filter.
@@ -189,7 +189,7 @@ One Azure resource is defined in the Bicep file:
189189
190190
You need to enter the following parameters:
191191
192-
- **startDate**: Replace **\<start-date\>** with the start date. It must be the first of the month in YYYY-MM-DD format. A future start date shouldn't be more than three months in the future. A past start date should be selected within the timegrain period.
192+
- **startDate**: Replace **\<start-date\>** with the start date. It must be the first of the month in YYYY-MM-DD format. A future start date shouldn't be more than three months in the future. A past start date should be selected within the time grain period.
193193
- **endDate**: Replace **\<end-date\>** with the end date in YYYY-MM-DD format. If not provided, it defaults to ten years from the start date.
194194
- **contactEmails**: First create a variable that holds your emails and then pass that variable. Replace the sample emails with the email addresses to send the budget notification to when the threshold is exceeded.
195195
- **contactGroups**: First create a variable that holds your contact groups and then pass that variable. Replace the sample contact groups with the list of action groups to send the budget notification to when the threshold is exceeded. You must pass the resource ID of the action group, which you can get with [az monitor action-group show](/cli/azure/monitor/action-group#az-monitor-action-group-show) or [Get-AzActionGroup](/powershell/module/az.monitor/get-azactiongroup).

articles/cost-management-billing/troubleshoot-billing/troubleshoot-customer-agreement-billing-issues-usage-file-pivot-tables.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ In this section, you create a pivot table where you can troubleshoot overall gen
4646

4747
1. In the PivotTable Fields area, drag **Meter Category** and **Product** to the **Rows** section. Put **Product** below **Meter Category**.
4848
:::image type="content" source="./media/troubleshoot-customer-agreement-billing-issues-usage-file-pivot-tables/rows-section.png" alt-text="Screenshot showing Meter Category and Product in Rows." lightbox="./media/troubleshoot-customer-agreement-billing-issues-usage-file-pivot-tables/rows-section.png" :::
49-
1. Next, add the **costInBillingCurrenty** column to the **Values** section. You can also use the **Quantity** column instead to get information about consumption units and transactions. For example, GB and Hours. Or, transactions instead of cost in different currencies like USD, EUR, and INR.
49+
1. Next, add the **costInBillingCurrency** column to the **Values** section. You can also use the **Quantity** column instead to get information about consumption units and transactions. For example, GB and Hours. Or, transactions instead of cost in different currencies like USD, EUR, and INR.
5050
:::image type="content" source="./media/troubleshoot-customer-agreement-billing-issues-usage-file-pivot-tables/add-pivot-table-fields.png" alt-text="Screenshot showing fields added to the pivot table." lightbox="./media/troubleshoot-customer-agreement-billing-issues-usage-file-pivot-tables/add-pivot-table-fields.png" :::
5151
1. Now you have a dashboard for generalized consumption investigation. You can filter for a specific service using the filtering options in the pivot table.
5252
:::image type="content" source="./media/troubleshoot-customer-agreement-billing-issues-usage-file-pivot-tables/pivot-table-filter-option-row-label.png" alt-text="Screenshot showing the pivot table filter option for a row label." lightbox="./media/troubleshoot-customer-agreement-billing-issues-usage-file-pivot-tables/pivot-table-filter-option-row-label.png" :::

0 commit comments

Comments
 (0)