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

Change the example commit message of rev 1.56 to one that has content vs.

Browse source 
stating the obvious in-order to give a better example of what a minimal
commit message should be.
This commit is contained in:
David E. O'Brien 2001-04-05 20:34:32 +00:00
parent 82d52622d4
commit eff1349e39
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=9126
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
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.55 2001/04/04 08:31:49 nik Exp $</pubdate> <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.56 2001/04/04 11:54:01 nik 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.56 2001-04-04 11:54:01 nik Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.57 2001-04-05 20:34:32 obrien 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.56 2001-04-04 11:54:01 nik Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.57 2001-04-05 20:34:32 obrien Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.56 2001-04-04 11:54:01 nik Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.57 2001-04-05 20:34:32 obrien Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -2192,8 +2192,8 @@ cvs add: use 'cvs commit' to add this file permanently
<example> <example>
<title>Commit log for a commit based on a PR</title> <title>Commit log for a commit based on a PR</title>
<para>John Smith has submitted a PR containing a patch, which has <para>Fix the problem where the foo device driver would fail to
been applied.</para> attach if the bar device was present due to a clash in resources.</para>
<programlisting>... <programlisting>...

12
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.55 2001/04/04 08:31:49 nik Exp $</pubdate> <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.56 2001/04/04 11:54:01 nik 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.56 2001-04-04 11:54:01 nik Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.57 2001-04-05 20:34:32 obrien 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.56 2001-04-04 11:54:01 nik Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.57 2001-04-05 20:34:32 obrien Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.56 2001-04-04 11:54:01 nik Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.57 2001-04-05 20:34:32 obrien Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -2192,8 +2192,8 @@ cvs add: use 'cvs commit' to add this file permanently
<example> <example>
<title>Commit log for a commit based on a PR</title> <title>Commit log for a commit based on a PR</title>
<para>John Smith has submitted a PR containing a patch, which has <para>Fix the problem where the foo device driver would fail to
been applied.</para> attach if the bar device was present due to a clash in resources.</para>
<programlisting>... <programlisting>...