Skip to content

Commit 943f46a

Browse files
authored
Merge branch 'main' into arc-vm-networking-tab
2 parents 7ff032a + bcc5711 commit 943f46a

File tree

1,861 files changed

+23735
-28756
lines changed

Some content is hidden

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

1,861 files changed

+23735
-28756
lines changed

.acrolinx-config.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
{:allowed-branchname-matches ["main" "release-.*"]
2-
:allowed-filename-matches ["azure-stack" "AKS-Hybrid" "azure-managed-lustre"]}
2+
:allowed-filename-matches ["azure-stack" "AKS-Hybrid" "azure-managed-lustre" "azure-local"]}

.openpublishing.publish.config.json

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,22 @@
11
{
22
"docsets_to_publish": [
3+
{
4+
"docset_name": "adaptive-cloud",
5+
"build_source_folder": "adaptive-cloud",
6+
"build_output_subfolder": "adaptive-cloud",
7+
"locale": "en-us",
8+
"monikers": [],
9+
"moniker_ranges": [],
10+
"open_to_public_contributors": false,
11+
"type_mapping": {
12+
"Conceptual": "Content"
13+
},
14+
"build_entry_point": "docs",
15+
"template_folder": "_themes"
16+
},
317
{
418
"docset_name": "AKS-Hybrid",
5-
"build_source_folder": "AKS-Hybrid",
19+
"build_source_folder": "AKS-Arc",
620
"build_output_subfolder": "AKS-Hybrid",
721
"locale": "en-us",
822
"monikers": [],
@@ -16,25 +30,28 @@
1630
"template_folder": "_themes"
1731
},
1832
{
19-
"docset_name": "AzureLocal",
20-
"build_source_folder": "azure-local",
21-
"build_output_subfolder": "AzureLocal",
33+
"docset_name": "azure-managed-lustre",
34+
"build_source_folder": "azure-managed-lustre",
35+
"build_output_subfolder": "azure-managed-lustre",
2236
"locale": "en-us",
2337
"monikers": [],
2438
"moniker_ranges": [],
2539
"open_to_public_contributors": true,
2640
"type_mapping": {
2741
"Conceptual": "Content"
2842
},
29-
"build_entry_point": "docs"
43+
"build_entry_point": "docs",
44+
"template_folder": "_themes"
3045
},
3146
{
32-
"docset_name": "azure-managed-lustre",
33-
"build_source_folder": "azure-managed-lustre",
34-
"build_output_subfolder": "azure-managed-lustre",
47+
"docset_name": "AzureLocal",
48+
"build_source_folder": "azure-local",
49+
"build_output_subfolder": "AzureLocal",
3550
"locale": "en-us",
3651
"monikers": [],
37-
"moniker_ranges": [],
52+
"moniker_ranges": [
53+
">=azloc-2408"
54+
],
3855
"open_to_public_contributors": true,
3956
"type_mapping": {
4057
"Conceptual": "Content"
@@ -136,6 +153,7 @@
136153
".openpublishing.redirection.pep.json",
137154
".openpublishing.redirection.aks.json",
138155
".openpublishing.redirection.aks-edge.json",
139-
".openpublishing.redirection.azure-local.json"
156+
".openpublishing.redirection.azure-local.json",
157+
".openpublishing.redirection.hub-hotfixes.json"
140158
]
141159
}
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path": "adaptive-cloud/app-solutions/index.yml",
5+
"redirect_url": "/azure-stack/user/overview-patterns-solution-examples",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "adaptive-cloud/app-solutions/overview-app-design-considerations.md",
10+
"redirect_url": "/azure/architecture/guide",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "adaptive-cloud/app-solutions/overview-patterns-solution-examples.md",
15+
"redirect_url": "/azure-stack/user/overview-patterns-solution-examples",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "adaptive-cloud/app-solutions/pattern-cicd-pipeline.md",
20+
"redirect_url": "/azure-stack/user/pattern-cicd-pipeline",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "adaptive-cloud/app-solutions/pattern-cross-cloud-scale-onprem-data.md",
25+
"redirect_url": "/azure-stack/user/pattern-cross-cloud-scale-on-premises-data",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "adaptive-cloud/app-solutions/pattern-cross-cloud-scale.md",
30+
"redirect_url": "/azure-stack/user/pattern-cross-cloud-scale",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "adaptive-cloud/app-solutions/pattern-geo-distributed.md",
35+
"redirect_url": "/azure-stack/user/pattern-geo-distributed",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "adaptive-cloud/app-solutions/pattern-highly-available-kubernetes.md",
40+
"redirect_url": "/azure-stack/user/pattern-highly-available-kubernetes",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "adaptive-cloud/app-solutions/pattern-hybrid-relay.md",
45+
"redirect_url": "/azure-stack/user/pattern-hybrid-relay",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "adaptive-cloud/app-solutions/pattern-out-of-stock-at-edge.md",
50+
"redirect_url": "/azure-stack/user/pattern-out-of-stock-at-edge",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "adaptive-cloud/app-solutions/pattern-retail-footfall-detection.md",
55+
"redirect_url": "/azure-stack/user/pattern-retail-footfall-detection",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "adaptive-cloud/app-solutions/pattern-tiered-data-analytics.md",
60+
"redirect_url": "/azure-stack/user/pattern-tiered-data-analytics",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "adaptive-cloud/app-solutions/pattern-train-ml-model-at-edge.md",
65+
"redirect_url": "/azure-stack/user/pattern-train-machine-learning-model-at-edge",
66+
"redirect_document_id": false
67+
}
68+
]
69+
}

.openpublishing.redirection.aks-edge.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"redirections": [
33
{
4-
"source_path": "AKS-Hybrid/reference/aks-edge-ps/set-aksedgearcconnection.md",
4+
"source_path": "AKS-Arc/reference/aks-edge-ps/set-aksedgearcconnection.md",
55
"redirect_url": "/azure/aks/hybrid/reference/aks-edge-ps/connect-aksedgearc",
66
"redirect_document_id": false
77
}

0 commit comments

Comments
 (0)