Skip to content

Commit ea00b43

Browse files
committed
Resolve merge conflict
2 parents ab212f0 + 48cf507 commit ea00b43

File tree

3,511 files changed

+86315
-74949
lines changed

Some content is hidden

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

3,511 files changed

+86315
-74949
lines changed

.github/policies/disallow-edits.yml

Lines changed: 51 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,58 @@ configuration:
1010
- payloadType: Pull_Request
1111
- isAction:
1212
action: Opened
13-
- or:
14-
- filesMatchPattern:
15-
matchAny: true
16-
pattern: articles/index.*
13+
- filesMatchPattern:
14+
matchAny: true
15+
pattern: articles/index.*
1716
then:
1817
- addReply:
1918
reply: >-
20-
@${issueAuthor} - You tried to add an index file to this repository; this is not permitted so your pull request will be closed automatically.
19+
@${issueAuthor} - You tried to add an index file to this repository; this is not permitted so your pull request will be closed automatically.
2120
- closePullRequest
21+
22+
- description: Close PRs to the "ai-services/personalizer" folder where the author isn't a member of the MicrosoftDocs org (i.e. PRs in public repo).
23+
if:
24+
- payloadType: Pull_Request
25+
- isAction:
26+
action: Opened
27+
- filesMatchPattern:
28+
matchAny: true
29+
pattern: articles/ai-services/personalizer/*
30+
- not:
31+
activitySenderHasAssociation:
32+
association: Member
33+
then:
34+
- addReply:
35+
reply: >-
36+
@${issueAuthor} - Pull requests that modify files in this folder aren't accepted from public contributors.
37+
- closePullRequest
38+
39+
- description: \@mention specific people when a PR is opened in the "ai-services/personalizer" folder.
40+
if:
41+
- payloadType: Pull_Request
42+
- isAction:
43+
action: Opened
44+
- filesMatchPattern:
45+
matchAny: true
46+
pattern: articles/ai-services/personalizer/*
47+
- activitySenderHasAssociation:
48+
association: Member
49+
- not:
50+
or:
51+
- isActivitySender:
52+
user: eric-urban
53+
- isActivitySender:
54+
user: nitinme
55+
- isActivitySender:
56+
user: mrbullwinkle
57+
then:
58+
- addReply:
59+
reply: >-
60+
@${issueAuthor} - Please don't sign off on this PR. The area owners will sign off once they've reviewed your contribution.
61+
- mentionUsers:
62+
mentionees:
63+
- eric-urban
64+
- nitinme
65+
- mrbullwinkle
66+
replyTemplate: ${mentionees} - Please review this PR and sign off when you're ready to merge it.
67+
assignMentionees: True # This part probably won't work since the bot doesn't have write perms.

.openpublishing.publish.config.json

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,15 @@
105105
"branch_mapping": {}
106106
},
107107
{
108-
"path_to_root": "azureai-samples-nov2024",
108+
"path_to_root": "azureai-samples-main",
109109
"url": "https://github.com/Azure-Samples/azureai-samples",
110-
"branch": "dantaylo/nov2024",
110+
"branch": "main",
111+
"branch_mapping": {}
112+
},
113+
{
114+
"path_to_root": "azureai-samples-csharp",
115+
"url": "https://github.com/Azure-Samples/azureai-samples",
116+
"branch": "dantaylo/csharp",
111117
"branch_mapping": {}
112118
},
113119
{
@@ -170,6 +176,12 @@
170176
"branch": "main",
171177
"branch_mapping": {}
172178
},
179+
{
180+
"path_to_root": "azureai-model-inference-bicep",
181+
"url": "https://github.com/Azure-Samples/azureai-model-inference-bicep",
182+
"branch": "main",
183+
"branch_mapping": {}
184+
},
173185
{
174186
"path_to_root": "azure-docs-pr-policy-includes",
175187
"url": "https://github.com/MicrosoftDocs/azure-docs-pr",

.openpublishing.redirection.json

Lines changed: 236 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,80 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/search/performance-benchmarks.md",
5+
"redirect_url": "/previous-versions/azure/search/performance-benchmarks",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/search/search-traffic-analytics.md",
10+
"redirect_url": "/previous-versions/azure/search/search-traffic-analytics",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/genomics/frequently-asked-questions-genomics.yml",
15+
"redirect_url": "/previous-versions/azure/genomics/frequently-asked-questions-genomics",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/genomics/index.yml",
20+
"redirect_url": "/previous-versions/azure/genomics/index",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/genomics/business-continuity-genomics.md",
25+
"redirect_url": "/previous-versions/azure/genomics/business-continuity-genomics",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/genomics/file-support-ticket-genomics.md",
30+
"redirect_url": "/previous-versions/azure/genomics/file-support-ticket-genomics",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/genomics/overview-what-is-genomics.md",
35+
"redirect_url": "/previous-versions/azure/genomics/overview-what-is-genomics",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "articles/genomics/quickstart-input-bam.md",
40+
"redirect_url": "/previous-versions/azure/genomics/quickstart-input-bam",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "articles/genomics/quickstart-input-multiple.md",
45+
"redirect_url": "/previous-versions/azure/genomics/quickstart-input-multiple",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/genomics/quickstart-input-pair-fastq.md",
50+
"redirect_url": "/previous-versions/azure/genomics/quickstart-input-pair-fastq",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "articles/genomics/quickstart-input-sas.md",
55+
"redirect_url": "/previous-versions/azure/genomics/quickstart-input-sas",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "articles/genomics/quickstart-run-genomics-workflow-portal.md",
60+
"redirect_url": "/previous-versions/azure/genomics/quickstart-run-genomics-workflow-portal",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "articles/genomics/troubleshooting-guide-genomics.md",
65+
"redirect_url": "/previous-versions/azure/genomics/troubleshooting-guide-genomics",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "articles/genomics/version-release-history-genomics.md",
70+
"redirect_url": "/previous-versions/azure/genomics/version-release-history-genomics",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path_from_root": "/articles/ai-studio/concepts/what-are-ai-services.md",
75+
"redirect_url": "/azure/ai-services/what-are-ai-services",
76+
"redirect_document_id": false
77+
},
378
{
479
"source_path_from_root": "/articles/ai-services/openai/concepts/use-your-image-data.md",
580
"redirect_url": "/azure/ai-services/openai/concepts/use-your-data",
@@ -15,6 +90,11 @@
1590
"redirect_url": "/azure/search/search-how-to-dotnet-sdk",
1691
"redirect_document_id": false
1792
},
93+
{
94+
"source_path_from_root": "/articles/ai-services/agents/how-to/tools/overview.md",
95+
"redirect_url": "/azure/ai-services/agents/overview",
96+
"redirect_document_id": false
97+
},
1898
{
1999
"source_path_from_root": "/articles/search/search-howto-index-csv-blobs.md",
20100
"redirect_url": "/azure/search/search-how-to-index-csv-blobs",
@@ -24,6 +104,161 @@
24104
"source_path_from_root": "/articles/search/search-howto-large-index.md",
25105
"redirect_url": "/azure/search/search-how-to-large-index",
26106
"redirect_document_id": false
107+
},
108+
{
109+
"source_path_from_root": "/articles/ai-services/agents/concepts/agents.md",
110+
"redirect_url": "/azure/ai-services/agents/overview",
111+
"redirect_document_id": false
112+
},
113+
{
114+
"source_path_from_root": "/articles/ai-services/openai/how-to/use-your-data-securely.md",
115+
"redirect_url": "/azure/ai-services/openai/how-to/on-your-data-configuration",
116+
"redirect_document_id": false
117+
},
118+
{
119+
"source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/concepts/data-formats.md",
120+
"redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
121+
"redirect_document_id": false
122+
},
123+
{
124+
"source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/concepts/entity-components.md",
125+
"redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
126+
"redirect_document_id": false
127+
},
128+
{
129+
"source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/concepts/evaluation-metrics.md",
130+
"redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
131+
"redirect_document_id": false
132+
},
133+
{
134+
"source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/how-to/call-api.md",
135+
"redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
136+
"redirect_document_id": false
137+
},
138+
{
139+
"source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/how-to/create-project.md",
140+
"redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
141+
"redirect_document_id": false
142+
},
143+
{
144+
"source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/how-to/deploy-model.md",
145+
"redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
146+
"redirect_document_id": false
147+
},
148+
{
149+
"source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/how-to/design-schema.md",
150+
"redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
151+
"redirect_document_id": false
152+
},
153+
{
154+
"source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/how-to/fail-over.md",
155+
"redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
156+
"redirect_document_id": false
157+
},
158+
{
159+
"source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/how-to/label-data.md",
160+
"redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
161+
"redirect_document_id": false
162+
},
163+
{
164+
"source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/how-to/train-model.md",
165+
"redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
166+
"redirect_document_id": false
167+
},
168+
{
169+
"source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/how-to/view-model-evaluation.md",
170+
"redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
171+
"redirect_document_id": false
172+
},
173+
{
174+
"source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/language-support.md",
175+
"redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
176+
"redirect_document_id": false
177+
},
178+
{
179+
"source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/overview.md",
180+
"redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
181+
"redirect_document_id": false
182+
},
183+
{
184+
"source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/quickstart.md",
185+
"redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
186+
"redirect_document_id": false
187+
},
188+
{
189+
"source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/reference/glossary.md",
190+
"redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
191+
"redirect_document_id": false
192+
},
193+
{
194+
"source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/reference/service-limits.md",
195+
"redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
196+
"redirect_document_id": false
197+
},
198+
{
199+
"source_path_from_root": "/articles/ai-services/language-service/sentiment-opinion-mining/custom/concepts/data-formats.md",
200+
"redirect_url": "/azure/ai-services/language-service/sentiment-opinion-mining/overview",
201+
"redirect_document_id": false
202+
},
203+
{
204+
"source_path_from_root": "/articles/ai-services/language-service/sentiment-opinion-mining/custom/how-to/call-api.md",
205+
"redirect_url": "/azure/ai-services/language-service/sentiment-opinion-mining/overview",
206+
"redirect_document_id": false
207+
},
208+
{
209+
"source_path_from_root": "/articles/ai-services/language-service/sentiment-opinion-mining/custom/how-to/create-project.md",
210+
"redirect_url": "/azure/ai-services/language-service/sentiment-opinion-mining/overview",
211+
"redirect_document_id": false
212+
},
213+
{
214+
"source_path_from_root": "/articles/ai-services/language-service/sentiment-opinion-mining/custom/how-to/deploy-model.md",
215+
"redirect_url": "/azure/ai-services/language-service/sentiment-opinion-mining/overview",
216+
"redirect_document_id": false
217+
},
218+
{
219+
"source_path_from_root": "/articles/ai-services/language-service/sentiment-opinion-mining/custom/how-to/design-schema.md",
220+
"redirect_url": "/azure/ai-services/language-service/sentiment-opinion-mining/overview",
221+
"redirect_document_id": false
222+
},
223+
{
224+
"source_path_from_root": "/articles/ai-services/language-service/sentiment-opinion-mining/custom/how-to/label-data.md",
225+
"redirect_url": "/azure/ai-services/language-service/sentiment-opinion-mining/overview",
226+
"redirect_document_id": false
227+
},
228+
{
229+
"source_path_from_root": "/articles/ai-services/language-service/sentiment-opinion-mining/custom/how-to/train-model.md",
230+
"redirect_url": "/azure/ai-services/language-service/sentiment-opinion-mining/overview",
231+
"redirect_document_id": false
232+
},
233+
{
234+
"source_path_from_root": "/articles/ai-services/language-service/sentiment-opinion-mining/custom/quickstart.md",
235+
"redirect_url": "/azure/ai-services/language-service/sentiment-opinion-mining/overview",
236+
"redirect_document_id": false
237+
},
238+
{
239+
"source_path_from_root": "/articles/ai-services/openai/references/azure-machine-learning.md",
240+
"redirect_url": "/azure/ai-services/openai/concepts/use-your-data",
241+
"redirect_document_id": false
242+
},
243+
{
244+
"source_path_from_root": "/articles/open-datasets/dataset-covid-19-open-research.md",
245+
"redirect_url": "/azure/open-datasets/dataset-catalog",
246+
"redirect_document_id": false
247+
},
248+
{
249+
"source_path_from_root": "/articles/ai-services/language-service/language-studio.md",
250+
"redirect_url": "/azure/ai-services/language-service/overview",
251+
"redirect_document_id": false
252+
},
253+
{
254+
"source_path_from_root": "/articles/ai-services/language-service/summarization/region-support.md",
255+
"redirect_url": "/azure/ai-services/language-service/concepts/regional-support",
256+
"redirect_document_id": false
257+
},
258+
{
259+
"source_path_from_root": "/articles/open-datasets/dataset-genomics-data-lake.md",
260+
"redirect_url": "/azure/open-datasets/dataset-catalog",
261+
"redirect_document_id": false
27262
}
28263
]
29-
}
264+
}

.vscode/settings.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"cSpell.words": [
3+
"DALL"
4+
]
5+
}

.whatsnew.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"$schema": "https://whatsnewapi.azurewebsites.net/schema",
3+
"docSetProductName": "Azure AI Services",
4+
"rootDirectory": "articles/",
5+
"docLinkSettings": {
6+
"linkFormat": "relative",
7+
"relativeLinkPrefix": "../"
8+
},
9+
"navigationOptions": {
10+
"maximumNumberOfArticles": 5,
11+
"tocParentNode": "Latest documentation updates",
12+
"repoTocFolder": "articles/ai-services",
13+
"indexParentNode": "Latest documentation updates",
14+
"repoIndexFolder": "articles/ai-services"
15+
},
16+
"areas": [
17+
{
18+
"names": [ "ai-services" ],
19+
"heading": "Azure AI Services"
20+
},
21+
{
22+
"names": [ "ai-studio" ],
23+
"heading": "Azure AI Foundry"
24+
},
25+
{
26+
"names": [ "machine-learning" ],
27+
"heading": "Azure Machine Learning"
28+
},
29+
{
30+
"names": [ "search" ],
31+
"heading": "Azure AI Search"
32+
33+
}
34+
]
35+
}

0 commit comments

Comments
 (0)