diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 7dfeae8d3c..657e3c61b0 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -30,6 +30,7 @@
&tm-attrib.freebsd;
+ &tm-attrib.coverity;
&tm-attrib.cvsup;
&tm-attrib.ibm;
&tm-attrib.intel;
@@ -745,11 +746,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.267 2007-07-06 16:37:13 chinsan Exp $ (or in FreeBSD's case,
+ of the $Id: article.sgml,v 1.268 2007-08-10 17:58:16 keramida 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.267 2007-07-06 16:37:13 chinsan Exp $ line,
- leaving the original $Id: article.sgml,v 1.267 2007-07-06 16:37:13 chinsan Exp $ line intact).
+ (remove the marker lines and the second $Id: article.sgml,v 1.268 2007-08-10 17:58:16 keramida Exp $ line,
+ leaving the original $Id: article.sgml,v 1.268 2007-08-10 17:58:16 keramida Exp $ line intact).
@@ -1730,6 +1731,69 @@ docs:Documentation Bug:freebsd-doc:
&man.scp.1;.
+
+ &coverity.prevent; Availability for &os; Committers
+
+ In January 2006, the &os; Foundation obtained a license for
+ &coverity.prevent; from &coverity Ltd. With this donation, all
+ &os; developers can obtain access to Coverity
+ Prevent analysis results of all &os; Project
+ software.
+
+ &os; developers who are interested in obtaining access to the
+ analysis results of the automated Coverity
+ Prevent runs, can find out more by logging
+ into freefall and reading the relevant bits of the
+ files:
+
+
+
+ /usr/local/coverity/coverity_license.txt
+
+ The license terms to which the &os; developers will have
+ to agree in order to use &coverity.prevent; analysis
+ results.
+
+
+
+
+ /usr/local/coverity/coverity_announcement.txt
+
+ The announcement posted to the developers' mailing list of the
+ &os; Project. It contains useful information about the &os;
+ Foundation and &coverity; Ltd., as well as signup information
+ for registering with the &coverity.prevent; installation of the
+ &os; Cluster.
+
+ After reading and understanding the license terms
+ of coverity_license.txt, all &os; developers
+ who are interested in using the analysis results of
+ &coverity.prevent; should read this file.
+
+
+
+
+ /usr/local/coverity/coverity_readme.txt
+
+ A short guide about fixes which are committed to the &os;
+ source tree after being detected by &coverity.prevent; and
+ analyzed by an &os; developer.
+
+
+
+
+ The &os; Wiki includes a mini-guide for developers who are
+ interested in working with the &coverity.prevent; analysis reports:
+ . Please
+ note that this mini-guide is only readable by &os; developers, so if you
+ cannot access this page, you will have to ask someone to add you to the
+ appropriate Wiki access list.
+
+ Finally, all &os; developers who are going to use &coverity.prevent;
+ are always encouraged to ask for more details and usage information, by
+ posting any questions to the mailing list of the &os; developers.
+
+
The FreeBSD Committers' Big List of Rules
diff --git a/share/sgml/trademarks.ent b/share/sgml/trademarks.ent
index 34ef4387e4..27096a3736 100644
--- a/share/sgml/trademarks.ent
+++ b/share/sgml/trademarks.ent
@@ -95,6 +95,13 @@
countries.">
WordPerfect">
+
+Coverity is a registered trademark;
+Coverity Extend, Coverity Prevent and Coverity Prevent SQS are trademarks of
+Coverity, Inc.">
+Coverity">
+Coverity Prevent">
+
Sound Blaster is a trademark of
Creative Technology Ltd. in the United States and/or other