Skip to content

Commit 5aa3d93

Browse files
Update README.md
Update "Compiling" section. Update "Contributions" section (a) delete mention of belvedere branch (b) add "Licensing of contributions" subsection.
1 parent 93aaa4c commit 5aa3d93

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

README.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,24 +63,28 @@ Note that the default branch on GitHub is `master`, which contains the state of
6363
6464
### Contributions
6565

66-
#### CodeSnip 4
67-
6866
To contribute to CodeSnip 4 development please fork the repository on GitHub. Create a feature branch off the `develop` branch. Make your changes to your feature branch then submit a pull request via GitHub.
6967

7068
> **Do not create branches off `master`, always branch from `develop`.**
7169
72-
#### CodeSnip 5 Belvedere
70+
#### Licensing of contributions
71+
72+
The license that applies to any existing file you edit will continue to apply to the edited file. Any existing license text or copyright statement **must not** be altered or removed.
7373

74-
Proceed as for CodeSnip 4 except create your feature branch off the `belvedere` branch instead of `develop`.
74+
Any new file you contribute **must** either be licensed under the Mozilla Public License v2.0 (MPL2) or have a license compatible with the MPL2. If a license is not specified then the MPL2 will be applied to the file. You should insert a suitable copyright statement in the file.
7575

76-
> **Do not submit changes to the earlier `pagoda` or `pavilion` branches because they will not be accepted.**
76+
Any third party code used by your contributed code **must** also have a license compatible with the MPL2.
77+
78+
> MPL2 boilerplate text, in several programming language's comment formats, can be found in the file `Docs/MPL-2.0-Boilerplate.txt`. You will need to change the name of the copyright holder.
7779
7880
### Compiling
7981

80-
`master` has a file in the root directory named [`Build.html`](https://htmlpreview.github.io/?https://github.com/delphidabbler/codesnip/blob/master/Build.html) that gives detailed information about how to compile the current release of CodeSnip.
82+
`master` has a file in the root directory named [`Build.html`](https://htmlpreview.github.io/?https://github.com/delphidabbler/codesnip/blob/master/Build.html) that gives detailed information about how to compile the current release of CodeSnip 4.
8183

8284
There is also a [Compiling & Source Code FAQ](https://github.com/delphidabbler/codesnip-faq/blob/master/SourceCode.md).
8385

86+
CodeSnip 4 **must** be compiled with Delphi XE. See [Compiling & Source Code FAQ 11](https://github.com/delphidabbler/codesnip-faq/blob/master/SourceCode.md#faq-11) for the reason why.
87+
8488
## Change Log
8589

8690
The program's current change log can be found in the file `CHANGELOG.md` in the root of the `master` branch.

0 commit comments

Comments
 (0)