chore: update some contributing related stuff

alvinthen · Nov 17, 2021 · f17698c · f17698c
1 parent 9efa9bc
commit f17698c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,13 +1,9 @@
-Remix is a commercial project developed by React Training LLC.
+Remix is a project developed by React Training LLC.
 
-We do not ask for contributions from our subscribers. After all, that's what
-you're paying _us_ for. 😅
-
-However, if there is something that you'd like to contribute, whether it's a bug
-fix to scratch your own itch or a typo that you just can't overlook in the docs,
-we'd be happy to have your contribution. But we need you to sign a contributor
-license agreement (CLA) first that assigns us ownership so we are able to
-include it in the software we sell.
+If you'd like to contribute something, whether it's a bug fix to scratch your
+own itch or a typo in the docs, we'd be happy to have your contribution. We need
+you to sign a contributor license agreement (CLA) first that assigns us
+ownership so we are able to include it in this software.
 
 We don't yet have a CLA, but we are working on it and we will be able to accept
 your contributions once we do. Until then, please keep letting us know about our

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -3,11 +3,11 @@
 All Remix development happens here on GitHub. There are two main branches in this
 repository that you should be aware of:
 
-- `master` - This is the stable line. Code in this branch should always pass all
+- `main` - This is the stable line. Code in this branch should always pass all
   the tests. Hot fixes may be pushed directly to this branch without appearing in
   `dev`. Docs on the website reflect this branch.
 - `dev` - This is where most development happens. When hot fix commits land in
-  `master` they are merged into this branch. Feature branches are based on this
+  `main` they are merged into this branch. Feature branches are based on this
   branch and are merged in as they are completed.
 
 We currently use `yarn` ([version 1](https://classic.yarnpkg.com/lang/en/)) to