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

Add Security Officer to Who's Who section.

Browse source 
Reminded by:	rwatson
This commit is contained in:
Jacques Vidrine 2002-02-06 17:45:08 +00:00
parent c2b12c7bc9
commit 0022abb4b6
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=12107
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -525,11 +525,11 @@
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.94 2002-02-06 17:05:45 phantom Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.95 2002-02-06 17:45:08 nectar 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.94 2002-02-06 17:05:45 phantom Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.94 2002-02-06 17:05:45 phantom Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.95 2002-02-06 17:45:08 nectar Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.95 2002-02-06 17:45:08 nectar Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -1207,6 +1207,18 @@ docs:Documentation Bug:nik:</programlisting>
</listitem>
</varlistentry>
<varlistentry>
<term>&a.nectar;</term>
<listitem>
<para>Jacques is the
<ulink url="../../../../security/">FreeBSD Security
Officer</ulink>
and oversees the Security Officer Team.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>&a.wollman;</term>