paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-02 13:45:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #446 from MaaxGr/fix-dev-docs

Browse Source 
master to main in paperless development docs and CONTRIBUTING.md
This commit is contained in:
shamoon 2022-03-19 12:01:04 -07:00 committed by GitHub
commit 0979f3c5c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTING.md
View File

@ -15,7 +15,7 @@ Paperless supports python 3.8 and 3.9. We format Python code with [Black](https:
## Branches ## 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. `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. 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. The admins occasionally invite contributors directly if we believe having them on a team will accelerate their work.

2
docs/extending.rst
View File

@ -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: 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. when a new release is made.
* ``dev`` contains the code that will be in the next release. * ``dev`` contains the code that will be in the next release.
* ``feature-X`` contain bigger changes that will be in some release, but not * ``feature-X`` contain bigger changes that will be in some release, but not