diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index a0de4593b6..a7f3c2b33b 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -585,11 +585,11 @@ You will almost certainly get a conflict because - of the $Id: article.sgml,v 1.102 2002-03-25 16:31:13 rwatson Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.103 2002-03-25 16:56:38 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.102 2002-03-25 16:31:13 rwatson Exp $ line, leaving the original - $Id: article.sgml,v 1.102 2002-03-25 16:31:13 rwatson Exp $ line intact). + the second $Id: article.sgml,v 1.103 2002-03-25 16:56:38 rwatson Exp $ line, leaving the original + $Id: article.sgml,v 1.103 2002-03-25 16:56:38 rwatson Exp $ line intact). @@ -1141,6 +1141,23 @@ docs:Documentation Bug:nik: and by no means all-inclusively, these are: + + + &a.jhb; + + + John is the manager of the SMPng Project, and has + authority over the architectural design and implementation + of the move to fine-grained kernel threading and locking. + He's also the editor of the SMPng Architecture Document. + If you're working on fine-grained SMP and locking, please + coordinate with John. You can learn more about the + SMPng Project on its home page: + http://www.FreeBSD.org/smp/ + + + &a.nik;