- Update info about maintainership of addport script

This commit is contained in:
Pav Lucistnik 2007-12-19 19:25:51 +00:00
parent 3f8d387977
commit b399cd6398
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=31129

View file

@ -750,11 +750,11 @@ alias scvs cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.org:/home/ncvs</p
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.269 2007-10-15 13:27:28 marck Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.270 2007-12-19 19:25:51 pav 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.269 2007-10-15 13:27:28 marck Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.269 2007-10-15 13:27:28 marck Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.270 2007-12-19 19:25:51 pav Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.270 2007-12-19 19:25:51 pav Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -2472,8 +2472,8 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
It will also add an entry to the
<filename>CVSROOT/modules</filename> file and the port's
category <filename>Makefile</filename>. It was
written by &a.mharo; and &a.will;, but Will is the current
maintainer so please send questions/patches about
written by &a.mharo; and &a.will;, and is currently maintained
by &a.garga;, so please send questions/patches about
<command>addport</command> to him.</para>
</answer>
</qandaentry>