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

Wrap `bento' in <hostid> tags, and s/remote repo/remote repository/.

Browse source
This commit is contained in:
Giorgos Keramidas 2003-02-01 17:45:58 +00:00
parent f7f0d4f360
commit ceafe46b44
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=15873
1 changed files with 5 additions and 5 deletions

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

@ -529,7 +529,7 @@
<row>
<entry><literal>P</literal></entry>
<entry>The file was updated without trouble (you will only see
this when working against a remote repo).</entry>
this when working against a remote repository).</entry>
</row>
<row>
@ -608,11 +608,11 @@
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.152 2003-01-28 03:50:08 murray Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.153 2003-02-01 17:45:58 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.152 2003-01-28 03:50:08 murray Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.152 2003-01-28 03:50:08 murray Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.153 2003-02-01 17:45:58 keramida Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.153 2003-02-01 17:45:58 keramida Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -2450,7 +2450,7 @@ docs:Documentation Bug:nik:</programlisting>
<para>However, just because the port does not show up there
does not mean it is building correctly. (One of the
dependencies may have failed, for instance.) Here are
the relevant directories on bento, so feel free to dig
the relevant directories on <hostid>bento</hostid>, so feel free to dig
around.</para>
<programlisting> /a/asami/portbuild/&lt;arch&gt;/&lt;major_version&gt;/errors error logs from latest &lt;major_version&gt; run on &lt;arch&gt;