Skip to content

Commit da58481

Browse files
learn-build-service-prod[bot]learn-build-service-prod[bot]
authored
Merge pull request #3356 from MicrosoftDocs/main638641764245824041sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents a88dc82 + 3027b01 commit da58481

File tree

258 files changed

+239
-460
lines changed

Some content is hidden

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

258 files changed

+239
-460
lines changed

‎AKS-Hybrid/includes/hci-applies-to-23h2.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
22
author: alkohli
33
ms.author: alkohli
4-
ms.service: azure-stack
4+
ms.service: azure-stack-hci
55
ms.topic: include
66
ms.date: 10/13/2023
7-
ms.subservice: azure-stack-hci
87
ms.reviewer: alkohli
98
ms.lastreviewed: 10/13/2023
109
---

‎azure-stack/docfx.json

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,15 @@
206206
"recommendations": true
207207
},
208208
"fileMetadata": {
209+
"ms.service": {
210+
"asdk/**/*.md": "azure-stack-hub",
211+
"mdc/**/*.md": "azure-stack-hub",
212+
"hci/**/*.md": "azure-stack-hci",
213+
"operator/**/*.md": "azure-stack-hub",
214+
"partner/**/*.md": "azure-stack-hub",
215+
"reference/**/*.md": "azure-stack-hub",
216+
"user/**/*.md": "azure-stack-hub"
217+
},
209218
"titleSuffix": {
210219
"**/*.md": "Azure Stack Hub",
211220
"asdk/**/*.md": "Azure Stack Development Kit (ASDK)",
@@ -227,12 +236,7 @@
227236
},
228237
"ms.subservice": {
229238
"asdk/**/*.md": "azure-stack-hub-asdk",
230-
"hci/**/*.md": "azure-stack-hci",
231-
"mdc/**/*.md": "azure-stack-hub-mdc",
232-
"operator/**/*.md": "azure-stack-hub",
233-
"partner/**/*.md": "azure-stack-hub",
234-
"reference/**/*.md": "azure-stack-hub",
235-
"user/**/*.md": "azure-stack-hub"
239+
"mdc/**/*.md": "azure-stack-hub-mdc"
236240
}
237241
},
238242
"template": [],

‎azure-stack/hci/assurance/azure-stack-fedramp-guidance.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ title: FedRAMP guidance for Azure Stack HCI
33
description: Learn about FedRAMP compliance using Azure Stack HCI.
44
ms.date: 9/23/2024
55
ms.topic: conceptual
6-
ms.service: azure-stack
7-
ms.subservice: azure-stack-hci
6+
ms.service: azure-stack-hci
87
ms.author: nguyenhung
98
author: dv00000
109
ms.reviewer: alkohli

‎azure-stack/hci/assurance/azure-stack-hipaa-guidance.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ title: HIPAA guidance for Azure Stack HCI
33
description: Learn about HIPAA compliance using Azure Stack HCI.
44
ms.date: 2/5/2024
55
ms.topic: conceptual
6-
ms.service: azure-stack
7-
ms.subservice: azure-stack-hci
6+
ms.service: azure-stack-hci
87
ms.author: nguyenhung
98
author: dv00000
109
ms.reviewer: alkohli

‎azure-stack/hci/assurance/azure-stack-iso27001-guidance.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ title: ISO 27001 guidance for Azure Stack HCI
33
description: Learn about ISO 27001 compliance using Azure Stack HCI.
44
ms.date: 2/5/2024
55
ms.topic: conceptual
6-
ms.service: azure-stack
7-
ms.subservice: azure-stack-hci
6+
ms.service: azure-stack-hci
87
ms.author: nguyenhung
98
author: dv00000
109
ms.reviewer: alkohli

‎azure-stack/hci/assurance/azure-stack-pci-dss-guidance.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ title: PCI DSS guidance for Azure Stack HCI
33
description: Learn about PCI DSS compliance using Azure Stack HCI.
44
ms.date: 2/5/2024
55
ms.topic: conceptual
6-
ms.service: azure-stack
7-
ms.subservice: azure-stack-hci
6+
ms.service: azure-stack-hci
87
ms.author: nguyenhung
98
author: dv00000
109
ms.reviewer: alkohli

‎azure-stack/hci/assurance/azure-stack-security-standards.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ title: Azure Stack HCI and security standards
33
description: Learn about Azure Stack HCI, security standards, and security assurance.
44
ms.date: 09/23/2024
55
ms.topic: conceptual
6-
ms.service: azure-stack
7-
ms.subservice: azure-stack-hci
6+
ms.service: azure-stack-hci
87
ms.author: nguyenhung
98
author: dv00000
109
ms.reviewer: alkohli

‎azure-stack/hci/azure-stack-hci-license-billing.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ metadata:
55
ms.topic: faq
66
author: ronmiab
77
ms.author: robess
8-
ms.service: azure-stack
9-
ms.subservice: azure-stack-hci
8+
ms.service: azure-stack-hci
109
ms.date: 07/15/2024
1110

1211
title: Azure Stack HCI OEM license and billing FAQ

‎azure-stack/hci/azure-stack-hci-oem-license.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ ms.topic: overview
66
ms.date: 07/15/2024
77
ms.author: robess
88
ms.reviewer: alkohli
9-
ms.subservice: azure-stack-hci
109
# customer intent: As a content developer, I want to provide customers with the appropriate Azure Stack HCI OEM license information so that they can have a clear understanding of what the license is and how it can be beneficial to them.
1110
---
1211

‎azure-stack/hci/concepts/azure-hybrid-benefit-hci.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ description: Learn about Azure Hybrid Benefit for Azure Stack HCI.
44
author: sethmanheim
55
ms.author: sethm
66
ms.topic: conceptual
7-
ms.service: azure-stack
8-
ms.subservice: azure-stack-hci
7+
ms.service: azure-stack-hci
98
ms.custom: devx-track-azurepowershell
109
ms.date: 04/29/2024
1110
---

0 commit comments

Comments
 (0)