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

document that we are discouraging the advertising clause. Also

Browse source 
document that we have begun discouraging variants in the license, as
well as completely new licenses.

Approved by: core@
This commit is contained in:
Warner Losh 2004-04-09 06:13:10 +00:00
parent 94d915e0c0
commit 4f1a845d7f
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=20612
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
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.187 2004-04-09 05:59:21 imp Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.188 2004-04-09 06:13:10 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.187 2004-04-09 05:59:21 imp Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.188 2004-04-09 06:13:10 imp Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.187 2004-04-09 05:59:21 imp Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.188 2004-04-09 06:13:10 imp Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1118,6 +1118,23 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 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 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.</programlisting> SUCH DAMAGE.</programlisting>
<para>The &os; project strongly discourages the so called
advertising clause in new code. Due to the large number of
contributers 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
removing it. In fact, please consider using the above license
for your code.</para>
<para>The &os; project discourages completely new licenses and
variations on the standard licenses. New licenses require the
approval of <email>core@FreeBSD.org</email> to reside in the
main repository. The more different licenses that are used in
the tree, the more problems that this causes to those wishing to
utilize this code, typically from unintended consequences from a
poorly worded license.</para>
</sect1> </sect1>
<sect1 id="developer.relations"> <sect1 id="developer.relations">