From 6d273a99c67f2b20a4c101ddc7e8bb9d6d2e600d Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 18 Oct 2018 16:02:12 +0000
Subject: [PATCH] Update the list of files to edit when switching head to a new
 major version number.

Sponsored by:	The FreeBSD Foundation
---
 .../freebsd-releng/releng-major-version.xml   | 24 +++++++++----------
 .../freebsd-releng/releng-minor-version.xml   |  5 ----
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml b/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml
index 4c16eeee6b..30e8b80ba0 100644
--- a/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml
+++ b/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml
@@ -118,11 +118,6 @@
 	    <entry>Update the &os; version</entry>
 	  </row>
 
-	  <row>
-	    <entry><filename>head/gnu/usr.bin/groff/tmac/mdoc.local.in</filename></entry>
-	    <entry>Add the new &os; version</entry>
-	  </row>
-
 	  <row>
 	    <entry><filename>head/sys/conf/newvers.sh</filename></entry>
 	    <entry>Update the <varname>BRANCH</varname> value to
@@ -132,7 +127,8 @@
 
 	  <row>
 	    <entry><filename>head/Makefile.inc1</filename></entry>
-	    <entry>Update <varname>TARGET_TRIPLE</varname></entry>
+	    <entry>Update <literal>TARGET_TRIPLE</literal> and
+	      <literal>MACHINE_TRIPLE</literal></entry>
 	  </row>
 
 	  <row>
@@ -140,12 +136,6 @@
 	    <entry>Update <literal>__FreeBSD_version</literal></entry>
 	  </row>
 
-	  <row>
-	    <entry><filename>head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp</filename></entry>
-	    <entry>Update
-	      <literal>__FreeBSD_cc_version</literal></entry>
-	  </row>
-
 	  <row>
 	    <entry><filename>head/gnu/usr.bin/cc/cc_tools/freebsd-native.h</filename></entry>
 	    <entry>Update <literal>FBSD_MAJOR</literal> and
@@ -159,16 +149,24 @@
 	      section</entry>
 	  </row>
 
+	  <row>
+	    <entry><filename>head/lib/clang/llvm.build.mk</filename></entry>
+	    <entry>Update the value of
+	      <literal>OS_VERSION</literal></entry>
+	  </row>
+
 	  <row>
 	    <entry><filename>head/release/Makefile</filename></entry>
 	    <entry>Remove the
 	      <literal>debug.witness.trace</literal> entries</entry>
 	  </row>
 
+	  <?ignore
 	  <row>
 	    <entry><filename>head/release/doc/en_US.ISO8859-1/readme/article.xml</filename></entry>
 	    <entry>Replace &amp;a.current; with &amp;a.stable;</entry>
 	  </row>
+	  ?>
 
 	  <?ignore
 
@@ -180,7 +178,7 @@
 	  ?>
 
 	  <row>
-	    <entry><filename>head/lib/clang/clang.build.mk</filename></entry>
+	    <entry><filename>head/lib/clang/llvm.build.mk</filename></entry>
 	    <entry>Uncomment <literal>-DNDEBUG</literal></entry>
 	  </row>
 
diff --git a/en_US.ISO8859-1/articles/freebsd-releng/releng-minor-version.xml b/en_US.ISO8859-1/articles/freebsd-releng/releng-minor-version.xml
index 9644e1d2a8..6f7c8556f1 100644
--- a/en_US.ISO8859-1/articles/freebsd-releng/releng-minor-version.xml
+++ b/en_US.ISO8859-1/articles/freebsd-releng/releng-minor-version.xml
@@ -29,11 +29,6 @@
 	</thead>
 
 	<tbody>
-	  <row>
-	    <entry><filename>gnu/usr.bin/groff/tmac/mdoc.local.in</filename></entry>
-	    <entry>Add the new &os; version</entry>
-	  </row>
-
 	  <row>
 	    <entry><filename>sys/conf/newvers.sh</filename></entry>
 	    <entry>Update the <varname>BRANCH</varname> value to