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

Two <filename> elements separated by a single dot look very funny in

Browse source 
the output.  Abuse Philippe Charnier's favorite "The FOO thing" trick
to slightly improve the way things look.
This commit is contained in:
Giorgos Keramidas 2003-03-27 16:35:29 +00:00
parent ee2ee50669
commit 998c5f45c5
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=16376
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

@ -316,7 +316,7 @@
<para>You now have a directory named <filename>src</filename>, <para>You now have a directory named <filename>src</filename>,
with subdirectories <filename>CVS</filename> and with subdirectories <filename>CVS</filename> and
<filename>sys</filename>. <filename>src/sys</filename> has <filename>sys</filename>. The <filename>src/sys</filename> directory has
subdirectories <filename>CVS</filename> and subdirectories <filename>CVS</filename> and
<filename>miscfs</filename>, etc.</para> <filename>miscfs</filename>, etc.</para>
</listitem> </listitem>
@ -608,11 +608,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.161 2003-03-01 23:08:14 ceri Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.162 2003-03-27 16:35:29 keramida Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict 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.161 2003-03-01 23:08:14 ceri Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.162 2003-03-27 16:35:29 keramida Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.161 2003-03-01 23:08:14 ceri Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.162 2003-03-27 16:35:29 keramida Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>