Skip to content

Commit c8b802d

Browse files
committed
Merge branch 'main'
2 parents 7516309 + 770b03b commit c8b802d

File tree

843 files changed

+7754
-5795
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

843 files changed

+7754
-5795
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,21 +1210,11 @@
12101210
"redirect_url": "/azure/azure-monitor/app/overview-dashboard",
12111211
"redirect_document_id": false
12121212
},
1213-
{
1214-
"source_path_from_root": "/articles/azure-monitor/agents/azure-monitor-agent-overview.md",
1215-
"redirect_url": "/azure/azure-monitor/agents/agents-overview",
1216-
"redirect_document_id": false
1217-
},
12181213
{
12191214
"source_path_from_root": "/articles/azure-monitor/agents/use-azure-monitor-agent-troubleshooter.md",
12201215
"redirect_url": "/azure/azure-monitor/agents/troubleshooter-ama-windows",
12211216
"redirect_document_id": false
12221217
},
1223-
{
1224-
"source_path_from_root": "/azure/azure-monitor/agents/agents-overview.md#log-analytics-agent",
1225-
"redirect_url": "/azure/azure-monitor/agents/log-analytics-agent",
1226-
"redirect_document_id": false
1227-
},
12281218
{
12291219
"source_path_from_root": "/articles/application-insights/app-insights-platforms.md",
12301220
"redirect_url": "/azure/azure-monitor/app/platforms",
@@ -2535,11 +2525,6 @@
25352525
"redirect_url": "/azure/azure-monitor/agents/agent-manage",
25362526
"redirect_document_id": false
25372527
},
2538-
{
2539-
"source_path_from_root": "/articles/monitoring/monitoring-overview-azure-agents.md",
2540-
"redirect_url": "/azure/azure-monitor/platform/agents-overview",
2541-
"redirect_document_id": false
2542-
},
25432528
{
25442529
"source_path_from_root": "/articles/log-analytics/log-analytics-agent-windows.md",
25452530
"redirect_url": "/azure/azure-monitor/agents/agent-windows",
@@ -3841,7 +3826,7 @@
38413826
},
38423827
{
38433828
"source_path_from_root": "/articles/azure-monitor/platform/agents-overview.md",
3844-
"redirect_url": "/azure/azure-monitor/agents/agents-overview",
3829+
"redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-overview",
38453830
"redirect_document_id": false
38463831
},
38473832
{
@@ -6793,6 +6778,32 @@
67936778
"source_path_from_root": "/articles/azure-monitor/agents/azure-monitor-agent-migration-tools.md",
67946779
"redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-migration",
67956780
"redirect_document_id": false
6796-
}
6781+
},
6782+
{
6783+
"source_path_from_root": "/articles/azure-monitor/agents/agents-overview.md",
6784+
"redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-overview",
6785+
"redirect_document_id": false
6786+
},
6787+
{
6788+
"source_path_from_root": "/articles/azure-monitor/agents/azure-monitor-agent-data-collection-endpoint.md",
6789+
"redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-network-configuration",
6790+
"redirect_document_id": false
6791+
},
6792+
{
6793+
"source_path_from_root": "/articles/azure-monitor/agents/data-collection-text-log.md",
6794+
"redirect_url": "/azure/azure-monitor/agents/data-collection-log-text",
6795+
"redirect_document_id": false
6796+
},
6797+
{
6798+
"source_path_from_root": "/articles/monitoring/monitoring-overview-azure-agents.md",
6799+
"redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-overview",
6800+
"redirect_document_id": false
6801+
},
6802+
{
6803+
"source_path_from_root": "/articles/azure-monitor/agents/data-collection-rule-azure-monitor-agent.md",
6804+
"redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-data-collection",
6805+
"redirect_document_id": false
6806+
}
67976807
]
67986808
}
6809+

