diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index cd18704e63..77d53a1444 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -22,7 +22,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.79 2001/07/15 05:22:50 dd Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.80 2001/07/15 06:33:28 dd Exp $ 1999 @@ -522,11 +522,11 @@ You'll almost certainly get a conflict because - of the $Id: article.sgml,v 1.80 2001-07-15 06:33:28 dd Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.81 2001-07-16 15:33:07 nik Exp $ (or in FreeBSD's case, $FreeBSD$) lines, so you'll have to edit the file to resolve the conflict (remove the marker lines and - the second $Id: article.sgml,v 1.80 2001-07-15 06:33:28 dd Exp $ line, leaving the original - $Id: article.sgml,v 1.80 2001-07-15 06:33:28 dd Exp $ line intact). + the second $Id: article.sgml,v 1.81 2001-07-16 15:33:07 nik Exp $ line, leaving the original + $Id: article.sgml,v 1.81 2001-07-16 15:33:07 nik Exp $ line intact). @@ -1083,6 +1083,24 @@ docs:Documentation Bug:nik: + + &a.nik; + + + Nik oversees the + Doc. Project. + As well as writing documentation he put together the + infrastructure under doc/share/mk and the + stylesheets and related code under + doc/share/sgml. If you've got questions + about these you are encouraged to send them via the + doc@FreeBSD.org mailing list. Committers + interested in contributing to the documentation should familiarise + themself with the + Documentation Project Primer. + + + &a.ru;