diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 65b1594aa4..d36f87a2b4 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.58 2001/04/05 20:35:49 obrien Exp $
+ $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.59 2001/04/07 18:22:32 obrien Exp $
1999
@@ -516,11 +516,11 @@
You'll almost certainly get a conflict because
- of the $Id: article.sgml,v 1.59 2001-04-07 18:22:32 obrien Exp $ (or in FreeBSD's case,
+ of the $Id: article.sgml,v 1.60 2001-04-08 17:26:41 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.59 2001-04-07 18:22:32 obrien Exp $ line, leaving the original
- $Id: article.sgml,v 1.59 2001-04-07 18:22:32 obrien Exp $ line intact).
+ the second $Id: article.sgml,v 1.60 2001-04-08 17:26:41 nik Exp $ line, leaving the original
+ $Id: article.sgml,v 1.60 2001-04-08 17:26:41 nik Exp $ line intact).
@@ -2180,8 +2180,9 @@ cvs add: use 'cvs commit' to add this file permanently
Commit log for a commit based on a PR
- John Smith has submitted a PR containing a patch, which has
- been applied.
+ You want to commit a change based on a PR submitted by John
+ Smith containing a patch. The end of the commit message should
+ look something like this.
...
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 65b1594aa4..d36f87a2b4 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.58 2001/04/05 20:35:49 obrien Exp $
+ $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.59 2001/04/07 18:22:32 obrien Exp $
1999
@@ -516,11 +516,11 @@
You'll almost certainly get a conflict because
- of the $Id: article.sgml,v 1.59 2001-04-07 18:22:32 obrien Exp $ (or in FreeBSD's case,
+ of the $Id: article.sgml,v 1.60 2001-04-08 17:26:41 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.59 2001-04-07 18:22:32 obrien Exp $ line, leaving the original
- $Id: article.sgml,v 1.59 2001-04-07 18:22:32 obrien Exp $ line intact).
+ the second $Id: article.sgml,v 1.60 2001-04-08 17:26:41 nik Exp $ line, leaving the original
+ $Id: article.sgml,v 1.60 2001-04-08 17:26:41 nik Exp $ line intact).
@@ -2180,8 +2180,9 @@ cvs add: use 'cvs commit' to add this file permanently
Commit log for a commit based on a PR
- John Smith has submitted a PR containing a patch, which has
- been applied.
+ You want to commit a change based on a PR submitted by John
+ Smith containing a patch. The end of the commit message should
+ look something like this.
...