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

Correct punctuation and grammar.

Browse source 
Reviewed by:	dd, chris
This commit is contained in:
Gregory Sutter 2001-05-29 19:29:25 +00:00
parent fc65647924
commit 357f80a5ed
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=9510
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@
</author> </author>
</authorgroup> </authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.66 2001/05/12 08:07:35 obrien Exp $</pubdate> <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.67 2001/05/13 15:44:20 nik Exp $</pubdate>
<copyright> <copyright>
<year>1999</year> <year>1999</year>
@ -516,11 +516,11 @@
</itemizedlist> </itemizedlist>
<para>You'll almost certainly get a conflict because <para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.67 2001-05-13 15:44:20 nik Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.68 2001-05-29 19:29:25 gsutter Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.67 2001-05-13 15:44:20 nik Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.68 2001-05-29 19:29:25 gsutter Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.67 2001-05-13 15:44:20 nik Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.68 2001-05-29 19:29:25 gsutter Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1267,8 +1267,8 @@ docs:Documentation Bug:nik:</programlisting>
</listitem> </listitem>
<listitem> <listitem>
<para>Respect existing maintainers if listed in the <para>Respect existing maintainers (if listed in the
(<makevar>MAINTAINER</makevar> field in <makevar>MAINTAINER</makevar> field in
<filename>Makefile</filename> or in the <filename>Makefile</filename> or in the
<filename>MAINTAINER</filename> file in the top-level <filename>MAINTAINER</filename> file in the top-level
directory).</para> directory).</para>
@ -1308,7 +1308,7 @@ docs:Documentation Bug:nik:</programlisting>
<listitem> <listitem>
<para>Respect all code freezes and read the <para>Respect all code freezes and read the
<literal>committers</literal> mailing list on a timely basis <literal>committers</literal> mailing list in a timely manner
so you know when a code freeze is in effect.</para> so you know when a code freeze is in effect.</para>
</listitem> </listitem>

14
en_US.ISO_8859-1/articles/committers-guide/article.sgml
View file

@ -19,7 +19,7 @@
</author> </author>
</authorgroup> </authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.66 2001/05/12 08:07:35 obrien Exp $</pubdate> <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.67 2001/05/13 15:44:20 nik Exp $</pubdate>
<copyright> <copyright>
<year>1999</year> <year>1999</year>
@ -516,11 +516,11 @@
</itemizedlist> </itemizedlist>
<para>You'll almost certainly get a conflict because <para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.67 2001-05-13 15:44:20 nik Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.68 2001-05-29 19:29:25 gsutter Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.67 2001-05-13 15:44:20 nik Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.68 2001-05-29 19:29:25 gsutter Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.67 2001-05-13 15:44:20 nik Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.68 2001-05-29 19:29:25 gsutter Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1267,8 +1267,8 @@ docs:Documentation Bug:nik:</programlisting>
</listitem> </listitem>
<listitem> <listitem>
<para>Respect existing maintainers if listed in the <para>Respect existing maintainers (if listed in the
(<makevar>MAINTAINER</makevar> field in <makevar>MAINTAINER</makevar> field in
<filename>Makefile</filename> or in the <filename>Makefile</filename> or in the
<filename>MAINTAINER</filename> file in the top-level <filename>MAINTAINER</filename> file in the top-level
directory).</para> directory).</para>
@ -1308,7 +1308,7 @@ docs:Documentation Bug:nik:</programlisting>
<listitem> <listitem>
<para>Respect all code freezes and read the <para>Respect all code freezes and read the
<literal>committers</literal> mailing list on a timely basis <literal>committers</literal> mailing list in a timely manner
so you know when a code freeze is in effect.</para> so you know when a code freeze is in effect.</para>
</listitem> </listitem>