diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 8e2df65c91..b086b12bb9 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -19,7 +19,7 @@
- $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.66 2001/05/12 08:07:35 obrien Exp $
+ $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.67 2001/05/13 15:44:20 nik Exp $
1999
@@ -516,11 +516,11 @@
You'll almost certainly get a conflict because
- of the $Id: article.sgml,v 1.67 2001-05-13 15:44:20 nik Exp $ (or in FreeBSD's case,
+ of the $Id: article.sgml,v 1.68 2001-05-29 19:29:25 gsutter 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.67 2001-05-13 15:44:20 nik Exp $ line, leaving the original
- $Id: article.sgml,v 1.67 2001-05-13 15:44:20 nik Exp $ line intact).
+ the second $Id: article.sgml,v 1.68 2001-05-29 19:29:25 gsutter Exp $ line, leaving the original
+ $Id: article.sgml,v 1.68 2001-05-29 19:29:25 gsutter Exp $ line intact).
@@ -1267,8 +1267,8 @@ docs:Documentation Bug:nik:
- Respect existing maintainers if listed in the
- (MAINTAINER field in
+ Respect existing maintainers (if listed in the
+ MAINTAINER field in
Makefile or in the
MAINTAINER file in the top-level
directory).
@@ -1308,7 +1308,7 @@ docs:Documentation Bug:nik:
Respect all code freezes and read the
- committers mailing list on a timely basis
+ committers mailing list in a timely manner
so you know when a code freeze is in effect.
diff --git a/en_US.ISO_8859-1/articles/committers-guide/article.sgml b/en_US.ISO_8859-1/articles/committers-guide/article.sgml
index 8e2df65c91..b086b12bb9 100644
--- a/en_US.ISO_8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO_8859-1/articles/committers-guide/article.sgml
@@ -19,7 +19,7 @@
- $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.66 2001/05/12 08:07:35 obrien Exp $
+ $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.67 2001/05/13 15:44:20 nik Exp $
1999
@@ -516,11 +516,11 @@
You'll almost certainly get a conflict because
- of the $Id: article.sgml,v 1.67 2001-05-13 15:44:20 nik Exp $ (or in FreeBSD's case,
+ of the $Id: article.sgml,v 1.68 2001-05-29 19:29:25 gsutter 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.67 2001-05-13 15:44:20 nik Exp $ line, leaving the original
- $Id: article.sgml,v 1.67 2001-05-13 15:44:20 nik Exp $ line intact).
+ the second $Id: article.sgml,v 1.68 2001-05-29 19:29:25 gsutter Exp $ line, leaving the original
+ $Id: article.sgml,v 1.68 2001-05-29 19:29:25 gsutter Exp $ line intact).
@@ -1267,8 +1267,8 @@ docs:Documentation Bug:nik:
- Respect existing maintainers if listed in the
- (MAINTAINER field in
+ Respect existing maintainers (if listed in the
+ MAINTAINER field in
Makefile or in the
MAINTAINER file in the top-level
directory).
@@ -1308,7 +1308,7 @@ docs:Documentation Bug:nik:
Respect all code freezes and read the
- committers mailing list on a timely basis
+ committers mailing list in a timely manner
so you know when a code freeze is in effect.