From 1f0ea1169e3c3cb2fe50b40d4e2fe0a480c01138 Mon Sep 17 00:00:00 2001 From: Ceri Davies Date: Sat, 1 Mar 2003 01:36:25 +0000 Subject: [PATCH] Spelling and grammatical nit-picking. --- en_US.ISO8859-1/articles/committers-guide/article.sgml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index d173283cf6..70062fadeb 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -76,7 +76,7 @@ Mailing Lists &a.developers;, &a.committers; - (Both of these are private list; archives can be found + (Both of these are private lists; archives can be found in /home/mail/developers-archive and /home/mail/committers-archive on the FreeBSD.org @@ -608,11 +608,11 @@ You will almost certainly get a conflict because - of the $Id: article.sgml,v 1.156 2003-02-22 05:21:12 mike Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.157 2003-03-01 01:36:25 ceri 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.156 2003-02-22 05:21:12 mike Exp $ line, - leaving the original $Id: article.sgml,v 1.156 2003-02-22 05:21:12 mike Exp $ line intact). + (remove the marker lines and the second $Id: article.sgml,v 1.157 2003-03-01 01:36:25 ceri Exp $ line, + leaving the original $Id: article.sgml,v 1.157 2003-03-01 01:36:25 ceri Exp $ line intact). @@ -1052,7 +1052,7 @@ checkout -P Accept correction. We are all fallible. When you have made a mistake, apologize and get on with life. Do not beat up yourself, and certainly do not beat up others for your mistake. - Do not waste time on embarassment or recrimination, just fix + Do not waste time on embarrassment or recrimination, just fix the problem and move on. Ask for help. Seek out (and give) peer reviews. One of