.openpublishing.redirection.json

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/networking/connectivity-interoperability-configuration.md",
5+
"redirect_url": "/previous-versions/azure/networking/connectivity-interoperability-configuration",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/expressroute/expressroute-howto-add-gateway-classic.md",
10+
"redirect_url": "/previous-versions/azure/expressroute/expressroute-howto-add-gateway-classic",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/expressroute/expressroute-howto-set-global-reach-cli.md",
15+
"redirect_url": "/previous-versions/azure/expressroute/expressroute-howto-set-global-reach-cli",
16+
},
317
{
418
"source_path": "articles/digital-twins/how-to-integrate-maps.md",
519
"redirect_url": "/previous-versions/azure/digital-twins/how-to-integrate-maps",
@@ -4754,11 +4768,9 @@
47544768
"redirect_document_id": false
47554769
},
47564770
{
4757-
47584771
"source_path_from_root": "/articles/cosmos-db/how-to-move-regions.md",
47594772
"redirect_url": "/azure/operational-excellence/relocation-cosmos-db",
47604773
"redirect_document_id": false
4761-
47624774
},
47634775
{
47644776
"source_path_from_root": "/articles/site-recovery/move-vaults-across-regions.md",
@@ -4769,7 +4781,21 @@
47694781
"source_path_from_root": "/articles/defender-for-iot/organizations/tutorial-clearpass.md",
47704782
"redirect_url": "/azure/defender-for-iot/organizations/integrate-overview",
47714783
"redirect_document_id": false
4784+
},
4785+
{
4786+
"source_path_from_root": "/articles/event-grid/high-availability-disaster-recovery.md",
4787+
"redirect_url": "/azure/reliability/reliability-event-grid",
4788+
"redirect_document_id": false
4789+
},
4790+
{
4791+
"source_path_from_root": "/articles/event-grid/availability-zones-disaster-recovery.md",
4792+
"redirect_url": "/azure/reliability/reliability-event-grid",
4793+
"redirect_document_id": false
47724794
}
47734795

4796+
4797+
4798+
4799+
47744800
]
47754801
}

articles/active-directory-b2c/relyingparty.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ The **OutputClaim** element contains the following attributes:
283283

284284
### SubjectNamingInfo
285285

286-
With the **SubjectNameingInfo** element, you control the value of the token subject:
286+
With the **SubjectNamingInfo** element, you control the value of the token subject:
287287

288288
- **JWT token** - the `sub` claim. This is a principal about which the token asserts information, such as the user of an application. This value is immutable and cannot be reassigned or reused. It can be used to perform safe authorization checks, such as when the token is used to access a resource. By default, the subject claim is populated with the object ID of the user in the directory. For more information, see [Token, session and single sign-on configuration](session-behavior.md).
289289
- **SAML token** - the `<Subject><NameID>` element, which identifies the subject element. The NameId format can be modified.

articles/ai-services/content-safety/includes/severity-levels-text-four.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ ms.author: pafarley
2323
| **Severity Level** | **Description** | **Example Text** |
2424
| --- | --- | --- |
2525
| Safe | Content is safe but may contain hate and fairness related terms used in generic and safe contexts such as: <ul><li>Education</li><li>Media</li><li>Official statistics</li><li>History</li><li>Medicine</li><li>Science</li><li>Other similar contexts</li></ul> | `"Black people should not be killed by police or mistreated just because of their skin color."` |
26-
| Low | Content that contains positive characterization or protection of the Identity groups, displays discrimination, stereotypes and prejudiced, judgmental, or opinionated views or attitudes related to hate speech or targeting identity groups. This includes:<ul><li>Slurs in research papers, dictionaries, or media with a direct quote</li><li>General hate speech that targets objects, individuals or groups</li><li>Limited hate speech or depictions of negative sentiment in fictional contexts (for example, gaming, movies, literature) </li></ul> | `"I don't like [identity group] because they are all so aggressive. They attacked us over and over again for no reason at all."` |
26+
| Low | Content that contains positive characterization or protection of the Identity groups, displays discrimination, stereotypes and prejudiced, judgmental, or opinionated views or attitudes related to hate speech or targeting identity groups. This includes:<ul><li>Slurs in research papers, dictionaries, or media with a direct quote</li><li>General hate speech that targets objects, individuals or groups</li><li>Limited hate speech or depictions of negative sentiment in fictional contexts (for example, gaming, movies, literature) </li></ul> | `"I hate you! You are so stupid."` |
2727
| Medium | Content that contains insults, bullying, intimidation, de-humanization or derogation of individuals or groups. This includes: <ul><li>Language that is mocking and imitating Identity groups attributes </li> <li>Describing individuals or groups as inferior or deficient </li> <li>Denying or demeaning identity groups existence </li> <li>Texts that deny historical, well-documented, and violent events such as Holocaust, enslavement, or colonization </li></ul> | `"The [real world event] is a fraud. What we've discovered is that sources have been lying about the number of victims. Here is proof."` |
28-
| High | Content that contains hate speech as propaganda threatening or calling for violence against Identity groups, radicalizes, recruits or incites people to join extremist efforts or spread hate speech. This includes: <ul><li>Incendiary, offensive, and vulgar language targeting specific individuals or identity groups </li><li>Claims of superiority to justify discrimination, segregation, or exclusion </li><li>Texts that contain any form of glorification of Nazi and SS symbolism, KKK and the confederate flag outside of historical, educational, or artistic settings </li><li>Texts that display hate crime preparation, praise and glorification of violence against Identity groups, or that praise, glorify, or endorse genocide </li></ul> | `"Millions of [identity group] were wiped out because they were the inferior race. Murdering them continues to be right and honorable because…"` |
28+
| High | Content that contains hate speech as propaganda threatening or calling for violence against Identity groups, radicalizes, recruits or incites people to join extremist efforts or spread hate speech. This includes: <ul><li>Incendiary, offensive, and vulgar language targeting specific individuals or identity groups </li><li>Claims of superiority to justify discrimination, segregation, or exclusion </li><li>Texts that contain any form of glorification of Nazi and SS symbolism, KKK and the confederate flag outside of historical, educational, or artistic settings </li><li>Texts that display hate crime preparation, praise and glorification of violence against Identity groups, or that praise, glorify, or endorse genocide </li></ul> | `"[Identity Group] threaten our existence, so we should wipe them out."` |
2929

