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

- Update info about maintainership of addport script

Browse source
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
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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