From 9249cb989218546c2ea4c9fba1b8cbb799b31a54 Mon Sep 17 00:00:00 2001 From: wvengen Date: Mon, 17 Mar 2014 13:37:29 +0100 Subject: [PATCH] reword license text in README --- LICENSE | 4 ++-- README.md | 18 ++++-------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/LICENSE b/LICENSE index 872b60c4..24884fc4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ -FoodSoft - a webbased foodcoop management software -Copyright (C) 2009 Benni and Lasse +Foodsoft - web-based software to manage a non-profit food coop +Copyright (c) 2011-2014 Benni, Lasse, wvengen and others This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/README.md b/README.md index 197a8c9a..e19bfcdd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -FoodSoft +Foodsoft ========= [![Build Status](https://travis-ci.org/foodcoops/foodsoft.png?branch=master)](https://travis-ci.org/foodcoops/foodsoft) [![Coverage Status](https://coveralls.io/repos/foodcoops/foodsoft/badge.png?branch=master)](https://coveralls.io/r/foodcoops/foodsoft?branch=master) @@ -33,17 +33,7 @@ very much a work in progress. License ------- -FoodSoft - a webbased foodcoop management software -Copyright (C) 2011 Benni and Lasse +GPL version 3 or later, please see +[LICENSE](https://github.com/foodcoops/foodsoft/blob/master/LICENSE) +for the full text. -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -(See file LICENSE for the full text of the GPL)