Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-10-31 11:00:14 -04:00
commit 4e070b4d7f
3 changed files with 18 additions and 5 deletions

View File

@ -62,11 +62,7 @@ see [configuration for the Haskell newbie](https://propellor.branchable.com/hask
Now they'll automatically update every 30 minutes, and you can
`git commit -S` and `git push` changes that affect any number of
hosts.
10. Write some neat new properties and send patches to <propellor@joeyh.name>!
Use `git commit --signoff` to certify that your additions to propellor
are released under its BSD license.
See <https://propellor.branchable.com/contributing> for coding styles,
etc.
10. Write some neat new properties and send patches!
## debugging

15
doc/contributing.mdwn Normal file
View File

@ -0,0 +1,15 @@
Propellor is free software, released under a BSD license. Anyone is free to
modify and distribute it; indeed doing so is a fundamental part of how
propellor is configured and used.
You don't have to contribute your patches, but you're encouraged to do so;
let's all make propellor awesome together! Patches can be sent to
<propellor@joeyh.name> or pull requests can be posted to [[todo]].
To certify that a change is released under propellor's BSD license,
you can use `git commit --signoff`.
Propellor has its own [[coding_style]], which you are encouraged to follow
-- at least when you want to get a patch merged into propellor.
When writing code for your own internal use, feel free to ignore all the
rules, except the ones about avoiding partial functions.

View File

@ -26,6 +26,8 @@ hosts = -- (o) `
Propellor is free software, licensed under the BSD license.
You are encouraged to send patches and improve it. See [[contributing]].
## news
[[!inline pages="news/* and !*/Discussion" show="4" archive=yes]]