From owner-svn-doc-user@freebsd.org  Thu Mar 30 17:53:38 2017
Return-Path: <owner-svn-doc-user@freebsd.org>
Delivered-To: svn-doc-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27F50D263E2
 for <svn-doc-user@mailman.ysv.freebsd.org>;
 Thu, 30 Mar 2017 17:53:38 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CD40514B;
 Thu, 30 Mar 2017 17:53:37 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2UHrad8093083;
 Thu, 30 Mar 2017 17:53:36 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2UHracL093082;
 Thu, 30 Mar 2017 17:53:36 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201703301753.v2UHracL093082@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 30 Mar 2017 17:53:36 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-user@freebsd.org
Subject: svn commit: r50106 -
 user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng
X-SVN-Group: doc-user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-user@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for doc experimental trees
 <svn-doc-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-user>,
 <mailto:svn-doc-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-user/>
List-Post: <mailto:svn-doc-user@freebsd.org>
List-Help: <mailto:svn-doc-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-user>,
 <mailto:svn-doc-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Mar 2017 17:53:38 -0000

Author: gjb
Date: Thu Mar 30 17:53:36 2017
New Revision: 50106
URL: https://svnweb.freebsd.org/changeset/doc/50106

Log:
  - Add a note explaining the purpose of defaults-X.conf,
    builds-X.conf, and main.conf.
  - Use <filename> where appropriate.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-building.xml

Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-building.xml
==============================================================================
--- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-building.xml	Thu Mar 30 17:46:45 2017	(r50105)
+++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-building.xml	Thu Mar 30 17:53:36 2017	(r50106)
@@ -118,20 +118,30 @@ KERNEL="GENERIC64"</programlisting>
 
       <itemizedlist>
 	<listitem>
-	  <para>builds-<replaceable>11</replaceable>.conf -&gt;
-	    main.conf</para>
+	  <para><filename>builds-<replaceable>11</replaceable>.conf</filename>
+	    -&gt; <filename>main.conf</filename></para>
 	  <para>This controls <filename>thermite.sh</filename>
 	    behavior</para>
 	</listitem>
 
 	<listitem>
-	  <para><replaceable>11</replaceable>-<replaceable>amd64</replaceable>-<replaceable>GENERIC</replaceable>-<replaceable>snap</replaceable>.conf
-	    -&gt; defaults-<replaceable>11</replaceable>.conf -&gt;
-	    main.conf</para>
+	  <para><filename><replaceable>11</replaceable>-<replaceable>amd64</replaceable>-<replaceable>GENERIC</replaceable>-<replaceable>snap</replaceable>.conf</filename>
+	    -&gt;
+	    <filename>defaults-<replaceable>11</replaceable>.conf</filename>
+	    -&gt; <filename>main.conf</filename></para>
 	  <para>This controls <filename>release/release.sh</filename>
 	    behavior within the build &man.chroot.8;</para>
 	</listitem>
       </itemizedlist>
+
+      <note>
+	<para>The
+	  <filename>builds-<replaceable>11</replaceable>.conf</filename>,
+	  <filename>defaults-<replaceable>11</replaceable>.conf</filename>,
+	  and <filename>main.conf</filename> configuration files exist
+	  to reduce repetition between the various per-build
+	  files.</para>
+      </note>
     </sect3>
   </sect2>