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

Fix typo: detemrine -> determine.

Browse source
This commit is contained in:
Giorgos Keramidas 2002-05-11 14:06:54 +00:00
parent 8c9e766ac4
commit b11ddec147
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=13036
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -583,11 +583,11 @@
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.114 2002-05-09 00:24:17 obrien Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.115 2002-05-11 14:06:54 keramida 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.114 2002-05-09 00:24:17 obrien Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.114 2002-05-09 00:24:17 obrien Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.115 2002-05-11 14:06:54 keramida Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.115 2002-05-11 14:06:54 keramida Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -755,7 +755,7 @@
and also makes it harder to understand just what functional
changes were made. In the case of documentation files, it
can make the job of the translation teams more complicated,
as it becomes difficult for them to detemrine exactly what
as it becomes difficult for them to determine exactly what
content changes need to be translated.</para>
<para>Avoid committing changes to multiple files in one go