Skip to content

Commit 5aa72a8

Browse files
vivekjMSFTvivekjMSFT
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents 2fbd4cc + ed1ab81 commit 5aa72a8

File tree

6,447 files changed

+27241
-191468
lines changed

Some content is hidden

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

6,447 files changed

+27241
-191468
lines changed

‎.openpublishing.publish.config.json

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,42 @@
200200
"branch": "master",
201201
"branch_mapping": {}
202202
},
203+
{
204+
"path_to_root": "functions-quickstart-dotnet-azd",
205+
"url": "https://github.com/Azure-Samples/functions-quickstart-dotnet-azd",
206+
"branch": "main",
207+
"branch_mapping": {}
208+
},
209+
{
210+
"path_to_root": "functions-quickstart-java-azd",
211+
"url": "https://github.com/Azure-Samples/azure-functions-java-flex-consumption-azd",
212+
"branch": "main",
213+
"branch_mapping": {}
214+
},
215+
{
216+
"path_to_root": "functions-quickstart-python-azd",
217+
"url": "https://github.com/Azure-Samples/functions-quickstart-python-http-azd",
218+
"branch": "main",
219+
"branch_mapping": {}
220+
},
221+
{
222+
"path_to_root": "functions-quickstart-powershell-azd",
223+
"url": "https://github.com/Azure-Samples/functions-quickstart-powershell-azd",
224+
"branch": "main",
225+
"branch_mapping": {}
226+
},
227+
{
228+
"path_to_root": "functions-quickstart-javascript-azd",
229+
"url": "https://github.com/Azure-Samples/functions-quickstart-javascript-azd",
230+
"branch": "main",
231+
"branch_mapping": {}
232+
},
233+
{
234+
"path_to_root": "functions-quickstart-typescript-azd",
235+
"url": "https://github.com/Azure-Samples/functions-quickstart-typescript-azd",
236+
"branch": "main",
237+
"branch_mapping": {}
238+
},
203239
{
204240
"path_to_root": "azure-functions-templates-v3",
205241
"url": "https://github.com/Azure/azure-functions-templates",
@@ -560,6 +596,12 @@
560596
"branch": "main",
561597
"branch_mapping": {}
562598
},
599+
{
600+
"path_to_root": "msdocs-spring-boot-mongodb-sample-app",
601+
"url": "https://github.com/Azure-Samples/msdocs-spring-boot-mongodb-sample-app",
602+
"branch": "main",
603+
"branch_mapping": {}
604+
},
563605
{
564606
"path_to_root": "msdocs-tomcat-mysql-sample-app",
565607
"url": "https://github.com/Azure-Samples/msdocs-tomcat-mysql-sample-app",
@@ -857,4 +899,4 @@
857899
"articles/virtual-network/.openpublishing.redirection.virtual-network.json",
858900
"articles/vpn-gateway/.openpublishing.redirection.vpn-gateway.json"
859901
]
860-
}
902+
}

‎.openpublishing.redirection.active-directory.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24393,7 +24393,7 @@
2439324393
{
2439424394
"source_path_from_root": "/articles/active-directory/reports-monitoring/overview-service-health-notifications.md",
2439524395
"redirect_url": "/azure/service-health/service-health-portal-update",
24396-
"redirect_document_id": true
24396+
"redirect_document_id": false
2439724397
},
2439824398
{
2439924399
"source_path_from_root": "/articles/active-directory/reports-monitoring/quickstart-configure-named-locations.md",
@@ -33686,4 +33686,4 @@
3368633686
"redirect_document_id": false
3368733687
}
3368833688
]
33689-
}
33689+
}

‎.openpublishing.redirection.app-service.json

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1322,7 +1322,22 @@
13221322
},
13231323
{
13241324
"source_path_from_root": "/articles/app-service/containers/quickstart-multi-container.md",
1325-
"redirect_url": "/azure/app-service/quickstart-multi-container",
1325+
"redirect_url": "/azure/app-service/tutorial-custom-container-sidecar",
1326+
"redirect_document_id": false
1327+
},
1328+
{
1329+
"source_path_from_root": "/articles/app-service/containers/tutorial-multi-container-app.md",
1330+
"redirect_url": "/azure/app-service/tutorial-custom-container-sidecar",
1331+
"redirect_document_id": false
1332+
},
1333+
{
1334+
"source_path_from_root": "/articles/app-service/quickstart-multi-container.md",
1335+
"redirect_url": "/azure/app-service/tutorial-custom-container-sidecar",
1336+
"redirect_document_id": false
1337+
},
1338+
{
1339+
"source_path_from_root": "/articles/app-service/tutorial-multi-container-app.md",
1340+
"redirect_url": "/azure/app-service/tutorial-custom-container-sidecar",
13261341
"redirect_document_id": false
13271342
},
13281343
{
@@ -1966,18 +1981,18 @@
19661981
"redirect_document_id": false
19671982
},
19681983
{
1969-
"source_path_from_root": "/articles/app-service/containers/tutorial-java-spring-cosmosdb.md",
1984+
"source_path_from_root": "/articles/app-service/tutorial-java-quarkus-postgresql-app.md",
19701985
"redirect_url": "/azure/app-service/tutorial-java-spring-cosmosdb",
19711986
"redirect_document_id": false
19721987
},
19731988
{
1974-
"source_path_from_root": "/articles/app-service-web/app-service-web-tutorial-java-mysql.md",
1989+
"source_path_from_root": "/articles/app-service/containers/tutorial-java-spring-cosmosdb.md",
19751990
"redirect_url": "/azure/app-service/tutorial-java-spring-cosmosdb",
19761991
"redirect_document_id": false
19771992
},
19781993
{
1979-
"source_path_from_root": "/articles/app-service/containers/tutorial-multi-container-app.md",
1980-
"redirect_url": "/azure/app-service/tutorial-multi-container-app",
1994+
"source_path_from_root": "/articles/app-service-web/app-service-web-tutorial-java-mysql.md",
1995+
"redirect_url": "/azure/app-service/tutorial-java-spring-cosmosdb",
19811996
"redirect_document_id": false
19821997
},
19831998
{

‎.openpublishing.redirection.azure-functions.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/azure-functions/functions-bindings-return-value.md",
5+
"redirect_url": "/azure/azure-functions/functions-triggers-bindings",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/azure-functions/durable/durable-functions-configure-durable-functions-with-credentials.md",
510
"redirect_url": "/azure/azure-functions/durable/durable-functions-configure-managed-identity",
611
"redirect_document_id": false
7-
}
12+
}
813
]
914
}

0 commit comments

Comments
 (0)