Skip to content

Commit 14e7594

Browse files
duongauduongau
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into networkingoverview
2 parents d8cd875 + 9e9aa0e commit 14e7594

File tree

933 files changed

+16145
-12016
lines changed

Some content is hidden

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

933 files changed

+16145
-12016
lines changed

‎.openpublishing.publish.config.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,12 @@
254254
"branch": "main",
255255
"branch_mapping": {}
256256
},
257+
{
258+
"path_to_root": "function-flex-consumption",
259+
"url": "https://github.com/Azure-Samples/azure-functions-flex-consumption-samples",
260+
"branch": "main",
261+
"branch_mapping": {}
262+
},
257263
{
258264
"path_to_root": "functions-azure-product",
259265
"url": "https://github.com/Azure/Azure-Functions",
@@ -506,6 +512,12 @@
506512
"branch": "sdk-codetest",
507513
"branch_mapping": {}
508514
},
515+
{
516+
"path_to_root": "rag-data-openai-python-promptflow-main",
517+
"url": "https://github.com/Azure-Samples/rag-data-openai-python-promptflow",
518+
"branch": "main",
519+
"branch_mapping": {}
520+
},
509521
{
510522
"path_to_root": "azureml-examples-main",
511523
"url": "https://github.com/azure/azureml-examples",
@@ -1225,6 +1237,12 @@
12251237
"url": "https://github.com/MicrosoftDocs/SupportArticles-docs",
12261238
"branch": "main",
12271239
"branch_mapping": {}
1240+
},
1241+
{
1242+
"path_to_root": "msdocs-python-fastapi-webapp-quickstart",
1243+
"url": "https://github.com/Azure-Samples/msdocs-python-fastapi-webapp-quickstart",
1244+
"branch": "main",
1245+
"branch_mapping": {}
12281246
}
12291247
],
12301248
"branch_target_mapping": {

‎.openpublishing.redirection.azure-app-configuration.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424
"source_path_from_root": "/articles/azure-app-configuration/quickstart-azure-function-csharp.md",
2525
"redirect_url": "/azure/azure-app-configuration/quickstart-azure-functions-csharp",
2626
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/azure-app-configuration/concept-github-action.md",
30+
"redirect_url": "/azure/azure-app-configuration/push-kv-github-action.md",
31+
"redirect_document_id": false
2732
}
2833
]
2934
}

‎.openpublishing.redirection.baremetal-infrastructure.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,41 @@
134134
"source_path_from_root": "/articles/baremetal-infrastructure/workloads/sap/baremetal-overview-architecture.md",
135135
"redirect_url": "/azure/baremetal-infrastructure/concepts-baremetal-infrastructure-overview",
136136
"redirect_document_id": false
137+
},
138+
{
139+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/solution-design.md",
140+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
141+
"redirect_document_id": false
142+
},
143+
{
144+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/nc2-baremetal-overview.md",
145+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure",
146+
"redirect_document_id": false
147+
},
148+
{
149+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/skus.md",
150+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure",
151+
"redirect_document_id": false
152+
},
153+
{
154+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/nc2-on-azure-responsibility-matrix.md",
155+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure",
156+
"redirect_document_id": false
157+
},
158+
{
159+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/requirements.md",
160+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
161+
"redirect_document_id": false
162+
},
163+
{
164+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/use-cases-and-supported-scenarios.md",
165+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
166+
"redirect_document_id": false
167+
},
168+
{
169+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/supported-instances-and-regions.md",
170+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
171+
"redirect_document_id": false
137172
}
138173
]
139174
}

