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

Split a long sentence, removing the need for an – separator.

Browse source
This commit is contained in:
Giorgos Keramidas 2002-05-26 23:22:29 +00:00
parent 48923af77c
commit cf416a63bd
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=13253
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

@ -181,7 +181,7 @@
sources, etc), a script called <filename>easy-import</filename> is sources, etc), a script called <filename>easy-import</filename> is
also provided for making the process easier. It automatically also provided for making the process easier. It automatically
adds the new module entry, does the appropriate thing with adds the new module entry, does the appropriate thing with
<command>cvs import</command>, etc. &ndash; just run it without <command>cvs import</command>, etc. Just run it without
arguments and it will prompt you for everything it needs to arguments and it will prompt you for everything it needs to
know.</para> know.</para>
@ -583,11 +583,11 @@
</itemizedlist> </itemizedlist>
<para>You will almost certainly get a conflict because <para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.122 2002-05-17 17:25:06 obrien Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.123 2002-05-26 23:22:29 keramida Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) lines, so you will have to edit <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 file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.122 2002-05-17 17:25:06 obrien Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.123 2002-05-26 23:22:29 keramida Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.122 2002-05-17 17:25:06 obrien Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.123 2002-05-26 23:22:29 keramida Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>