diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 4bb773a926e8..59f88cb61ef7 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -35,7 +35,7 @@ relevant versions. Check the boxes below to indicate the versions affected by th - [ ] I have read the [contributors guide][contrib] and followed the style and process guidelines - [ ] PR has a meaningful title -- [ ] PR is targeted at the _staging_ branch +- [ ] PR is targeted at the _main_ branch - [ ] All relevant versions updated - [ ] Includes content related to issues and PRs - see [Closing issues using keywords][key]. - [ ] This PR is ready to merge and is not **Work in Progress**. If the PR is work in progress, diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index fabbfcc2aa87..79103602af18 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -66,7 +66,7 @@ ] } ], - "git_repository_branch_open_to_public_contributors": "staging", + "git_repository_branch_open_to_public_contributors": "main", "git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/PowerShell-Docs", "need_generate_pdf_url_template": false, "need_preview_pull_request": true, diff --git a/README.md b/README.md index 491aeda39a96..38f4669ca71a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Microsoft Open Source Code of Conduct -> Updated: 09/06/2021 +> Updated: 05/05/2022 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more @@ -9,13 +9,13 @@ contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additio comments. [live-badge]: https://powershell.visualstudio.com/PowerShell-Docs/_apis/build/status/PowerShell-Docs-CI?branchName=live -[staging-badge]: https://powershell.visualstudio.com/PowerShell-Docs/_apis/build/status/PowerShell-Docs-CI?branchName=staging +[main-badge]: https://powershell.visualstudio.com/PowerShell-Docs/_apis/build/status/PowerShell-Docs-CI?branchName=main ## Build Status -| Live Branch | Staging Branch | +| live branch | main branch | | :---------------------------- | :---------------------------------- | -| [![live-badge][]][live-badge] | [![staging-badge][]][staging-badge] | +| [![live-badge][]][live-badge] | [![main-badge][]][main-badge] | ## PowerShell Documentation @@ -54,7 +54,7 @@ The following list describes the main folders in this repository. ## Contributing -We welcome public contributions into this repository via pull requests into the _staging_ branch. +We welcome public contributions into this repository via pull requests into the _main_ branch. Please note that before we can accept your pull request you must sign our [Contribution License Agreement](https://cla.microsoft.com/). This is a one-time requirement. diff --git a/ci.yml b/ci.yml index 3208f4217dda..e074109d95f8 100644 --- a/ci.yml +++ b/ci.yml @@ -3,7 +3,7 @@ trigger: branches: include: - live - - staging + - main paths: include: - '*' @@ -16,7 +16,7 @@ trigger: pr: branches: include: - - staging + - main - live paths: include: diff --git a/daily.yml b/daily.yml index baed621fbcff..eee732c60581 100644 --- a/daily.yml +++ b/daily.yml @@ -3,7 +3,7 @@ trigger: branches: include: - live - - staging + - main paths: include: - '*' @@ -16,7 +16,7 @@ trigger: pr: branches: include: - - staging + - main - live paths: include: diff --git a/reference/5.1/Microsoft.PowerShell.Core/Import-Module.md b/reference/5.1/Microsoft.PowerShell.Core/Import-Module.md index 446adaf88a1e..92f6648b2359 100644 --- a/reference/5.1/Microsoft.PowerShell.Core/Import-Module.md +++ b/reference/5.1/Microsoft.PowerShell.Core/Import-Module.md @@ -2,7 +2,8 @@ external help file: System.Management.Automation.dll-Help.xml Locale: en-US Module Name: Microsoft.PowerShell.Core -ms.date: 10/22/2021 +ms.date: 05/05/2022 +no-loc: [-Scope] online version: https://docs.microsoft.com/powershell/module/microsoft.powershell.core/import-module?view=powershell-5.1&WT.mc_id=ps-gethelp schema: 2.0.0 title: Import-Module diff --git a/reference/7.0/Microsoft.PowerShell.Core/Import-Module.md b/reference/7.0/Microsoft.PowerShell.Core/Import-Module.md index 93570507348f..05f96638b40b 100644 --- a/reference/7.0/Microsoft.PowerShell.Core/Import-Module.md +++ b/reference/7.0/Microsoft.PowerShell.Core/Import-Module.md @@ -2,7 +2,8 @@ external help file: System.Management.Automation.dll-Help.xml Locale: en-US Module Name: Microsoft.PowerShell.Core -ms.date: 10/22/2021 +ms.date: 05/05/2022 +no-loc: [-Scope] online version: https://docs.microsoft.com/powershell/module/microsoft.powershell.core/import-module?view=powershell-7&WT.mc_id=ps-gethelp schema: 2.0.0 title: Import-Module diff --git a/reference/7.1/Microsoft.PowerShell.Core/Import-Module.md b/reference/7.1/Microsoft.PowerShell.Core/Import-Module.md index bd7d3a18e195..1e7543508835 100644 --- a/reference/7.1/Microsoft.PowerShell.Core/Import-Module.md +++ b/reference/7.1/Microsoft.PowerShell.Core/Import-Module.md @@ -2,7 +2,8 @@ external help file: System.Management.Automation.dll-Help.xml Locale: en-US Module Name: Microsoft.PowerShell.Core -ms.date: 10/22/2021 +ms.date: 05/05/2022 +no-loc: [-Scope] online version: https://docs.microsoft.com/powershell/module/microsoft.powershell.core/import-module?view=powershell-7.1&WT.mc_id=ps-gethelp schema: 2.0.0 title: Import-Module diff --git a/reference/7.2/Microsoft.PowerShell.Core/Import-Module.md b/reference/7.2/Microsoft.PowerShell.Core/Import-Module.md index b6eb0f16fd3c..b01b7e1ea6af 100644 --- a/reference/7.2/Microsoft.PowerShell.Core/Import-Module.md +++ b/reference/7.2/Microsoft.PowerShell.Core/Import-Module.md @@ -2,7 +2,8 @@ external help file: System.Management.Automation.dll-Help.xml Locale: en-US Module Name: Microsoft.PowerShell.Core -ms.date: 10/22/2021 +ms.date: 05/05/2022 +no-loc: [-Scope] online version: https://docs.microsoft.com/powershell/module/microsoft.powershell.core/import-module?view=powershell-7.2&WT.mc_id=ps-gethelp schema: 2.0.0 title: Import-Module diff --git a/reference/7.3/Microsoft.PowerShell.Core/Import-Module.md b/reference/7.3/Microsoft.PowerShell.Core/Import-Module.md index 00628820f54d..592ad150299b 100644 --- a/reference/7.3/Microsoft.PowerShell.Core/Import-Module.md +++ b/reference/7.3/Microsoft.PowerShell.Core/Import-Module.md @@ -2,7 +2,8 @@ external help file: System.Management.Automation.dll-Help.xml Locale: en-US Module Name: Microsoft.PowerShell.Core -ms.date: 10/22/2021 +ms.date: 05/05/2022 +no-loc: [-Scope] online version: https://docs.microsoft.com/powershell/module/microsoft.powershell.core/import-module?view=powershell-7.3&WT.mc_id=ps-gethelp schema: 2.0.0 title: Import-Module diff --git a/reference/docs-conceptual/community/2020-updates.md b/reference/docs-conceptual/community/2020-updates.md index 7b05e455a6cc..44a7999fa46d 100644 --- a/reference/docs-conceptual/community/2020-updates.md +++ b/reference/docs-conceptual/community/2020-updates.md @@ -1,6 +1,6 @@ --- description: List of changes to the PowerShell documentation for 2020 -ms.date: 01/05/2021 +ms.date: 05/05/2022 title: What's New in PowerShell Docs for 2020 --- @@ -384,7 +384,7 @@ issues. Thank you! - The PowerShell Docs community pages - [Community resources](/powershell/scripting/community/community-support) page - [What's new in PowerShell Docs](#2020-march) page (this page) - - [PowerShell Infographic](https://github.com/MicrosoftDocs/PowerShell-Docs/blob/staging/assets/PowerShell_7_Infographic.pdf) + - [PowerShell Infographic](https://github.com/MicrosoftDocs/PowerShell-Docs/blob/main/assets/PowerShell_7_Infographic.pdf) added to the Digital Art page - [PowerShell-Doc contributor guide](/powershell/scripting/community/contributing/overview) - New PowerShell content diff --git a/reference/docs-conceptual/community/contributing/get-started-writing.md b/reference/docs-conceptual/community/contributing/get-started-writing.md index f78d77323d43..4738ef72cbdb 100644 --- a/reference/docs-conceptual/community/contributing/get-started-writing.md +++ b/reference/docs-conceptual/community/contributing/get-started-writing.md @@ -1,6 +1,6 @@ --- description: This article is an overview of how to get started as a contributor to the PowerShell documentation. -ms.date: 12/09/2020 +ms.date: 05/05/2022 ms.topic: conceptual title: Get started contributing to PowerShell documentation --- @@ -31,9 +31,7 @@ The conceptual documentation includes the following content: - SDK documentation The [conceptual documentation][conceptual] is not organized by version. All articles are displayed -for every version of PowerShell. We're working to create version-specific articles. When that -feature is available in our documentation, this guide will be update with the appropriate -information. +for every version of PowerShell. We're working to create version-specific articles. > [!NOTE] > Anytime a conceptual article is added, removed, or renamed, the TOC must be updated and included @@ -106,9 +104,9 @@ Both methods end with the creation of a Pull Request (PR). See [Submitting a pull request](pull-requests.md) for more information and best practices. -[conceptual]: https://github.com/MicrosoftDocs/PowerShell-Docs/tree/staging/reference/docs-conceptual +[conceptual]: https://github.com/MicrosoftDocs/PowerShell-Docs/tree/main/reference/docs-conceptual [fork]: /contribute/get-started-setup-local#fork-the-repository [making-changes]: /contribute/how-to-write-workflows-major#making-your-changes [psdocs]: https://github.com/MicrosoftDocs/PowerShell-Docs -[ref]: https://github.com/MicrosoftDocs/PowerShell-Docs/tree/staging/reference +[ref]: https://github.com/MicrosoftDocs/PowerShell-Docs/tree/main/reference [rfc]: https://github.com/PowerShell/powershell-rfc/blob/master/RFC0000-RFC-Process.md diff --git a/reference/docs-conceptual/community/contributing/managing-pull-requests.md b/reference/docs-conceptual/community/contributing/managing-pull-requests.md index b6e63de02664..98fd2a6dd9e6 100644 --- a/reference/docs-conceptual/community/contributing/managing-pull-requests.md +++ b/reference/docs-conceptual/community/contributing/managing-pull-requests.md @@ -1,6 +1,6 @@ --- description: This article explains how the PowerShell-Docs team manages pull requests. -ms.date: 12/09/2020 +ms.date: 05/05/2022 ms.topic: conceptual title: How we manage pull requests --- @@ -60,14 +60,14 @@ See the [editorial checklist](editorial-checklist.md) for a more comprehensive l ## Branch Merge Process -The `staging` branch is the only branch that is merged into `live`. Merges from short-lived +The `main` branch is the only branch that is merged into `live`. Merges from short-lived (working) branches should be squashed. -| *Merge from/to* | *release-branch* | *staging* | *live* | -| ---------------- |:----------------:|:----------------:|:-----------:| +| *Merge from/to* | *release-branch* | *main* | *live* | +| ---------------- | :--------------: | :--------------: | :---------: | | *working-branch* | squash and merge | squash and merge | Not allowed | -| *release-branch* | — | merge | Not allowed | -| *staging* | rebase | — | merge | +| *release-branch* | — | merge | Not allowed | +| *main* | rebase | — | merge | ### PR Merger checklist @@ -102,11 +102,11 @@ unresolved conflicts that need to be fixed. ## Publishing to Live -Periodically, the changes accumulated in the `staging` branch need to be published to the live +Periodically, the changes accumulated in the `main` branch need to be published to the live website. -- The `staging` branch is merged to `live` each weekday at 3pm PST. -- The `staging` branch should be merged to `live` after any significant change. +- The `main` branch is merged to `live` each weekday at 3pm PST. +- The `main` branch should be merged to `live` after any significant change. - Changes to 50 or more files - After merging a release branch - Changes to repo or docset configurations (docfx.json, OPS configs, build scripts, etc.) diff --git a/reference/docs-conceptual/community/contributing/pull-requests.md b/reference/docs-conceptual/community/contributing/pull-requests.md index a1d322fc2c08..20f0d46f5f7d 100644 --- a/reference/docs-conceptual/community/contributing/pull-requests.md +++ b/reference/docs-conceptual/community/contributing/pull-requests.md @@ -1,6 +1,6 @@ --- description: This article explains how to submit pull requests to the PowerShell-Docs repository. -ms.date: 12/09/2020 +ms.date: 05/05/2022 ms.topic: conceptual title: How to submit pull requests --- @@ -12,18 +12,18 @@ reviewed before it can be merged. For best results, review the ## Using git branches -The default branch for PowerShell-Docs is the `staging` branch. Changes made in working branches are -merged into the `staging` branch before then being published. The `staging` branch is merged into -the `live` branch every weekday at 3:00 PM (Pacific Time). The `live` branch contains the content -that is published to docs.microsoft.com. +The default branch for PowerShell-Docs is the `main` branch. Changes made in working branches are +merged into the `main` branch before then being published. The `main` branch is merged into the +`live` branch every weekday at 3:00 PM (Pacific Time). The `live` branch contains the content that +is published to docs.microsoft.com. Before starting any changes, create a working branch in your local copy of the PowerShell-Docs repository. When working locally, be sure to synchronize your local repository before creating your -working branch. The working branch should be created from an update-to-date copy of the `staging` +working branch. The working branch should be created from an update-to-date copy of the `main` branch. -All pull requests should target the `staging` branch. Don't submit change to the `live` branch. -Changes made in the `staging` branch get merged into `live`, overwriting any changes made to `live`. +All pull requests should target the `main` branch. Don't submit change to the `live` branch. Changes +made in the `main` branch get merged into `live`, overwriting any changes made to `live`. ## Make the pull request process work better for everyone diff --git a/reference/docs-conceptual/community/digital-art.md b/reference/docs-conceptual/community/digital-art.md index 259f09dac1ac..492de6c80474 100644 --- a/reference/docs-conceptual/community/digital-art.md +++ b/reference/docs-conceptual/community/digital-art.md @@ -2,7 +2,7 @@ author: sdwheeler description: Download PowerShell related artwork and posters ms.author: sewhee -ms.date: 02/14/2020 +ms.date: 05/05/2022 title: PowerShell Digital Art --- # PowerShell Digital Art @@ -14,7 +14,7 @@ entrusted with the Scrolls of Monad!* ## PowerShell Infographic -- [PowerShell Infographic](https://github.com/MicrosoftDocs/PowerShell-Docs/blob/staging/assets/PowerShell_7_Infographic.pdf) +- [PowerShell Infographic](https://github.com/MicrosoftDocs/PowerShell-Docs/blob/main/assets/PowerShell_7_Infographic.pdf) ## Comic