svn commit: r51826 - in head: en_US.ISO8859-1/books/handbook/introduction share/xml

Author: sevan
Date: Wed Jun 13 14:55:04 2018
New Revision: 51826
URL: https://svnweb.freebsd.org/changeset/doc/51826

Log:
  Update the list of supported architectures.
  
  Submitted by:	trasz
  Approved by:	bcr (mentor)
  Differential Revision:	https://reviews.freebsd.org/D15781

Modified:
  head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
  head/share/xml/trademarks.ent

Modified: head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml	Wed Jun 13 09:58:06 2018	(r51825)
+++ head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml	Wed Jun 13 14:55:04 2018	(r51826)
@@ -63,9 +63,10 @@
 
     <indexterm><primary>4.4BSD-Lite</primary></indexterm>
 
-    <para>&os; is a 4.4BSD-Lite based operating system for Intel (x86
-      and &itanium;), AMD64, &arm;, and Sun &ultrasparc; computers.  Ports to
-      other architectures are also under way.  You can also read about
+    <para>&os; is an Open Source, Unix-like operating system for x86
+      (both 32 and 64 bit), &arm;, AArch64, &risc-v;, &mips;, &power;,
+      &powerpc;, and Sun &ultrasparc; computers, originally based
+      on 4.4BSD-Lite.  You can also read about
       <link linkend="history">the history of &os;</link>, or the
       <link xlink:href="&url.base;/releases">current release</link>.
       If you are interested in contributing something to the Project

Modified: head/share/xml/trademarks.ent
==============================================================================
--- head/share/xml/trademarks.ent	Wed Jun 13 09:58:06 2018	(r51825)
+++ head/share/xml/trademarks.ent	Wed Jun 13 14:55:04 2018	(r51826)
@@ -146,6 +146,7 @@ Coverity, Inc.</para>">
   United States, other countries, or both.</para>">
 <!ENTITY aix "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>AIX</trademark>">
 <!ENTITY os2 "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>OS/2</trademark>">
+<!ENTITY power "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>POWER</trademark>">
 <!ENTITY powerpc "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>PowerPC</trademark>">
 <!ENTITY ps2 "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>PS/2</trademark>">
 <!ENTITY s390 "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>S/390</trademark>">
@@ -292,6 +293,11 @@ Coverity, Inc.</para>">
 <!ENTITY tm-attrib.redhat "<para xmlns='http://docbook.org/ns/docbook'>Red Hat, RPM, are trademarks or
   registered trademarks of Red Hat, Inc. in the United States and
   other countries.</para>">
+
+<!-- https://riscv.org/risc-v-trademark-usage/ -->
+<!ENTITY tm-attrib.risc-v "<para xmlns='http://docbook.org/ns/docbook'>The “RISC-V” trade name is
+  a registration pending trade mark of the RISC-V Foundation.</para>">
+<!ENTITY risc-v "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>RISC-V</trademark>">
 
 <!-- These four are no longer used in the en_US documentation, but need
   leaving until translations stop using them -->
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"