Date: Thu, 18 Oct 2018 16:11:27 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r52377 - head/en_US.ISO8859-1/articles/freebsd-releng Message-ID: <201810181611.w9IGBRNi069337@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Thu Oct 18 16:11:27 2018 New Revision: 52377 URL: https://svnweb.freebsd.org/changeset/doc/52377 Log: Gratuitous replaceable version number bump from 11 to 12. Sponsored by: The FreeBSD Foundation Modified: head/en_US.ISO8859-1/articles/freebsd-releng/article.xml head/en_US.ISO8859-1/articles/freebsd-releng/releng-building.xml head/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml head/en_US.ISO8859-1/articles/freebsd-releng/releng-minor-version.xml head/en_US.ISO8859-1/articles/freebsd-releng/releng-website.xml Modified: head/en_US.ISO8859-1/articles/freebsd-releng/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/freebsd-releng/article.xml Thu Oct 18 16:02:12 2018 (r52376) +++ head/en_US.ISO8859-1/articles/freebsd-releng/article.xml Thu Oct 18 16:11:27 2018 (r52377) @@ -11,11 +11,11 @@ <!ENTITY team.secteam "&os; Security Team"> <!ENTITY branch.head "<literal xmlns='http://docbook.org/ns/docbook'>head/</literal>">; <!ENTITY branch.stable "<literal xmlns='http://docbook.org/ns/docbook'>stable/</literal>">; -<!ENTITY branch.stablex "<literal xmlns='http://docbook.org/ns/docbook'>stable/<replaceable>11</replaceable>/</literal>">; +<!ENTITY branch.stablex "<literal xmlns='http://docbook.org/ns/docbook'>stable/<replaceable>12</replaceable>/</literal>">; <!ENTITY branch.releng "<literal xmlns='http://docbook.org/ns/docbook'>releng/</literal>">; -<!ENTITY branch.relengx "<literal xmlns='http://docbook.org/ns/docbook'>releng/<replaceable>11.0</replaceable>/</literal>">; -<!ENTITY branch.releasex "<literal xmlns='http://docbook.org/ns/docbook'>release/<replaceable>11.0.0</replaceable>/</literal>">; -<!ENTITY branch.revision "<replaceable xmlns='http://docbook.org/ns/docbook'>11.0</replaceable>">; +<!ENTITY branch.relengx "<literal xmlns='http://docbook.org/ns/docbook'>releng/<replaceable>12.0</replaceable>/</literal>">; +<!ENTITY branch.releasex "<literal xmlns='http://docbook.org/ns/docbook'>release/<replaceable>12.0.0</replaceable>/</literal>">; +<!ENTITY branch.revision "<replaceable xmlns='http://docbook.org/ns/docbook'>12.0</replaceable>">; <!-- Externally included files --> <!ENTITY release.building SYSTEM "./releng-building.xml"> Modified: head/en_US.ISO8859-1/articles/freebsd-releng/releng-building.xml ============================================================================== --- head/en_US.ISO8859-1/articles/freebsd-releng/releng-building.xml Thu Oct 18 16:02:12 2018 (r52376) +++ head/en_US.ISO8859-1/articles/freebsd-releng/releng-building.xml Thu Oct 18 16:11:27 2018 (r52377) @@ -118,16 +118,16 @@ KERNEL="GENERIC64"</programlisting> <itemizedlist> <listitem> - <para><filename>builds-<replaceable>11</replaceable>.conf</filename> + <para><filename>builds-<replaceable>12</replaceable>.conf</filename> -> <filename>main.conf</filename></para> <para>This controls <filename>thermite.sh</filename> behavior</para> </listitem> <listitem> - <para><filename><replaceable>11</replaceable>-<replaceable>amd64</replaceable>-<replaceable>GENERIC</replaceable>-<replaceable>snap</replaceable>.conf</filename> + <para><filename><replaceable>12</replaceable>-<replaceable>amd64</replaceable>-<replaceable>GENERIC</replaceable>-<replaceable>snap</replaceable>.conf</filename> -> - <filename>defaults-<replaceable>11</replaceable>.conf</filename> + <filename>defaults-<replaceable>12</replaceable>.conf</filename> -> <filename>main.conf</filename></para> <para>This controls <filename>release/release.sh</filename> behavior within the build &man.chroot.8;</para> @@ -136,8 +136,8 @@ KERNEL="GENERIC64"</programlisting> <note> <para>The - <filename>builds-<replaceable>11</replaceable>.conf</filename>, - <filename>defaults-<replaceable>11</replaceable>.conf</filename>, + <filename>builds-<replaceable>12</replaceable>.conf</filename>, + <filename>defaults-<replaceable>12</replaceable>.conf</filename>, and <filename>main.conf</filename> configuration files exist to reduce repetition between the various per-build files.</para> @@ -195,8 +195,8 @@ KERNEL="GENERIC64"</programlisting> <screen>&prompt.root; <userinput>cd /releng/scripts-snapshot/scripts</userinput> &prompt.root; <userinput>./setrev.sh -b &branch.stablex;</userinput> -&prompt.root; <userinput>./zfs-setup.sh -c ./builds-<replaceable>11</replaceable>.conf</userinput> -&prompt.root; <userinput>./thermite.sh -c ./builds-<replaceable>11</replaceable>.conf</userinput></screen> +&prompt.root; <userinput>./zfs-setup.sh -c ./builds-<replaceable>12</replaceable>.conf</userinput> +&prompt.root; <userinput>./thermite.sh -c ./builds-<replaceable>12</replaceable>.conf</userinput></screen> <para>Once the builds have completed, additional helper scripts are available to generate development snapshot emails which are @@ -204,7 +204,7 @@ KERNEL="GENERIC64"</programlisting> mailing list:</para> <screen>&prompt.root; <userinput>cd /releng/scripts-snapshot/scripts</userinput> -&prompt.root; <userinput>./get-checksums.sh -c ./builds-<replaceable>11</replaceable>.conf | ./generate-email.pl > snapshot-<replaceable>11</replaceable>-mail</userinput></screen> +&prompt.root; <userinput>./get-checksums.sh -c ./builds-<replaceable>12</replaceable>.conf | ./generate-email.pl > snapshot-<replaceable>12</replaceable>-mail</userinput></screen> <note> <para>The generated output should be double-checked for @@ -236,9 +236,9 @@ KERNEL="GENERIC64"</programlisting> <para>In addition, the <literal>BUILDTYPE</literal> and <literal>types</literal> must be changed from <literal>snap</literal> to <literal>release</literal> in - <filename>defaults-<replaceable>11</replaceable>.conf</filename> + <filename>defaults-<replaceable>12</replaceable>.conf</filename> and - <filename>builds-<replaceable>11</replaceable>.conf</filename>, + <filename>builds-<replaceable>12</replaceable>.conf</filename>, respectively.</para> <para>When building <literal>BETA</literal>, @@ -253,7 +253,7 @@ KERNEL="GENERIC64"</programlisting> Subversion repository, replacing <literal>HEAD</literal> with the last changed revision. Also set <literal>releasesrc</literal> in - <filename>builds-<replaceable>11</replaceable>.conf</filename> + <filename>builds-<replaceable>12</replaceable>.conf</filename> to the relevant branch, such as &branch.stablex; or &branch.relengx;.</para> Modified: head/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml ============================================================================== --- head/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml Thu Oct 18 16:02:12 2018 (r52376) +++ head/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml Thu Oct 18 16:11:27 2018 (r52377) @@ -64,35 +64,35 @@ <tbody> <row> - <entry><filename>stable/<replaceable>11</replaceable>/UPDATING</filename></entry> + <entry><filename>stable/<replaceable>12</replaceable>/UPDATING</filename></entry> <entry>Update the &os; version, and remove the notice about <literal>WITNESS</literal></entry> </row> <row> - <entry><filename>stable/<replaceable>11</replaceable>/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h</filename></entry> + <entry><filename>stable/<replaceable>12</replaceable>/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h</filename></entry> <entry><screen>#ifndef MALLOC_PRODUCTION #define MALLOC_PRODUCTION #endif</screen></entry> </row> <row> - <entry><filename>stable/<replaceable>11</replaceable>/sys/*/conf/GENERIC*</filename></entry> + <entry><filename>stable/<replaceable>12</replaceable>/sys/*/conf/GENERIC*</filename></entry> <entry>Remove debugging support</entry> </row> <row> - <entry><filename>stable/<replaceable>11</replaceable>/release/release.conf.sample</filename></entry> + <entry><filename>stable/<replaceable>12</replaceable>/release/release.conf.sample</filename></entry> <entry>Update <varname>SRCBRANCH</varname></entry> </row> <row> - <entry><filename>stable/<replaceable>11</replaceable>/sys/*/conf/GENERIC-NODEBUG</filename></entry> + <entry><filename>stable/<replaceable>12</replaceable>/sys/*/conf/GENERIC-NODEBUG</filename></entry> <entry>Remove these kernel configurations</entry> </row> <row> - <entry><filename>stable/<replaceable>11</replaceable>/sys/conf/newvers.sh</filename></entry> + <entry><filename>stable/<replaceable>12</replaceable>/sys/conf/newvers.sh</filename></entry> <entry>Update the <varname>BRANCH</varname> value to reflect <literal>BETA1</literal></entry> </row> Modified: head/en_US.ISO8859-1/articles/freebsd-releng/releng-minor-version.xml ============================================================================== --- head/en_US.ISO8859-1/articles/freebsd-releng/releng-minor-version.xml Thu Oct 18 16:02:12 2018 (r52376) +++ head/en_US.ISO8859-1/articles/freebsd-releng/releng-minor-version.xml Thu Oct 18 16:11:27 2018 (r52377) @@ -105,40 +105,40 @@ <tbody> <row> - <entry><filename>releng/<replaceable>11.0</replaceable>/sys/conf/newvers.sh</filename></entry> + <entry><filename>releng/<replaceable>12.0</replaceable>/sys/conf/newvers.sh</filename></entry> <entry>Change <literal>BETA<replaceable>X</replaceable></literal> to <literal>RC1</literal></entry> </row> <row> - <entry><filename>releng/<replaceable>11.0</replaceable>/sys/sys/param.h</filename></entry> + <entry><filename>releng/<replaceable>12.0</replaceable>/sys/sys/param.h</filename></entry> <entry>Update <varname>__FreeBSD_version</varname></entry> </row> <row> - <entry><filename>releng/<replaceable>11.0</replaceable>/etc/pkg/FreeBSD.conf</filename></entry> + <entry><filename>releng/<replaceable>12.0</replaceable>/etc/pkg/FreeBSD.conf</filename></entry> <entry>Replace <literal>latest</literal> with <literal>quarterly</literal> as the default package repository location</entry> </row> <row> - <entry><filename>releng/<replaceable>11.0</replaceable>/release/pkg_repos/release-dvd.conf</filename></entry> + <entry><filename>releng/<replaceable>12.0</replaceable>/release/pkg_repos/release-dvd.conf</filename></entry> <entry>Replace <literal>latest</literal> with <literal>quarterly</literal> as the default package repository location</entry> </row> <row> - <entry><filename>stable/<replaceable>11</replaceable>/sys/conf/newvers.sh</filename></entry> + <entry><filename>stable/<replaceable>12</replaceable>/sys/conf/newvers.sh</filename></entry> <entry>Update <literal>BETA<replaceable>X</replaceable></literal> with <literal>PRERELEASE</literal></entry> </row> <row> - <entry><filename>stable/<replaceable>11</replaceable>/sys/sys/param.h</filename></entry> + <entry><filename>stable/<replaceable>12</replaceable>/sys/sys/param.h</filename></entry> <entry>Update <varname>__FreeBSD_version</varname></entry> </row> Modified: head/en_US.ISO8859-1/articles/freebsd-releng/releng-website.xml ============================================================================== --- head/en_US.ISO8859-1/articles/freebsd-releng/releng-website.xml Thu Oct 18 16:02:12 2018 (r52376) +++ head/en_US.ISO8859-1/articles/freebsd-releng/releng-website.xml Thu Oct 18 16:11:27 2018 (r52377) @@ -88,7 +88,7 @@ <tbody> <row> - <entry><filename>en_US.ISO8859-1/htdocs/releases/11.0R/schedule.xml</filename></entry> + <entry><filename>en_US.ISO8859-1/htdocs/releases/12.0R/schedule.xml</filename></entry> <entry>Change <literal>% beta.local.where</literal> <literal>IGNORE</literal> to <literal>INCLUDE</literal></entry>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810181611.w9IGBRNi069337>