Skip to content

Commit cc05990

Browse files
authored
Merge pull request #208717 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 7a5df68 + 3cf1881 commit cc05990

File tree

7 files changed

+11
-10
lines changed

7 files changed

+11
-10
lines changed

articles/active-directory/hybrid/how-to-connect-fed-group-claims.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ You can also configure group claims in the [optional claims](../../active-direct
197197

198198
By default, group `ObjectID` attributes will be emitted in the group claim value. To modify the claim value to contain on-premises group attributes, or to change the claim type to a role, use the `optionalClaims` configuration described in the next step.
199199

200-
3. Set optional clams for group name configuration.
200+
3. Set optional claims for group name configuration.
201201

202202
If you want the groups in the token to contain the on-premises Active Directory group attributes, specify which token-type optional claim should be applied in the `optionalClaims` section. You can list multiple token types:
203203

articles/advisor/advisor-cost-recommendations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Advisor recommends resizing virtual machines when it's possible to fit the curre
5757

5858
### Burstable recommendations
5959

60-
We evaluate is workloads are eligible to run on specialized SKUs called **Burstable SKUs** that support variable workload performance requirements and are less expensive than general purpose SKUs. Learn more about burstable SKUs here: [B-series burstable - Azure Virtual Machines](../virtual-machines/sizes-b-series-burstable.md).
60+
We evaluate if workloads are eligible to run on specialized SKUs called **Burstable SKUs** that support variable workload performance requirements and are less expensive than general purpose SKUs. Learn more about burstable SKUs here: [B-series burstable - Azure Virtual Machines](../virtual-machines/sizes-b-series-burstable.md).
6161

6262
- A burstable SKU recommendation is made if:
6363
- The average **CPU utilization** is less than a burstable SKUs' baseline performance

articles/azure-monitor/alerts/alerts-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Metric alert rules include these features:
4646
- You can configure if metric alerts are [stateful or stateless](alerts-overview.md#alerts-and-state). Metric alerts are stateful by default.
4747

4848
The target of the metric alert rule can be:
49-
- A single resource, such as a VM. See this article for supported resource types.
49+
- A single resource, such as a VM. See [this article](alerts-metric-near-real-time.md) for supported resource types.
5050
- [Multiple resources](#monitor-multiple-resources) of the same type in the same Azure region, such as a resource group.
5151

5252
### Multiple conditions

articles/azure-vmware/index.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
ms.topic: landing-page
1111
author: suzizuber
1212
ms.author: v-szuber
13-
ms.date: 04/22/2022
13+
ms.date: 08/22/2022
1414

1515

1616
# card 1
@@ -67,10 +67,10 @@ landingContent:
6767
url: tutorial-network-checklist.md
6868
- text: 2 - Create a private cloud
6969
url: tutorial-create-private-cloud.md
70-
- text: 3 - Access a private cloud
71-
url: tutorial-access-private-cloud.md
72-
- text: 4 - Configure networking
70+
- text: 3 - Configure networking
7371
url: tutorial-configure-networking.md
72+
- text: 4 - Access a private cloud
73+
url: tutorial-access-private-cloud.md
7474
- text: 5 - Create an NSX-T network segment
7575
url: tutorial-nsx-t-network-segment.md
7676
- text: 6 - Peer on-premises to private cloud

articles/cognitive-services/QnAMaker/How-To/get-analytics-knowledge-base.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ QnA Maker stores all chat logs and other telemetry, if you have enabled Applicat
3434
| join kind= inner (
3535
traces | extend id = operation_ParentId
3636
) on id
37+
| where message == "QnAMaker GenerateAnswer"
3738
| extend question = tostring(customDimensions['Question'])
3839
| extend answer = tostring(customDimensions['Answer'])
3940
| extend score = tostring(customDimensions['Score'])

articles/defender-for-cloud/onboard-management-group.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ To onboard a management group and all its subscriptions:
3535
The remediation task will then enable Defender for Cloud, for free, on the non-compliant subscriptions.
3636

3737
> [!IMPORTANT]
38-
> The policy definition will only enable Defender for Cloud on **existing** subscriptions. To register newly created subscriptions, open the compliance tab, select the relevant non-compliant subscriptions, and create a remediation task.Repeat this step when you have one or more new subscriptions you want to monitor with Defender for Cloud.
38+
> The policy definition will only enable Defender for Cloud on **existing** subscriptions. To register newly created subscriptions, open the compliance tab, select the relevant non-compliant subscriptions, and create a remediation task. Repeat this step when you have one or more new subscriptions you want to monitor with Defender for Cloud.
3939
4040
## Optional modifications
4141

articles/virtual-machines/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@
454454
href: ./linux/provisioning.md
455455
- name: Endorsed Linux distributions
456456
href: ./linux/endorsed-distros.md
457-
- name: Linux distribution specific requirements
457+
- name: Distribution specific requirements
458458
items:
459459
- name: Generic steps
460460
displayName: Linux distribution specific requirements, generic
@@ -469,7 +469,7 @@
469469
displayName: Linux distribution specific requirements, Flatcar, Container
470470
href: ./linux/flatcar-create-upload-vhd.md
471471
- name: FreeBSD
472-
displayName: Linux distribution specific requirements, FreeBSD
472+
displayName: distribution, FreeBSD, nix
473473
href: ./linux/freebsd-intro-on-azure.md
474474
- name: Oracle Linux
475475
displayName: Linux distribution specific requirements, Oracle

0 commit comments

Comments
 (0)