3030
### Sexual severity levels
3131

3232
| **Severity Level** | **Description** | **Example Text** |
3333
| --- | --- | --- |
3434
| Safe | Content is safe but may contain sexually related terms used in generic and safe contexts such as: <ul><li>Education </li><li>Media </li><li>Official statistics </li><li>History</li><li> Medicine </li><li>Science</li><li> Mentions of family or romantic relations </li></ul> | `"Fewer young adults are having sex than in previous generations."` |
35-
| Low | Content that expresses prejudiced, judgmental or opinionated views on sexually related topics or mentions sexually related terms in fictional or real-world experiences that are not extremely graphic. This includes: <ul><li> Mentions of sexual anatomy or sex scenes in fictional and artistic contexts </li><li>Medical prescriptions and diagnosis</li><li> Personal experiences, sexual problems and traumas with some graphic content including coping mechanisms and resources </li></ul> | `"We made out for a while, and he started to feel me up. I felt a bulge in his pants."` |
35+
| Low | Content that expresses prejudiced, judgmental or opinionated views on sexually related topics or mentions sexually related terms in fictional or real-world experiences that are not extremely graphic. This includes: <ul><li> Mentions of sexual anatomy or sex scenes in fictional and artistic contexts </li><li>Medical prescriptions and diagnosis</li><li> Personal experiences, sexual problems and traumas with some graphic content including coping mechanisms and resources </li></ul> | `"The ancient Greeks were known to create penis-shaped sculptures out of ceramic and clay."` |
3636
| Medium | Content that describes sexual arousal and activity in explicit and graphic terms, includes fantasies about sex and sexual abuse. This includes: <ul><li>Mentions of sexual stimulation and masturbation </li><li>Pornography limited to business and prostitution, escort, etc. as careers without sex scenes </li><li>Advertisement for adult products such as sex toys </li><li>Personal experiences and descriptions related to sexual, erotic or tantric massages, strip clubs, erotic shows, BDSM attributes and practices </li></ul> | `"We both climaxed at the same time."` |
3737
| High | Content describing solicitation of sexual commercial services, containing detailed descriptions of sexual activity, violent sexual abuse and rape, and non-consensual power exchanges, abuse, and voyeurism. This also includes content that is used to promote, endorse, or glorify extreme or illegal sexual acts. This includes: </li><li> Any depiction of Child Sexual Abuse Material (CSAM) including any explicit or potential reference to underage sex </li><li>Child grooming, child abuse, and other child exploitation </li><li>Explicit or potential references to incest, zoophilia, necrophilia, etc. </li><li>Human sex trafficking recruitment, including victim manipulation </li></ul> | `"I was abused as a child by my uncle and I liked it. Nowadays, I make money by producing child pornography with my neighbor’s 6 year old son."` |
3838

