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

Assorted spelling, punctuation, and markup fixes.

Browse source 
PR:		28732
Submitted by:	Giorgos Keramidas <keramida@ceid.upatras.gr>
This commit is contained in:
Dima Dorfman 2001-07-08 01:17:53 +00:00
parent f161a4dba6
commit 73e2ee8aa9
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=9809
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@
</author>
</authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.72 2001/06/11 01:16:39 ache Exp $</pubdate>
<pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.73 2001/06/22 08:18:55 nik Exp $</pubdate>
<copyright>
<year>1999</year>
@ -54,7 +54,7 @@
<row>
<entry><emphasis>Main CVSROOT</emphasis></entry>
<entry>/home/ncvs</entry>
<entry><filename>/home/ncvs</filename></entry>
</row>
<row>
@ -288,7 +288,7 @@
<listitem>
<para>Check out the <filename>miscfs</filename> module as it was
one week agao.</para>
one week ago.</para>
<screen>&prompt.user; <userinput>cvs co -D'last week' miscfs</userinput></screen>
@ -463,7 +463,7 @@
change, and you run <command>cvs update</command>. CVS notices
that you've made local changes, and tries to merge your
changes with the changes between the version you originally
checked out and the one you updated to. If the changed are to
checked out and the one you updated to. If the changes are to
separate portions of the file, it'll almost always work fine
(though the result might not be syntactically or semantically
correct).</para>
@ -519,11 +519,11 @@
</itemizedlist>
<para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.73 2001-06-22 08:18:55 nik Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.74 2001-07-08 01:17:53 dd Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.73 2001-06-22 08:18:55 nik Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.73 2001-06-22 08:18:55 nik Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.74 2001-07-08 01:17:53 dd Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.74 2001-07-08 01:17:53 dd Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -733,7 +733,7 @@ checkout -P</programlisting>
properly (tabs often look wrong in diffs because of the extra
character in front of each line).</para>
<para><ulink url="http://people.FreeBSD.org/~eivind/cdiff">http://people.FreeBSD.org/~eivind/cdiff</ulink></para>
<para><ulink url="http://people.FreeBSD.org/~eivind/cdiff">http://people.FreeBSD.org/~eivind/cdiff</ulink></para>
<para>Simply use it instead of &man.more.1; or &man.less.1;:</para>
@ -783,7 +783,7 @@ checkout -P</programlisting>
<listitem>
<para>Add yourself to the <quote>Developers</quote> section of the
Handbook and remove yourself from the <quote>Additional
Contributors</quote> section.</para>
Contributors</quote> section.</para>
<para>This is a relatively easy task, but remains a good first test of
your CVS skills.</para>
@ -1513,7 +1513,7 @@ docs:Documentation Bug:nik:</programlisting>
<listitem>
<para>Any disputed change must be backed out pending
resolution of the dispute if requested by a maintainer
resolution of the dispute if requested by a maintainer.
Security related changes may
override a maintainer's wishes at the Security Officer's
discretion.</para>