Fix two typos and reword a sentence so it makes sense.
Approved by: murray, jhb
This commit is contained in:
parent
11526b9238
commit
c952f7f788
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=12538
1 changed files with 6 additions and 6 deletions
|
@ -524,11 +524,11 @@
|
|||
</itemizedlist>
|
||||
|
||||
<para>You will almost certainly get a conflict because
|
||||
of the <literal>$Id: article.sgml,v 1.100 2002-03-15 08:28:12 roam Exp $</literal> (or in FreeBSD's case,
|
||||
of the <literal>$Id: article.sgml,v 1.101 2002-03-20 14:50:47 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.100 2002-03-15 08:28:12 roam Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.100 2002-03-15 08:28:12 roam Exp $</literal> line intact).</para>
|
||||
the second <literal>$Id: article.sgml,v 1.101 2002-03-20 14:50:47 ceri Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.101 2002-03-20 14:50:47 ceri Exp $</literal> line intact).</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
@ -1246,11 +1246,11 @@ docs:Documentation Bug:nik:</programlisting>
|
|||
replacement for the &a.arch; or the &a.audit;. In fact
|
||||
using it as such hurts the FreeBSD Project as it gives a sense of a
|
||||
closed list where general decisions affecting all of the FreeBSD
|
||||
using community are made with out being <quote>open</quote>.
|
||||
using community are made without being <quote>open</quote>.
|
||||
Last, but not least <emphasis>never, never ever, email
|
||||
developers@FreeBSD.org and CC:/BCC: another FreeBSD list</emphasis>.
|
||||
Never, ever email another FreeBSD email list and CC:/BCC:
|
||||
developers@FreeBSD.org. Doing so can greatly deminish the benefits
|
||||
developers@FreeBSD.org. Doing so can greatly diminish the benefits
|
||||
of this list.
|
||||
</para>
|
||||
</listitem>
|
||||
|
@ -1492,7 +1492,7 @@ docs:Documentation Bug:nik:</programlisting>
|
|||
<para>You were not always a committer. At one time you were
|
||||
a contributor. Remember that at all times. Remember what
|
||||
it was like trying to get help and attention. Do not forget
|
||||
that your work as a contributor time was very important to
|
||||
that your work as a contributor was very important to
|
||||
you. Remember what it was like. Do not discourage, belittle,
|
||||
or demean contributors. Treat them with respect. They are
|
||||
our committers in waiting. They are every bit as important
|
||||
|
|
Loading…
Reference in a new issue