fixing merge conflicts

Author: ShawnJackson

.github/copilot/skills/extended-zones-article-writer.md

@@ -0,0 +1,131 @@
+# Extended Zones Article Writer
+
+Write production-ready how-to, quickstart, tutorial, or overview articles for the Azure Extended Zones Learn documentation.
+
+## Context Sources
+
+### Existing articles (reference for style and structure)
+- **Directory:** `C:\github\azure-docs-pr\articles\extended-zones\`
+- **Best style reference:** `create-storage-account.md` (canonical how-to example)
+- **TOC:** `TOC.yml` — defines the site navigation structure
+- **Overview:** `overview.md` — contains the supported services table
+
+### Team code repos (for technical accuracy)
+- `C:\github\AzureStack-Fiji-Workloads` — team workloads and service code
+- `C:\github\Extended-Zones-Core-Platform` — core platform code
+- `C:\github\Fiji-Services-EdgeZoneRP` — Edge Zone resource provider
+- `C:\github\Fiji-EdgeZones-TSG-TeamDocs` — troubleshooting and team docs
+- `C:\github\EdgeZones-Operations-Configuration` — operations config
+- `C:\github\EdgeZones-Operations-Validation` — validation scripts
+
+---
+
+## Frontmatter Template
+
+```yaml
+---
+title: <Descriptive title — verb + noun + "in an Azure Extended Zone">
+description: <One sentence, under 160 characters, starting with "Learn how to...">
+author: svaldesgzz
+ms.author: svaldes
+ms.service: azure-extended-zones
+ms.topic: <how-to | quickstart | tutorial | overview | concept-article>
+ms.date: <MM/DD/YYYY>
+---
+```
+
+---
+
+## Article Naming Conventions
+
+| Type | Pattern | Example |
+|---|---|---|
+| How-to | `[action]-[resource].md` | `create-storage-account.md` |
+| Quickstart | `deploy-[resource]-[method].md` | `deploy-vm-portal.md` |
+| Tutorial | `[action]-[resource].md` | `backup-virtual-machine.md` |
+| Overview | `overview.md` or `[topic]-overview.md` | `overview.md` |
+
+---
+
+## Article Structure by Type
+
+### How-to guide (`ms.topic: how-to`)
+1. H1 title
+2. Intro paragraph ("In this article, you learn how to...")
+3. `## Prerequisites` — subscription, Extended Zone access, tools
+4. `## Sign in to Azure` — standard portal sign-in step
+5. Main task sections (H2 per major step)
+6. `## Clean up resources` — portal resource group deletion
+7. `## Related content` — 3–4 bullet links to related articles
+
+### Quickstart (`ms.topic: quickstart`)
+Same as how-to but faster-paced, single focused task, ends with a "Next steps" section.
+
+### Tutorial (`ms.topic: tutorial`)
+Multi-step, progressive task. Each H2 section builds on the previous one.
+
+---
+
+## Key Formatting Rules
+
+**Tables** (use for all settings/configuration steps):
+```markdown
+| Setting | Value |
+| --- | --- |
+| Key vault name | Enter a unique name, such as *myKeyVault*. |
+| Region | Select the **parent region** of the target Extended Zone. |
+```
+
+**Note/Important/Caution blocks:**
+```markdown
+> [!NOTE]
+> Note text here.
+
+> [!IMPORTANT]
+> Critical info here.
+
+> [!CAUTION]
+> Warning text here.
+```
+
+**Code blocks** — always use language-specific fences:
+- Azure CLI: ` ```azurecli `
+- PowerShell: ` ```azurepowershell `
+- JSON: ` ```json `
+- Bash: ` ```bash `
+
+**Cross-links** — use relative paths:
+```markdown
+[Request access to an Azure Extended Zone](request-access.md)
+```
+
+**No screenshots** — use text instructions and tables only (no `:::image` directives).
+
+---
+
+## Extended Zone–Specific Notes
+
+- **Key Vault, Disk Encryption Sets, and most control-plane services** are created in the **parent Azure region**, not the Extended Zone itself.
+- **VMs, AKS clusters, storage accounts** are deployed **in the Extended Zone** using `--edge-zone <zone-name>` in the CLI or by selecting "Deploy to an Azure Extended Zone" in the portal under the Region field.
+- Always remind users: select the **parent region** first in the portal, then select **Deploy to an Azure Extended Zone** and choose the Extended Zone.
+- Storage in Extended Zones is **Premium only** with **LRS** redundancy.
+- Refer to `request-access.md` whenever Extended Zone access or zone names are needed.
+
+---
+
+## Publishing Checklist
+
+After writing the article:
+
+1. **Save the file** to `C:\github\azure-docs-pr\articles\extended-zones\<filename>.md`
+
+2. **Update `TOC.yml`** — add an entry under the appropriate section:
+   ```yaml
+   - name: <Short descriptive name>
+     href: <filename>.md
+   ```
+   Sections in TOC: Overview, Quickstarts, Tutorials, Concepts, How-to guides, Arc-enabled PaaS workloads, Security, Reference, Resources
+
+3. **Update `overview.md`** if the article covers a new service — add it to the supported services table under the correct category row (`Compute`, `Networking`, `Storage`, `BCDR`, `Arc-enabled PaaS`, `Other`). Services use `<br>` as separator and are written as markdown links.
+
+4. **Verify frontmatter** — all required fields present (`title`, `description`, `author`, `ms.author`, `ms.service`, `ms.topic`, `ms.date`).

