Skip to content

Commit b42ee4b

Browse files
Merge pull request #1 from MikeRayMSFT/tlaw-edits
Synchronize from Main - resolve merge conflicts
2 parents b63c5e9 + ebbca71 commit b42ee4b

File tree

16,374 files changed

+344985
-204936
lines changed

Some content is hidden

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

16,374 files changed

+344985
-204936
lines changed
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: "📄 Azure Kubernetes Services - Feedback control template"
2+
title: "Feedback"
3+
description: >-
4+
🛈 FYI - This issue template is intended for use by the feedback control on the bottom of Azure Kubernetes Services pages on the
5+
https://learn.microsoft.com/azure/aks site.
6+
labels:
7+
- "azure-kubernetes-services/svc"
8+
body:
9+
- type: markdown
10+
attributes:
11+
value: "## Enter your feedback"
12+
- type: markdown
13+
attributes:
14+
value: Select the issue type, and describe the issue in the text box below. Add as much detail as needed to help us resolve the issue.
15+
- type: dropdown
16+
id: issue-type
17+
attributes:
18+
label: Type of issue
19+
options:
20+
- Typo
21+
- Code doesn't work
22+
- Missing information
23+
- Outdated article
24+
- Other (describe below)
25+
validations:
26+
required: true
27+
- type: textarea
28+
id: userfeedback
29+
validations:
30+
required: true
31+
attributes:
32+
label: Feedback
33+
description: >-
34+
If possible, please provide extended details that will add context and help the team update
35+
the documentation. Additional details may not be useful for typos, grammar, formatting, etc.
36+
For technical or factual errors, please include code snippets and output to show how the
37+
documentation is incorrect.
38+
- type: markdown
39+
attributes:
40+
value: "## 🚧 Article information 🚧"
41+
- type: markdown
42+
attributes:
43+
value: "*Don't modify the following fields*. They are automatically filled in for you. Doing so will disconnect your issue from the affected article. *Don't edit them*."
44+
- type: input
45+
id: pageUrl
46+
validations:
47+
required: true
48+
attributes:
49+
label: Page URL
50+
- type: input
51+
id: contentSourceUrl
52+
validations:
53+
required: true
54+
attributes:
55+
label: Content source URL
56+
- type: input
57+
id: author
58+
validations:
59+
required: true
60+
attributes:
61+
label: Author
62+
description: GitHub Id of the author
63+
- type: input
64+
id: documentVersionIndependentId
65+
validations:
66+
required: true
67+
attributes:
68+
label: Document Id

.openpublishing.publish.config.json

