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

/usr/bin/ppp -> /usr/sbin/ppp.

Browse source 
Also, I think I modified lpd once about two years ago.  Relinquish the
apparent title of ``maintainer''.
This commit is contained in:
Brian Somers 2001-01-25 00:09:15 +00:00
parent 9d697f2242
commit 69fb29a67b
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=8732
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@
</author> </author>
</authorgroup> </authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.47 2001/01/13 02:04:07 dannyboy Exp $</pubdate> <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.48 2001/01/15 03:49:03 trevor Exp $</pubdate>
<copyright> <copyright>
<year>1999</year> <year>1999</year>
@ -516,11 +516,11 @@
</itemizedlist> </itemizedlist>
<para>You'll almost certainly get a conflict because <para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.48 2001-01-15 03:49:03 trevor Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.49 2001-01-25 00:09:15 brian Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll 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.48 2001-01-15 03:49:03 trevor Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.49 2001-01-25 00:09:15 brian Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.48 2001-01-15 03:49:03 trevor Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.49 2001-01-25 00:09:15 brian Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1097,7 +1097,7 @@ docs:Documentation Bug:nik:</programlisting>
<listitem> <listitem>
<para>Official maintainer of <para>Official maintainer of
<filename>/usr/bin/ppp</filename> and LPD.</para> <filename>/usr/sbin/ppp</filename>.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>

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

@ -19,7 +19,7 @@
</author> </author>
</authorgroup> </authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.47 2001/01/13 02:04:07 dannyboy Exp $</pubdate> <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.48 2001/01/15 03:49:03 trevor Exp $</pubdate>
<copyright> <copyright>
<year>1999</year> <year>1999</year>
@ -516,11 +516,11 @@
</itemizedlist> </itemizedlist>
<para>You'll almost certainly get a conflict because <para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.48 2001-01-15 03:49:03 trevor Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.49 2001-01-25 00:09:15 brian Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll 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.48 2001-01-15 03:49:03 trevor Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.49 2001-01-25 00:09:15 brian Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.48 2001-01-15 03:49:03 trevor Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.49 2001-01-25 00:09:15 brian Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1097,7 +1097,7 @@ docs:Documentation Bug:nik:</programlisting>
<listitem> <listitem>
<para>Official maintainer of <para>Official maintainer of
<filename>/usr/bin/ppp</filename> and LPD.</para> <filename>/usr/sbin/ppp</filename>.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>