diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e71a08d613..342ecb8ca5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,7 +24,7 @@ We've tried to make editing an existing, public file as simple as possible. ### To edit a topic -1. Browse to the [Windows Server](https://docs.microsoft.com/windows-server) article that you want to update, and then select **Edit**. +1. Browse to the [Windows Server](https://learn.microsoft.com/windows-server) article that you want to update, and then select **Edit**. ![GitHub Web, showing the Edit link](media/contribute-link.png) diff --git a/Contributor-guide/create-new-using-github.md b/Contributor-guide/create-new-using-github.md index 2a5045862e..c58fff426e 100644 --- a/Contributor-guide/create-new-using-github.md +++ b/Contributor-guide/create-new-using-github.md @@ -24,19 +24,19 @@ There are two separate locations where we keep Windows Server technical content. Before you can start working in the repo, you must create and set up your GitHub account, set up two-factor verification, and install and configure all the necessary tools. If you've already done this, you can skip down to the [Fork the repository section](#fork-the-repository) of this article. -1. [Create a GitHub account and profile](https://review.docs.microsoft.com/help/contribute/contribute-get-started-setup-github?branch=master#create-a-github-account-and-set-up-your-profile) +1. [Create a GitHub account and profile](https://review.learn.microsoft.com/help/contribute/contribute-get-started-setup-github?branch=main#create-a-github-account-and-set-up-your-profile) -2. [Link your account to your Microsoft account and to the Microsoft and MicrosoftDocs organizations](https://review.docs.microsoft.com/help/contribute/contribute-get-started-setup-github?branch=master#link-your-github-and-microsoft-accounts) +2. [Link your account to your Microsoft account and to the Microsoft and MicrosoftDocs organizations](https://review.learn.microsoft.com/help/contribute/contribute-get-started-setup-github?branch=main#link-your-github-and-microsoft-accounts) -3. [Turn on two-factor verification](https://review.docs.microsoft.com/help/contribute/contribute-get-started-setup-github?branch=master#enable-two-factor-authentication-and-create-an-access-token) +3. [Turn on two-factor verification](https://review.learn.microsoft.com/help/contribute/contribute-get-started-setup-github?branch=main#enable-two-factor-authentication-and-create-an-access-token) -4. [Authorize the build system to access your GitHub account](https://review.docs.microsoft.com/help/contribute/contribute-get-started-setup-github?branch=master#authorize-the-ops-build-system-to-access-your-github-account) +4. [Authorize the build system to access your GitHub account](https://review.learn.microsoft.com/help/contribute/contribute-get-started-setup-github?branch=main#authorize-the-ops-build-system-to-access-your-github-account) -5. [Install Visual Studio Code](https://review.docs.microsoft.com/help/contribute/contribute-get-started-setup-tools?branch=master#install-visual-studio-code) +5. [Install Visual Studio Code](https://review.learn.microsoft.com/help/contribute/contribute-get-started-setup-tools?branch=main#install-visual-studio-code) -6. [Install GitHub and its tools](https://review.docs.microsoft.com/help/contribute/contribute-get-started-setup-tools?branch=master#install-git-client-tools) +6. [Install GitHub and its tools](https://review.learn.microsoft.com/help/contribute/contribute-get-started-setup-tools?branch=main#install-git-client-tools) -7. [Install the Docs Authoring Pack](https://review.docs.microsoft.com/help/contribute/contribute-get-started-setup-tools?branch=master#install-the-docs-authoring-pack) +7. [Install the Docs Authoring Pack](https://review.learn.microsoft.com/help/contribute/contribute-get-started-setup-tools?branch=main#install-the-docs-authoring-pack) ## Set up your own version of the repo @@ -222,6 +222,6 @@ For more information about GitHub and the markdown language, see: ### Markdown -- [Our internal markdown guidance](https://review.docs.microsoft.com/help/contribute/markdown-reference?branch=master) +- [Our internal markdown guidance](https://review.learn.microsoft.com/help/contribute/markdown-reference?branch=main) - [External, GitHub tutorial](https://www.markdowntutorial.com/) diff --git a/Contributor-guide/github-browser-updates.md b/Contributor-guide/github-browser-updates.md index 742f816ffc..9d7005410d 100644 --- a/Contributor-guide/github-browser-updates.md +++ b/Contributor-guide/github-browser-updates.md @@ -29,7 +29,7 @@ There are two separate locations where we keep Windows Server technical content. Quick edits streamline the process to report and fix small errors and omissions in documents. Despite all efforts, small grammar and spelling errors _do_ make their way into our published documents. -1. Follow the instructions in [GitHub account setup](https://review.docs.microsoft.com/en-us/help/contribute/contribute-get-started-setup-github?branch=master). +1. Follow the instructions in [GitHub account setup](https://review.learn.microsoft.com/help/contribute/contribute-get-started-setup-github?branch=main). 1. Go to the [Windows Server](https://github.com/MicrosoftDocs/windowsserverdocs-pr/tree/master/WindowsServerDocs) or [Azure Stack HCI](https://github.com/MicrosoftDocs/azure-stack-docs-pr/tree/master/azure-stack/hci) private repository. The private repositories are monitored more frequently so our approval time is faster, they benefit from increased quality checks, and provide the ability to view content in staging as it will appear on our live site. diff --git a/README.md b/README.md index 6fa547f874..0772c03c82 100644 --- a/README.md +++ b/README.md @@ -18,14 +18,14 @@ There are two separate locations where we keep Windows Server technical content. ## Public (`windowsserverdocs-pr`) and private (`windowsserverdocs`) repos -These repos are actively managed and contain the source for Windows Server technical content published to [Microsoft Docs](https://docs.microsoft.com): +These repos are actively managed and contain the source for Windows Server technical content published to [Microsoft Docs](https://learn.microsoft.com): -- [Windows Server home page](https://docs.microsoft.com/windows-server/) -- [Windows Server Essentials](https://docs.microsoft.com/windows-server-essentials) +- [Windows Server home page](https://learn.microsoft.com/windows-server/) +- [Windows Server Essentials](https://learn.microsoft.com/windows-server-essentials) ## Markdown info -For information on using Markdown in Microsoft technical articles, see the [Docs Markdown reference](https://docs.microsoft.com/contribute/markdown-reference). +For information on using Markdown in Microsoft technical articles, see the [Docs Markdown reference](https://learn.microsoft.com/contribute/markdown-reference). ## License diff --git a/WindowsServerDocs/administration/manage-windows-server.yml b/WindowsServerDocs/administration/manage-windows-server.yml index e2fa5b391d..f48105fcfb 100644 --- a/WindowsServerDocs/administration/manage-windows-server.yml +++ b/WindowsServerDocs/administration/manage-windows-server.yml @@ -60,7 +60,7 @@ landingContent: - linkListType: learn links: - text: Learning path - url: /learn/paths/manage-hybrid-infrastructure-with-azure-arc + url: /training/paths/manage-hybrid-infrastructure-with-azure-arc # Card - title: Windows Admin Center diff --git a/WindowsServerDocs/administration/toc.yml b/WindowsServerDocs/administration/toc.yml index 7b2d385ac5..e5e467706f 100644 --- a/WindowsServerDocs/administration/toc.yml +++ b/WindowsServerDocs/administration/toc.yml @@ -206,9 +206,9 @@ items: - name: Microsoft Learn items: - name: Manage hybrid infrastructure with Azure Arc - href: /learn/paths/manage-hybrid-infrastructure-with-azure-arc + href: /training/paths/manage-hybrid-infrastructure-with-azure-arc - name: Windows Server deployment, configuration, and administration - href: /learn/paths/windows-server-deployment-configuration-administration/ + href: /training/paths/windows-server-deployment-configuration-administration/ - name: Manage Windows Servers and workloads in a hybrid environment - href: /learn/paths/manage-windows-servers-workloads-hybrid-environment/ + href: /training/paths/manage-windows-servers-workloads-hybrid-environment/ diff --git a/WindowsServerDocs/get-started/get-started-with-windows-server.md b/WindowsServerDocs/get-started/get-started-with-windows-server.md index 7288707573..6646f8c20b 100644 --- a/WindowsServerDocs/get-started/get-started-with-windows-server.md +++ b/WindowsServerDocs/get-started/get-started-with-windows-server.md @@ -27,7 +27,7 @@ For the latest news on Windows Server, visit the [Windows Server blog](https://c ## Learn -Browse [learning paths for Windows Server](/learn/browse/?source=learn&terms=Windows%20Server&resource_type=learning%20path) to help learn new skills and accelerate your deployment with step-by-step guidance. You can learn how to deploy, configure and administer Windows Server, as well as network infrastructure, file servers and storage management, Hyper-V and virtualization, plus much more. +Browse [learning paths for Windows Server](/training/browse/?source=learn&terms=Windows%20Server&resource_type=learning%20path) to help learn new skills and accelerate your deployment with step-by-step guidance. You can learn how to deploy, configure and administer Windows Server, as well as network infrastructure, file servers and storage management, Hyper-V and virtualization, plus much more. ## Windows Insider Program @@ -42,5 +42,5 @@ To get started, find out more from these resources. * Compare the [differences in the editions in Windows Server 2022](../get-started/editions-comparison-windows-server-2022.md). * Choose the right installation option based on whether you want the [Desktop Experience](Getting-Started-with-Server-with-Desktop-Experience.md) or a [minimal Core interface](Getting-Started-with-Server-Core.md). * Understand the [hardware requirements](../get-started/hardware-requirements.md) to run Windows Server. -* Follow the learning path for [Windows Server deployment, configuration, and administration](/learn/paths/windows-server-deployment-configuration-administration/). +* Follow the learning path for [Windows Server deployment, configuration, and administration](/training/paths/windows-server-deployment-configuration-administration/). * If you still need to use Windows Server 2008, Windows Server 2008 R2 (and in future Windows Server 2012, or Windows Server 2012 R2) [Extended Security Updates](extended-security-updates-overview.md) are available to help keep you safe with security updates and bulletins rated critical and important. diff --git a/WindowsServerDocs/get-started/perform-in-place-upgrade.md b/WindowsServerDocs/get-started/perform-in-place-upgrade.md index c1fe428e88..13bc8b9c68 100644 --- a/WindowsServerDocs/get-started/perform-in-place-upgrade.md +++ b/WindowsServerDocs/get-started/perform-in-place-upgrade.md @@ -140,4 +140,4 @@ new version: If you'd like to learn more about deploying, post-installation configuration and activation options, check out the -[Windows Server deployment, configuration, and administration learning path](/learn/paths/windows-server-deployment-configuration-administration/). +[Windows Server deployment, configuration, and administration learning path](/training/paths/windows-server-deployment-configuration-administration/). diff --git a/WindowsServerDocs/manage/windows-admin-center/extend/guides/ui-text-style-guide.md b/WindowsServerDocs/manage/windows-admin-center/extend/guides/ui-text-style-guide.md index 4abea74105..b66b90b6b3 100644 --- a/WindowsServerDocs/manage/windows-admin-center/extend/guides/ui-text-style-guide.md +++ b/WindowsServerDocs/manage/windows-admin-center/extend/guides/ui-text-style-guide.md @@ -128,7 +128,7 @@ Almost never. Provide a help link only when: Never link directly to a web address—instead use a redirection service. -Microsoft developers should use an FWLink except when it's a help link that users might have to manually type, in which case use an `aka.ms` link (as long as the target of the URL is a website that automatically recognizes the browser locale, such as `docs.microsoft.com`). +Microsoft developers should use an FWLink except when it's a help link that users might have to manually type, in which case use an `aka.ms` link (as long as the target of the URL is a website that automatically recognizes the browser locale, such as `learn.microsoft.com`). ### Text guidelines