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

Document the "Security:" commit message footer.

Browse source 
Submitted by:	nectar
This commit is contained in:
Simon L. B. Nielsen 2005-07-29 16:58:11 +00:00
parent 725f98609d
commit a6da031cba
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=25270
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -728,11 +728,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.223 2005-04-14 02:08:38 hrs Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.224 2005-07-29 16:58:11 simon 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.223 2005-04-14 02:08:38 hrs Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.223 2005-04-14 02:08:38 hrs Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.224 2005-07-29 16:58:11 simon Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.224 2005-07-29 16:58:11 simon Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -3109,6 +3109,15 @@ cvs add: use 'cvs commit' to add this file permanently
number of days, weeks, or months after which an
<acronym>MFC</acronym> is planned.</entry>
</row>
<row>
<entry><literal>Security:</literal></entry>
<entry>If the change is related to a security
vulnerability or security exposure, include one or
more references or a description of the
issue.</entry>
</row>
</tbody>
</tgroup>
</informaltable>