Skip to content

Commit 49d1576

Browse files
TaojunshenTaojunshen
authored
Merge pull request #279038 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 5a9a83f + 622f248 commit 49d1576

File tree

7 files changed

+58
-55
lines changed

7 files changed

+58
-55
lines changed

‎articles/ai-services/content-safety/how-to/custom-categories-rapid.md

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ In the commands below, replace `<your_api_key>`, `<your_endpoint>`, and other ne
5050
The following command creates an incident with a name and definition.
5151

5252
```bash
53-
curl --location --request PATCH 'https://<endpoint>/contentsafety/text/incidents/<text-incident-name>?api-version=2024-02-15-preview ' \
53+
curl --location --request PATCH 'https://<endpoint>/contentsafety/text/incidents/<text-incident-name>?api-version=2024-02-15-preview' \
5454
--header 'Ocp-Apim-Subscription-Key: <your-content-safety-key>' \
5555
--header 'Content-Type: application/json' \
5656
--data '{
@@ -88,7 +88,7 @@ The following command creates an incident with a name and definition.
8888
import requests
8989
import json
9090

91-
url = "https://<endpoint>/contentsafety/text/incidents/<text-incident-name>?api-version=2024-02-15-preview "
91+
url = "https://<endpoint>/contentsafety/text/incidents/<text-incident-name>?api-version=2024-02-15-preview"
9292

9393
payload = json.dumps({
9494
"incidentName": "<text-incident-name>",
@@ -112,7 +112,7 @@ Use the following command to add text examples to the incident.
112112
#### [cURL](#tab/curl)
113113

114114
```bash
115-
curl --location 'https://<endpoint>/contentsafety/text/incidents/<text-incident-name>:addIncidentSamples?api-version=2024-02-15-preview ' \
115+
curl --location 'https://<endpoint>/contentsafety/text/incidents/<text-incident-name>:addIncidentSamples?api-version=2024-02-15-preview' \
116116
--header 'Ocp-Apim-Subscription-Key: <your-content-safety-key>' \
117117
--header 'Content-Type: application/json' \
118118
--data-raw '{
@@ -130,7 +130,7 @@ curl --location 'https://<endpoint>/contentsafety/text/incidents/<text-incident-
130130
import requests
131131
import json
132132

133-
url = "https://<endpoint>/contentsafety/text/incidents/<text-incident-name>:addIncidentSamples?api-version=2024-02-15-preview "
133+
url = "https://<endpoint>/contentsafety/text/incidents/<text-incident-name>:addIncidentSamples?api-version=2024-02-15-preview"
134134

