os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Clean up sample BSD license in Committer's Guide to match the one in

Browse source 
/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.
This commit is contained in:
Robert Watson 2007-01-10 14:38:29 +00:00
parent 6f2c143f5b
commit e54cf223f7
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=29357
1 changed files with 46 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

74
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -730,11 +730,11 @@ alias scvs cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.org:/home/ncvs</p
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.252 2007-01-10 10:53:35 rwatson Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.253 2007-01-10 14:38:29 rwatson Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.252 2007-01-10 10:53:35 rwatson Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.252 2007-01-10 10:53:35 rwatson Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.253 2007-01-10 14:38:29 rwatson Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.253 2007-01-10 14:38:29 rwatson Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -1196,32 +1196,36 @@ Host pcvs.FreeBSD.org
<para>Currently the &os; Project suggests and uses the following
text as the preferred license scheme:</para>
<programlisting>Copyright &copy; &lt;Year&gt; &lt;Author&gt;.
All rights reserved.
<programlisting>/*-
* 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]
*/</programlisting>
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.</programlisting>
<para>The &os; project strongly discourages the so called
advertising clause in new code. Due to the large number of
<para>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.</programlisting>
utilize this code, typically from unintended consequences from a
poorly worded license.</para>
<para>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.</para>
<para>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.</para>
</sect1>
<sect1 id="developer.relations">