From d650c6c1f24a9ae866bd867b86461f082e51c3f8 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sun, 1 Nov 2015 16:00:25 +1030 Subject: [PATCH] Update readme/contributing --- framework/core/CONTRIBUTING.md | 12 +----------- framework/core/README.md | 4 ++-- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/framework/core/CONTRIBUTING.md b/framework/core/CONTRIBUTING.md index be1fb6aa9..425788df1 100644 --- a/framework/core/CONTRIBUTING.md +++ b/framework/core/CONTRIBUTING.md @@ -1,13 +1,3 @@ # Contributing to Flarum -Thanks for your interest in contributing to Flarum! Please read the [Contributing docs](http://flarum.org/docs/contributing) to learn how you can help. - -## Contributor License Agreement - -By contributing your code to Flarum you grant Toby Zerner a non-exclusive, irrevocable, worldwide, royalty-free, sublicenseable, transferable license under all of Your relevant intellectual property rights (including copyright, patent, and any other rights), to use, copy, prepare derivative works of, distribute and publicly perform and display the Contributions on any licensing terms, including without limitation: (a) open source licenses like the MIT license; and (b) binary, proprietary, or commercial licenses. Except for the licenses granted herein, You reserve all right, title, and interest in and to the Contribution. - -You confirm that you are able to grant us these rights. You represent that You are legally entitled to grant the above license. If Your employer has rights to intellectual property that You create, You represent that You have received permission to make the Contributions on behalf of that employer, or that Your employer has waived such rights for the Contributions. - -You represent that the Contributions are Your original works of authorship, and to Your knowledge, no other person claims, or has the right to claim, any right in any invention or patent related to the Contributions. You also represent that You are not legally obligated, whether by entering into an agreement or otherwise, in any way that conflicts with the terms of this license. - -Toby Zerner acknowledges that, except as explicitly described in this Agreement, any Contribution which you provide is on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. +Howdy! We're really excited that you are interested in contributing to Flarum. Before submitting your contribution, please take a moment and read through the [Contributing Guidelines](https://github.com/flarum/flarum/blob/master/CONTRIBUTING.md). diff --git a/framework/core/README.md b/framework/core/README.md index 79b0a7f80..270ec653b 100644 --- a/framework/core/README.md +++ b/framework/core/README.md @@ -1,7 +1,7 @@ # Flarum Core -This repository contains the core code of Flarum. If you want to install Flarum, visit the [main Flarum repository](http://github.com/flarum/flarum). +This repository contains Flarum's core code. If you want to set up a forum, visit the [main Flarum repository](http://github.com/flarum/flarum). ## Contributing -Interested in contributing to Flarum? Please read the [Contributing docs](http://flarum.org/docs/contributing) to learn how you can help. +Flarum is open-source and we would love your help building it! Please read the [Contributing Guide](https://github.com/flarum/flarum/blob/master/CONTRIBUTING.md) to learn how you can help.