Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 Mar 2017 17:53:36 +0000 (UTC)
From:      Glen Barber <gjb@FreeBSD.org>
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
Message-ID:  <201703301753.v2UHracL093082@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703301753.v2UHracL093082>