135135
payload = json.dumps({
136136
"IncidentSamples": [
@@ -195,7 +195,7 @@ Run the following command to analyze sample text content for the incident you ju
195195
#### [cURL](#tab/curl)
196196

197197
```bash
198-
curl --location 'https://<endpoint>/contentsafety/text:detectIncidents?api-version=2024-02-15-preview ' \
198+
curl --location 'https://<endpoint>/contentsafety/text:detectIncidents?api-version=2024-02-15-preview' \
199199
--header 'Ocp-Apim-Subscription-Key: <your-content-safety-key>' \
200200
--header 'Content-Type: application/json' \
201201
--data '{
@@ -212,7 +212,7 @@ curl --location 'https://<endpoint>/contentsafety/text:detectIncidents?api-versi
212212
import requests
213213
import json
214214

215-
url = "https://<endpoint>/contentsafety/text:detectIncidents?api-version=2024-02-15-preview "
215+
url = "https://<endpoint>/contentsafety/text:detectIncidents?api-version=2024-02-15-preview"
216216

217217
payload = json.dumps({
218218
"text": "<test-text>",
@@ -245,7 +245,7 @@ The following command creates an image incident:
245245

246246

247247
```bash
248-
curl --location --request PATCH 'https://<endpoint>/contentsafety/image/incidents/<image-incident-name>?api-version=2024-02-15-preview ' \
248+
curl --location --request PATCH 'https://<endpoint>/contentsafety/image/incidents/<image-incident-name>?api-version=2024-02-15-preview' \
249249
--header 'Ocp-Apim-Subscription-Key: <your-content-safety-key>' \
250250
--header 'Content-Type: application/json' \
251251
--data '{
@@ -281,7 +281,7 @@ The following command creates an image incident:
281281
import requests
282282
import json
283283

284-
url = "https://<endpoint>/contentsafety/image/incidents/<image-incident-name>?api-version=2024-02-15-preview "
284+
url = "https://<endpoint>/contentsafety/image/incidents/<image-incident-name>?api-version=2024-02-15-preview"
285285

286286
payload = json.dumps({
287287
"incidentName": "<image-incident-name>"
@@ -306,7 +306,7 @@ Use the following command to add examples images to your incident. The image sam
306306
#### [cURL](#tab/curl)
307307

308308
```bash
309-
curl --location 'https://<endpoint>/contentsafety/image/incidents/<image-incident-name>:addIncidentSamples?api-version=2024-02-15-preview ' \
309+
curl --location 'https://<endpoint>/contentsafety/image/incidents/<image-incident-name>:addIncidentSamples?api-version=2024-02-15-preview' \
310310
--header 'Ocp-Apim-Subscription-Key: <your-content-safety-key>' \
311311
--header 'Content-Type: application/json' \
312312
--data '{
@@ -327,7 +327,7 @@ curl --location 'https://<endpoint>/contentsafety/image/incidents/<image-inciden
327327
import requests
328328
import json
329329

330-
url = "https://<endpoint>/contentsafety/image/incidents/<image-incident-name>:addIncidentSamples?api-version=2024-02-15-preview "
330+
url = "https://<endpoint>/contentsafety/image/incidents/<image-incident-name>:addIncidentSamples?api-version=2024-02-15-preview"
331331

332332
payload = json.dumps({
333333
"IncidentSamples": [
@@ -391,7 +391,7 @@ Use the following command to upload a sample image and test it against the incid
391391
#### [cURL](#tab/curl)
392392

393393
```bash
394-
curl --location 'https://<endpoint>/contentsafety/image:detectIncidents?api-version=2024-02-15-preview ' \
394+
curl --location 'https://<endpoint>/contentsafety/image:detectIncidents?api-version=2024-02-15-preview' \
395395
--header 'Ocp-Apim-Subscription-Key: <your-content-safety-key>' \
396396
--header 'Content-Type: application/json' \
397397
--data '{
@@ -412,7 +412,7 @@ curl --location 'https://<endpoint>/contentsafety/image:detectIncidents?api-vers
412412
import requests
413413
import json
414414

415-
url = "https://<endpoint>/contentsafety/image:detectIncidents?api-version=2024-02-15-preview "
415+
url = "https://<endpoint>/contentsafety/image:detectIncidents?api-version=2024-02-15-preview"
416416

417417
payload = json.dumps({
418418
"image": {
@@ -446,7 +446,7 @@ The following operations are useful for managing incidents and incident samples.
446446
#### [cURL](#tab/curl)
447447

448448
```bash
449-
curl --location GET 'https://<endpoint>/contentsafety/text/incidents?api-version=2024-02-15-preview ' \
449+
curl --location GET 'https://<endpoint>/contentsafety/text/incidents?api-version=2024-02-15-preview' \
450450
--header 'Ocp-Apim-Subscription-Key: <your-content-safety-key>'
451451
```
452452

@@ -455,7 +455,7 @@ curl --location GET 'https://<endpoint>/contentsafety/text/incidents?api-version
455455
```python
456456
import requests
457457

458-
url = "https://<endpoint>/contentsafety/text/incidents?api-version=2024-02-15-preview "
458+
url = "https://<endpoint>/contentsafety/text/incidents?api-version=2024-02-15-preview"
459459

460460
payload = {}
461461
headers = {
@@ -473,7 +473,7 @@ print(response.text)
473473
#### [cURL](#tab/curl)
474474

475475
```bash
476-
curl --location GET 'https://<endpoint>/contentsafety/text/incidents/<text-incident-name>?api-version=2024-02-15-preview ' \
476+
curl --location GET 'https://<endpoint>/contentsafety/text/incidents/<text-incident-name>?api-version=2024-02-15-preview' \
477477
--header 'Ocp-Apim-Subscription-Key: <your-content-safety-key>'
478478
```
479479

@@ -482,7 +482,7 @@ curl --location GET 'https://<endpoint>/contentsafety/text/incidents/<text-incid
482482
```python
483483
import requests
484484

485-
url = "https://<endpoint>/contentsafety/text/incidents/<text-incident-name>?api-version=2024-02-15-preview "
485+
url = "https://<endpoint>/contentsafety/text/incidents/<text-incident-name>?api-version=2024-02-15-preview"
486486

487487
payload = {}
488488
headers = {
@@ -500,7 +500,7 @@ print(response.text)
500500
#### [cURL](#tab/curl)
501501

502502
```bash
503-
curl --location --request DELETE 'https://<endpoint>/contentsafety/text/incidents/<text-incident-name>?api-version=2024-02-15-preview ' \
503+
curl --location --request DELETE 'https://<endpoint>/contentsafety/text/incidents/<text-incident-name>?api-version=2024-02-15-preview' \
504504
--header 'Ocp-Apim-Subscription-Key: <your-content-safety-key>'
505505
```
506506

@@ -509,7 +509,7 @@ curl --location --request DELETE 'https://<endpoint>/contentsafety/text/incident
509509
```python
510510
import requests
511511

512-
url = "https://<endpoint>/contentsafety/text/incidents/<text-incident-name>?api-version=2024-02-15-preview "
512+
url = "https://<endpoint>/contentsafety/text/incidents/<text-incident-name>?api-version=2024-02-15-preview"
513513

514514
payload = {}
515515
headers = {
@@ -529,15 +529,15 @@ This command retrieves the unique IDs of all the samples associated with a given
529529
#### [cURL](#tab/curl)
530530

531531
```bash
532-
curl --location GET 'https://<endpoint>/contentsafety/text/incidents/<text-incident-name>/incidentsamples?api-version=2024-02-15-preview ' \
532+
curl --location GET 'https://<endpoint>/contentsafety/text/incidents/<text-incident-name>/incidentsamples?api-version=2024-02-15-preview' \
533533
--header 'Ocp-Apim-Subscription-Key: <your-content-safety-key>'
534534
```
535535
#### [Python](#tab/python)
536536

537537
```python
538538
import requests
539539

540-
url = "https://<endpoint>/contentsafety/text/incidents/<text-incident-name>/incidentsamples?api-version=2024-02-15-preview "
540+
url = "https://<endpoint>/contentsafety/text/incidents/<text-incident-name>/incidentsamples?api-version=2024-02-15-preview"
541541

542542
payload = {}
543543
headers = {
@@ -557,15 +557,15 @@ Use an incident sample ID to look up details about the sample.
557557
#### [cURL](#tab/curl)
558558

559559
```bash
560-
curl --location GET 'https://<endpoint>/contentsafety/text/incidents/<text-incident-name>/incidentsamples/<your-incident-sample-id>?api-version=2024-02-15-preview ' \
560+
curl --location GET 'https://<endpoint>/contentsafety/text/incidents/<text-incident-name>/incidentsamples/<your-incident-sample-id>?api-version=2024-02-15-preview' \
561561
--header 'Ocp-Apim-Subscription-Key: <your-content-safety-key>'
562562
```
563563
#### [Python](#tab/python)
564564

565565
```python
566566
import requests
567567

568-
url = "https://<endpoint>/contentsafety/text/incidents/<text-incident-name>/incidentsamples/<your-incident-sample-id>?api-version=2024-02-15-preview "
568+
url = "https://<endpoint>/contentsafety/text/incidents/<text-incident-name>/incidentsamples/<your-incident-sample-id>?api-version=2024-02-15-preview"
569569

570570
payload = {}
571571
headers = {
@@ -585,7 +585,7 @@ Use an incident sample ID to retrieve and delete that sample.
585585
#### [cURL](#tab/curl)
586586

587587
```bash
588-
curl --location 'https://<endpoint>/contentsafety/text/incidents/<text-incident-name>:removeIncidentSamples?api-version=2024-02-15-preview ' \
588+
curl --location 'https://<endpoint>/contentsafety/text/incidents/<text-incident-name>:removeIncidentSamples?api-version=2024-02-15-preview' \
589589
--header 'Ocp-Apim-Subscription-Key: <your-content-safety-key>' \
590590
--header 'Content-Type: application/json' \
591591
--data '{
@@ -600,7 +600,7 @@ curl --location 'https://<endpoint>/contentsafety/text/incidents/<text-incident-
600600
import requests
601601
import json
602602

603-
url = "https://<endpoint>/contentsafety/text/incidents/<text-incident-name>:removeIncidentSamples?api-version=2024-02-15-preview "
603+
url = "https://<endpoint>/contentsafety/text/incidents/<text-incident-name>:removeIncidentSamples?api-version=2024-02-15-preview"
604604

605605
payload = json.dumps({
606606
"IncidentSampleIds": [
@@ -625,7 +625,7 @@ print(response.text)
625625
#### [cURL](#tab/curl)
626626

627627
```bash
628-
curl --location GET 'https://<endpoint>/contentsafety/image/incidents?api-version=2024-02-15-preview ' \
628+
curl --location GET 'https://<endpoint>/contentsafety/image/incidents?api-version=2024-02-15-preview' \
629629
--header 'Ocp-Apim-Subscription-Key: <your-content-safety-key>'
630630
```
631631

@@ -634,7 +634,7 @@ curl --location GET 'https://<endpoint>/contentsafety/image/incidents?api-versio
634634
```python
635635
import requests
636636

637-
url = "https://<endpoint>/contentsafety/image/incidents?api-version=2024-02-15-preview "
637+
url = "https://<endpoint>/contentsafety/image/incidents?api-version=2024-02-15-preview"
638638

639639
payload = {}
640640
headers = {
@@ -652,15 +652,15 @@ print(response.text)
652652
#### [cURL](#tab/curl)
653653

654654
```bash
655-
curl --location GET 'https://<endpoint>/contentsafety/image/incidents/<image-incident-name>?api-version=2024-02-15-preview ' \
655+
curl --location GET 'https://<endpoint>/contentsafety/image/incidents/<image-incident-name>?api-version=2024-02-15-preview' \
656656
--header 'Ocp-Apim-Subscription-Key: <your-content-safety-key>'
657657
```
658658
#### [Python](#tab/python)
659659

660660
```python
661661
import requests
662662

663-
url = "https://<endpoint>/contentsafety/image/incidents/<image-incident-name>?api-version=2024-02-15-preview "
663+
url = "https://<endpoint>/contentsafety/image/incidents/<image-incident-name>?api-version=2024-02-15-preview"
664664

665665
payload = {}
666666
headers = {
@@ -678,7 +678,7 @@ print(response.text)
678678
#### [cURL](#tab/curl)
679679

680680
```bash
681-
curl --location --request DELETE 'https://<endpoint>/contentsafety/image/incidents/<image-incident-name>?api-version=2024-02-15-preview ' \
681+
curl --location --request DELETE 'https://<endpoint>/contentsafety/image/incidents/<image-incident-name>?api-version=2024-02-15-preview' \
682682
--header 'Ocp-Apim-Subscription-Key: <your-content-safety-key>'
683683
```
684684

@@ -687,7 +687,7 @@ curl --location --request DELETE 'https://<endpoint>/contentsafety/image/inciden
687687
```python
688688
import requests
689689

690-
url = "https://<endpoint>/contentsafety/image/incidents/<image-incident-name>?api-version=2024-02-15-preview "
690+
url = "https://<endpoint>/contentsafety/image/incidents/<image-incident-name>?api-version=2024-02-15-preview"
691691

692692
payload = {}
693693
headers = {
@@ -708,15 +708,15 @@ This command retrieves the unique IDs of all the samples associated with a given
708708
#### [cURL](#tab/curl)
709709

710710
```bash
711-
curl --location GET 'https://<endpoint>/contentsafety/image/incidents/<image-incident-name>/incidentsamples?api-version=2024-02-15-preview ' \
711+
curl --location GET 'https://<endpoint>/contentsafety/image/incidents/<image-incident-name>/incidentsamples?api-version=2024-02-15-preview' \
712712
--header 'Ocp-Apim-Subscription-Key: <your-content-safety-key>'
713713
```
714714
#### [Python](#tab/python)
715715

716716
```python
717717
import requests
718718

719-
url = "https://<endpoint>/contentsafety/image/incidents/<image-incident-name>/incidentsamples?api-version=2024-02-15-preview "
719+
url = "https://<endpoint>/contentsafety/image/incidents/<image-incident-name>/incidentsamples?api-version=2024-02-15-preview"
720720

721721
payload = {}
722722
headers = {
@@ -737,15 +737,15 @@ Use an incident sample ID to look up details about the sample.
737737
#### [cURL](#tab/curl)
738738

739739
```bash
740-
curl --location GET 'https://<endpoint>/contentsafety/image/incidents/<image-incident-name>/incidentsamples/<your-incident-sample-id>?api-version=2024-02-15-preview ' \
740+
curl --location GET 'https://<endpoint>/contentsafety/image/incidents/<image-incident-name>/incidentsamples/<your-incident-sample-id>?api-version=2024-02-15-preview' \
741741
--header 'Ocp-Apim-Subscription-Key: <your-content-safety-key>'
742742
```
743743
#### [Python](#tab/python)
744744

745745
```python
746746
import requests
747747

748-
url = "https://<endpoint>/contentsafety/image/incidents/<image-incident-name>/incidentsamples/<your-incident-sample-id>?api-version=2024-02-15-preview "
748+
url = "https://<endpoint>/contentsafety/image/incidents/<image-incident-name>/incidentsamples/<your-incident-sample-id>?api-version=2024-02-15-preview"
749749

750750
payload = {}
751751
headers = {
@@ -766,7 +766,7 @@ Use an incident sample ID to retrieve and delete that sample.
766766
#### [cURL](#tab/curl)
767767

768768
```bash
769-
curl --location 'https://<endpoint>/contentsafety/image/incidents/<image-incident-name>:removeIncidentSamples?api-version=2024-02-15-preview ' \
769+
curl --location 'https://<endpoint>/contentsafety/image/incidents/<image-incident-name>:removeIncidentSamples?api-version=2024-02-15-preview' \
770770
--header 'Ocp-Apim-Subscription-Key: <your-content-safety-key>' \
771771
--header 'Content-Type: application/json' \
772772
--data '{
@@ -781,7 +781,7 @@ curl --location 'https://<endpoint>/contentsafety/image/incidents/<image-inciden
781781
import requests
782782
import json
783783

784-
url = "https://<endpoint>/contentsafety/image/incidents/<image-incident-name>:removeIncidentSamples?api-version=2024-02-15-preview "
784+
url = "https://<endpoint>/contentsafety/image/incidents/<image-incident-name>:removeIncidentSamples?api-version=2024-02-15-preview"
785785

786786
payload = json.dumps({
787787
"IncidentSampleIds": [

‎articles/aks/use-psa.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.author: tamram
1111

1212
# Use Pod Security Admission in Azure Kubernetes Service (AKS)
1313

14-
Pod Security Admission (PSA) uses labels to enforce Pod Security Standards policies on pods running in a namespace. AKS enables Pod Security Admission is enabled by default. For more information about Pod Security Admission and Pod Security Standards, see [Enforce Pod Security Standards with namespace labels][kubernetes-psa] and [Pod Security Standards][kubernetes-pss].
14+
Pod Security Admission (PSA) uses labels to enforce Pod Security Standards policies on pods running in a namespace. In AKS, Pod Security Admission is enabled by default. For more information about Pod Security Admission and Pod Security Standards, see [Enforce Pod Security Standards with namespace labels][kubernetes-psa] and [Pod Security Standards][kubernetes-pss].
1515

1616
Pod Security Admission is a built-in policy solution for single cluster implementations. If you want to use an enterprise-grade policy, we recommend you use [Azure policy](use-azure-policy.md).
1717

‎articles/azure-monitor/alerts/resource-manager-alerts-log.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ resource alert 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = {
467467
"value": "GreaterThan"
468468
},
469469
"threshold": {
470-
"value": "80"
470+
"value": 80
471471
},
472472
"timeAggregation": {
473473
"value": "Average"

0 commit comments

Comments
 (0)