Skip to content

Commit 3445ca4

Browse files
mumianmumian
committed
resolve merge conflicts
2 parents 852ee41 + 63f4149 commit 3445ca4

File tree

317 files changed

+1049
-3834
lines changed

Some content is hidden

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

317 files changed

+1049
-3834
lines changed

‎.openpublishing.redirection.json

Lines changed: 126 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2944,32 +2944,152 @@
29442944
},
29452945
{
29462946
"source_path_from_root": "/articles/orbital/delete-contact.md",
2947-
"redirect_url": "/azure/orbital/spacecraft-object",
2947+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
29482948
"redirect_document_id": false
29492949
},
29502950
{
29512951
"source_path_from_root": "/articles/orbital/license-spacecraft.md",
2952-
"redirect_url": "/azure/orbital/initiate-licensing",
2952+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
29532953
"redirect_document_id": false
29542954
},
29552955
{
29562956
"source_path_from_root": "/articles/orbital/orbital-preview.md",
2957-
"redirect_url": "/azure/orbital/overview",
2957+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
29582958
"redirect_document_id": false
29592959
},
29602960
{
29612961
"source_path_from_root": "/articles/orbital/overview-analytics.md",
2962-
"redirect_url": "/azure/orbital/overview",
2962+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
29632963
"redirect_document_id": false
29642964
},
29652965
{
29662966
"source_path_from_root": "/articles/orbital/partner-network-integration.md",
2967-
"redirect_url": "/azure/orbital/about-ground-stations#partner-ground-stations",
2967+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
29682968
"redirect_document_id": false
29692969
},
29702970
{
29712971
"source_path_from_root": "/articles/orbital/space-partner-program-overview.md",
2972-
"redirect_url": "/azure/orbital/overview",
2972+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
2973+
"redirect_document_id": false
2974+
},
2975+
{
2976+
"source_path_from_root": "/articles/orbital/virtual-rf-tutorial.md",
2977+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
2978+
"redirect_document_id": false
2979+
},
2980+
{
2981+
"source_path_from_root": "/articles/orbital/update-tle.md",
2982+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
2983+
"redirect_document_id": false
2984+
},
2985+
{
2986+
"source_path_from_root": "/articles/orbital/spacecraft-object.md",
2987+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
2988+
"redirect_document_id": false
2989+
},
2990+
{
2991+
"source_path_from_root": "/articles/orbital/schedule-contact.md",
2992+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
2993+
"redirect_document_id": false
2994+
},
2995+
{
2996+
"source_path_from_root": "/articles/orbital/satellite-imagery-with-orbital-ground-station.md",
2997+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
2998+
"redirect_document_id": false
2999+
},
3000+
{
3001+
"source_path_from_root": "/articles/orbital/sar-reference-architecture.md",
3002+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
3003+
"redirect_document_id": false
3004+
},
3005+
{
3006+
"source_path_from_root": "/articles/orbital/resource-graph-samples.md",
3007+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
3008+
"redirect_document_id": false
3009+
},
3010+
{
3011+
"source_path_from_root": "/articles/orbital/register-spacecraft.md",
3012+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
3013+
"redirect_document_id": false
3014+
},
3015+
{
3016+
"source_path_from_root": "/articles/orbital/receive-real-time-telemetry.md",
3017+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
3018+
"redirect_document_id": false
3019+
},
3020+
{
3021+
"source_path_from_root": "/articles/orbital/prepare-for-launch.md",
3022+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
3023+
"redirect_document_id": false
3024+
},
3025+
{
3026+
"source_path_from_root": "/articles/orbital/modem-chain.md",
3027+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
3028+
"redirect_document_id": false
3029+
},
3030+
{
3031+
"source_path_from_root": "/articles/orbital/organize-stac-data.md",
3032+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
3033+
"redirect_document_id": false
3034+
},
3035+
{
3036+
"source_path_from_root": "/articles/orbital/overview.md",
3037+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
3038+
"redirect_document_id": false
3039+
},
3040+
{
3041+
"source_path_from_root": "/articles/orbital/mission-phases.md",
3042+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
3043+
"redirect_document_id": false
3044+
},
3045+
{
3046+
"source_path_from_root": "/articles/orbital/initiate-licensing.md",
3047+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
3048+
"redirect_document_id": false
3049+
},
3050+
{
3051+
"source_path_from_root": "/articles/orbital/index.yml",
3052+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
3053+
"redirect_document_id": false
3054+
},
3055+
{
3056+
"source_path_from_root": "/articles/orbital/get-started.md",
3057+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
3058+
"redirect_document_id": false
3059+
},
3060+
{
3061+
"source_path_from_root": "/articles/orbital/geospatial-reference-architecture.md",
3062+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
3063+
"redirect_document_id": false
3064+
},
3065+
{
3066+
"source_path_from_root": "/articles/orbital/downlink-aqua.md",
3067+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
3068+
"redirect_document_id": false
3069+
},
3070+
{
3071+
"source_path_from_root": "/articles/orbital/contact-profile.md",
3072+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
3073+
"redirect_document_id": false
3074+
},
3075+
{
3076+
"source_path_from_root": "/articles/orbital/concepts-contact.md",
3077+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
3078+
"redirect_document_id": false
3079+
},
3080+
{
3081+
"source_path_from_root": "/articles/orbital/concepts-contact-profile.md",
3082+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
3083+
"redirect_document_id": false
3084+
},
3085+
{
3086+
"source_path_from_root": "/articles/orbital/about-ground-stations.md",
3087+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
3088+
"redirect_document_id": false
3089+
},
3090+
{
3091+
"source_path_from_root": "/articles/orbital/prepare-network.md",
3092+
"redirect_url": "https://azure.microsoft.com/en-us/updates?id=azure-orbital-ground-station-retirement",
29733093
"redirect_document_id": false
29743094
},
29753095
{

‎articles/active-directory-b2c/partner-bindid.md

Lines changed: 6 additions & 6 deletions

‎articles/app-service/app-service-ip-restrictions.md

Lines changed: 0 additions & 2 deletions

‎articles/app-service/deploy-local-git.md

Lines changed: 1 addition & 1 deletion

‎articles/app-service/media/app-service-hybrid-connections/hybrid-connections-app-service-plan-properties.png

15.7 KB

‎articles/app-service/media/app-service-hybrid-connections/hybrid-connections-service-bus-endpoint.png

9.07 KB

‎articles/app-service/media/app-service-ip-restrictions/access-restrictions-ip-edit.png

-12.9 KB
Binary file not shown.

‎articles/app-service/media/configure-authentication-provider-apple/apple-configure-app.jpg

5.37 KB

‎articles/app-service/media/configure-authentication-provider-apple/apple-configure-service-2.jpg

6.07 KB

‎articles/app-service/media/custom-dns-web-site-buydomains-web-app/dncmntask-cname-buydomains-dns-zone.png

-2.36 KB

0 commit comments

Comments
 (0)