aboutsummaryrefslogtreecommitdiff
path: root/en_US.ISO8859-1
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2007-01-10 10:53:35 +0000
committerRobert Watson <rwatson@FreeBSD.org>2007-01-10 10:53:35 +0000
commit4791bd27729074a35e8669c52a9d81cdc317d520 (patch)
treed6533d5a5f62c49a518d0278dbd0aa199c82f6b3 /en_US.ISO8859-1
parent8d4ba38ffdcb22235c544b6fda839e5926ca2925 (diff)
Notes
Diffstat (limited to 'en_US.ISO8859-1')
-rw-r--r--en_US.ISO8859-1/articles/committers-guide/article.sgml9
1 files changed, 5 insertions, 4 deletions
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index db844f930a..4bf7e22fc1 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -730,11 +730,11 @@ alias scvs cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.org:/home/ncvs</p
</itemizedlist>
<para>You will almost certainly get a conflict because
- of the <literal>$Id: article.sgml,v 1.251 2006-12-06 00:38:21 ceri Exp $</literal> (or in FreeBSD's case,
+ of the <literal>$Id: article.sgml,v 1.252 2007-01-10 10:53:35 rwatson 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.251 2006-12-06 00:38:21 ceri Exp $</literal> line,
- leaving the original <literal>$Id: article.sgml,v 1.251 2006-12-06 00:38:21 ceri Exp $</literal> line intact).</para>
+ (remove the marker lines and the second <literal>$Id: article.sgml,v 1.252 2007-01-10 10:53:35 rwatson Exp $</literal> line,
+ leaving the original <literal>$Id: article.sgml,v 1.252 2007-01-10 10:53:35 rwatson Exp $</literal> line intact).</para>
</listitem>
<listitem>
@@ -1196,7 +1196,8 @@ Host pcvs.FreeBSD.org
<para>Currently the &os; Project suggests and uses the following
text as the preferred license scheme:</para>
-<programlisting>Copyright &copy; &lt;Year&gt; &lt;Author&gt;. All rights reserved.
+<programlisting>Copyright &copy; &lt;Year&gt; &lt;Author&gt;.
+All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions