From 31eacb41675b5e61fd8cd7d2970f62b5fb599ae1 Mon Sep 17 00:00:00 2001
From: Dmitry Morozovsky <marck@FreeBSD.org>
Date: Mon, 15 Oct 2007 13:27:28 +0000
Subject: [PATCH] Mention RELENG_7 tag.  Wrap long line while I'm here.

---
 .../articles/committers-guide/article.sgml           | 12 ++++++++----
 1 file changed, 8 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 657e3c61b0..9d381e26fc 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -114,7 +114,11 @@
 
 	  <row>
 	    <entry><emphasis>Noteworthy CVS Tags</emphasis></entry>
-	    <entry><literal>RELENG_5</literal> (5.X-STABLE), <literal>RELENG_6</literal> (6.X-STABLE), <literal>HEAD</literal> (-CURRENT)</entry>
+	    <entry><literal>RELENG_5</literal> (5.X-STABLE), 
+	      <literal>RELENG_6</literal> (6.X-STABLE), 
+	      <literal>RELENG_7</literal> (7.X-STABLE), 
+	      <literal>HEAD</literal> (-CURRENT)
+	    </entry>
 	  </row>
 	</tbody>
       </tgroup>
@@ -746,11 +750,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.268 2007-08-10 17:58:16 keramida Exp $</literal> (or in FreeBSD's case,
+	  of the <literal>$Id: article.sgml,v 1.269 2007-10-15 13:27:28 marck 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.268 2007-08-10 17:58:16 keramida Exp $</literal> line,
-	  leaving the original <literal>$Id: article.sgml,v 1.268 2007-08-10 17:58:16 keramida Exp $</literal> line intact).</para>
+	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.269 2007-10-15 13:27:28 marck Exp $</literal> line,
+	  leaving the original <literal>$Id: article.sgml,v 1.269 2007-10-15 13:27:28 marck Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>