Skip to content

Commit 8d27c71

Browse files
authored
Merge pull request #235250 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents b898705 + 1d9f9e2 commit 8d27c71

15 files changed

+27
-23
lines changed

articles/active-directory/governance/how-to-lifecycle-workflow-sync-attributes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ For more information on expressions, see [Reference for writing expressions for
5252

5353
The expression examples above use endDate for SAP and StatusHireDate for Workday. However, you may opt to use different attributes.
5454

55-
For example, you might use StatusContinuesFirstDayOfWork instead of StatusHireDate for Workday. In this instance your expression would be:
55+
For example, you might use StatusContinuousFirstDayOfWork instead of StatusHireDate for Workday. In this instance your expression would be:
5656

57-
`FormatDateTime([StatusContinuesFirstDayOfWork], , "yyyy-MM-ddzzz", "yyyyMMddHHmmss.fZ")`
57+
`FormatDateTime([StatusContinuousFirstDayOfWork], , "yyyy-MM-ddzzz", "yyyyMMddHHmmss.fZ")`
5858

5959

6060
The following table has a list of suggested attributes and their scenario recommendations.

articles/active-directory/saas-apps/hubspot-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ To provision a user account in HubSpot:
169169

170170
![The Create user option in HubSpot](./media/hubspot-tutorial/teams.png)
171171

172-
1. In the **Add email addess(es)** box, enter the email address of the user in the format brittasimon\@contoso.com, and then select **Next**.
172+
1. In the **Add email address(es)** box, enter the email address of the user in the format brittasimon\@contoso.com, and then select **Next**.
173173

174174
![The Add email address(es) box in the Create users section in HubSpot](./media/hubspot-tutorial/add-user.png)
175175

articles/aks/manage-abort-operations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.date: 3/23/2023
1010

1111
Sometimes deployment or other processes running within pods on nodes in a cluster can run for periods of time longer than expected due to various reasons. While it's important to allow those processes to gracefully terminate when they're no longer needed, there are circumstances where you need to release control of node pools and clusters with long running operations using an *abort* command.
1212

13-
AKS now supports aborting a long running operation, which is now generally available. This feature allows you to take back control and run another operation seamlessly. This design is supported using the [Azure REST API](/rest/api/azure/) or the [Azure CLI](/cli/azure/).
13+
AKS support for aborting long running operations is now generally available. This feature allows you to take back control and run another operation seamlessly. This design is supported using the [Azure REST API](/rest/api/azure/) or the [Azure CLI](/cli/azure/).
1414

1515
The abort operation supports the following scenarios:
1616

@@ -68,4 +68,4 @@ When you terminate an operation, it doesn't roll back to the previous state and
6868

6969
## Next steps
7070

71-
Learn more about [Container insights](../azure-monitor/containers/container-insights-overview.md) to understand how it helps you monitor the performance and health of your Kubernetes cluster and container workloads.
71+
Learn more about [Container insights](../azure-monitor/containers/container-insights-overview.md) to understand how it helps you monitor the performance and health of your Kubernetes cluster and container workloads.

articles/azure-netapp-files/faq-data-migration-protection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ You can also use a wide array of free tools to copy data. For NFS, you can use w
4545

4646
The requirements for replicating an Azure NetApp Files volume to another Azure region are as follows:
4747
- Ensure Azure NetApp Files is available in the target Azure region.
48-
- Validate network connectivity between VNets in each region. Currently, global peering between VNets is not supported. You can establish connectivity between VNets by linking with an ExpressRoute circuit or using a S2S VPN connection.
48+
- Validate network connectivity between the source and the Azure NetApp Files target volume IP address. Data transfer between on premises and Azure NetApp Files volumes, or across Azure regions, is supported via [site-to-site VPN and ExpressRoute](azure-netapp-files-network-topologies.md#hybrid-environments), [Global VNet peering](azure-netapp-files-network-topologies.md#global-or-cross-region-vnet-peering), or [Azure Virtual WAN connections](configure-virtual-wan.md).
4949
- Create the target Azure NetApp Files volume.
5050
- Transfer the source data to the target volume by using your preferred file copy tool.
5151

articles/cognitive-services/openai/encrypt-data-at-rest.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ az keyvault key delete \
134134

135135
### Delete fine-tuned models and deployments
136136

137-
The Fine-tunes API allows customers to create their own fine-tuned version of the OpenAI models based on the training data that you've uploaded to the service via the Files APIs. The trained fine-tuned models are stored in Azure Storage in the same region, encrypted at rest and logically isolated with their Azure subscription and API credentials. Fine-tuned models and deployments can be deleted by the user by calling the [DELETE API operation](./how-to/fine-tuning.md?pivots=programming-language-python#delete-your-model-deployment).
137+
The Fine-tunes API allows customers to create their own fine-tuned version of the OpenAI models based on the training data that you've uploaded to the service via the Files APIs. The trained fine-tuned models are stored in Azure Storage in the same region, encrypted at rest (either with Microsoft-managed keys or customer-managed keys) and logically isolated with their Azure subscription and API credentials. Fine-tuned models and deployments can be deleted by the user by calling the [DELETE API operation](./how-to/fine-tuning.md?pivots=programming-language-python#delete-your-model-deployment).
138138

139139
## Disable customer-managed keys
140140

@@ -154,4 +154,4 @@ When you previously enabled customer managed keys this also enabled a system ass
154154
## Next steps
155155

156156
* [Language service Customer-Managed Key Request Form](https://aka.ms/cogsvc-cmk)
157-
* [Learn more about Azure Key Vault](../../key-vault/general/overview.md)
157+
* [Learn more about Azure Key Vault](../../key-vault/general/overview.md)

articles/cosmos-db/analytical-store-change-data-capture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ In addition to providing incremental data feed from analytical store to diverse
3333
- There's no limitation around the fixed data retention period for which changes are available
3434

3535
> [!IMPORTANT]
36-
> Please note that "from the beginning" means that all data and all transactions since the container creation are availble for CDC, including deletes and updates. To ingest and process deletes and updates, you have to use specific settings in your CDC processes in Azure Synapse or Azure Data Factory. These settings are turned off by default. For more information, click [here](get-started-change-data-capture.md)
36+
> Please note that if the "Start from beginning" option is selected, the initial load includes a full snapshot of container data in the first run, and changed or incremental data is captured in subsequent runs. Similarly, when the "Start from timestamp" option is selected, the initial load processes the data from the given timestamp, and incremental or changed data is captured in subsequent runs. The `Capture intermediate updates`, `Capture Deletes` and `Capture Transactional store TTLs`, which are found under the [source options](get-started-change-data-capture.md) tab, determine if intermediate updates and deletes are captured in sinks.
3737
3838
## Features
3939

articles/data-factory/connector-troubleshoot-synapse-sql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ This article provides suggestions to troubleshoot common problems with the Azure
294294

295295
## Error code: SqlDeniedPublicAccess
296296

297-
- **Message**: `Cannot connect to SQL Database: '%server;', Database: '%database;', Reason: Connection was denied since Deny Public Network Access is set to Yes. To connect to this server, 1. If you persist public network access disabled, please use Managed Vritual Network IR and create private endpoint. https://docs.microsoft.com/en-us/azure/data-factory/managed-virtual-network-private-endpoint; 2. Otherwise you can enable public network access, set "Public network access" option to "Selected networks" on Auzre SQL Networking setting.`
297+
- **Message**: `Cannot connect to SQL Database: '%server;', Database: '%database;', Reason: Connection was denied since Deny Public Network Access is set to Yes. To connect to this server, 1. If you persist public network access disabled, please use Managed Vritual Network IR and create private endpoint. https://docs.microsoft.com/en-us/azure/data-factory/managed-virtual-network-private-endpoint; 2. Otherwise you can enable public network access, set "Public network access" option to "Selected networks" on Azure SQL Networking setting.`
298298

299299
- **Causes**: Azure SQL Database is set to deny public network access. This requires to use managed virtual network and create private endpoint to access.
300300

articles/event-grid/event-filtering.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ For events in the **Event Grid schema**, use the following values for the key: `
164164

165165
For events in **Cloud Events schema**, use the following values for the key: `eventid`, `source`, `eventtype`, `eventtypeversion`, or event data (like `data.key1`).
166166

167-
For **custom input schema**, use the event data fields (like `data.key1`). To access fields in the data section, use the `.` (dot) notation. For example, `data.sitename`, `data.appEventTypeDetail.action` to access `sitename` or `action` for the following sample event.
167+
For **custom input schema**, use the event data fields (like `data.key1`). To access fields in the data section, use the `.` (dot) notation. For example, `data.siteName`, `data.appEventTypeDetail.action` to access `siteName` or `action` for the following sample event.
168168

169169
```json
170170
"data": {
@@ -590,9 +590,9 @@ FOR_EACH filter IN (a, b, c)
590590
All string comparisons aren't case-sensitive.
591591

592592
> [!NOTE]
593-
> If the event JSON doesn't contain the advanced filter key, filter is evaulated as **not matched** for the following operators: NumberGreaterThan, NumberGreaterThanOrEquals, NumberLessThan, NumberLessThanOrEquals, NumberIn, BoolEquals, StringContains, StringNotContains, StringBeginsWith, StringNotBeginsWith, StringEndsWith, StringNotEndsWith, StringIn.
593+
> If the event JSON doesn't contain the advanced filter key, filter is evaluated as **not matched** for the following operators: NumberGreaterThan, NumberGreaterThanOrEquals, NumberLessThan, NumberLessThanOrEquals, NumberIn, BoolEquals, StringContains, StringNotContains, StringBeginsWith, StringNotBeginsWith, StringEndsWith, StringNotEndsWith, StringIn.
594594
>
595-
>The filter is evaulated as **matched** for the following operators:NumberNotIn, StringNotIn.
595+
>The filter is evaluated as **matched** for the following operators: NumberNotIn, StringNotIn.
596596
597597

598598
## IsNullOrUndefined

articles/event-grid/webhook-event-delivery.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ And, follow one of these steps:
8888
For an example of handling the subscription validation handshake, see a [C# sample](https://github.com/Azure-Samples/event-grid-dotnet-publish-consume-events/blob/master/EventGridConsumer/EventGridConsumer/Function1.cs).
8989

9090
## Endpoint validation with CloudEvents v1.0
91-
CloudEvents v1.0 implements its own abuse protection semantics using the **HTTP OPTIONS** method. You can read more about it [here](https://github.com/cloudevents/spec/blob/v1.0/http-webhook.md#4-abuse-protection). When you use the CloudEvents schema for output, Event Grid uses with the CloudEvents v1.0 abuse protection in place of the Event Grid validation event mechanism.
91+
CloudEvents v1.0 implements its own abuse protection semantics using the **HTTP OPTIONS** method. You can read more about it [here](https://github.com/cloudevents/spec/blob/v1.0/http-webhook.md#4-abuse-protection). When you use the CloudEvents schema for output, Event Grid uses the CloudEvents v1.0 abuse protection in place of the Event Grid validation event mechanism.
9292

9393
## Event schema compatibility
9494
When a topic is created, an incoming event schema is defined. And, when a subscription is created, an outgoing event schema is defined. The following table shows you the compatibility allowed when creating a subscription.

articles/expressroute/expressroute-howto-ipsec-transport-private-windows.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ The IPsec policy requires all HTTP connections on the destination port 8080 to u
263263

264264
[![49]][49]
265265
2. To assign the security group policy to the OU **IPSecOU**, right-click the security policy and chose **Assign**.
266-
Every computer tht belongs to the OU will have the security group policy assigned.
266+
Every computer that belongs to the OU will have the security group policy assigned.
267267

268268
[![50]][50]
269269

@@ -357,4 +357,4 @@ For more information about ExpressRoute, see the [ExpressRoute FAQ](expressroute
357357
[48]: ./media/expressroute-howto-ipsec-transport-private-windows/security-policy-completed.png "end of process of creation of the security policy"
358358
[49]: ./media/expressroute-howto-ipsec-transport-private-windows/gpo-not-assigned.png "IPsec policy linked to the GPO but not assigned"
359359
[50]: ./media/expressroute-howto-ipsec-transport-private-windows/gpo-assigned.png "IPsec policy assigned to the GPO"
360-
[51]: ./media/expressroute-howto-ipsec-transport-private-windows/encrypted-traffic.png "Capture of IPsec encrypted traffic"
360+
[51]: ./media/expressroute-howto-ipsec-transport-private-windows/encrypted-traffic.png "Capture of IPsec encrypted traffic"

0 commit comments

Comments
 (0)