From e54cf223f7c6aa49724f80e89fd5c4ab4b4db507 Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Wed, 10 Jan 2007 14:38:29 +0000 Subject: [PATCH] Clean up sample BSD license in Committer's Guide to match the one in /usr/share/examples/etc/bsd-style-copyright. There were a number of minor wording and formatting differences. Provide it in C source code format. Add text talking about non-BSD licenses in the tree, including limitations. Add a paragraph adding strong caution when it comes to intellectual property, pointing at the core team as a contact for any problems. --- .../articles/committers-guide/article.sgml | 74 ++++++++++++------- 1 file changed, 46 insertions(+), 28 deletions(-) diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 4bf7e22fc1..f40ae532a5 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -730,11 +730,11 @@ alias scvs cvs -d user@ncvs.FreeBSD.org:/home/ncvs

You will almost certainly get a conflict because - of the $Id: article.sgml,v 1.252 2007-01-10 10:53:35 rwatson Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.253 2007-01-10 14:38:29 rwatson Exp $ (or in FreeBSD's case, $FreeBSD$) lines, so you will have to edit the file to resolve the conflict - (remove the marker lines and the second $Id: article.sgml,v 1.252 2007-01-10 10:53:35 rwatson Exp $ line, - leaving the original $Id: article.sgml,v 1.252 2007-01-10 10:53:35 rwatson Exp $ line intact). + (remove the marker lines and the second $Id: article.sgml,v 1.253 2007-01-10 14:38:29 rwatson Exp $ line, + leaving the original $Id: article.sgml,v 1.253 2007-01-10 14:38:29 rwatson Exp $ line intact). @@ -1196,32 +1196,36 @@ Host pcvs.FreeBSD.org Currently the &os; Project suggests and uses the following text as the preferred license scheme: -Copyright © <Year> <Author>. -All rights reserved. +/*- + * Copyright (c) [year] [your name] + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * [id for your version control system, if any] + */ -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - - The &os; project strongly discourages the so called - advertising clause in new code. Due to the large number of + The &os; project strongly discourages the so-called + "advertising clause" in new code. Due to the large number of contributors to the &os; project, complying with this clause for many commercial vendors has become difficult. If you have code in the tree with the advertising clause, please consider @@ -1236,6 +1240,20 @@ SUCH DAMAGE. utilize this code, typically from unintended consequences from a poorly worded license. + Project policy dictates that code under some non-BSD licenses + must be placed only in specific sections of the repository, and + in some cases, compilation must be conditional or even disabled + by default. For example, the GENERIC kernel must be compiled + under only licenses identical to or substantially similar to the + BSD license. GPL, APSL, CDSL, etc, licensed software must not be + compiled into GENERIC. + + Developers are reminded that in open source, getting "open" + right is just as important as getting "source" right, as improper + handling of intellectual property has serious consequences. Any + questions or concerns should immediately be brought to the + attention of the core team. +