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

Correct spelling of CDDL.

Browse source
This commit is contained in:
Robert Watson 2007-01-10 15:13:57 +00:00
parent e54cf223f7
commit 6bde3e9101
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=29358
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
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.253 2007-01-10 14:38:29 rwatson Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.254 2007-01-10 15:13:57 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.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>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.254 2007-01-10 15:13:57 rwatson Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.254 2007-01-10 15:13:57 rwatson Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -1245,7 +1245,7 @@ Host pcvs.FreeBSD.org
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
BSD license. GPL, APSL, CDDL, etc, licensed software must not be
compiled into GENERIC.</para>
<para>Developers are reminded that in open source, getting "open"