.openpublishing.redirection.json

@@ -7288,6 +7288,11 @@
     {
       "source_path": "articles/virtual-network/virtual-network-troubleshoot-cannot-delete-vnet.md",
       "redirect_url": "/troubleshoot/azure/virtual-network/virtual-network-troubleshoot-cannot-delete-vnet"
-    }
+    },
+    {
+      "source_path": "articles/certification/edge-secured-core-get-certified.md",
+      "redirect_url": "/azure/certification/requirements-edge-secured-core",
+      "redirect_document_id": false
+    },
   ]
 }

articles/active-directory-b2c/best-practices.md

@@ -18,6 +18,8 @@ ms.subservice: b2c
 ---
 
 # Recommendations and best practices for Azure Active Directory B2C
+[!INCLUDE [active-directory-b2c-identity-protection-retirement](../../includes/active-directory-b2c-identity-protection-retirement.md)]
+
 [!INCLUDE [active-directory-b2c-end-of-sale-notice-b](../../includes/active-directory-b2c-end-of-sale-notice-b.md)]
 
 The following best practices and recommendations cover some of the primary aspects of integrating Azure Active Directory (Azure AD) B2C into existing or new application environments.

articles/active-directory-b2c/billing.md

@@ -19,6 +19,8 @@ ms.custom:
 ---
 
 # Billing model for Azure Active Directory B2C
+[!INCLUDE [active-directory-b2c-identity-protection-retirement](../../includes/active-directory-b2c-identity-protection-retirement.md)]
+
 [!INCLUDE [active-directory-b2c-end-of-sale-notice-b](../../includes/active-directory-b2c-end-of-sale-notice-b.md)]
 
 Azure Active Directory B2C (Azure AD B2C) pricing is based on monthly active users (MAU), which is the count of unique users with authentication activity within a calendar month. This billing model applies to both Azure AD B2C tenants and [Microsoft Entra guest user collaboration (B2B)](../active-directory/external-identities/external-identities-pricing.md). MAU billing helps you reduce costs by offering a free tier and flexible, predictable pricing. 

articles/active-directory-b2c/conditional-access-identity-protection-overview.md

@@ -16,6 +16,8 @@ ms.custom: sfi-ropc-nochange
 ---
 
 # Identity Protection and Conditional Access for Azure AD B2C
+[!INCLUDE [active-directory-b2c-identity-protection-retirement](../../includes/active-directory-b2c-identity-protection-retirement.md)]
+
 [!INCLUDE [active-directory-b2c-end-of-sale-notice-b](../../includes/active-directory-b2c-end-of-sale-notice-b.md)]
 
 Enhance the security of Azure Active Directory B2C (Azure AD B2C) with Microsoft Entra ID Protection and Conditional Access. The Identity Protection risk-detection features, including risky users and risky sign-ins, are automatically detected and displayed in your Azure AD B2C tenant. You can create Conditional Access policies that use these risk detections to determine actions and enforce organizational policies. Together, these capabilities give Azure AD B2C application owners greater control over risky authentications and access policies.

articles/active-directory-b2c/conditional-access-user-flow.md

@@ -20,6 +20,8 @@ ms.custom:
 ---
 
 # Add Conditional Access to user flows in Azure Active Directory B2C
+[!INCLUDE [active-directory-b2c-identity-protection-retirement](../../includes/active-directory-b2c-identity-protection-retirement.md)]
+
 [!INCLUDE [active-directory-b2c-end-of-sale-notice-b](../../includes/active-directory-b2c-end-of-sale-notice-b.md)]
 
 [!INCLUDE [active-directory-b2c-choose-user-flow-or-custom-policy](../../includes/active-directory-b2c-choose-user-flow-or-custom-policy.md)]

