From 34faed2813fb9d12a6c7c395511217fd4aaad469 Mon Sep 17 00:00:00 2001
From: Ceri Davies <ceri@FreeBSD.org>
Date: Tue, 20 Apr 2004 18:35:00 +0000
Subject: [PATCH] Standardise some spelling. Translators can probably ignore
this.
---
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 db1a7980ec..369f6d2de5 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -218,7 +218,7 @@
the possibility of placing each on a separate machine in the future,
there is a separate hostname for each that committers should use.
Additionally, each repository is stored in a separate directory. The
- following table summarises the situation.</para>
+ following table summarizes the situation.</para>
<table frame="none" id="cvs-repositories-and-hosts">
<title>&os; CVS Repositories, Hosts and Directories</title>
@@ -678,11 +678,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
</itemizedlist>
<para>You will almost certainly get a conflict because
- of the <literal>$Id: article.sgml,v 1.188 2004-04-09 06:13:10 imp Exp $</literal> (or in FreeBSD's case,
+ of the <literal>$Id: article.sgml,v 1.189 2004-04-20 18:35:00 ceri Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict
- (remove the marker lines and the second <literal>$Id: article.sgml,v 1.188 2004-04-09 06:13:10 imp Exp $</literal> line,
- leaving the original <literal>$Id: article.sgml,v 1.188 2004-04-09 06:13:10 imp Exp $</literal> line intact).</para>
+ (remove the marker lines and the second <literal>$Id: article.sgml,v 1.189 2004-04-20 18:35:00 ceri Exp $</literal> line,
+ leaving the original <literal>$Id: article.sgml,v 1.189 2004-04-20 18:35:00 ceri Exp $</literal> line intact).</para>
</listitem>
<listitem>
@@ -1121,7 +1121,7 @@ SUCH DAMAGE.</programlisting>
<para>The &os; project strongly discourages the so called
advertising clause in new code. Due to the large number of
- contributers to the &os; project, complying with this clause for
+ contributors to the &os; project, complying with this clause for
many commercial vendors has become difficult. If you have code
in the tree with the advertising clause, please consider
removing it. In fact, please consider using the above license