From owner-svn-doc-head@FreeBSD.ORG  Wed Oct  9 16:59:13 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 3CDFAB56;
 Wed,  9 Oct 2013 16:59:13 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 10604256C;
 Wed,  9 Oct 2013 16:59:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r99GxCUI096304;
 Wed, 9 Oct 2013 16:59:12 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r99GxCS0096303;
 Wed, 9 Oct 2013 16:59:12 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201310091659.r99GxCS0096303@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 9 Oct 2013 16:59:12 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42915 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Oct 2013 16:59:13 -0000

Author: gjb
Date: Wed Oct  9 16:59:12 2013
New Revision: 42915
URL: http://svnweb.freebsd.org/changeset/doc/42915

Log:
  Add a macro for the number of branchs that are active.
  Update rel*.releng macros to use svn branch name style.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/en_US.ISO8859-1/books/faq/book.xml

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Wed Oct  9 16:42:32 2013	(r42914)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Wed Oct  9 16:59:12 2013	(r42915)
@@ -2,18 +2,19 @@
 <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
 	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
+<!ENTITY rel.numbranch "3">  <!-- number of branches that follow in this list -->
 <!ENTITY rel.head "<emphasis>10-CURRENT</emphasis>">
 <!ENTITY rel.head.relx "10.<replaceable>X</replaceable>">
-<!ENTITY rel.head.releng "<symbol>HEAD</symbol>">
+<!ENTITY rel.head.releng "<symbol>head/</symbol>">
 <!ENTITY rel.head.packages "packages-10-current">
 <!ENTITY rel.relx "9.<replaceable>X</replaceable>">
 <!ENTITY rel.stable "<emphasis>9-STABLE</emphasis>">
-<!ENTITY rel.releng "<symbol>RELENG_9</symbol>">
+<!ENTITY rel.releng "<symbol>stable/9/</symbol>">
 <!ENTITY rel.relengdate "September 2011">
 <!ENTITY rel.packages "packages-9-stable">
 <!ENTITY rel2.relx "8.<replaceable>X</replaceable>">
 <!ENTITY rel2.stable "<emphasis>8-STABLE</emphasis>">
-<!ENTITY rel2.releng "<symbol>RELENG_8</symbol>">
+<!ENTITY rel2.releng "<symbol>stable/8/</symbol>">
 <!ENTITY rel2.relengdate "August 2009">
 <!ENTITY rel2.packages "packages-8-stable">
 ]>
@@ -7890,11 +7891,11 @@ hint.sio.7.irq="12"</programlisting>
 	</question>
 
 	<answer>
-	  <para>There are currently four active/semi-active branches in
+	  <para>There are currently &rel.numbranch; active/semi-active branches in
 	    the &os; <ulink
 	      url="http://svnweb.FreeBSD.org/base/">Subversion Repository</ulink>.
 	    (Earlier branches are only changed very rarely, which is why
-	    there are only four active branches of development):</para>
+	    there are only &rel.numbranch; active branches of development):</para>
 
 	  <itemizedlist>
 	    <listitem>