@@ -42,7 +42,7 @@ ms.author: pafarley
4242
| **Severity Level** | **Description** | **Example Text** |
4343
| --- | --- | --- |
4444
| Safe | Content is safe but may contain terms related to violence used in generic and safe contexts such as:<ul><li>Education </li><li>Media </li><li>Official statistics </li><li>History </li><li>Medicine </li><li>Science </li><li>Common objects when not used as weapons </li><li>Hunting or shooting sport and guns technical specifications </li></ul> | `"Carnivores such as lions and tigers are prone to killing one another. Death occurs at the paws, claws, jaws, or tusks that might fatally gore one another during fights."` |
45-
| Low | Content in fictional contexts (for example, gaming, literature, arts) that depict violent or graphic scenes without glorification, endorsement or mal-intent. This includes: <ul><li>Personal experiences of violence (without violent intent) </li><li>Biased, prejudiced, judgmental, or opinionated views on violence </li><li>Mentions of violent acts and death at low intensity </li></ul> | `"Some people just need to be slapped."` |
45+
| Low | Content in fictional contexts (for example, gaming, literature, arts) that depict violent or graphic scenes without glorification, endorsement or mal-intent. This includes: <ul><li>Personal experiences of violence (without violent intent) </li><li>Biased, prejudiced, judgmental, or opinionated views on violence </li><li>Mentions of violent acts and death at low intensity </li></ul> | `"Trench warfare persisted throughout World War I as armies of millions faced each other in dugouts reinforced with concrete to withstand artillery bombardment."` |
4646
| Medium | Content that contains graphic depictions of violence and death at medium intensity as well as fantasies about violent acts or threats. This includes: <ul><li>Texts that put the victim at fault or depict perpetrators in a positive light </li><li>Historical references to genocide and the Holocaust without endorsement or glorification </li><li>References to known mass shootings without endorsement or glorification </li><li>References to terrorist and violent extremist groups and events without endorsement or glorification </li><li>Texts that seek advice or recommendation or texts that provide instructions on how to perform a violent act against an animal, an individual, a group of individuals or an object or infrastructure that can result in individual or mass harm </li><li>Bullying and intimidation </li></ul> | `"Go to another state or another city and kill any stranger; for example, shoot them with a silencer gun. Since you have not any connection with him, you will not get caught."` |
4747
| High | Content that contains terrorist or violent extremist propaganda and violent ideology on the Internet that describes, praises, supports, endorses or glorifies killings as part of terroristic activity, aids offers to terrorist organizations or causes. This includes: <ul><li>Texts that seek instructions on affiliation with terrorist and violent extremist groups </li><li>Texts that provide instructions on how to recruit followers, influence people toward a terrorist cause or extremist ideology, adopt radical views or provide training on how terrorist and violent extremist groups operate, or provide information on their leaders and members </li><li> Texts that plan and coordinate attacks on individuals or groups of people, including shooting events, use of bombs and explosives on civilian infrastructure, or bladed weapon attacks when performed by non-combatants or non-terrorists </li><li> Content that references forced labor including children, domestic servitude, stalking, and forced medical procedures </li></ul> | `"Let's call and threaten to explode the hospital during the weekend. I've got the explosives ready, and will have them installed tonight."` |
4848

articles/ai-services/language-service/question-answering/quickstart/sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ zone_pivot_groups: custom-qna-quickstart
1616
# Quickstart: custom question answering
1717

1818
> [!NOTE]
19-
> [Azure Open AI On Your Data](../../../openai/concepts/use-your-data.md) utilizes large language models (LLMs) to produce similar results to Custom Question Answering. If you wish to connect an existing Custom Question Answering project to Azure Open AI On Your Data, please check out our [guide](../how-to/azure-openai-integration.md).
19+
> [Azure OpenAI On Your Data](../../../openai/concepts/use-your-data.md) utilizes large language models (LLMs) to produce similar results to Custom Question Answering. If you wish to connect an existing Custom Question Answering project to Azure OpenAI On Your Data, please check out our [guide](../how-to/azure-openai-integration.md).
2020
2121
> [!NOTE]
2222
> Are you looking to migrate your workloads from QnA Maker? See our [migration guide](../how-to/migrate-qnamaker-to-question-answering.md) for information on feature comparisons and migration steps.

0 commit comments

Comments
 (0)