From bd2438dfff19c9d803a8f900250e32351be782cc Mon Sep 17 00:00:00 2001
From: Andrew Turner <andrew@FreeBSD.org>
Date: Fri, 15 Jan 2016 17:21:31 +0000
Subject: [PATCH] Add arm64 and riscv to the list of supported architectures in
 the committers guide.

Reviewed by:	allanjude, gjb
Approved by:	core (gnn)
Differential Revision:	https://reviews.freebsd.org/D4955
---
 en_US.ISO8859-1/articles/committers-guide/article.xml | 7 ++++---
 share/xml/common.ent                                  | 2 ++
 share/xml/freebsd.ent                                 | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml
index 4edf3d0750..0a255df9b5 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.xml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.xml
@@ -3915,8 +3915,8 @@ Relnotes:           yes</programlisting>
 	list must exist and should be relatively recent.  It should be
 	integrated into the &os; documentation.</para>
 
-      <para>Current Tier 2 platforms are &arch.arm;, &arch.ia64;
-	(through &os; 10),
+      <para>Current Tier 2 platforms are &arch.arm;, &arch.arm64;,
+	&arch.ia64; (through &os; 10),
 	&arch.pc98;, &arch.powerpc;, and &arch.sparc64;.</para>
     </sect2>
 
@@ -3948,7 +3948,8 @@ Relnotes:           yes</programlisting>
 	hardware or emulation environment.  This documentation need
 	not be integrated into the &os; tree.</para>
 
-      <para>Current Tier 3 platforms are &arch.mips;.</para>
+      <para>Current Tier 3 platforms are &arch.mips;, and
+	&arch.riscv;.</para>
     </sect2>
 
     <sect2>
diff --git a/share/xml/common.ent b/share/xml/common.ent
index 837f017296..f7434273c5 100644
--- a/share/xml/common.ent
+++ b/share/xml/common.ent
@@ -54,11 +54,13 @@
 <!ENTITY arch.alpha "alpha">
 <!ENTITY arch.amd64 "amd64">
 <!ENTITY arch.arm "arm">
+<!ENTITY arch.arm64 "arm64">
 <!ENTITY arch.i386 "i386">
 <!ENTITY arch.ia64 "ia64">
 <!ENTITY arch.mips "mips">
 <!ENTITY arch.pc98 "pc98">
 <!ENTITY arch.powerpc "powerpc">
+<!ENTITY arch.riscv "riscv">
 <!ENTITY arch.sparc64 "sparc64">
 <!ENTITY arch.sun4v "sun4v">
 
diff --git a/share/xml/freebsd.ent b/share/xml/freebsd.ent
index 173fc4da6b..7442ee96c1 100644
--- a/share/xml/freebsd.ent
+++ b/share/xml/freebsd.ent
@@ -30,12 +30,14 @@ used in both environments.
 <!ENTITY arch.alpha "alpha">
 <!ENTITY arch.amd64 "amd64">
 <!ENTITY arch.arm "arm">
+<!ENTITY arch.arm64 "arm64">
 <!ENTITY arch.i386 "i386">
 <!ENTITY arch.ia64 "ia64">
 <!ENTITY arch.mips "mips">
 <!ENTITY arch.pc98 "pc98">
 <!ENTITY arch.powerpc "powerpc">
 <!ENTITY arch.powerpc64 "powerpc64">
+<!ENTITY arch.riscv "riscv">
 <!ENTITY arch.sparc64 "sparc64">
 <!ENTITY arch.sun4v "sun4v">