Skip to content

Commit 9be9cf1

Browse files
authored
Merge pull request #300493 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 2964a7e + 3114b75 commit 9be9cf1

13 files changed

+18
-16
lines changed

articles/communication-services/concepts/analytics/logs/call-diagnostics-updates-log-schema.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ When using the Call Diagnostics Updates Log Schema, always refer to the highest
4242

4343
### More about log versions and data latency
4444

45-
The call diagnostics updates log schema may require approximately 60 minutes following the end of a call to propogate data, most logs may be available within 40 minutes.
45+
The call diagnostics updates log schema may require approximately 60 minutes following the end of a call to propagate data, most logs may be available within 40 minutes.
4646

4747
After a call ends, an initial version (version 1) of the log is sent to the CallSummaryUpdates and CallDiagnosticUpdates tables. Initial versions may contain `null` values, if more information becomes available updated versions of the logs are created with more complete information. For example, client data can be delayed because of network connectivity issues between the client computer and our servers, or something as simple as a user closing the lid on their laptop post-call before their client data was sent and re-opening it hours (or days) later.
4848

articles/communication-services/concepts/analytics/logs/call-summary-updates-log-schema.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ When using the call summary updates log schema, always refer to the highest `Cal
4343

4444
### More about log versions and data latency
4545

46-
The call summary updates log schema may require approximately 60 minutes following the end of a call to propogate data, most logs may be available within 40 minutes.
46+
The call summary updates log schema may require approximately 60 minutes following the end of a call to propagate data, most logs may be available within 40 minutes.
4747

4848
After a call ends, an initial version (version 1) of the log is sent to the CallSummaryUpdates and CallDiagnosticUpdates tables. Initial versions may contain `null` values, if more information becomes available updated versions of the logs are created with more complete information. For example, client data can be delayed because of network connectivity issues between the client computer and our servers, or something as simple as a user closing the lid on their laptop post-call before their client data was sent and re-opening it hours (or days) later.
4949

articles/container-apps/tutorial-ci-cd-runners-jobs.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,13 +243,15 @@ To run a self-hosted runner, you need to create a personal access token (PAT) in
243243
GITHUB_PAT="<GITHUB_PAT>"
244244
REPO_OWNER="<REPO_OWNER>"
245245
REPO_NAME="<REPO_NAME>"
246+
REGISTRATION_TOKEN_API_URL="<YOUR_REGISTRATION_TOKEN_API_URL>"
246247
```
247248
248249
# [PowerShell](#tab/powershell)
249250
```powershell
250251
$GITHUB_PAT="<GITHUB_PAT>"
251252
$REPO_OWNER="<REPO_OWNER>"
252253
$REPO_NAME="<REPO_NAME>"
254+
$REGISTRATION_TOKEN_API_URL="<YOUR_REGISTRATION_TOKEN_API_URL>"
253255
```
254256
255257
---
@@ -261,6 +263,7 @@ To run a self-hosted runner, you need to create a personal access token (PAT) in
261263
| `<GITHUB_PAT>` | The GitHub PAT you generated. |
262264
| `<REPO_OWNER>` | The owner of the repository you created earlier. This value is usually your GitHub username. |
263265
| `<REPO_NAME>` | The name of the repository you created earlier. This value is the same name you entered in the *Repository name* field. |
266+
| `<YOUR_REGISTRATION_TOKEN_API_URL>` | The registration token API URL in the *entrypoint.sh* file. | For example, 'https://myapi.example.com/get-token' |
264267
265268
## Build the GitHub Actions runner container image
266269
@@ -647,15 +650,13 @@ To run a self-hosted runner, you need to create a personal access token (PAT) in
647650
AZP_TOKEN="<AZP_TOKEN>"
648651
ORGANIZATION_URL="<ORGANIZATION_URL>"
649652
AZP_POOL="container-apps"
650-
REGISTRATION_TOKEN_API_URL="<YOUR_REGISTRATION_TOKEN_API_URL>"
651653
```
652654
653655
# [PowerShell](#tab/powershell)
654656
```powershell
655657
$AZP_TOKEN="<AZP_TOKEN>"
656658
$ORGANIZATION_URL="<ORGANIZATION_URL>"
657659
$AZP_POOL="container-apps"
658-
$REGISTRATION_TOKEN_API_URL="<YOUR_REGISTRATION_TOKEN_API_URL>"
659660
```
660661
661662
---
@@ -666,7 +667,6 @@ To run a self-hosted runner, you need to create a personal access token (PAT) in
666667
|---|---|---|
667668
| `<AZP_TOKEN>` | The Azure DevOps PAT you generated. | |
668669
| `<ORGANIZATION_URL>` | The URL of your Azure DevOps organization. Make sure no trailing `/` is present at the end of the URL. | For example, `https://dev.azure.com/myorg` or `https://myorg.visualstudio.com`. |
669-
| `<YOUR_REGISTRATION_TOKEN_API_URL>` | The registration token API URL in the *entrypoint.sh* file. | For example, 'https://myapi.example.com/get-token' |
670670
671671
## Build the Azure Pipelines agent container image
672672

