Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 868a3de

Browse files
authoredMay 5, 2022
Change staging branch references to main (MicrosoftDocs#8790)
1 parent 4928df2 commit 868a3de

File tree

10 files changed

+36
-38
lines changed

10 files changed

+36
-38
lines changed
 

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ relevant versions. Check the boxes below to indicate the versions affected by th
3535

3636
- [ ] I have read the [contributors guide][contrib] and followed the style and process guidelines
3737
- [ ] PR has a meaningful title
38-
- [ ] PR is targeted at the _staging_ branch
38+
- [ ] PR is targeted at the _main_ branch
3939
- [ ] All relevant versions updated
4040
- [ ] Includes content related to issues and PRs - see [Closing issues using keywords][key].
4141
- [ ] This PR is ready to merge and is not **Work in Progress**. If the PR is work in progress,

‎.openpublishing.publish.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
]
6767
}
6868
],
69-
"git_repository_branch_open_to_public_contributors": "staging",
69+
"git_repository_branch_open_to_public_contributors": "main",
7070
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/PowerShell-Docs",
7171
"need_generate_pdf_url_template": false,
7272
"need_preview_pull_request": true,

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Microsoft Open Source Code of Conduct
22

3-
> Updated: 09/06/2021
3+
> Updated: 05/05/2022
44
55
This project has adopted the
66
[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
99
comments.
1010

1111
[live-badge]: https://powershell.visualstudio.com/PowerShell-Docs/_apis/build/status/PowerShell-Docs-CI?branchName=live
12-
[staging-badge]: https://powershell.visualstudio.com/PowerShell-Docs/_apis/build/status/PowerShell-Docs-CI?branchName=staging
12+
[main-badge]: https://powershell.visualstudio.com/PowerShell-Docs/_apis/build/status/PowerShell-Docs-CI?branchName=main
1313

1414
## Build Status
1515

16-
| Live Branch | Staging Branch |
16+
| live branch | main branch |
1717
| :---------------------------- | :---------------------------------- |
18-
| [![live-badge][]][live-badge] | [![staging-badge][]][staging-badge] |
18+
| [![live-badge][]][live-badge] | [![main-badge][]][main-badge] |
1919

2020
## PowerShell Documentation
2121

@@ -54,7 +54,7 @@ The following list describes the main folders in this repository.
5454
5555
## Contributing
5656

57-
We welcome public contributions into this repository via pull requests into the _staging_ branch.
57+
We welcome public contributions into this repository via pull requests into the _main_ branch.
5858
Please note that before we can accept your pull request you must sign our
5959
[Contribution License Agreement](https://cla.microsoft.com/). This is a one-time requirement.
6060

‎ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ trigger:
33
branches:
44
include:
55
- live
6-
- staging
6+
- main
77
paths:
88
include:
99
- '*'
@@ -16,7 +16,7 @@ trigger:
1616
pr:
1717
branches:
1818
include:
19-
- staging
19+
- main
2020
- live
2121
paths:
2222
include:

‎daily.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ trigger:
33
branches:
44
include:
55
- live
6-
- staging
6+
- main
77
paths:
88
include:
99
- '*'
@@ -16,7 +16,7 @@ trigger:
1616
pr:
1717
branches:
1818
include:
19-
- staging
19+
- main
2020
- live
2121
paths:
2222
include:

‎reference/docs-conceptual/community/2020-updates.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
description: List of changes to the PowerShell documentation for 2020
3-
ms.date: 01/05/2021
3+
ms.date: 05/05/2022
44
title: What's New in PowerShell Docs for 2020
55
---
66

@@ -384,7 +384,7 @@ issues. Thank you!
384384
- The PowerShell Docs community pages
385385
- [Community resources](/powershell/scripting/community/community-support) page
386386
- [What's new in PowerShell Docs](#2020-march) page (this page)
387-
- [PowerShell Infographic](https://github.com/MicrosoftDocs/PowerShell-Docs/blob/staging/assets/PowerShell_7_Infographic.pdf)
387+
- [PowerShell Infographic](https://github.com/MicrosoftDocs/PowerShell-Docs/blob/main/assets/PowerShell_7_Infographic.pdf)
388388
added to the Digital Art page
389389
- [PowerShell-Doc contributor guide](/powershell/scripting/community/contributing/overview)
390390
- New PowerShell content

‎reference/docs-conceptual/community/contributing/get-started-writing.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
description: This article is an overview of how to get started as a contributor to the PowerShell documentation.
3-
ms.date: 12/09/2020
3+
ms.date: 05/05/2022
44
ms.topic: conceptual
55
title: Get started contributing to PowerShell documentation
66
---
@@ -31,9 +31,7 @@ The conceptual documentation includes the following content:
3131
- SDK documentation
3232

3333
The [conceptual documentation][conceptual] is not organized by version. All articles are displayed
34-
for every version of PowerShell. We're working to create version-specific articles. When that
35-
feature is available in our documentation, this guide will be update with the appropriate
36-
information.
34+
for every version of PowerShell. We're working to create version-specific articles.
3735

3836
> [!NOTE]
3937
> 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
106104
[Submitting a pull request](pull-requests.md) for more information and best practices.
107105

108106
<!--link refs-->
109-
[conceptual]: https://github.com/MicrosoftDocs/PowerShell-Docs/tree/staging/reference/docs-conceptual
107+
[conceptual]: https://github.com/MicrosoftDocs/PowerShell-Docs/tree/main/reference/docs-conceptual
110108
[fork]: /contribute/get-started-setup-local#fork-the-repository
111109
[making-changes]: /contribute/how-to-write-workflows-major#making-your-changes
112110
[psdocs]: https://github.com/MicrosoftDocs/PowerShell-Docs
113-
[ref]: https://github.com/MicrosoftDocs/PowerShell-Docs/tree/staging/reference
111+
[ref]: https://github.com/MicrosoftDocs/PowerShell-Docs/tree/main/reference
114112
[rfc]: https://github.com/PowerShell/powershell-rfc/blob/master/RFC0000-RFC-Process.md

‎reference/docs-conceptual/community/contributing/managing-pull-requests.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
description: This article explains how the PowerShell-Docs team manages pull requests.
3-
ms.date: 12/09/2020
3+
ms.date: 05/05/2022
44
ms.topic: conceptual
55
title: How we manage pull requests
66
---
@@ -60,14 +60,14 @@ See the [editorial checklist](editorial-checklist.md) for a more comprehensive l
6060

6161
## Branch Merge Process
6262

63-
The `staging` branch is the only branch that is merged into `live`. Merges from short-lived
63+
The `main` branch is the only branch that is merged into `live`. Merges from short-lived
6464
(working) branches should be squashed.
6565

66-
| *Merge from/to* | *release-branch* | *staging* | *live* |
67-
| ---------------- |:----------------:|:----------------:|:-----------:|
66+
| *Merge from/to* | *release-branch* | *main* | *live* |
67+
| ---------------- | :--------------: | :--------------: | :---------: |
6868
| *working-branch* | squash and merge | squash and merge | Not allowed |
69-
| *release-branch* | &mdash; | merge | Not allowed |
70-
| *staging* | rebase | &mdash; | merge |
69+
| *release-branch* | &mdash; | merge | Not allowed |
70+
| *main* | rebase | &mdash; | merge |
7171

7272
### PR Merger checklist
7373

@@ -102,11 +102,11 @@ unresolved conflicts that need to be fixed.
102102

103103
## Publishing to Live
104104

105-
Periodically, the changes accumulated in the `staging` branch need to be published to the live
105+
Periodically, the changes accumulated in the `main` branch need to be published to the live
106106
website.
107107

108-
- The `staging` branch is merged to `live` each weekday at 3pm PST.
109-
- The `staging` branch should be merged to `live` after any significant change.
108+
- The `main` branch is merged to `live` each weekday at 3pm PST.
109+
- The `main` branch should be merged to `live` after any significant change.
110110
- Changes to 50 or more files
111111
- After merging a release branch
112112
- Changes to repo or docset configurations (docfx.json, OPS configs, build scripts, etc.)

‎reference/docs-conceptual/community/contributing/pull-requests.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
description: This article explains how to submit pull requests to the PowerShell-Docs repository.
3-
ms.date: 12/09/2020
3+
ms.date: 05/05/2022
44
ms.topic: conceptual
55
title: How to submit pull requests
66
---
@@ -12,18 +12,18 @@ reviewed before it can be merged. For best results, review the
1212

1313
## Using git branches
1414

15-
The default branch for PowerShell-Docs is the `staging` branch. Changes made in working branches are
16-
merged into the `staging` branch before then being published. The `staging` branch is merged into
17-
the `live` branch every weekday at 3:00 PM (Pacific Time). The `live` branch contains the content
18-
that is published to docs.microsoft.com.
15+
The default branch for PowerShell-Docs is the `main` branch. Changes made in working branches are
16+
merged into the `main` branch before then being published. The `main` branch is merged into the
17+
`live` branch every weekday at 3:00 PM (Pacific Time). The `live` branch contains the content that
18+
is published to docs.microsoft.com.
1919

2020
Before starting any changes, create a working branch in your local copy of the PowerShell-Docs
2121
repository. When working locally, be sure to synchronize your local repository before creating your
22-
working branch. The working branch should be created from an update-to-date copy of the `staging`
22+
working branch. The working branch should be created from an update-to-date copy of the `main`
2323
branch.
2424

25-
All pull requests should target the `staging` branch. Don't submit change to the `live` branch.
26-
Changes made in the `staging` branch get merged into `live`, overwriting any changes made to `live`.
25+
All pull requests should target the `main` branch. Don't submit change to the `live` branch. Changes
26+
made in the `main` branch get merged into `live`, overwriting any changes made to `live`.
2727

2828
## Make the pull request process work better for everyone
2929

‎reference/docs-conceptual/community/digital-art.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
author: sdwheeler
33
description: Download PowerShell related artwork and posters
44
ms.author: sewhee
5-
ms.date: 02/14/2020
5+
ms.date: 05/05/2022
66
title: PowerShell Digital Art
77
---
88
# PowerShell Digital Art
@@ -14,7 +14,7 @@ entrusted with the Scrolls of Monad!*
1414

1515
## PowerShell Infographic
1616

17-
- [PowerShell Infographic](https://github.com/MicrosoftDocs/PowerShell-Docs/blob/staging/assets/PowerShell_7_Infographic.pdf)
17+
- [PowerShell Infographic](https://github.com/MicrosoftDocs/PowerShell-Docs/blob/main/assets/PowerShell_7_Infographic.pdf)
1818

1919
## Comic
2020

0 commit comments

Comments
 (0)
Please sign in to comment.