‎.openpublishing.redirection.defender-for-cloud.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
{
22
"redirections": [
33
{
4-
"source_path_from_root": "/articles/defender-for-cloud/recommendations-reference.md",
4+
"source_path_from_root": "/articles/defender-for-cloud/multicloud.yml",
55
"redirect_url": "/azure/defender-for-cloud/security-policy-concept",
66
"redirect_document_id": false
77
},
8+
{
9+
"source_path_from_root": "/articles/defender-for-cloud/recommendations-reference.md",
10+
"redirect_url": "/azure/defender-for-cloud/plan-multicloud-security-get-started",
11+
"redirect_document_id": false
12+
},
813
{
914
"source_path_from_root": "/articles/defender-for-cloud/recommendations-reference-gcp.md",
1015
"redirect_url": "/azure/defender-for-cloud/security-policy-concept",

‎.openpublishing.redirection.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,6 +1189,16 @@
11891189
"redirect_url": "/azure/azure-maps/",
11901190
"redirect_document_id": true
11911191
},
1192+
{
1193+
"source_path_from_root": "/articles/azure-maps/tutorial-creator-indoor-maps.md",
1194+
"redirect_url": "/azure/azure-maps/creator-indoor-maps",
1195+
"redirect_document_id": false
1196+
},
1197+
{
1198+
"source_path_from_root": "/articles/azure-maps/about-creator.md",
1199+
"redirect_url": "/azure/azure-maps/creator-indoor-maps",
1200+
"redirect_document_id": true
1201+
},
11921202
{
11931203
"source_path_from_root": "/articles/azure-maps/search-categories.md",
11941204
"redirect_url": "/azure/azure-maps/supported-search-categories",
@@ -4797,6 +4807,11 @@
47974807
"redirect_url": "/azure/reliability/reliability-event-grid",
47984808
"redirect_document_id": false
47994809
},
4810+
{
4811+
"source_path_from_root": "/articles/openshift/howto-encrypt-data-disks.md",
4812+
"redirect_url": "/azure/openshift/howto-byok",
4813+
"redirect_document_id": false
4814+
},
48004815
{
48014816
"source_path_from_root": "/articles/event-grid/availability-zones-disaster-recovery.md",
48024817
"redirect_url": "/azure/reliability/reliability-event-grid",

‎.openpublishing.redirection.operator-nexus.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
"source_path_from_root": "/articles/operator-nexus/template-cloud-native-network-function-deployment.md",
3030
"redirect_url": "/azure/operator-nexus/quickstarts-kubernetes-cluster-deployment-cli",
3131
"redirect_document_id": false
32+
},
33+
{
34+
"source_path_from_root": "/articles/operator-nexus/concepts-nexus-network.md",
35+
"redirect_url": "/azure/operator-nexus/concepts-nexus-networking",
36+
"redirect_document_id": false
3237
}
3338
]
34-
}
39+
}

‎articles/ai-services/content-safety/includes/quickstarts/rest-quickstart-image.md

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ curl --location --request POST '<endpoint>/contentsafety/image:analyze?api-versi
5151
"image": {
5252
"content": "<base_64_string>"
5353
},
54-
"categories": [
55-
"Hate", "SelfHarm", "Sexual", "Violence"
56-
],
54+
"categories": ["Hate", "SelfHarm", "Sexual", "Violence"],
5755
"outputType": "FourSeverityLevels"
5856
}'
5957
```
@@ -63,9 +61,9 @@ curl --location --request POST '<endpoint>/contentsafety/image:analyze?api-versi
6361
>
6462
> ```
6563
> {
66-
> "image": {
67-
> "blobUrl": "<your_storage_url>"
68-
> }
64+
> "image": {
65+
> "blobUrl": "<your_storage_url>"
66+
> }
6967
> }
7068
> ```
7169
@@ -91,24 +89,24 @@ You should see the image moderation results displayed as JSON data in the consol
9189
9290
```json
9391
{
94-
"categoriesAnalysis": [
95-
{
96-
"category": "Hate",
97-
"severity": 2
98-
},
99-
{
100-
"category": "SelfHarm",
101-
"severity": 0
102-
},
103-
{
104-
"category": "Sexual",
105-
"severity": 0
106-
},
107-
{
108-
"category": "Violence",
109-
"severity": 0
110-
}
111-
]
92+
"categoriesAnalysis": [
93+
{
94+
"category": "Hate",
95+
"severity": 2
96+
},
97+
{
98+
"category": "SelfHarm",
99+
"severity": 0
100+
},
101+
{
102+
"category": "Sexual",
103+
"severity": 0
104+
},
105+
{
106+
"category": "Violence",
107+
"severity": 0
108+
}
109+
]
112110
}
113111
```
114112

‎articles/ai-services/content-safety/includes/quickstarts/rest-quickstart-text.md

Lines changed: 22 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,10 @@ curl --location --request POST '<endpoint>/contentsafety/text:analyze?api-versio
3636
--header 'Content-Type: application/json' \
3737
--data-raw '{
3838
"text": "I hate you",
39-
"categories": [
40-
"Hate","Sexual","SelfHarm","Violence"
41-
],
42-
"blocklistNames": [
43-
"string"
44-
],
45-
"haltOnBlocklistHit": true,
46-
"outputType": "FourSeverityLevels"
39+
"categories": ["Hate", "Sexual", "SelfHarm", "Violence"],
40+
"blocklistNames": ["string"],
41+
"haltOnBlocklistHit": true,
42+
"outputType": "FourSeverityLevels"
4743
}'
4844
```
4945