articles/cyclecloud/cluster-references/configuration-reference.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ Configuration object attributes behave like other objects, but are extended to p
1717
No quotes are necessary for strings or for boolean expressions, true or false.
1818

1919
``` ini
20-
[[[configuraton my-project]]]
20+
[[[configuration my-project]]]
2121
Attribute1 = Value1
2222
Attribute2 = Value2
2323
KeyAttribute3.Attribute3 = true
2424

25-
[[[configuraton cyclecloud.mounts.mount1]]]
25+
[[[configuration cyclecloud.mounts.mount1]]]
2626
Attribute1 = Value1
2727
```
2828

articles/defender-for-iot/organizations/how-to-manage-device-inventory-for-organizations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Use any of the following options to modify or filter the devices shown:
3030
| **Sort devices** | Select a column header to sort the devices by that column. Select it again to change the sort direction. |
3131
|**Filter devices shown** | Either use the **Search** box to search for specific device details, or select **Add filter** to filter the devices shown. <br><br> In the **Add filter** box, define your filter by column name, operator, and value. Select **Apply** to apply your filter.<br><br> You can apply multiple filters at the same time. Search results and filters aren't saved when you refresh the **Device inventory** page. <br><br> The **Last active time** and **Network location (Preview)** filters are on by default. |
3232
|**Modify columns shown** | Select **Edit columns** :::image type="icon" source="media/how-to-manage-device-inventory-on-the-cloud/edit-columns-icon.png" border="false":::. In the **Edit columns** pane:<br><br> - Select the **+ Add Column** button to add new columns to the grid.<br> - Drag and drop fields to change the columns order.<br>- To remove a column, select the **Delete** :::image type="icon" source="media/how-to-manage-device-inventory-on-the-cloud/trashcan-icon.png" border="false"::: icon to the right.<br>- To reset the columns to their default settings, select **Reset** :::image type="icon" source="media/how-to-manage-device-inventory-on-the-cloud/reset-icon.png" border="false":::. <br><br>Select **Save** to save any changes made. |
33-
| **Group devices** | From the **Group by** above the gird, select a category, such as **Class**, **Data source**, **Location**, **Purdue level**, **Site**, **Type**, **Vendor**, or **Zone**, to group the devices shown. Inside each group, devices retain the same column sorting. To remove the grouping, select **No grouping**. |
33+
| **Group devices** | From the **Group by** above the grid, select a category, such as **Class**, **Data source**, **Location**, **Purdue level**, **Site**, **Type**, **Vendor**, or **Zone**, to group the devices shown. Inside each group, devices retain the same column sorting. To remove the grouping, select **No grouping**. |
3434

