From 6bde3e910135f11c9de9e718e8015d2b5d0044ef Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Wed, 10 Jan 2007 15:13:57 +0000 Subject: [PATCH] Correct spelling of CDDL. --- en_US.ISO8859-1/articles/committers-guide/article.sgml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index f40ae532a5..f9c3defb30 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.253 2007-01-10 14:38:29 rwatson Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.254 2007-01-10 15:13:57 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.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). + (remove the marker lines and the second $Id: article.sgml,v 1.254 2007-01-10 15:13:57 rwatson Exp $ line, + leaving the original $Id: article.sgml,v 1.254 2007-01-10 15:13:57 rwatson Exp $ line intact). @@ -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. Developers are reminded that in open source, getting "open"