Merge branch 'main' into kerb-policy

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 Thank you for your interest in the Windows IT professional documentation! We appreciate your feedback, edits, and additions to our docs.
 This page covers the basic steps for editing our technical documentation.
-For a more up-to-date and complete contribution guide, see the main [contributor guide overview](https://docs.microsoft.com/contribute/).
+For a more up-to-date and complete contribution guide, see the main [contributor guide overview](https://learn.microsoft.com/contribute/).
 
 ## Sign a CLA
 
@@ -19,10 +19,10 @@ We've tried to make editing an existing, public file as simple as possible.
 
 ### To edit a topic
 
-1. Browse to the [Microsoft Docs](https://docs.microsoft.com/) article that you want to update.
+1. Browse to the [Microsoft Docs](https://learn.microsoft.com/) article that you want to update.
 
     > **Note**<br>
-    > If you're a Microsoft employee or vendor, before you edit the article, append `review.` to the beginning of the URL. This action lets you use the private repository, **windows-docs-pr**. For more information, see the [internal contributor guide](https://review.docs.microsoft.com/help/get-started/edit-article-in-github?branch=main).
+    > If you're a Microsoft employee or vendor, before you edit the article, append `review.` to the beginning of the URL. This action lets you use the private repository, **windows-docs-pr**. For more information, see the [internal contributor guide](https://review.learn.microsoft.com/help/get-started/edit-article-in-github?branch=main).
 
 1. Then select the **Pencil** icon.
 
@@ -37,7 +37,7 @@ We've tried to make editing an existing, public file as simple as possible.
 
     ![GitHub Web, showing the Pencil icon.](images/pencil-icon.png)
 
-1. Using Markdown language, make your changes to the file. For info about how to edit content using Markdown, see the [Docs Markdown reference](https://docs.microsoft.com/contribute/markdown-reference) and GitHub's [Mastering Markdown](https://guides.github.com/features/mastering-markdown/) documentation.
+1. Using Markdown language, make your changes to the file. For info about how to edit content using Markdown, see the [Docs Markdown reference](https://learn.microsoft.com/contribute/markdown-reference) and GitHub's [Mastering Markdown](https://guides.github.com/features/mastering-markdown/) documentation.
 
 1. Make your suggested change, and then select **Preview changes** to make sure it looks correct.
 
@@ -57,16 +57,16 @@ We've tried to make editing an existing, public file as simple as possible.
 
     The pull request is sent to the writer of the topic and your edits are reviewed. If your request is accepted, updates are published to their respective article. This repository contains articles on some of the following topics:
 
-    - [Windows client documentation for IT Pros](https://docs.microsoft.com/windows/resources/)
+    - [Windows client documentation for IT Pros](https://learn.microsoft.com/windows/resources/)
-    - [Microsoft Store](https://docs.microsoft.com/microsoft-store)
+    - [Microsoft Store](https://learn.microsoft.com/microsoft-store)
-    - [Windows 10 for Education](https://docs.microsoft.com/education/windows)
+    - [Windows 10 for Education](https://learn.microsoft.com/education/windows)
-    - [Windows 10 for SMB](https://docs.microsoft.com/windows/smb)
+    - [Windows 10 for SMB](https://learn.microsoft.com/windows/smb)
-    - [Internet Explorer 11](https://docs.microsoft.com/internet-explorer/)
+    - [Internet Explorer 11](https://learn.microsoft.com/internet-explorer/)
 
 ## Making more substantial changes
 
 To make substantial changes to an existing article, add or change images, or contribute a new article, you'll need to create a local clone of the content.
-For info about creating a fork or clone, see [Set up a local Git repository](https://docs.microsoft.com/contribute/get-started-setup-local). The GitHub docs topic, [Fork a Repo](https://docs.github.com/articles/fork-a-repo), is also insightful.
+For info about creating a fork or clone, see [Set up a local Git repository](https://learn.microsoft.com/contribute/get-started-setup-local). The GitHub docs topic, [Fork a Repo](https://docs.github.com/articles/fork-a-repo), is also insightful.
 
 Fork the official repo into your personal GitHub account, and then clone the fork down to your local device.  Work locally, then push your changes back into your fork.  Finally, open a pull request back to the main branch of the official repo.
 
@@ -82,4 +82,4 @@ In the new issue form, enter a brief title. In the body of the form, describe th
 
 - You can use your favorite text editor to edit Markdown files.  We recommend [Visual Studio Code](https://code.visualstudio.com/), a free lightweight open source editor from Microsoft.
 - You can learn the basics of Markdown in just a few minutes.  To get started, check out [Mastering Markdown](https://guides.github.com/features/mastering-markdown/).
-- Microsoft technical documentation uses several custom Markdown extensions. To learn more, see the [Docs Markdown reference](https://docs.microsoft.com/contribute/markdown-reference).
+- Microsoft technical documentation uses several custom Markdown extensions. To learn more, see the [Docs Markdown reference](https://learn.microsoft.com/contribute/markdown-reference).

education/index.yml

@@ -73,7 +73,7 @@ productDirectory:
           text: IT admin help
         - url: https://support.office.com/education
           text: Education help center
-        - url: /learn/educator-center/
+        - url: /training/educator-center/
           text: Teacher training packs
     # Card    
     - title: Check out our education journey

education/windows/windows-11-se-overview.md

@@ -87,7 +87,6 @@ The following applications can also run on Windows 11 SE, and can be deployed us
 | Application                             | Supported version | App Type | Vendor                       |
 |-----------------------------------------|-------------------|----------|------------------------------|
 | AirSecure                               | 8.0.0             | Win32    | AIR                          |
-| Alertus Desktop                         | 5.4.44.0          | Win32    | Alertus technologies         |
 | Brave Browser                           | 1.34.80           | Win32    | Brave                        |
 | Bulb Digital Portfolio                  | 0.0.7.0           | Store    | Bulb                         |
 | Cisco Umbrella                          | 3.0.110.0         | Win32    | Cisco                        |
@@ -119,7 +118,7 @@ The following applications can also run on Windows 11 SE, and can be deployed us
 | Mozilla Firefox                         | 99.0.1            | Win32    | Mozilla                      |
 | NAPLAN                                  | 2.5.0             | Win32    | NAP                          |
 | Netref Student                          | 22.2.0            | Win32    | NetRef                       |
-| NetSupport Manager                      | 12.01.0011        | Win32    | NetSupport                   |
+| NetSupport Manager                      | 12.01.0014        | Win32    | NetSupport                   |
 | NetSupport Notify                       | 5.10.1.215        | Win32    | NetSupport                   |
 | NetSupport School                       | 14.00.0011        | Win32    | NetSupport                   |
 | NextUp Talker                           | 1.0.49            | Win32    | NextUp Technologies          |

store-for-business/whats-new-microsoft-store-business-education.md

@@ -41,7 +41,7 @@ We've been working on bug fixes and performance improvements to provide you a be
 | ![Private store performance icon.](images/perf-improvement-icon.png) |**Performance improvements in private store**<br /><br /> We've made it significantly faster for you to update the private store. Many changes to the private store are available immediately after you make them. <br /><br />[Get more info](./manage-private-store-settings.md#private-store-performance)<br /><br />**Applies to**:<br /> Microsoft Store for Business <br /> Microsoft Store for Education |
 | <iframe width="288" height="232" src="https://www.youtube-nocookie.com/embed/IpLIZU_j7Z0" frameborder="0" allowfullscreen></iframe>| **Manage Windows device deployment with Windows Autopilot Deployment** <br /><br /> In Microsoft Store for Business, you can manage devices for your organization and apply an Autopilot deployment profile to your devices. When people in your organization run the out-of-box experience on the device, the profile configures Windows, based on the Autopilot deployment profile you applied to the device.<br /><br />[Get more info](add-profile-to-devices.md)<br /><br />**Applies to**:<br /> Microsoft Store for Business <br /> Microsoft Store for Education  |
 | ![Microsoft Store for Business Settings page, Distribute tab showing app requests setting.](images/msfb-wn-1709-app-request.png) |**Request an app**<br /><br />People in your organization can request additional licenses for apps in your private store, and then Admins or Purchasers can make the purchases. <br /><br />[Get more info](./acquire-apps-microsoft-store-for-business.md#request-apps)<br /><br />**Applies to**:<br /> Microsoft Store for Business <br /> Microsoft Store for Education |
-||  ![Image showing Add a Collection.](images/msfb-add-collection.png) |**Private store collections**<br /><br> You can groups of apps in your private store with **Collections**. This can help you organize apps and help people find apps for their job or classroom. <br /><br />[Get more info](https://review.docs.microsoft.com/microsoft-store/manage-private-store-settings?branch=msfb-14856406#add-a-collection)<br /><br />**Applies to**:<br /> Microsoft Store for Business <br /> Microsoft Store for Education |
+||  ![Image showing Add a Collection.](images/msfb-add-collection.png) |**Private store collections**<br /><br> You can groups of apps in your private store with **Collections**. This can help you organize apps and help people find apps for their job or classroom. <br /><br />[Get more info](https://review.learn.microsoft.com/microsoft-store/manage-private-store-settings?branch=msfb-14856406#add-a-collection)<br /><br />**Applies to**:<br /> Microsoft Store for Business <br /> Microsoft Store for Education |
 -->
 
 ## Previous releases and updates

template.md

@@ -28,7 +28,7 @@ When you create a new markdown file article, **Save as** this template to a new
 
 ## Metadata
 
-The full metadata block is above the markdown between the `---` lines. For more information, see [Metadata attributes](https://review.docs.microsoft.com/en-us/help/contribute/metadata-attributes?branch=main) in the contributor guide. Some key notes:
+The full metadata block is above the markdown between the `---` lines. For more information, see [Metadata attributes](https://review.learn.microsoft.com/help/contribute/metadata-attributes?branch=main) in the contributor guide. Some key notes:
 
 - You _must_ have a space between the colon (`:`) and the value for a metadata element.
 
@@ -65,7 +65,7 @@ The full metadata block is above the markdown between the `---` lines. For more
 
 All basic and Github-flavored markdown (GFM) is supported. For more information, see the following articles:
 
-- [Docs Markdown reference in the Contributor Guide](https://review.docs.microsoft.com/help/contribute/markdown-reference?branch=main)
+- [Docs Markdown reference in the Contributor Guide](https://review.learn.microsoft.com/help/contribute/markdown-reference?branch=main)
 - [Baseline markdown syntax](https://daringfireball.net/projects/markdown/syntax)
 - [Github-flavored markdown (GFM) documentation](https://docs.github.com/github/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax)
 
@@ -79,7 +79,7 @@ Second-level headings (`##`, also known as H2) generate the on-page TOC that app
 
 Limit the length of second-level headings to avoid excessive line wraps.
 
-Make sure _all_ headings of any level have a unique name for the article. The build creates an anchor for all headings on the page using kebab formatting. For example, from the [Docs Markdown reference](https://review.docs.microsoft.com/help/contribute/markdown-reference?branch=main) article, the heading **Alerts (Note, Tip, Important, Caution, Warning)** becomes the anchor `#alerts-note-tip-important-caution-warning`. If there are duplicate headings, then the anchors don't behave properly. This behavior also applies when using include files, make sure the headings are unique across the main markdown file, and all include markdown files.
+Make sure _all_ headings of any level have a unique name for the article. The build creates an anchor for all headings on the page using kebab formatting. For example, from the [Docs Markdown reference](https://review.learn.microsoft.com/help/contribute/markdown-reference?branch=main) article, the heading **Alerts (Note, Tip, Important, Caution, Warning)** becomes the anchor `#alerts-note-tip-important-caution-warning`. If there are duplicate headings, then the anchors don't behave properly. This behavior also applies when using include files, make sure the headings are unique across the main markdown file, and all include markdown files.
 
 Don't skip levels. For example, don't have an H3 (`###`) without a parent H2 (`##`).
 
@@ -111,7 +111,7 @@ _Italics_ (a single asterisk (`*`) also works, but the underscore (`_`) helps di
 >
 > It supports headings in the current and other files too! (Just not the custom `bkmk` anchors that are sometimes used in this content.)
 
-For more information, see [Add links to articles](https://review.docs.microsoft.com/help/contribute/links-how-to?branch=main) in the contributor guide.
+For more information, see [Add links to articles](https://review.learn.microsoft.com/help/contribute/links-how-to?branch=main) in the contributor guide.
 
 ### Article in the same repo
 
@@ -149,7 +149,7 @@ There's a broken link report that runs once a week in the build system, get the
 
 Don't use URL shorteners like `go.microsoft.com/fwlink` or `aka.ms`. Include the full URL to the target.
 
-For more information, see [Add links to articles](https://review.docs.microsoft.com/help/contribute/links-how-to?branch=main) in the contributor guide.
+For more information, see [Add links to articles](https://review.learn.microsoft.com/help/contribute/links-how-to?branch=main) in the contributor guide.
 
 ## Lists
 
@@ -289,4 +289,4 @@ Always include alt text for accessibility, and always end it with a period.
 ## docs.ms extensions
 
 > [!div class="nextstepaction"]
-> [Microsoft Endpoint Configuration Manager documentation](https://docs.microsoft.com/mem/configmgr)
+> [Microsoft Endpoint Configuration Manager documentation](https://learn.microsoft.com/mem/configmgr)

windows/client-management/manage-corporate-devices.md

@@ -44,6 +44,3 @@ You can use the same management tools to manage all device types running Windows
 [Microsoft Intune End User Enrollment Guide](/samples/browse/?redirectedfrom=TechNet-Gallery)
 
 [Windows 10 (and Windows 11) and Azure Active Directory: Embracing the Cloud](https://go.microsoft.com/fwlink/p/?LinkId=615768)
-
-Microsoft Virtual Academy course: [Configuration Manager & Windows Intune](/learn/)
- 

windows/client-management/mdm/diagnosticlog-csp.md

@@ -565,7 +565,7 @@ The data type is string.
 
 Default string is as follows:
 
-`https://docs.microsoft.com/windows/'desktop/WES/eventmanifestschema-channeltype-complextype`
+`https://learn.microsoft.com/windows/'desktop/WES/eventmanifestschema-channeltype-complextype`
 
 Add **SDDL**
 

windows/client-management/mdm/diagnosticlog-ddf.md

@@ -2028,7 +2028,7 @@ The content below are the latest versions of the DDF files:
                     <Delete />
                     <Replace />
                   </AccessType>
-                  <Description>SDDL String controlling access to the channel. Default: https://docs.microsoft.com/windows/desktop/WES/eventmanifestschema-channeltype-complextype</Description>
+                  <Description>SDDL String controlling access to the channel. Default: https://learn.microsoft.com/windows/desktop/WES/eventmanifestschema-channeltype-complextype</Description>
                   <DFFormat>
                     <chr />
                   </DFFormat>
@@ -2178,9 +2178,3 @@ The content below are the latest versions of the DDF files:
  
 
  
-
-
-
-
-
-

windows/client-management/mdm/enroll-a-windows-10-device-automatically-using-group-policy.md

@@ -219,7 +219,7 @@ Requirements:
 
 4. Rename the extracted Policy Definitions folder to `PolicyDefinitions`.
 
-5. Copy the PolicyDefinitions folder to `\\SYSVOL\contoso.com\policies\PolicyDefinitions`.
+5. Copy the PolicyDefinitions folder to `\\contoso.com\SYSVOL\contoso.com\policies\PolicyDefinitions`.
 
    If this folder doesn't exist, then you'll be switching to a [central policy store](/troubleshoot/windows-client/group-policy/create-and-manage-central-store) for your entire domain.
 

windows/client-management/mdm/healthattestation-ddf.md

@@ -92,7 +92,7 @@ The XML below is the current version for this CSP.
             <AccessType>
               <Get />
             </AccessType>
-            <Description>Provides the current status of the device health request.  For the complete list of status see https://docs.microsoft.com/en-us/windows/client-management/mdm/healthattestation-csp#device-healthattestation-csp-status-and-error-codes</Description>
+            <Description>Provides the current status of the device health request.  For the complete list of status see https://learn.microsoft.com/windows/client-management/mdm/healthattestation-csp#device-healthattestation-csp-status-and-error-codes</Description>
             <DFFormat>
               <int />
             </DFFormat>
@@ -456,9 +456,3 @@ The XML below is the current version for this CSP.
  
 
  
-
-
-
-
-
-

windows/configuration/customize-taskbar-windows-11.md

@@ -157,7 +157,7 @@ Use the following steps to add your XML file to a group policy, and apply the po
 
 4. When you apply the policy, the taskbar includes your changes. The next time users sign in, they'll see the changes.
 
-    For more information on using group policies, see [Implement Group Policy Objects](/learn/modules/implement-group-policy-objects/).
+    For more information on using group policies, see [Implement Group Policy Objects](/training/modules/implement-group-policy-objects/).
 
 ### Create a Microsoft Endpoint Manager policy to deploy your XML file
 

windows/configuration/kiosk-xml.md

@@ -59,7 +59,7 @@ ms.topic: article
                               <!-- A link file is required for desktop applications to show on start layout, the link file can be placed under
                                    "%AllUsersProfile%\Microsoft\Windows\Start Menu\Programs" if the link file is shared for all users or
                                    "%AppData%\Microsoft\Windows\Start Menu\Programs" if the link file is for the specific user only 
-                                   see document https://docs.microsoft.com/windows/configuration/start-layout-xml-desktop
+                                   see document https://learn.microsoft.com/windows/configuration/start-layout-xml-desktop
                               -->
                               <!-- for inbox desktop applications, a link file might already exist and can be used directly -->
                               <start:DesktopApplicationTile Size="2x2" Column="2" Row="0" DesktopApplicationLinkPath="%AllUsersProfile%\Microsoft\Windows\Start Menu\Programs\Accessories\paint.lnk" />
@@ -192,7 +192,7 @@ This sample demonstrates that both UWP and Win32 apps can be configured to autom
                               <!-- A link file is required for desktop applications to show on start layout, the link file can be placed under
                                    "%AllUsersProfile%\Microsoft\Windows\Start Menu\Programs" if the link file is shared for all users or
                                    "%AppData%\Microsoft\Windows\Start Menu\Programs" if the link file is for the specific user only 
-                                   see document https://docs.microsoft.com/windows/configuration/start-layout-xml-desktop
+                                   see document https://learn.microsoft.com/windows/configuration/start-layout-xml-desktop
                               -->
                               <!-- for inbox desktop applications, a link file might already exist and can be used directly -->
                               <start:DesktopApplicationTile Size="2x2" Column="2" Row="0" DesktopApplicationLinkPath="%AllUsersProfile%\Microsoft\Windows\Start Menu\Programs\Accessories\paint.lnk" />
@@ -313,7 +313,7 @@ This sample demonstrates that only a global profile is used, with no active user
                               <!-- A link file is required for desktop applications to show on start layout, the link file can be placed under
                                    "%AllUsersProfile%\Microsoft\Windows\Start Menu\Programs" if the link file is shared for all users or
                                    "%AppData%\Microsoft\Windows\Start Menu\Programs" if the link file is for the specific user only 
-                                   see document https://docs.microsoft.com/windows/configuration/start-layout-xml-desktop
+                                   see document https://learn.microsoft.com/windows/configuration/start-layout-xml-desktop
                               -->
                               <!-- for inbox desktop applications, a link file might already exist and can be used directly -->
                               <start:DesktopApplicationTile Size="2x2" Column="2" Row="0" DesktopApplicationLinkPath="%AllUsersProfile%\Microsoft\Windows\Start Menu\Programs\Accessories\paint.lnk" />
@@ -365,7 +365,7 @@ Below sample shows dedicated profile and global profile mixed usage, a user woul
                               <!-- A link file is required for desktop applications to show on start layout, the link file can be placed under
                                    "%AllUsersProfile%\Microsoft\Windows\Start Menu\Programs" if the link file is shared for all users or
                                    "%AppData%\Microsoft\Windows\Start Menu\Programs" if the link file is for the specific user only 
-                                   see document https://docs.microsoft.com/windows/configuration/start-layout-xml-desktop
+                                   see document https://learn.microsoft.com/windows/configuration/start-layout-xml-desktop
                               -->
                               <!-- for inbox desktop applications, a link file might already exist and can be used directly -->
                               <start:DesktopApplicationTile Size="2x2" Column="2" Row="0" DesktopApplicationLinkPath="%AllUsersProfile%\Microsoft\Windows\Start Menu\Programs\Accessories\paint.lnk" />

windows/configuration/lock-down-windows-10-to-specific-apps.md

@@ -458,7 +458,7 @@ Usage is demonstrated below, by using the new XML namespace and specifying `Glob
                               <!-- A link file is required for desktop applications to show on start layout, the link file can be placed under
                                    "%AllUsersProfile%\Microsoft\Windows\Start Menu\Programs" if the link file is shared for all users or
                                    "%AppData%\Microsoft\Windows\Start Menu\Programs" if the link file is for the specific user only 
-                                   see document https://docs.microsoft.com/windows/configuration/start-layout-xml-desktop
+                                   see document https://learn.microsoft.com/windows/configuration/start-layout-xml-desktop
                               -->
                               <!-- for inbox desktop applications, a link file might already exist and can be used directly -->
                               <start:DesktopApplicationTile Size="2x2" Column="2" Row="0" DesktopApplicationLinkPath="%AllUsersProfile%\Microsoft\Windows\Start Menu\Programs\Accessories\paint.lnk" />

windows/configuration/provisioning-packages/how-it-pros-can-use-configuration-service-providers.md

@@ -179,6 +179,6 @@ Here is a list of CSPs supported on Windows 10 Enterprise:
 -   [Update CSP](/windows/client-management/mdm/update-csp)
 -   [VPN CSP](/windows/client-management/mdm/vpn-csp)
 -   [VPNv2 CSP](/windows/client-management/mdm/vpnv2-csp)
--   [Wi-Fi CSP](/documentation/)
+-   [Wi-Fi CSP](/windows/client-management/mdm/wifi-csp)
 -   [WindowsLicensing CSP](/windows/client-management/mdm/windowslicensing-csp)
 -   [WindowsSecurityAuditing CSP](/windows/client-management/mdm/windowssecurityauditing-csp)

windows/deployment/index.yml

@@ -100,8 +100,8 @@ landingContent:
       - linkListType: learn
         links:
           - text: Plan to deploy updates for Windows 10 and Microsoft 365 Apps
-            url: /learn/modules/windows-plan
+            url: /training/modules/windows-plan
           - text: Prepare to deploy updates for Windows 10 and Microsoft 365 Apps
-            url: /learn/modules/windows-prepare/
+            url: /training/modules/windows-prepare/
           - text: Deploy updates for Windows 10 and Microsoft 365 Apps
-            url: /learn/modules/windows-deploy
+            url: /training/modules/windows-deploy

windows/deployment/update/deployment-service-overview.md

@@ -88,8 +88,8 @@ The Microsoft Graph SDK includes a PowerShell extension that you can use to scri
 ### Building your own application
 
 Microsoft Graph makes deployment service APIs available through. Get started with these learning paths:
-- Learning Path: [Microsoft Graph Fundamentals](/learn/paths/m365-msgraph-fundamentals/)
+- Learning path: [Microsoft Graph Fundamentals](/training/paths/m365-msgraph-fundamentals/)
-- Learning Path: [Build apps with Microsoft Graph](/learn/paths/m365-msgraph-associate/)
+- Learning path: [Build apps with Microsoft Graph](/training/paths/m365-msgraph-associate/)
 
 Once you are familiar with Microsoft Graph development, see [Windows updates API overview in Microsoft Graph](/graph/windowsupdates-concept-overview) for more.
 

windows/deployment/upgrade/setupdiag.md

@@ -444,14 +444,14 @@ System Information:
 Error: SetupDiag reports Optional Component installation failed to open OC Package. Package Name: Foundation, Error: 0x8007001F
 Recommend you check the "Windows Modules Installer" service (Trusted Installer) is started on the system and set to automatic start, reboot and try the update again.  Optionally, you can check the status of optional components on the system (search for Windows Features), uninstall any unneeded optional components, reboot and try the update again.
 Error: SetupDiag reports down-level failure, Operation: Finalize, Error: 0x8007001F - 0x50015
-Refer to https://docs.microsoft.com/windows/deployment/upgrade/upgrade-error-codes for error information.
+Refer to https://learn.microsoft.com/windows/deployment/upgrade/upgrade-error-codes for error information.
 ```
 
 ### XML log sample
 
 ```xml
 <?xml version="1.0" encoding="utf-16"?>
-<SetupDiag xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://docs.microsoft.com/windows/deployment/upgrade/setupdiag">
+<SetupDiag xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://learn.microsoft.com/windows/deployment/upgrade/setupdiag">
   <Version>1.6.0.0</Version>
   <ProfileName>FindSPFatalError</ProfileName>
   <ProfileGuid>A4028172-1B09-48F8-AD3B-86CDD7D55852</ProfileGuid>
@@ -494,7 +494,7 @@ Error: 0x00000057</FailureData>
   <FailureData>LogEntry: 2019-06-06 21:47:11, Error                 SP     Error converting install time 5/2/2019 to structure[gle=0x00000057]</FailureData>
   <FailureData>LogEntry: 2019-06-06 21:47:11, Error                 SP     Error converting install time 5/2/2019 to structure[gle=0x00000057]</FailureData>
   <FailureData>
-Refer to "https://docs.microsoft.com/windows/desktop/Debug/system-error-codes" for error information.</FailureData>
+Refer to "https://learn.microsoft.com/windows/desktop/Debug/system-error-codes" for error information.</FailureData>
   <FailureDetails>Err = 0x00000057, LastOperation = Gather data, scope: EVERYTHING, LastPhase = Downlevel</FailureDetails>
 </SetupDiag>
 ```
@@ -548,7 +548,7 @@ Refer to "https://docs.microsoft.com/windows/desktop/Debug/system-error-codes" f
         "LogEntry: 2019-06-06 21:47:11, Error                 SP     Error converting install time 5\/2\/2019 to structure[
             gle=0x00000057
         ]",
-        "\u000aRefer to \"https:\/\/docs.microsoft.com\/en-us\/windows\/desktop\/Debug\/system-error-codes\" for error information."
+        "\u000aRefer to \"https:\/\/learn.microsoft.com\/windows\/desktop\/Debug\/system-error-codes\" for error information."
     ],
     "FailureDetails":"Err = 0x00000057, LastOperation = Gather data, scope: EVERYTHING, LastPhase = Downlevel",
     "DeviceDriverInfo":null,

windows/privacy/index.yml

@@ -68,50 +68,50 @@ productDirectory:
 #     # Card
 #     - title: cardtitle1
 #       links:
-#         - url: file1.md OR https://docs.microsoft.com/file1
+#         - url: file1.md OR https://learn.microsoft.com/file1
 #           itemType: itemType
 #           text: linktext1
-#         - url: file2.md OR https://docs.microsoft.com/file2
+#         - url: file2.md OR https://learn.microsoft.com/file2
 #           itemType: itemType
 #           text: linktext2
-#         - url: file3.md OR https://docs.microsoft.com/file3
+#         - url: file3.md OR https://learn.microsoft.com/file3
 #           itemType: itemType
 #           text: linktext3
 #       # footerLink (optional)
 #       footerLink:
-#         url: filefooter.md OR https://docs.microsoft.com/filefooter
+#         url: filefooter.md OR https://learn.microsoft.com/filefooter
 #         text: See more
 #     # Card
 #     - title: cardtitle2
 #       links:
-#         - url: file1.md OR https://docs.microsoft.com/file1
+#         - url: file1.md OR https://learn.microsoft.com/file1
 #           itemType: itemType
 #           text: linktext1
-#         - url: file2.md OR https://docs.microsoft.com/file2
+#         - url: file2.md OR https://learn.microsoft.com/file2
 #           itemType: itemType
 #           text: linktext2
-#         - url: file3.md OR https://docs.microsoft.com/file3
+#         - url: file3.md OR https://learn.microsoft.com/file3
 #           itemType: itemType
 #           text: linktext3
 #       # footerLink (optional)
 #       footerLink:
-#         url: filefooter.md OR https://docs.microsoft.com/filefooter
+#         url: filefooter.md OR https://learn.microsoft.com/filefooter
 #         text: See more
 #     # Card
 #     - title: cardtitle3
 #       links:
-#         - url: file1.md OR https://docs.microsoft.com/file1
+#         - url: file1.md OR https://learn.microsoft.com/file1
 #           itemType: itemType
 #           text: linktext1
-#         - url: file2.md OR https://docs.microsoft.com/file2
+#         - url: file2.md OR https://learn.microsoft.com/file2
 #           itemType: itemType
 #           text: linktext2
-#         - url: file3.md OR https://docs.microsoft.com/file3
+#         - url: file3.md OR https://learn.microsoft.com/file3
 #           itemType: itemType
 #           text: linktext3
 #       # footerLink (optional)
 #       footerLink:
-#         url: filefooter.md OR https://docs.microsoft.com/filefooter
+#         url: filefooter.md OR https://learn.microsoft.com/filefooter
 #         text: See more
 
 # # tools section (optional)
@@ -122,15 +122,15 @@ productDirectory:
 #     # Card
 #     - title: cardtitle1
 #       # imageSrc should be square in ratio with no whitespace
-#       imageSrc: ./media/index/image1.svg OR https://docs.microsoft.com/media/logos/image1.svg
+#       imageSrc: ./media/index/image1.svg OR https://learn.microsoft.com/media/logos/image1.svg
 #       url: file1.md
 #     # Card
 #     - title: cardtitle2
-#       imageSrc: ./media/index/image2.svg OR https://docs.microsoft.com/media/logos/image2.svg
+#       imageSrc: ./media/index/image2.svg OR https://learn.microsoft.com/media/logos/image2.svg
 #       url: file2.md
 #     # Card
 #     - title: cardtitle3
-#       imageSrc: ./media/index/image3.svg OR https://docs.microsoft.com/media/logos/image3.svg
+#       imageSrc: ./media/index/image3.svg OR https://learn.microsoft.com/media/logos/image3.svg
 #       url: file3.md
 
 # additionalContent section (optional)
@@ -144,15 +144,15 @@ productDirectory:
 #         # Card
 #         - title: cardtitle1
 #           summary: cardsummary1
-#           url: file1.md OR https://docs.microsoft.com/file1
+#           url: file1.md OR https://learn.microsoft.com/file1
 #         # Card
 #         - title: cardtitle2
 #           summary: cardsummary2
-#           url: file1.md OR https://docs.microsoft.com/file2
+#           url: file1.md OR https://learn.microsoft.com/file2
 #         # Card
 #         - title: cardtitle3
 #           summary: cardsummary3
-#           url: file1.md OR https://docs.microsoft.com/file3
+#           url: file1.md OR https://learn.microsoft.com/file3
 #   # footer (optional)
 #   footer: "footertext [linktext](/footerfile)"
 

windows/security/identity-protection/credential-guard/dg-readiness-tool.md

@@ -25,6 +25,8 @@ appliesto:
 
 param([switch]$Capable, [switch]$Ready, [switch]$Enable, [switch]$Disable, $SIPolicyPath, [switch]$AutoReboot, [switch]$DG, [switch]$CG, [switch]$HVCI, [switch]$HLK, [switch]$Clear, [switch]$ResetVerifier)
 
+Set-StrictMode -Version Latest
+
 $path = "C:\DGLogs\"
 $LogFile = $path + "DeviceGuardCheckLog.txt"
 
@@ -796,7 +798,13 @@ function CheckOSArchitecture
 
 function CheckSecureBootState
 {
+    try { 
         $_secureBoot = Confirm-SecureBootUEFI
+    }
+    catch
+    {
+        $_secureBoot = $false
+    }
     Log $_secureBoot
     if($_secureBoot)
     {

windows/whats-new/windows-11-plan.md

@@ -114,4 +114,4 @@ You might already be using App Assure and Test Base in your Windows 10 environme
 
 ## Also see
 
-[Plan to deploy updates for Windows 10 and Microsoft 365 Apps](/learn/modules/windows-plan/)
+[Plan to deploy updates for Windows 10 and Microsoft 365 Apps](/training/modules/windows-plan/)

windows/whats-new/windows-11-prepare.md

@@ -125,7 +125,7 @@ Don't overlook the importance of user readiness to deliver an effective, enterpr
 
 ## Learn more
 
-See the [Stay current with Windows 10 and Microsoft 365 Apps](/learn/paths/m365-stay-current/) learning path.
+See the [Stay current with Windows 10 and Microsoft 365 Apps](/training/paths/m365-stay-current/) learning path.
 
 - The learning path was created for Windows 10, but the basic principles and tasks outlined for the plan, prepare, and deploy phases also apply to your deployment of Windows 11.