Lines changed: 51 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@
135135
"branch_mapping": {}
136136
},
137137
{
138-
"path_to_root": "ms-identity-dotnetcore-b2c-account-management",
138+
"path_to_root": "ms-identity-dotnetcore-b2c-account-management-archive",
139139
"url": "https://github.com/Azure-Samples/ms-identity-dotnetcore-b2c-account-management",
140-
"branch": "master",
140+
"branch": "archive",
141141
"branch_mapping": {}
142142
},
143143
{
@@ -236,6 +236,12 @@
236236
"branch": "main",
237237
"branch_mapping": {}
238238
},
239+
{
240+
"path_to_root": "functions-python-extensions",
241+
"url": "https://github.com/Azure/azure-functions-python-extensions",
242+
"branch": "dev",
243+
"branch_mapping": {}
244+
},
239245
{
240246
"path_to_root": "functions-python-tensorflow-tutorial",
241247
"url": "https://github.com/Azure-Samples/functions-python-tensorflow-tutorial",
@@ -247,7 +253,13 @@
247253
"url": "https://github.com/Azure-Samples/function-app-arm-templates",
248254
"branch": "main",
249255
"branch_mapping": {}
250-
},
256+
},
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+
},
251263
{
252264
"path_to_root": "functions-azure-product",
253265
"url": "https://github.com/Azure/Azure-Functions",
@@ -500,6 +512,12 @@
500512
"branch": "sdk-codetest",
501513
"branch_mapping": {}
502514
},
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+
},
503521
{
504522
"path_to_root": "azureml-examples-main",
505523
"url": "https://github.com/azure/azureml-examples",
@@ -980,6 +998,12 @@
980998
"branch": "main",
981999
"branch_mapping": {}
9821000
},
1001+
{
1002+
"path_to_root": "msdocs-app-service-sqldb-dotnetcore",
1003+
"url": "https://github.com/Azure-Samples/msdocs-app-service-sqldb-dotnetcore",
1004+
"branch": "main",
1005+
"branch_mapping": {}
1006+
},
9831007
{
9841008
"path_to_root": "azuresignalr-samples",
9851009
"url": "https://github.com/aspnet/AzureSignalR-samples",
@@ -1004,6 +1028,12 @@
10041028
"branch": "docs-snippets",
10051029
"branch_mapping": {}
10061030
},
1031+
{
1032+
"path_to_root": "functions-openai-extension",
1033+
"url": "https://github.com/Azure/azure-functions-openai-extension",
1034+
"branch": "main",
1035+
"branch_mapping": {}
1036+
},
10071037
{
10081038
"path_to_root": "cosmos-db-nosql-dotnet-samples",
10091039
"url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-samples",
@@ -1207,6 +1237,12 @@
12071237
"url": "https://github.com/MicrosoftDocs/SupportArticles-docs",
12081238
"branch": "main",
12091239
"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": {}
12101246
}
12111247
],
12121248
"branch_target_mapping": {
@@ -1224,7 +1260,12 @@
12241260
},
12251261
"redirection_files": [
12261262
".openpublishing.redirection.active-directory.json",
1263+
".openpublishing.redirection.ai-services-from-applied.json",
1264+
".openpublishing.redirection.ai-services-from-cog.json",
1265+
".openpublishing.redirection.applied-ai-old.json",
1266+
".openpublishing.redirection.applied-ai-services.json",
12271267
".openpublishing.redirection.ansible.json",
1268+
".openpublishing.redirection.api-center.json",
12281269
".openpublishing.redirection.api-management.json",
12291270
".openpublishing.redirection.app-service.json",
12301271
".openpublishing.redirection.asc-for-iot.json",
@@ -1246,12 +1287,14 @@
12461287
".openpublishing.redirection.azure-web-pubsub.json",
12471288
".openpublishing.redirection.baremetal-infrastructure.json",
12481289
".openpublishing.redirection.blockchain.json",
1290+
".openpublishing.redirection.cognitive-services.json",
12491291
".openpublishing.redirection.container-service.json",
12501292
".openpublishing.redirection.data-lake-analytics.json",
12511293
".openpublishing.redirection.defender-for-cloud.json",
12521294
".openpublishing.redirection.defender-for-iot.json",
12531295
".openpublishing.redirection.dev-spaces.json",
12541296
".openpublishing.redirection.devops-project.json",
1297+
".openpublishing.redirection.document-db.json",
12551298
".openpublishing.redirection.germany.json",
12561299
".openpublishing.redirection.government.json",
12571300
".openpublishing.redirection.guidance.json",
@@ -1264,6 +1307,7 @@
12641307
".openpublishing.redirection.machine-configuration.json",
12651308
".openpublishing.redirection.marketplace.json",
12661309
".openpublishing.redirection.openshift.json",
1310+
".openpublishing.redirection.private-multi-access-edge-compute-mec.json",
12671311
".openpublishing.redirection.purview.json",
12681312
".openpublishing.redirection.remoteapp.json",
12691313
".openpublishing.redirection.security-benchmark.json",
@@ -1278,12 +1322,9 @@
12781322
".openpublishing.redirection.virtual-desktop.json",
12791323
".openpublishing.redirection.vmware-cloudsimple.json",
12801324
"articles/active-directory-b2c/.openpublishing.redirection.active-directory-b2c.json",
1281-
"articles/ai-services/.openpublishing.redirection.ai-services-from-applied.json",
1282-
"articles/ai-services/.openpublishing.redirection.ai-services-from-cog.json",
1283-
"articles/ai-services/.openpublishing.redirection.applied-ai-old.json",
1284-
"articles/ai-services/.openpublishing.redirection.applied-ai-services.json",
1285-
"articles/ai-services/.openpublishing.redirection.cognitive-services.json",
1325+
"articles/ai-services.openpublishing.redirection.ai-services.json",
12861326
"articles/ai-studio/.openpublishing.redirection.ai-studio.json",
1327+
"articles/aks/.openpublishing.redirection.aks.json",
12871328
"articles/analysis-services/.openpublishing.redirection.analysis-services.json",
12881329
"articles/application-gateway/.openpublishing.redirection.application-gateway.json",
12891330
"articles/automation/.openpublishing.redirection.automation.json",
@@ -1334,6 +1375,7 @@
13341375
"articles/logic-apps/.openpublishing.redirection.logic-apps.json",
13351376
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
13361377
"articles/machine-learning/v1/.openpublishing.redirection.machine-learning-v1.json",
1378+
"articles/managed-instance-apache-cassandra/.openpublishing.redirection.managed-instance-apache-cassandra.json",
13371379
"articles/mariadb/.openpublishing.redirection.mariadb.json",
13381380
"articles/migrate/.openpublishing.redirection.migrate.json",
13391381
"articles/mysql/.openpublishing.redirection.mysql.json",
@@ -1342,6 +1384,7 @@
13421384
"articles/object-anchors/.openpublishing.redirection.object-anchors.json",
13431385
"articles/operator-insights/.openpublishing.redirection.operator-insights.json",
13441386
"articles/operator-nexus/.openpublishing.redirection.operator-nexus.json",
1387+
"articles/operator-service-manager/.openpublishing.redirection.operator-service-manager.json",
13451388
"articles/peering-service/.openpublishing.redirection.peering-service.json",
13461389
"articles/postgresql/.openpublishing.redirection.postgresql.json",
13471390
"articles/route-server/.openpublishing.redirection.route-server.json",

articles/ai-services/.openpublishing.redirection.ai-services-from-applied.json renamed to .openpublishing.redirection.ai-services-from-applied.json

Lines changed: 0 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -539,128 +539,6 @@
539539
"source_path_from_root": "/articles/applied-ai-services/immersive-reader/context/context.md",
540540
"redirect_url": "/azure/ai-services/immersive-reader/?context=/azure/ai-services/immersive-reader/context/context",
541541
"redirect_document_id": false
542-
},
543-
{
544-
"source_path_from_root": "/articles/ai-services/document-intelligence/v3-migration-guide.md",
545-
"redirect_url": "/azure/ai-services/document-intelligence/v3-1-migration-guide",
546-
"redirect_document_id": true
547-
},
548-
549-
{
550-
"source_path_from_root": "/articles/ai-services/document-intelligence/sdk-overview.md",
551-
"redirect_url": "/azure/ai-services/document-intelligence/sdk-overview-v3-0",
552-
"redirect_document_id": true
553-
},
554-
{
555-
"source_path_from_root": "/articles/ai-services/document-intelligence/sdk-preview.md",
556-
"redirect_url": "/azure/ai-services/document-intelligence/sdk-overview-v3-1",
557-
"redirect_document_id": true
558-
},
559-
{
560-
"source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/get-started/csharp.md",
561-
"redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/v2-1/csharp",
562-
"redirect_document_id": true
563-
},
564-
{
565-
"source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/get-started/java.md",
566-
"redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/v2-1/java",
567-
"redirect_document_id": true
568-
},
569-
{
570-
"source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/get-started/javascript.md",
571-
"redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/v2-1/javascript",
572-
"redirect_document_id": true
573-
},
574-
{
575-
"source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/get-started/python.md",
576-
"redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/v2-1/python",
577-
"redirect_document_id": true
578-
},
579-
{
580-
"source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/get-started/rest-api.md",
581-
"redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/v2-1/rest-api",
582-
"redirect_document_id": true
583-
},
584-
{
585-
"source_path_from_root": "/articles/ai-services/document-intelligence/concept-insurance-card.md",
586-
"redirect_url": "/azure/ai-services/document-intelligence/concept-health-insurance-card",
587-
"redirect_document_id": true
588-
},
589-
{
590-
"source_path_from_root": "/articles/ai-services/document-intelligence/concept-w2.md",
591-
"redirect_url": "/azure/ai-services/document-intelligence/concept-tax-document",
592-
"redirect_document_id": true
593-
},
594-
{
595-
"source_path_from_root": "/articles/ai-services/document-intelligence/resource-customer-stories.md",
596-
"redirect_url": "/azure/ai-services/document-intelligence/overview",
597-
"redirect_document_id": true
598-
},
599-
{
600-
"source_path_from_root": "/articles/ai-services/document-intelligence/language-support.md",
601-
"redirect_url": "/azure/ai-services/document-intelligence/language-support-ocr",
602-
"redirect_document_id": true
603-
},
604-
{
605-
"source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/v3-csharp-sdk.md",
606-
"redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/csharp-sdk.md",
607-
"redirect_document_id": true
608-
},
609-
{
610-
"source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/v3-javascript-sdk.md",
611-
"redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/javascript-sdk.md",
612-
"redirect_document_id": true
613-
},
614-
{
615-
"source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/v3-java-sdk.md",
616-
"redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/java-sdk.md",
617-
"redirect_document_id": true
618-
},
619-
{
620-
"source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/v3-python-sdk.md",
621-
"redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/python-sdk.md",
622-
"redirect_document_id": true
623-
},
624-
{
625-
"source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/v3-rest-api-sdk.md",
626-
"redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/rest-api-sdk.md",
627-
"redirect_document_id": true
628-
},
629-
{
630-
"source_path_from_root": "/articles/ai-services/translator/document-translation/quickstarts/document-translation-sdk.md",
631-
"redirect_url": "/azure/ai-services/translator/document-translation/quickstarts/asynchronous-sdk",
632-
"redirect_document_id": true
633-
},
634-
{
635-
"source_path_from_root": "/articles/ai-services/translator/document-translation/quickstarts/document-translation-rest-api.md",
636-
"redirect_url": "/azure/ai-services/translator/document-translation/quickstarts/asynchronous-rest-api",
637-
"redirect_document_id": true
638-
},
639-
{
640-
"source_path_from_root": "/articles/ai-services/translator/containers/translator-container-configuration.md",
641-
"redirect_url": "/azure/ai-services/translator/containers/configuration",
642-
"redirect_document_id": true
643-
},
644-
{
645-
"source_path_from_root": "/articles/ai-services/translator/containers/translator-container-supported-parameters.md",
646-
"redirect_url": "/azure/ai-services/translator/containers/translate-text-parameters",
647-
"redirect_document_id": true
648-
},
649-
{
650-
"source_path_from_root": "/articles/ai-services/translator/containers/translator-disconnected-containers.md",
651-
"redirect_url": "/azure/ai-services/translator/containers/install-run",
652-
"redirect_document_id": false
653-
},
654-
{
655-
"source_path_from_root": "/articles/ai-services/translator/containers/translator-how-to-install-container.md",
656-
"redirect_url": "/azure/ai-services/translator/containers/install-run",
657-
"redirect_document_id": true
658-
},
659-
{
660-
"source_path_from_root": "/articles/ai-services/document-intelligence/concept-retrieval-augumented-generation.md",
661-
"redirect_url": "/azure/ai-services/document-intelligence/concept-retrieval-augmented-generation",
662-
"redirect_document_id": true
663542
}
664-
665543
]
666544
}

0 commit comments

Comments
 (0)