Fix spelling errors.
This commit is contained in:
parent
b6e105c6b7
commit
6df2bb3d4e
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=9108
2 changed files with 16 additions and 16 deletions
|
@ -19,7 +19,7 @@
|
|||
</author>
|
||||
</authorgroup>
|
||||
|
||||
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.50 2001/03/28 10:55:43 phk Exp $</pubdate>
|
||||
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.51 2001/03/28 23:43:47 ben Exp $</pubdate>
|
||||
|
||||
<copyright>
|
||||
<year>1999</year>
|
||||
|
@ -363,7 +363,7 @@
|
|||
contents of the <filename>shazam</filename> directory to the
|
||||
latest version along the branch you checked out. If you
|
||||
checked out a <quote>point in time</quote>, does nothing
|
||||
unless the tags have moved in the repo or some other weird
|
||||
unless the tags have moved in the repository or some other weird
|
||||
stuff is going on.</para>
|
||||
|
||||
<para>Useful options, in addition to those listed above for
|
||||
|
@ -516,11 +516,11 @@
|
|||
</itemizedlist>
|
||||
|
||||
<para>You'll almost certainly get a conflict because
|
||||
of the <literal>$Id: article.sgml,v 1.51 2001-03-28 23:43:47 ben Exp $</literal> (or in FreeBSD's case,
|
||||
of the <literal>$Id: article.sgml,v 1.52 2001-04-03 16:04:54 obrien 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.51 2001-03-28 23:43:47 ben Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.51 2001-03-28 23:43:47 ben Exp $</literal> line intact).</para>
|
||||
the second <literal>$Id: article.sgml,v 1.52 2001-04-03 16:04:54 obrien Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.52 2001-04-03 16:04:54 obrien Exp $</literal> line intact).</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
@ -750,7 +750,7 @@ checkout -P</programlisting>
|
|||
<listitem>
|
||||
<para>CVS is old, arcane, crufty and buggy, and sometimes
|
||||
exhibits non-deterministic behavior which some claim as proof
|
||||
that it's actually merely the newtonian manifestation of a
|
||||
that it's actually merely the Newtonian manifestation of a
|
||||
sentient transdimensional entity. It's not humanly possible
|
||||
to know its every quirk inside out, so don't be afraid to ask
|
||||
the resident AI (<email>cvs@FreeBSD.org</email>) for help when
|
||||
|
@ -977,7 +977,7 @@ checkout -P</programlisting>
|
|||
|
||||
<step>
|
||||
<para>Update the GNATS <filename>categories</filename> file with these
|
||||
cageories. The file is
|
||||
categories. The file is
|
||||
<filename>$PREFIX/share/gnats/gnats-db/gnats-adm/categories</filename>.</para>
|
||||
|
||||
<programlisting># This category is mandatory
|
||||
|
@ -1615,7 +1615,7 @@ docs:Documentation Bug:nik:</programlisting>
|
|||
changes in commits to <filename>doc/</filename> or
|
||||
<filename>www/</filename>. The extra clutter in the diffs
|
||||
makes the translators' job much more difficult. Instead, make
|
||||
any style or whitespace changes in seperate commits that are
|
||||
any style or whitespace changes in separate commits that are
|
||||
clearly labeled as such in the commit message.</para>
|
||||
</sect2>
|
||||
</sect1>
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
</author>
|
||||
</authorgroup>
|
||||
|
||||
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.50 2001/03/28 10:55:43 phk Exp $</pubdate>
|
||||
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.51 2001/03/28 23:43:47 ben Exp $</pubdate>
|
||||
|
||||
<copyright>
|
||||
<year>1999</year>
|
||||
|
@ -363,7 +363,7 @@
|
|||
contents of the <filename>shazam</filename> directory to the
|
||||
latest version along the branch you checked out. If you
|
||||
checked out a <quote>point in time</quote>, does nothing
|
||||
unless the tags have moved in the repo or some other weird
|
||||
unless the tags have moved in the repository or some other weird
|
||||
stuff is going on.</para>
|
||||
|
||||
<para>Useful options, in addition to those listed above for
|
||||
|
@ -516,11 +516,11 @@
|
|||
</itemizedlist>
|
||||
|
||||
<para>You'll almost certainly get a conflict because
|
||||
of the <literal>$Id: article.sgml,v 1.51 2001-03-28 23:43:47 ben Exp $</literal> (or in FreeBSD's case,
|
||||
of the <literal>$Id: article.sgml,v 1.52 2001-04-03 16:04:54 obrien 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.51 2001-03-28 23:43:47 ben Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.51 2001-03-28 23:43:47 ben Exp $</literal> line intact).</para>
|
||||
the second <literal>$Id: article.sgml,v 1.52 2001-04-03 16:04:54 obrien Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.52 2001-04-03 16:04:54 obrien Exp $</literal> line intact).</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
@ -750,7 +750,7 @@ checkout -P</programlisting>
|
|||
<listitem>
|
||||
<para>CVS is old, arcane, crufty and buggy, and sometimes
|
||||
exhibits non-deterministic behavior which some claim as proof
|
||||
that it's actually merely the newtonian manifestation of a
|
||||
that it's actually merely the Newtonian manifestation of a
|
||||
sentient transdimensional entity. It's not humanly possible
|
||||
to know its every quirk inside out, so don't be afraid to ask
|
||||
the resident AI (<email>cvs@FreeBSD.org</email>) for help when
|
||||
|
@ -977,7 +977,7 @@ checkout -P</programlisting>
|
|||
|
||||
<step>
|
||||
<para>Update the GNATS <filename>categories</filename> file with these
|
||||
cageories. The file is
|
||||
categories. The file is
|
||||
<filename>$PREFIX/share/gnats/gnats-db/gnats-adm/categories</filename>.</para>
|
||||
|
||||
<programlisting># This category is mandatory
|
||||
|
@ -1615,7 +1615,7 @@ docs:Documentation Bug:nik:</programlisting>
|
|||
changes in commits to <filename>doc/</filename> or
|
||||
<filename>www/</filename>. The extra clutter in the diffs
|
||||
makes the translators' job much more difficult. Instead, make
|
||||
any style or whitespace changes in seperate commits that are
|
||||
any style or whitespace changes in separate commits that are
|
||||
clearly labeled as such in the commit message.</para>
|
||||
</sect2>
|
||||
</sect1>
|
||||
|
|
Loading…
Reference in a new issue