@@ -68,12 +64,8 @@ See the following sample request body:
6864
```json
6965
{
7066
"text": "I hate you",
71-
"categories": [
72-
"Hate","Sexual","SelfHarm","Violence"
73-
],
74-
"blocklistNames": [
75-
"array"
76-
],
67+
"categories": ["Hate", "Sexual", "SelfHarm", "Violence"],
68+
"blocklistNames": ["array"],
7769
"haltOnBlocklistHit": false,
7870
"outputType": "FourSeverityLevels"
7971
}
@@ -96,21 +88,22 @@ You should see the text moderation results displayed as JSON data in the console
9688
}
9789
],
9890
"categoriesAnalysis": [
99-
{
100-
"category": "Hate",
101-
"severity": 2
102-
},
103-
{
104-
"category": "SelfHarm",
105-
"severity": 0
106-
},
107-
{
108-
"category": "Sexual",
109-
"severity": 0
110-
},
111-
{
112-
"category": "Violence",
113-
"severity": 0
91+
{
92+
"category": "Hate",
93+
"severity": 2
94+
},
95+
{
96+
"category": "SelfHarm",
97+
"severity": 0
98+
},
99+
{
100+
"category": "Sexual",
101+
"severity": 0
102+
},
103+
{
104+
"category": "Violence",
105+
"severity": 0
106+
}
114107
]
115108
}
116109
```

‎articles/ai-services/content-safety/quickstart-custom-categories.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ curl -X PUT "<your_endpoint>/contentsafety/text/categories/survival-advice?api-v
6161
-H "Ocp-Apim-Subscription-Key: <your_api_key>" \
6262
-H "Content-Type: application/json" \
6363
-d "{
64-
\"categoryName\": \"survival-advice\",
65-
\"definition\": \"text prompts about survival advice in camping/wilderness situations\",
66-
\"sampleBlobUrl\": \"https://<your-azure-storage-url>/example-container/survival-advice.jsonl\"
64+
\"categoryName\": \"survival-advice\",
65+
\"definition\": \"text prompts about survival advice in camping/wilderness situations\",
66+
\"sampleBlobUrl\": \"https://<your-azure-storage-url>/example-container/survival-advice.jsonl\"
6767
}"
6868
```
6969

@@ -95,9 +95,9 @@ curl -X POST "<your_endpoint>/contentsafety/text:analyzeCustomCategory?api-versi
9595
-H "Ocp-Apim-Subscription-Key: <your_api_key>" \
9696
-H "Content-Type: application/json" \
9797
-d "{
98-
\"text\": \"<Example text to analyze>\",
99-
\"categoryName\": \"survival-advice\",
100-
\"version\": 1
98+
\"text\": \"<Example text to analyze>\",
99+
\"categoryName\": \"survival-advice\",
100+
\"version\": 1
101101
}"
102102
```
103103

0 commit comments

Comments
 (0)