diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index db6c91ab09..7a50ac6aab 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -579,11 +579,11 @@ You will almost certainly get a conflict because - of the $Id: article.sgml,v 1.131 2002-08-21 16:10:53 blackend Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.132 2002-08-21 16:15:12 blackend 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.131 2002-08-21 16:10:53 blackend Exp $ line, leaving the original - $Id: article.sgml,v 1.131 2002-08-21 16:10:53 blackend Exp $ line intact). + the second $Id: article.sgml,v 1.132 2002-08-21 16:15:12 blackend Exp $ line, leaving the original + $Id: article.sgml,v 1.132 2002-08-21 16:15:12 blackend Exp $ line intact). @@ -884,7 +884,10 @@ checkout -P Add yourself to the Developers section of the Contributors List and remove yourself from the Additional - Contributors section. Once you have done that, do not forget to add your author entity to doc/en_US.ISO8859-1/share/sgml/authors.ent; use the other entries as example. + Contributors section. Once you have done that, do not + forget to add your author entity to + doc/en_US.ISO8859-1/share/sgml/authors.ent; + use the other entries as example. This is a relatively easy task, but remains a good first test of your CVS skills.