Skip to content

Commit b16d14c

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into custom-properties
2 parents 61a9d92 + 4465eb6 commit b16d14c

File tree

1,743 files changed

+31920
-18581
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,743 files changed

+31920
-18581
lines changed

.openpublishing.publish.config.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -969,6 +969,12 @@
969969
"branch_mapping": {}
970970
},
971971
{
972+
"path_to_root": "azure-load-testing-samples",
973+
"url": "https://github.com/Azure-Samples/azure-load-testing-samples",
974+
"branch": "main",
975+
"branch_mapping": {}
976+
},
977+
{
972978
"path_to_root": "microsoft-graph",
973979
"url": "https://github.com/MicrosoftGraph/microsoft-graph-docs",
974980
"branch": "main",
@@ -994,6 +1000,7 @@
9941000
".openpublishing.redirection.app-service.json",
9951001
".openpublishing.redirection.azure-arc-data.json",
9961002
".openpublishing.redirection.azure-attestation.json",
1003+
".openpublishing.redirection.azure-app-configuration.json",
9971004
".openpublishing.redirection.azure-australia.json",
9981005
".openpublishing.redirection.azure-databricks.json",
9991006
".openpublishing.redirection.azure-hpc.json",
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/azure-app-configuration/howto-backup-config-store.md",
5+
"redirect_url": "/articles/azure-app-configuration/concept-geo-replication.md",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6136,6 +6136,11 @@
61366136
"redirect_url": "/azure/azure-monitor/app/data-model-complete",
61376137
"redirect_document_id": false
61386138
},
6139+
{
6140+
"source_path_from_root": "/articles/azure-monitor/vm/monitor-virtual-machine-management-packs.md",
6141+
"redirect_url": "/azure/azure-monitor/azure-monitor-operations-manager#migrate-management-pack-logic",
6142+
"redirect_document_id": false
6143+
},
61396144
{
61406145
"source_path_from_root": "/articles/azure-monitor/logs/dashboard-upgrade.md",
61416146
"redirect_url": "/azure/azure-monitor/visualize/tutorial-logs-dashboards",

.openpublishing.redirection.azure-productivity.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,11 @@
149149
"source_path": "articles/lab-services/classroom-labs-faq.yml",
150150
"redirect_url": "/azure/lab-services/lab-services-overview",
151151
"redirect_document_id": false
152-
}
152+
},
153+
{
154+
"source_path": "articles/lab-services/how-to-enable-nested-virtualization-template-vm-ui.md",
155+
"redirect_url": "/azure/lab-services/how-to-enable-nested-virtualization-template-vm-using-script",
156+
"redirect_document_id": false
157+
}
153158
]
154159
}

.openpublishing.redirection.healthcare-apis.json

Lines changed: 48 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -550,33 +550,73 @@
550550
"redirect_document_id": false
551551
},
552552
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-iot-connector-in-azure.md",
553-
"redirect_url": "/azure/healthcare-apis/iot/deploy-new-choose",
553+
"redirect_url": "/azure/healthcare-apis/iot/deploy-choose-method",
554554
"redirect_document_id": false
555555
},
556556
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-02-new-button.md",
557-
"redirect_url": "/azure/healthcare-apis/iot/deploy-new-button",
557+
"redirect_url": "/azure/healthcare-apis/iot/deploy-choose-method",
558558
"redirect_document_id": false
559559
},
560560
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-03-new-manual.md",
561-
"redirect_url": "/azure/healthcare-apis/iot/deploy-new-manual",
561+
"redirect_url": "/azure/healthcare-apis/iot/deploy-choose-method",
562562
"redirect_document_id": false
563563
},
564564
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-05-new-config.md",
565-
"redirect_url": "/azure/healthcare-apis/iot/deploy-new-config",
565+
"redirect_url": "/azure/healthcare-apis/iot/deploy-choose-method",
566566
"redirect_document_id": false
567567
},
568568
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-06-new-deploy.md",
569-
"redirect_url": "/azure/healthcare-apis/iot/deploy-new-deploy",
569+
"redirect_url": "/azure/healthcare-apis/iot/deploy-choose-method",
570570
"redirect_document_id": false
571571
},
572572
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-08-new-ps-cli.md",
573-
"redirect_url": "/azure/healthcare-apis/iot/deploy-new-powershell-cli",
573+
"redirect_url": "/azure/healthcare-apis/iot/deploy-json-powershell-cli",
574+
"redirect_document_id": false
575+
},
576+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-arm.md",
577+
"redirect_url": "/azure/healthcare-apis/iot/deploy-arm-template",
574578
"redirect_document_id": false
575579
},
576580
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-bicep-ps-cli.md",
577-
"redirect_url": "/azure/healthcare-apis/iot/deploy-new-bicep-powershell-cli",
581+
"redirect_url": "/azure/healthcare-apis/iot/deploy-bicep-powershell-cli",
578582
"redirect_document_id": false
579-
},
583+
},
584+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-bicep-powershell-cli.md",
585+
"redirect_url": "/azure/healthcare-apis/iot/deploy-bicep-powershell-cli",
586+
"redirect_document_id": false
587+
},
588+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-choose.md",
589+
"redirect_url": "/azure/healthcare-apis/iot/deploy-choose-method",
590+
"redirect_document_id": false
591+
},
592+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-powershell-cli.md",
593+
"redirect_url": "/azure/healthcare-apis/iot/deploy-json-powershell-cli",
594+
"redirect_document_id": false
595+
},
596+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-config.md",
597+
"redirect_url": "/azure/healthcare-apis/iot/deploy-manual-portal",
598+
"redirect_document_id": false
599+
},
600+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-deploy.md",
601+
"redirect_url": "/azure/healthcare-apis/iot/deploy-manual-portal",
602+
"redirect_document_id": false
603+
},
604+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-manual.md",
605+
"redirect_url": "/azure/healthcare-apis/iot/deploy-manual-portal",
606+
"redirect_document_id": false
607+
},
608+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-manual-prerequisites.md",
609+
"redirect_url": "/azure/healthcare-apis/iot/deploy-manual-portal",
610+
"redirect_document_id": false
611+
},
612+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-manual-config.md",
613+
"redirect_url": "/azure/healthcare-apis/iot/deploy-manual-portal",
614+
"redirect_document_id": false
615+
},
616+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-manual-post.md",
617+
"redirect_url": "/azure/healthcare-apis/iot/deploy-manual-portal",
618+
"redirect_document_id": false
619+
},
580620
{ "source_path_from_root": "/articles/healthcare-apis/iot/iot-connector-overview.md",
581621
"redirect_url": "/azure/healthcare-apis/iot/overview",
582622
"redirect_document_id": false

.openpublishing.redirection.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -965,6 +965,11 @@
965965
"redirect_url": "/azure/aks/workload-identity-migrate-from-pod-identity",
966966
"redirect_document_id": false
967967
},
968+
{
969+
"source_path_from_root": "/articles/aks/managed-aad.md",
970+
"redirect_url": "/azure/aks/managed-azure-ad",
971+
"redirect_document_id": false
972+
},
968973
{
969974
"source_path": "articles/germany/germany-developer-guide.md",
970975
"redirect_url": "/previous-versions/azure/germany/germany-developer-guide",
@@ -22557,6 +22562,16 @@
2255722562
"source_path_from_root": "/articles/azure-monitor/app/java-standalone-arguments.md",
2255822563
"redirect_url": "/azure/azure-monitor/app/java-get-started-supplemental",
2255922564
"redirect_document_id": true
22565+
},
22566+
{
22567+
"source_path_from_root": "/articles/healthcare-apis/dicom/dicom-cast-access-request.md",
22568+
"redirect_url": "/azure/healthcare-apis/dicom/dicom-cast-overview",
22569+
"redirect_document_id": false
22570+
},
22571+
{
22572+
"source_path_from_root": "/articles/sentinel/data-connectors/azure-information-protection.md",
22573+
"redirect_url": "/azure/sentinel/data-connectors-reference",
22574+
"redirect_document_id": false
2256022575
}
2256122576
]
2256222577
}

CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@ articles/service-health @rboucher
6666
/articles/security-center/ @memildin
6767
/includes/*security-controls*.md @memildin
6868

69+
# Defender for Cloud
70+
71+
/articles/defender-for-cloud @dcurwin @ElazarK
72+
6973
# DDOS Protection
7074
/articles/ddos-protection @aletheatoh @anupamvi
7175

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
2-
For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
2+
For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ Welcome to the open-source [documentation](/azure) of [Microsoft Azure](https://
44

55
## Getting Started
66

7-
Contributing to open source is more than just providing updates, it's also about letting us know when there is an issue. Read our [Contributing guidance](CONTRIBUTING.md) to find out more.
7+
Contributing to open source is more than just providing updates. It's also about letting us know when there is an issue. Read our [Contributing guidance](CONTRIBUTING.md) to find out more.
88

99
### Prerequisites
1010

11-
You've decided to contribute, that's great! To contribute to the documentation, you need a few tools.
11+
You've decided to contribute. That's great! To contribute to the documentation, you need a few tools.
1212

1313
#### GitHub
1414

1515
Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for [GitHub account setup](https://learn.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
1616

1717
#### Tools
1818

19-
To install necessary tools, follow the instructions for [Install content authoring tools](https://learn.microsoft.com/contribute/get-started-setup-tools) from our contributor guide.
19+
To install the necessary tools, follow the instructions for [Install content authoring tools](https://learn.microsoft.com/contribute/get-started-setup-tools) from our contributor guide.
2020

2121
## License
2222

23-
Please refer to [LICENSE](LICENSE), [LICENSE-CODE](LICENSE-CODE) and [ThirdPartyNotices](ThirdPartyNotices.md) for all Licensing information.
23+
Please refer to [LICENSE](LICENSE), [LICENSE-CODE](LICENSE-CODE), and [ThirdPartyNotices](ThirdPartyNotices.md) for all Licensing information.
2424

2525
## Code of Conduct
2626

SECURITY.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ If you believe you have found a security vulnerability in any Microsoft-owned re
1212

1313
Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
1414

15-
If you prefer to submit without logging in, send email to [[email protected]](mailto:[email protected]). If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
15+
If you prefer to submit without logging in, email [[email protected]](mailto:[email protected]). If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
1616

17-
You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc).
17+
You should receive a response within 24 hours. If you do not, you can email us to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc).
1818

1919
Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
2020

21-
* Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
21+
* Type of issue (e.g., buffer overflow, SQL injection, cross-site scripting, etc.)
2222
* Full paths of source file(s) related to the manifestation of the issue
2323
* The location of the affected source code (tag/branch/commit or direct URL)
2424
* Any special configuration required to reproduce the issue
@@ -28,7 +28,7 @@ Please include the requested information listed below (as much as you can provid
2828

2929
This information will help us triage your report more quickly.
3030

31-
If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
31+
If you are reporting for a bug bounty, providing more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
3232

3333
## Preferred Languages
3434

0 commit comments

Comments
 (0)