Skip to content

Commit 4f355aa

Browse files
authored
Merge pull request #247824 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 7c1bc96 + 6b945c9 commit 4f355aa

File tree

9 files changed

+23
-16
lines changed

9 files changed

+23
-16
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Please use the Feedback tool at the bottom of any article to submit bugs and sug
2222

2323
### Editing in GitHub
2424

25-
Follow the guidance for [Quick edits to existing documents](https://learn.microsoft.com/contribute/#quick-edits-to-documentation) in our contributor guide.
25+
Follow the guidance for [Quick edits to existing documents](https://learn.microsoft.com/contribute/content/#quick-edits-to-documentation) in our contributor guide.
2626

2727
### Pull requests
2828

articles/active-directory-b2c/enable-authentication-web-application.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ Azure AD B2C identity provider settings are stored in the *appsettings.json* fil
260260
"Instance": "https://<your-tenant-name>.b2clogin.com",
261261
"ClientId": "<web-app-application-id>",
262262
"Domain": "<your-b2c-domain>",
263-
"SignedOutCallbackPath": "/signout-oidc
263+
"SignedOutCallbackPath": "/signout-oidc",
264264
"SignUpSignInPolicyId": "<your-sign-up-in-policy>"
265265
}
266266
```

articles/azure-monitor/essentials/data-collection-rule-structure.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ This section contains the declaration of all the different types of data that wi
2424
The shape of the data you send to the endpoint doesn't need to match that of the destination table. Instead, the output of the transform that's applied on top of the input data needs to match the destination shape. The possible data types that can be assigned to the properties are `string`, `int`, `long`, `real`, `boolean`, `dynamic`, and `datetime`.
2525

2626
### destinations
27-
This section contains a declaration of all the destinations where the data will be sent. Only Log Analytics is currently supported as a destination. Each Log Analytics destination requires the full workspace resource ID and a friendly name that will be used elsewhere in the DCR to refer to this workspace.
27+
This section contains a declaration of all the destinations where the data will be sent. Only Log Analytics is currently supported as a destination. Each Log Analytics destination requires the full workspace resource ID and a friendly name that will be used elsewhere in the DCR to refer to this workspace.
2828

2929
### dataFlows
3030
This section ties the other sections together. It defines the following properties for each stream declared in the `streamDeclarations` section:
@@ -33,6 +33,10 @@ This section ties the other sections together. It defines the following properti
3333
- `transformKql` section, which is the [transformation](data-collection-transformations.md) applied to the data that was sent in the input shape described in the `streamDeclarations` section to the shape of the target table.
3434
- `outputStream` section, which describes which table in the workspace specified under the `destination` property the data will be ingested into. The value of `outputStream` has the `Microsoft-[tableName]` shape when data is being ingested into a standard Log Analytics table, or `Custom-[tableName]` when ingesting data into a custom-created table. Only one destination is allowed per stream.
3535

36+
> [!Note]
37+
>
38+
> You can only send logs from one specific data source to one workspace. To send data from a single data source to multiple workspaces, please create one DCR per workspace.
39+
3640
## Azure Monitor Agent
3741
A DCR for [Azure Monitor Agent](../agents/data-collection-rule-azure-monitor-agent.md) contains the following sections. For a sample, see [Sample data collection rule - agent](../agents/data-collection-rule-sample-agent.md). For agent based custom logs, see [Sample Custom Log Rules - Agent](../agents/data-collection-text-log.md)
3842

articles/cdn/onboard-apex-domain.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ Mapping your apex or root domain to your CDN profile requires CNAME flattening o
2424
2525
You can use the Azure portal to onboard an apex domain on your CDN and enable HTTPS on it by associating it with a certificate for TLS termination. Apex domains are also referred as root or naked domains.
2626

27+
> [!IMPORTANT]
28+
> CDN-managed certificates are not available for root or apex domains. If your Azure CDN custom domain is a root or apex domain, you must use the *Bring Your Own Certificate (BYOC)* feature.
29+
>
30+
2731
## Create an alias record for zone apex
2832

2933
1. Open **Azure DNS** configuration for the domain to be onboarded.

articles/defender-for-cloud/powershell-sample-vulnerability-assessment-baselines.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ $ECState = (GetExpressConfigurationStatus -SubscriptionId $SubscriptionId -Resou
111111
112112
Write-Host "Express Configuration status: " $ECState
113113
114-
if ($ECState = "Enabled")
114+
if ($ECState -eq "Enabled")
115115
{
116116
# Get list of databases
117117
$databases = Get-AzSqlDatabase -ResourceGroupName $ResourceGroupName -ServerName $ServerName | where {$_.DatabaseName -ne "master"}

articles/dns/private-resolver-endpoints-rulesets.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ The IP address associated with an inbound endpoint is always part of the private
3737
![View inbound endpoints](./media/private-resolver-endpoints-rulesets/east-inbound-endpoint.png)
3838

3939
> [!NOTE]
40-
> The IP address assigned to an inbound endpoint can be static if you use [PowerShell to provison the endpoint](dns-private-resolver-get-started-powershell.md#create-the-inbound-endpoint). The IP address that you choose can't be a [reserved IP address in the subnet](../virtual-network/virtual-networks-faq.md#are-there-any-restrictions-on-using-ip-addresses-within-these-subnets). If you use another method to provision the inbound endpoint, then typically the fifth IP address in the subnet is assigned. If the inbound endpoint is reprovisioned, this IP address might change, but normally the 5th IP address in the subnet is used again. The IP address does not change unless the inbound endpoint is reprovisioned.
40+
> The IP address assigned to an inbound endpoint can be static if you use [PowerShell to provision the endpoint](dns-private-resolver-get-started-powershell.md#create-the-inbound-endpoint). The IP address that you choose can't be a [reserved IP address in the subnet](../virtual-network/virtual-networks-faq.md#are-there-any-restrictions-on-using-ip-addresses-within-these-subnets). If you use another method to provision the inbound endpoint, then typically the fifth IP address in the subnet is assigned. If the inbound endpoint is reprovisioned, this IP address might change, but normally the 5th IP address in the subnet is used again. The IP address does not change unless the inbound endpoint is reprovisioned.
4141
4242
## Outbound endpoints
4343

articles/machine-learning/resource-azure-container-for-pytorch.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,13 @@ Azure Container for PyTorch is a lightweight, standalone environment that includ
4343

4444
The following configurations are supported:
4545

46-
| Environment Name | OS | GPU Version| Python Version | PyTorch Version | ORT-training Version | DeepSpeed Version | torch-ort Version |
47-
| --- | --- | --- | --- | --- | --- | --- | --- |
48-
|acpt-pytorch-2.0-cuda11.7|Ubuntu 20.04|cu117|3.8|2.0|1.14.1|0.8.2 |0.14.0|
49-
|acpt-pytorch-1.13-cuda11.7|Ubuntu 20.04|cu117|3.8|1.13.1|1.14.1|0.8.2|1.14.0|
50-
|acpt-pytorch-1.12-py39-cuda11.6|Ubuntu 20.04|cu116|3.9|1.12.1|1.14.1|0.8.2|1.14.0|
51-
|acpt-pytorch-1.12-cuda11.6|Ubuntu 20.04|cu116|3.8|1.12.1|1.14.1|0.8.2|1.14.0|
52-
|acpt-pytorch-1.11-cuda11.5|Ubuntu 20.04|cu115|3.8|1.11.0|1.11.1|0.7.3|1.11.0|
53-
|acpt-pytorch-1.11-cuda11.3|Ubuntu 20.04|cu113|3.8|1.11.0|1.14.1|0.8.2|1.14.0|
46+
| Environment Name | OS | GPU Version| Python Version | PyTorch Version | ORT-training Version | DeepSpeed Version | torch-ort Version | Nebula Version |
47+
| --- | --- | --- | --- | --- | --- | --- | --- | --- |
48+
|acpt-pytorch-2.0-cuda11.7|Ubuntu 20.04|cu117|3.8|2.0|1.15.0|0.9.5 |1.15.0|0.16.2|
49+
|acpt-pytorch-1.13-cuda11.7|Ubuntu 20.04|cu117|3.8|1.13.1|1.15.0|0.9.5|1.15.0|0.16.2|
50+
|acpt-pytorch-1.12-py39-cuda11.6|Ubuntu 20.04|cu116|3.9|1.12.1|1.15.0|0.9.5|1.15.0|0.16.2|
51+
|acpt-pytorch-1.12-cuda11.6|Ubuntu 20.04|cu116|3.8|1.12.1|1.15.0|0.9.5|1.15.0|0.16.2|
52+
|acpt-pytorch-1.11-cuda11.3|Ubuntu 20.04|cu113|3.8|1.11.0|1.15.0|0.9.5|1.15.0|0.16.2|
5453

5554
Other packages like fairscale, horovod, msccl, protobuf, pyspark, pytest, pytorch-lightning, tensorboard, NebulaML, torchvision, torchmetrics to support all training needs
5655

articles/sentinel/normalization-schema-user-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ Fields that appear in the table below are common to all ASIM schemas. Any guidel
146146
| Field | Class | Type | Description |
147147
|-------|-------|------|-------------|
148148
| **ActingAppId** | Optional | String | The ID of the application used by the actor to perform the activity, including a process, browser, or service. <br><br>For example: `0x12ae8` |
149-
| **ActiveAppName** | Optional | String | The name of the application used by the actor to perform the activity, including a process, browser, or service. <br><br>For example: `C:\Windows\System32\svchost.exe` |
149+
| **ActingAppName** | Optional | String | The name of the application used by the actor to perform the activity, including a process, browser, or service. <br><br>For example: `C:\Windows\System32\svchost.exe` |
150150
| **ActingAppType** | Optional | Enumerated | The type of acting application. Supported values include: <br>- `Process` <br>- `Browser` <br>- `Resource` <br>- `Other` |
151151
| **HttpUserAgent** | Optional | String | When authentication is performed over HTTP or HTTPS, this field's value is the user_agent HTTP header provided by the acting application when performing the authentication.<br><br>For example: `Mozilla/5.0 (iPhone; CPU iPhone OS 12_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1` |
152152

articles/spring-apps/includes/quickstart-deploy-web-app/deploy-consumption-plan.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ Use the following steps to clone and run the app locally.
2424
git clone https://github.com/Azure-Samples/ASA-Samples-Web-Application.git
2525
```
2626

27-
2. Use the following command to build the sample project:
27+
2. Use the following command to build the sample project with Maven:
2828

2929
```bash
3030
cd ASA-Samples-Web-Application
3131
./mvnw clean package
3232
```
3333

34-
3. Use the following command to run the sample application by using Maven:
34+
3. Use the following command to run the sample application:
3535

3636
```bash
3737
java -jar web/target/simple-todo-web-0.0.1-SNAPSHOT.jar

0 commit comments

Comments
 (0)