From 0cf9b11c3ee0615eb1ce5f3a578551a701036c08 Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 19 Mar 2022 17:34:28 +0100 Subject: [PATCH 1/2] master to main in paperless development docs --- docs/extending.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/extending.rst b/docs/extending.rst index df5f5241d..71dce05b2 100644 --- a/docs/extending.rst +++ b/docs/extending.rst @@ -7,7 +7,7 @@ This section describes the steps you need to take to start development on paperl Check out the source from github. The repository is organized in the following way: -* ``master`` always represents the latest release and will only see changes +* ``main`` always represents the latest release and will only see changes when a new release is made. * ``dev`` contains the code that will be in the next release. * ``feature-X`` contain bigger changes that will be in some release, but not From 30b3510fbd6dfc94c3f3cc7ff5e36f630497c654 Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 19 Mar 2022 17:37:43 +0100 Subject: [PATCH 2/2] master to main in CONTRIBUTING.md --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 81f9e8a5f..0d5467751 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,7 +15,7 @@ Paperless supports python 3.8 and 3.9. We format Python code with [Black](https: ## Branches -`master` always reflects the latest release. Apart from changes to the documentation or readme, absolutely no functional changes on this branch in between releases. +`main` always reflects the latest release. Apart from changes to the documentation or readme, absolutely no functional changes on this branch in between releases. `dev` contains all changes that will be part of the next release. Use this branch to start making your changes. @@ -127,4 +127,4 @@ All team members are notified when mentioned or assigned to a relevant issue or We are not overly strict with inviting people to the organization. If you have read the [team permissions](#permissions) and think having additional access would enhance your contributions, please reach out to an [admin](#structure) of the team. -The admins occasionally invite contributors directly if we believe having them on a team will accelerate their work. \ No newline at end of file +The admins occasionally invite contributors directly if we believe having them on a team will accelerate their work.