Back out rev 1.57. It wasn't clear to me what was being said in rev 1.56.
Hopefully the header "Commit log" will bet tweaked to not give the impression the example is supose to be a complete log message and thus the text is an example of a good commit message.
This commit is contained in:
parent
c7789b30b0
commit
d135bff76f
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=9136
2 changed files with 12 additions and 12 deletions
en_US.ISO8859-1/articles/committers-guide
en_US.ISO_8859-1/articles/committers-guide
|
@ -19,7 +19,7 @@
|
|||
</author>
|
||||
</authorgroup>
|
||||
|
||||
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.57 2001/04/05 20:34:32 obrien Exp $</pubdate>
|
||||
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.58 2001/04/05 20:35:49 obrien Exp $</pubdate>
|
||||
|
||||
<copyright>
|
||||
<year>1999</year>
|
||||
|
@ -516,11 +516,11 @@
|
|||
</itemizedlist>
|
||||
|
||||
<para>You'll almost certainly get a conflict because
|
||||
of the <literal>$Id: article.sgml,v 1.58 2001-04-05 20:35:49 obrien Exp $</literal> (or in FreeBSD's case,
|
||||
of the <literal>$Id: article.sgml,v 1.59 2001-04-07 18:22:32 obrien Exp $</literal> (or in FreeBSD's case,
|
||||
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
|
||||
the file to resolve the conflict (remove the marker lines and
|
||||
the second <literal>$Id: article.sgml,v 1.58 2001-04-05 20:35:49 obrien Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.58 2001-04-05 20:35:49 obrien Exp $</literal> line intact).</para>
|
||||
the second <literal>$Id: article.sgml,v 1.59 2001-04-07 18:22:32 obrien Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.59 2001-04-07 18:22:32 obrien Exp $</literal> line intact).</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
@ -2180,8 +2180,8 @@ cvs add: use 'cvs commit' to add this file permanently
|
|||
<example>
|
||||
<title>Commit log for a commit based on a PR</title>
|
||||
|
||||
<para>Fix the problem where the foo device driver would fail to
|
||||
attach if the bar device was present due to a clash in resources.</para>
|
||||
<para>John Smith has submitted a PR containing a patch, which has
|
||||
been applied.</para>
|
||||
|
||||
<programlisting>...
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
</author>
|
||||
</authorgroup>
|
||||
|
||||
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.57 2001/04/05 20:34:32 obrien Exp $</pubdate>
|
||||
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.58 2001/04/05 20:35:49 obrien Exp $</pubdate>
|
||||
|
||||
<copyright>
|
||||
<year>1999</year>
|
||||
|
@ -516,11 +516,11 @@
|
|||
</itemizedlist>
|
||||
|
||||
<para>You'll almost certainly get a conflict because
|
||||
of the <literal>$Id: article.sgml,v 1.58 2001-04-05 20:35:49 obrien Exp $</literal> (or in FreeBSD's case,
|
||||
of the <literal>$Id: article.sgml,v 1.59 2001-04-07 18:22:32 obrien Exp $</literal> (or in FreeBSD's case,
|
||||
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
|
||||
the file to resolve the conflict (remove the marker lines and
|
||||
the second <literal>$Id: article.sgml,v 1.58 2001-04-05 20:35:49 obrien Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.58 2001-04-05 20:35:49 obrien Exp $</literal> line intact).</para>
|
||||
the second <literal>$Id: article.sgml,v 1.59 2001-04-07 18:22:32 obrien Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.59 2001-04-07 18:22:32 obrien Exp $</literal> line intact).</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
@ -2180,8 +2180,8 @@ cvs add: use 'cvs commit' to add this file permanently
|
|||
<example>
|
||||
<title>Commit log for a commit based on a PR</title>
|
||||
|
||||
<para>Fix the problem where the foo device driver would fail to
|
||||
attach if the bar device was present due to a clash in resources.</para>
|
||||
<para>John Smith has submitted a PR containing a patch, which has
|
||||
been applied.</para>
|
||||
|
||||
<programlisting>...
|
||||
|
||||
|
|
Loading…
Reference in a new issue