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

Add preferred license so that people know what it is.

Browse source 
Docbook'd by: trhodes
This commit is contained in:
Warner Losh 2004-04-09 05:59:21 +00:00
parent a3c4bf0e29
commit 94d915e0c0
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=20611
1 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -678,11 +678,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
</itemizedlist> </itemizedlist>
<para>You will almost certainly get a conflict because <para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.186 2004-04-05 14:57:08 kensmith Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.187 2004-04-09 05:59:21 imp Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict 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.186 2004-04-05 14:57:08 kensmith Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.187 2004-04-09 05:59:21 imp Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.186 2004-04-05 14:57:08 kensmith Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.187 2004-04-09 05:59:21 imp Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1090,6 +1090,36 @@ checkout -P</programlisting>
&os.stable; branch.</para> &os.stable; branch.</para>
</sect1> </sect1>
<sect1 id="pref-license">
<title>Preferred License for New Files</title>
<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.
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>
</sect1>
<sect1 id="developer.relations"> <sect1 id="developer.relations">
<title>Developer Relations</title> <title>Developer Relations</title>