Skip to content

Commit 0eeb7cc

Browse files
committed
docs: replaces all mentions of "contrib" with "main"
1 parent cebd1fb commit 0eeb7cc

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

contributing/backoffice-project/contributing.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
In the high probability that you are porting something from angular JS then here are a few helpful tips for using Lit:
66

7-
Here is the LIT documentation and playground: [https://lit.dev](https://lit.dev)
7+
Here is the Lit documentation and playground: [https://lit.dev](https://lit.dev)
88

99
### How best to find what needs converting from the old backoffice?
1010

1111
1. Navigate to [https://github.com/umbraco/Umbraco-CMS](https://github.com/umbraco/Umbraco-CMS)
12-
2. Make sure you are on the `contrib` branch
12+
2. Make sure you are on the `main` branch
1313

1414
### What is the process of contribution?
1515

@@ -34,11 +34,11 @@ The frontend has an API formatter that takes the OpenAPI schema file and convert
3434

3535
### Caveats
3636

37-
The backoffice can be ran and tested against a real Umbraco instance by cloning down the Umbraco-CMS `contrib` branch, but there are no guarantees about how well it works yet.
37+
The backoffice can be ran and tested against a real Umbraco instance by cloning down the Umbraco-CMS `main` branch, but there are no guarantees about how well it works yet.
3838

3939
**Current schema for API:**
4040

41-
[OpenApi.json](https://raw.githubusercontent.com/umbraco/Umbraco-CMS/contrib/src/Umbraco.Cms.Api.Management/OpenApi.json)
41+
[OpenApi.json](https://raw.githubusercontent.com/umbraco/Umbraco-CMS/main/src/Umbraco.Cms.Api.Management/OpenApi.json)
4242

4343
**How to convert it:**
4444

contributing/umbraco-cms/contributing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The following steps are a quick-start guide:
3030
{% embed url="https://youtu.be/LPmyTcIXzAs" %}
3131

3232
3. **Switch to the correct branch**\
33-
Switch to the `contrib` branch
33+
Switch to the `main` branch
3434
4. **Build**
3535

3636
Build your fork of Umbraco locally as shown in the video below. You can build with any IDE that supports dotnet or the command line.
@@ -42,15 +42,15 @@ The following steps are a quick-start guide:
4242
{% embed url="https://youtu.be/sWetLj4PGQI" %}
4343

4444
5. **Branch**\
45-
Create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp/12345`. This means it's a temporary branch for the particular issue you're working on, in this case issue number `12345`. Don't commit to `contrib`, create a new branch first.
45+
Create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp/12345`. This means it's a temporary branch for the particular issue you're working on, in this case issue number `12345`. Don't commit to `main`, create a new branch first.
4646
6. **Change**
4747

4848
Make your changes, experiment, have fun, explore and learn, and don't be afraid. We welcome all contributions and will [happily give feedback](first-issue.md#questions).
4949
7. **Commit and push**
5050

5151
Done? Yay! 🎉
5252

53-
Remember to commit to your new `temp` branch, and don't commit to `contrib`. Then you can push the changes up to your fork on GitHub.
53+
Remember to commit to your new `temp` branch, and don't commit to `main`. Then you can push the changes up to your fork on GitHub.
5454
8. **Create pull request**
5555

5656
On GitHub, in your forked repository (`https://github.com/[YourUsername]/Umbraco-CMS`) you will see a banner saying that you pushed a new branch and a button to make a pull request. Tap the button and follow the instructions.

contributing/umbraco-cms/creating-a-pr.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ We recommend you to [sync with our repository][sync fork] before you submit your
77
GitHub will have picked up on the new branch you've pushed and will offer to create a Pull Request. Click that green button and away you go.
88
![Create a pull request](img/createpullrequest.png)
99

10-
We like to use [git flow][git flow] as much as possible, but don't worry if you are not familiar with it. The most important thing you need to know is that when you fork the Umbraco repository, the default branch is set to `contrib`. This is the branch you should be targeting.
10+
We like to use [git flow][git flow] as much as possible, but don't worry if you are not familiar with it. The most important thing you need to know is that when you fork the Umbraco repository, the default branch is set to `main`. This is the branch you should be targeting.
1111

1212
Please note: we are no longer accepting features for v8 and below but will continue to merge security fixes as and when they arise.
13-
13+
1414
## The review process
1515
[review process]: #the-review-process
1616

@@ -35,9 +35,9 @@ If you make the corrections we ask for in the same branch and push them to your
3535

3636
We understand you have other things to do and can't just drop everything to help us out.
3737

38-
So if we’re asking for your help to improve the PR we’ll wait for two weeks to give you a fair chance to make changes. We’ll ask for an update if we don’t hear back from you after that time.
38+
So if we’re asking for your help to improve the PR we’ll wait for two weeks to give you a fair chance to make changes. We’ll ask for an update if we don’t hear back from you after that time.
3939

40-
If we don’t hear back from you for 4 weeks, we’ll close the PR so that it doesn’t just hang around forever. You’re very welcome to re-open it once you have some more time to spend on it.
40+
If we don’t hear back from you for 4 weeks, we’ll close the PR so that it doesn’t just hang around forever. You’re very welcome to re-open it once you have some more time to spend on it.
4141

4242
There will be times that we really like your proposed changes and we’ll finish the final improvements we’d like to see ourselves. You still get the credits and your commits will live on in the git repository.
4343

@@ -48,4 +48,4 @@ There will be times that we really like your proposed changes and we’ll finish
4848

4949
[making larger changes]: contributing-before-you-start.md#making-large-changes
5050
[pr or package]: contributing-before-you-start.md#pull-request-or-package
51-
[Core collabs]: contributing-core-collabs-team.md
51+
[Core collabs]: contributing-core-collabs-team.md

contributing/umbraco-cms/first-issue.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,26 @@ Great question! The short version goes like this:
1111
1. **Fork**
1212

1313
Create a fork of [`Umbraco-CMS` on GitHub][Umbraco CMS repo]
14-
14+
1515
![Fork the repository](img/forkrepository.png)
16-
16+
1717
1. **Clone**
1818

1919
When GitHub has created your fork, you can clone it in your favorite Git tool
20-
21-
![Clone the fork](img/clonefork.png)
22-
20+
21+
![Clone the fork](img/clonefork.png)
22+
2323
1. **Switch to the correct branch**
2424

25-
Switch to the `contrib` branch
25+
Switch to the `main` branch
2626

2727
1. **Build**
2828

2929
Build your fork of Umbraco locally as described in the build documentation: you can [debug with Visual Studio Code][build - debugging with code] or [with Visual Studio][build - debugging with vs].
3030

3131
1. **Branch**
3232

33-
Create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-12345`. This means it's a temporary branch for the particular issue you're working on, in this case issue number `12345`. Don't commit to `contrib`, create a new branch first.
33+
Create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-12345`. This means it's a temporary branch for the particular issue you're working on, in this case issue number `12345`. Don't commit to `main`, create a new branch first.
3434

3535
1. **Change**
3636

@@ -40,7 +40,7 @@ Great question! The short version goes like this:
4040

4141
Done? Yay! 🎉
4242

43-
Remember to commit to your new `temp` branch, and don't commit to `contrib`. Then you can push the changes up to your fork on GitHub.
43+
Remember to commit to your new `temp` branch, and don't commit to `main`. Then you can push the changes up to your fork on GitHub.
4444

4545
#### Keeping your Umbraco fork in sync with the main repository
4646
[sync fork]: #keeping-your-umbraco-fork-in-sync-with-the-main-repository
@@ -57,10 +57,10 @@ Then when you want to get the changes from the main repository:
5757

5858
```
5959
git fetch upstream
60-
git rebase upstream/contrib
60+
git rebase upstream/main
6161
```
6262

63-
In this command we're syncing with the `contrib` branch, but you can of course choose another one if needed.
63+
In this command we're syncing with the `main` branch, but you can choose another one if needed.
6464

6565
[More information on how this works can be found on the thoughtbot blog.][sync fork ext]
6666

@@ -88,6 +88,6 @@ You can get in touch with [the core contributors team][core collabs] in multiple
8888

8989
[sync fork ext]: http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated "Details on keeping a git fork updated"
9090
[draft prs]: https://github.blog/2019-02-14-introducing-draft-pull-requests/ "GitHub's blog post providing details on draft pull requests"
91-
[contrib forum]: https://our.umbraco.com/forum/contributing-to-umbraco-cms/
91+
[contrib forum]: https://forum.umbraco.com/
9292
[Umbraco CMS repo]: https://github.com/umbraco/Umbraco-CMS
93-
[up for grabs issues]: https://github.com/umbraco/Umbraco-CMS/issues?q=is%3Aissue+is%3Aopen+label%3Acommunity%2Fup-for-grabs
93+
[up for grabs issues]: https://github.com/umbraco/Umbraco-CMS/issues?q=is%3Aissue+is%3Aopen+label%3Acommunity%2Fup-for-grabs

0 commit comments

Comments
 (0)