3535
For more information, see [Device inventory column data](device-inventory.md#device-inventory-column-data).
3636

articles/event-grid/includes/event-grid-create-event-subscriptions-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
1. If you are on the **Topics** page of your Event Grid namespace in the Azure portal, select your topic from the list of topics. If you are on the **Topics** page, follow instructions from [create, view, and manage a namespace topics](../create-view-manage-namespace-topics.md) to identify the topic you want to use to create the event subscription.
1515

1616
:::image type="content" source="../media/create-view-manage-event-subscriptions/select-topic.png" alt-text="Screenshot showing Event Grid topics page with a topic selected." lightbox="../media/create-view-manage-event-subscriptions/select-topic.png":::
17-
1. On the **Event Gird Namespace Topic** page, select **Subscriptions** option in the **Entities** section on the left menu.
17+
1. On the **Event Grid Namespace Topic** page, select **Subscriptions** option in the **Entities** section on the left menu.
1818
1. On the **Subscriptions** page, select "**+ Subscription**" button on the command bar.
1919

2020
:::image type="content" source="../media/create-view-manage-event-subscriptions/event-subscription-create.png" alt-text="Screenshot showing Event Grid event subscription create." lightbox="../media/create-view-manage-event-subscriptions/event-subscription-create.png":::

articles/hdinsight/hdinsight-config-for-vscode.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ For general information about working with settings in VS Code, refer to [User a
3434
| HDInsight: Sign-in Tips Enable | Unchecked | When this option is checked, there's a prompt when logging in to Azure |
3535
| HDInsight: Previous Extension Version | Display the version number of the current extension | Show the previous extension version|
3636
| HDInsight: Results Font Family | -apple-system, BlinkMacSystemFont, Segoe WPC, Segoe UI, HelveticaNeue-Light, Ubuntu, Droid Sans, sans-serif | Set the font family for the results grid; set to blank to use the editor font |
37-
| HDInsight: Results Font Size | 13 |Set the font size for the results gird; set to blank to use the editor size |
37+
| HDInsight: Results Font Size | 13 |Set the font size for the results grid; set to blank to use the editor size |
3838
| HDInsight Cluster: Linked Cluster | -- | Linked clusters urls. Also can edit the JSON file to set |
3939
| HDInsight Hive: Apply Localization | Unchecked | [Optional] Configuration options for localizing into Visual Studio Code's configured locale (must restart Visual Studio Code for settings to take effect)|
4040
| HDInsight Hive: Copy Includes Headers | Unchecked | [Optional] Configuration option for copying results from the Results Views |

articles/sap/workloads/high-availability-guide-suse-netapp-files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ The following items are prefixed with either **[A]** - applicable to all nodes,
673673
#### [ENSA2](#tab/ensa2)
674674
675675
> [!NOTE]
676-
> If you have a two-node cluster running ENSA2, you have the option to configure priority-fencing-delay cluster property. This property introduces additional delay in fencing a node that has higher total resoure priority when a split-brain scenario occurs. For more information, see [SUSE Linux Enteprise Server high availability extension administration guide](https://documentation.suse.com/sle-ha/15-SP3/single-html/SLE-HA-administration/#pro-ha-storage-protect-fencing).
676+
> If you have a two-node cluster running ENSA2, you have the option to configure priority-fencing-delay cluster property. This property introduces additional delay in fencing a node that has higher total resource priority when a split-brain scenario occurs. For more information, see [SUSE Linux Enteprise Server high availability extension administration guide](https://documentation.suse.com/sle-ha/15-SP3/single-html/SLE-HA-administration/#pro-ha-storage-protect-fencing).
677677
>
678678
> The property priority-fencing-delay is only applicable for ENSA2 running on two-node cluster.
679679

articles/sap/workloads/high-availability-guide-suse-nfs-azure-files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ The following items are prefixed with either **[A]** - applicable to all nodes,
574574
#### [ENSA2](#tab/ensa2)
575575

576576
> [!NOTE]
577-
> If you have a two-node cluster running ENSA2, you have the option to configure priority-fencing-delay cluster property. This property introduces additional delay in fencing a node that has higher total resoure priority when a split-brain scenario occurs. For more information, see [SUSE Linux Enteprise Server high availability extension administration guide](https://documentation.suse.com/sle-ha/15-SP3/single-html/SLE-HA-administration/#pro-ha-storage-protect-fencing).
577+
> If you have a two-node cluster running ENSA2, you have the option to configure priority-fencing-delay cluster property. This property introduces additional delay in fencing a node that has higher total resource priority when a split-brain scenario occurs. For more information, see [SUSE Linux Enteprise Server high availability extension administration guide](https://documentation.suse.com/sle-ha/15-SP3/single-html/SLE-HA-administration/#pro-ha-storage-protect-fencing).
578578
>
579579
> The property priority-fencing-delay is only applicable for ENSA2 running on two-node cluster.
580580

articles/sap/workloads/high-availability-guide-suse-nfs-simple-mount.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ The instructions in this section are applicable only if you're using Azure NetAp
737737
#### [ENSA2](#tab/ensa2)
738738
739739
> [!NOTE]
740-
> If you have a two-node cluster running ENSA2, you have the option to configure priority-fencing-delay cluster property. This property introduces additional delay in fencing a node that has higher total resoure priority when a split-brain scenario occurs. For more information, see [SUSE Linux Enteprise Server high availability extension administration guide](https://documentation.suse.com/sle-ha/15-SP3/single-html/SLE-HA-administration/#pro-ha-storage-protect-fencing).
740+
> If you have a two-node cluster running ENSA2, you have the option to configure priority-fencing-delay cluster property. This property introduces additional delay in fencing a node that has higher total resource priority when a split-brain scenario occurs. For more information, see [SUSE Linux Enteprise Server high availability extension administration guide](https://documentation.suse.com/sle-ha/15-SP3/single-html/SLE-HA-administration/#pro-ha-storage-protect-fencing).
741741
>
742742
> The property priority-fencing-delay is only applicable for ENSA2 running on two-node cluster. For more information, see [Enqueue Replication 2 High Availability cluster with simple mount](https://documentation.suse.com/sbp/sap-15/html/SAP-S4HA10-setupguide-sle15/index.html#multicluster)
743743

0 commit comments

Comments
 (0)