articles/active-directory-b2c/custom-policy-developer-notes.md

@@ -19,6 +19,8 @@ ms.subservice: b2c
 ---
 
 # Developer notes for Azure Active Directory B2C
+[!INCLUDE [active-directory-b2c-identity-protection-retirement](../../includes/active-directory-b2c-identity-protection-retirement.md)]
+
 [!INCLUDE [active-directory-b2c-end-of-sale-notice-b](../../includes/active-directory-b2c-end-of-sale-notice-b.md)]
 
 Azure Active Directory B2C [user flows and custom policies](user-flow-overview.md) are generally available. Azure AD B2C capabilities are under continual development, so although most features are generally available, some features are at different stages in the software release cycle. This article discusses cumulative improvements in Azure AD B2C and specifies feature availability.

articles/active-directory-b2c/faq.yml

@@ -321,3 +321,25 @@ sections:
           In Azure AD B2C, I revoke all sessions of a user by using the Azure portals Revoke sessions button, but it doesn't work.
         answer: |
           Currently, Azure AD B2C doesn't support user session revocation from the Azure portal. However, you can achieve this task by using [Microsoft Graph PowerShell](manage-users-portal.md#revoke-a-consumer-users-session) or [Microsoft Graph API](/graph/api/user-revokesigninsessions).
+  - name: Azure AD External Identities P2 retirement
+    questions:
+      - question: |
+          What happened to Azure AD External Identities P2 in B2C tenants?
+        answer: |
+          Azure AD External Identities P2 has been retired in Azure AD B2C tenants. P2-only features are no longer available.
+      - question: |
+          Does the retirement affect workforce tenants?
+        answer: |
+          No. ID Protection remains available for business guests in workforce tenants as part of Azure AD External Identities P2. The retirement applies only to B2C tenants.
+      - question: |
+          What should I do if I was using P2 ID Protection in my B2C tenant?
+        answer: |
+          To continue protecting against identity-based risks in B2C, consider integrating a [partner identity verification provider](identity-verification-proofing.md). All P2 tenants will be automatically switched to P1 on a rolling basis by the end of March 2026.
+      - question: |
+          Will I still be billed for P2 after the retirement?
+        answer: |
+          Your B2C tenant will be automatically switched to P1 by the end of March 2026 and you will be billed at P1 pricing. For guidance on changing your pricing tier, see [Azure AD B2C billing](billing.md).
+      - question: |
+          Is the P2 retirement related to the Azure AD B2C end of sale?
+        answer: |
+          These are separate topics. The end of sale means Azure AD B2C is no longer available to new customers as of May 2025. The P2 retirement specifically retires the P2 pricing tier and ID Protection in B2C tenants. Existing B2C customers on P1 can continue using the service.

articles/active-directory-b2c/identity-protection-investigate-risk.md

@@ -17,6 +17,8 @@ ms.custom: sfi-image-nochange
 
 # Investigate risk with Identity Protection in Azure AD B2C
 
+[!INCLUDE [active-directory-b2c-identity-protection-retirement](../../includes/active-directory-b2c-identity-protection-retirement.md)]
+
 [!INCLUDE [active-directory-b2c-end-of-sale-notice-b](../../includes/active-directory-b2c-end-of-sale-notice-b.md)]
 
 Identity Protection provides ongoing risk detection for your Azure AD B2C tenant. It allows organizations to discover, investigate, and remediate identity-based risks. Identity Protection comes with risk reports that can be used to investigate identity risks in Azure AD B2C tenants. In this article, you learn how to investigate and mitigate risks.

articles/active-directory-b2c/identity-verification-proofing.md

@@ -15,8 +15,11 @@ ms.author: gasinh
 
 # Identity verification and proofing partners
 
+[!INCLUDE [active-directory-b2c-identity-protection-retirement](../../includes/active-directory-b2c-identity-protection-retirement.md)]
+
 [!INCLUDE [active-directory-b2c-end-of-sale-notice-b](../../includes/active-directory-b2c-end-of-sale-notice-b.md)]
 
+
 With Azure Active Directory B2C (Azure AD B2C) and solutions from software-vendor partners, customers can enable end-user identity verification and proofing for account registration. Identity verification and proofing can check documents, knowledge-based information, and liveness.
 
 ## Architecture diagram