Skip to content

Commit 3df0cd5

Browse files
authored
Merge pull request #253686 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 fd6d95c + df6f8d1 commit 3df0cd5

File tree

13 files changed

+18
-19
lines changed

13 files changed

+18
-19
lines changed

articles/active-directory/authentication/how-to-mfa-registration-campaign.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ To enable a registration campaign in the Microsoft Entra admin center, complete
7777

7878
1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as [Authentication Policy Administrator](../roles/permissions-reference.md#authentication-policy-administrator) or [Global Administrator](../roles/permissions-reference.md#global-administrator).
7979
1. Browse to **Protection** > **Authentication methods** > **Registration campaign** and click **Edit**.
80-
1. For **State**, click **Microsoft managed** or **Enabled**. In the following screenshot, the registration campaign is **Microsoft managed**. That setting allows Microsoft to set the default value to be either Enabled or Disabled. From Sept. 25 to Oct. 20, 2023, the Microsoft managed value for the registration campaing will change to **Enabled** for voice call and text message users across all tenants. For more information, see [Protecting authentication methods in Azure Active Directory](concept-authentication-default-enablement.md).
80+
1. For **State**, click **Microsoft managed** or **Enabled**. In the following screenshot, the registration campaign is **Microsoft managed**. That setting allows Microsoft to set the default value to be either Enabled or Disabled. From Sept. 25 to Oct. 20, 2023, the Microsoft managed value for the registration campaign will change to **Enabled** for voice call and text message users across all tenants. For more information, see [Protecting authentication methods in Azure Active Directory](concept-authentication-default-enablement.md).
8181

8282
:::image type="content" border="true" source="media/how-to-mfa-registration-campaign/admin-experience.png" alt-text="Screenshot of enabling a registration campaign.":::
8383

articles/active-directory/develop/tutorial-single-page-app-react-sign-in-users.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ In this tutorial:
6868
<br />
6969
<h5>
7070
<center>
71-
Welcome to the Microsoft Authentication Library For Javascript -
71+
Welcome to the Microsoft Authentication Library For JavaScript -
7272
React SPA Tutorial
7373
</center>
7474
</h5>

articles/aks/custom-node-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ The settings below can be used to tune the operation of the virtual memory (VM)
265265
| Setting | Allowed values/interval | Default | Description |
266266
| ------- | ----------------------- | ------- | ----------- |
267267
| `vm.max_map_count` | 65530 - 262144 | 65530 | This file contains the maximum number of memory map areas a process may have. Memory map areas are used as a side-effect of calling `malloc`, directly by `mmap`, `mprotect`, and `madvise`, and also when loading shared libraries. |
268-
| `vm.vfs_cache_pressure` | 1 - 500 | 100 | This percentage value controls the tendency of the kernel to reclaim the memory, which is used for caching of directory and inode objects. |
268+
| `vm.vfs_cache_pressure` | 1 - 100 | 100 | This percentage value controls the tendency of the kernel to reclaim the memory, which is used for caching of directory and inode objects. |
269269
| `vm.swappiness` | 0 - 100 | 60 | This control is used to define how aggressive the kernel will swap memory pages. Higher values will increase aggressiveness, lower values decrease the amount of swap. A value of 0 instructs the kernel not to initiate swap until the amount of free and file-backed pages is less than the high water mark in a zone. |
270270
| `swapFileSizeMB` | 1 MB - Size of the [temporary disk](../virtual-machines/managed-disks-overview.md#temporary-disk) (/dev/sdb) | None | SwapFileSizeMB specifies size in MB of a swap file will be created on the agent nodes from this node pool. |
271271
| `transparentHugePageEnabled` | `always`, `madvise`, `never` | `always` | [Transparent Hugepages](https://www.kernel.org/doc/html/latest/admin-guide/mm/transhuge.html#admin-guide-transhuge) is a Linux kernel feature intended to improve performance by making more efficient use of your processor’s memory-mapping hardware. When enabled the kernel attempts to allocate `hugepages` whenever possible and any Linux process will receive 2-MB pages if the `mmap` region is 2 MB naturally aligned. In certain cases when `hugepages` are enabled system wide, applications may end up allocating more memory resources. An application may `mmap` a large region but only touch 1 byte of it, in that case a 2-MB page might be allocated instead of a 4k page for no good reason. This scenario is why it's possible to disable `hugepages` system-wide or to only have them inside `MADV_HUGEPAGE madvise` regions. |

articles/azure-monitor/app/distributed-tracing-telemetry-correlation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ It's important to make sure the incoming and outgoing configurations are exactly
171171
172172
### Enable W3C distributed tracing support for web apps
173173
174-
This feature is enabled by default for Javascript and the headers are automatically included when the hosting page domain is the same as the domain the requests are sent to (for example, the hosting page is `example.com` and the Ajax requests are sent to `example.com`). To change the distributed tracing mode, use the [`distributedTracingMode` configuration field](./javascript-sdk-configuration.md#sdk-configuration). AI_AND_W3C is provided by default for backward compatibility with any legacy services instrumented by Application Insights.
174+
This feature is enabled by default for JavaScript and the headers are automatically included when the hosting page domain is the same as the domain the requests are sent to (for example, the hosting page is `example.com` and the Ajax requests are sent to `example.com`). To change the distributed tracing mode, use the [`distributedTracingMode` configuration field](./javascript-sdk-configuration.md#sdk-configuration). AI_AND_W3C is provided by default for backward compatibility with any legacy services instrumented by Application Insights.
175175
176176
- **[npm-based setup](./javascript-sdk.md?tabs=npmpackage#get-started)**
177177

articles/azure-monitor/containers/container-insights-logging-v2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ For Python:
130130
Customers must [enable ContainerLogV2](./container-insights-logging-v2.md#enable-the-containerlogv2-schema) for multi-line logging to work.
131131

132132
### How to enable
133-
Multi-line logging is a preview feature and can be enabled by setting **enabled** flag to "true" under the `[log_collection_settings.enable_multiline_logs]` section in the the [config map](https://github.com/microsoft/Docker-Provider/blob/ci_prod/kubernetes/container-azm-ms-agentconfig.yaml)
133+
Multi-line logging feature can be enabled by setting **enabled** flag to "true" under the `[log_collection_settings.enable_multiline_logs]` section in the the [config map](https://github.com/microsoft/Docker-Provider/blob/ci_prod/kubernetes/container-azm-ms-agentconfig.yaml)
134134

135135
```yaml
136136
[log_collection_settings.enable_multiline_logs]

articles/azure-monitor/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ items:
117117
- name: Client-side JavaScript
118118
items:
119119
- name: Get Started with JavaScript SDK
120-
displayName: browser, client-side, Javascript (Web) SDK Loader Script
120+
displayName: browser, client-side, JavaScript (Web) SDK Loader Script
121121
href: app/javascript-sdk.md
122122
- name: Configure JavaScript SDK
123123
href: app/javascript-sdk-configuration.md

articles/azure-resource-manager/management/azure-services-resource-providers.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ The resources providers that are marked with **- registered** are registered by
8383
| Microsoft.DesktopVirtualization | [Azure Virtual Desktop](../../virtual-desktop/index.yml) |
8484
| Microsoft.Devices | [Azure IoT Hub](../../iot-hub/index.yml)<br />[Azure IoT Hub Device Provisioning Service](../../iot-dps/index.yml) |
8585
| Microsoft.DeviceUpdate | [Device Update for IoT Hub](../../iot-hub-device-update/index.yml)
86-
| Microsoft.DevOps | [Azure DevOps](/azure/devops/) |
8786
| Microsoft.DevSpaces | [Azure Dev Spaces](/previous-versions/azure/dev-spaces/) |
8887
| Microsoft.DevTestLab | [Azure Lab Services](../../lab-services/index.yml) |
8988
| Microsoft.DigitalTwins | [Azure Digital Twins](../../digital-twins/overview.md) |
@@ -178,7 +177,7 @@ The resources providers that are marked with **- registered** are registered by
178177
| Microsoft.TimeSeriesInsights | [Azure Time Series Insights](../../time-series-insights/index.yml) |
179178
| Microsoft.Token | Token |
180179
| Microsoft.VirtualMachineImages | [Azure Image Builder](../../virtual-machines/image-builder-overview.md) |
181-
| microsoft.visualstudio | [Azure DevOps](/azure/devops/) |
180+
| microsoft.visualstudio | [Azure DevOps](/azure/devops/) |
182181
| Microsoft.VMware | [Azure VMware Solution](../../azure-vmware/index.yml) |
183182
| Microsoft.VMwareCloudSimple | [Azure VMware Solution by CloudSimple](../../vmware-cloudsimple/index.md) |
184183
| Microsoft.VSOnline | [Azure DevOps](/azure/devops/) |

articles/communication-services/quickstarts/email/add-multiple-senders-mgmt-sdks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ In this quick start, you will learn how to add and remove sender addresses in Az
2222
::: zone-end
2323

2424
::: zone pivot="programming-language-javascript"
25-
[!INCLUDE [Add sender addresses with Javascript Management SDK](./includes/add-multiple-senders-js.md)]
25+
[!INCLUDE [Add sender addresses with JavaScript Management SDK](./includes/add-multiple-senders-js.md)]
2626
::: zone-end
2727

2828
::: zone pivot="programming-language-java"

articles/cosmos-db/hierarchical-partition-keys.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ item.setSessionId("0000-11-0000-1111");
286286
Mono<CosmosItemResponse<UserSession>> createResponse = container.createItem(item);
287287
```
288288

289-
##### [Javascript SDK v4](#tab/javascript-v4)
289+
##### [JavaScript SDK v4](#tab/javascript-v4)
290290

291291
```javascript
292292
// Create a new item
@@ -354,7 +354,7 @@ PartitionKey partitionKey = new PartitionKeyBuilder()
354354
Mono<CosmosItemResponse<UserSession>> createResponse = container.createItem(item, partitionKey);
355355
```
356356

357-
##### [Javascript SDK v4](#tab/javascript-v4)
357+
##### [JavaScript SDK v4](#tab/javascript-v4)
358358

359359
```javascript
360360
const item: UserSession = {
@@ -416,7 +416,7 @@ PartitionKey partitionKey = new PartitionKeyBuilder()
416416
// Perform a point read
417417
Mono<CosmosItemResponse<UserSession>> readResponse = container.readItem(id, partitionKey, UserSession.class);
418418
```
419-
##### [Javascript SDK v4](#tab/javascript-v4)
419+
##### [JavaScript SDK v4](#tab/javascript-v4)
420420

421421
```javascript
422422
// Store the unique identifier
@@ -499,7 +499,7 @@ pagedResponse.byPage().flatMap(fluxResponse -> {
499499
return Flux.empty();
500500
}).blockLast();
501501
```
502-
##### [Javascript SDK v4](#tab/javascript-v4)
502+
##### [JavaScript SDK v4](#tab/javascript-v4)
503503

504504
```javascript
505505
// Define a single-partition query that specifies the full partition key path
@@ -562,7 +562,7 @@ pagedResponse.byPage().flatMap(fluxResponse -> {
562562
}).blockLast();
563563
```
564564

565-
##### [Javascript SDK v4](#tab/javascript-v4)
565+
##### [JavaScript SDK v4](#tab/javascript-v4)
566566

567567
```javascript
568568
// Define a targeted cross-partition query specifying prefix path[s]

articles/data-factory/airflow-sync-github-repository.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ Response Body:
232232

233233
Here are some API payload examples:
234234

235-
- Git sync properties for Github with PAT:
235+
- Git sync properties for GitHub with PAT:
236236
```rest
237237
"gitSyncProperties": {
238238
"gitServiceType": "Github",
@@ -267,7 +267,7 @@ Here are some API payload examples:
267267
"tenantId": <service principal tenant id>
268268
}```
269269
270-
- Git sync properties for Github public repo:
270+
- Git sync properties for GitHub public repo:
271271
```rest
272272
"gitSyncProperties": {
273273
"gitServiceType": "Github",

0 commit comments

Comments
 (0)