os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Spelling and grammatical nit-picking.

Browse source
This commit is contained in:
Ceri Davies 2003-03-01 01:36:25 +00:00
parent 5bd21d4390
commit 1f0ea1169e
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=16156
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -76,7 +76,7 @@
<row> <row>
<entry><emphasis>Mailing Lists</emphasis></entry> <entry><emphasis>Mailing Lists</emphasis></entry>
<entry>&a.developers;, &a.committers; <entry>&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 <filename>/home/mail/developers-archive</filename> in <filename>/home/mail/developers-archive</filename>
and <filename>/home/mail/committers-archive</filename> and <filename>/home/mail/committers-archive</filename>
on the <hostid role="domainname">FreeBSD.org</hostid> on the <hostid role="domainname">FreeBSD.org</hostid>
@ -608,11 +608,11 @@
</itemizedlist> </itemizedlist>
<para>You will almost certainly get a conflict because <para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.156 2003-02-22 05:21:12 mike Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.157 2003-03-01 01:36:25 ceri Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict 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.156 2003-02-22 05:21:12 mike Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.157 2003-03-01 01:36:25 ceri Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.156 2003-02-22 05:21:12 mike Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.157 2003-03-01 01:36:25 ceri Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1052,7 +1052,7 @@ checkout -P</programlisting>
<para>Accept correction. We are all fallible. When you have made <para>Accept correction. We are all fallible. When you have made
a mistake, apologize and get on with life. Do not beat up a mistake, apologize and get on with life. Do not beat up
yourself, and certainly do not beat up others for your mistake. 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.</para> the problem and move on.</para>
<para>Ask for help. Seek out (and give) peer reviews. One of <para>Ask for help. Seek out (and give) peer reviews. One of