Page MenuHomeFreeBSD
Files F154644281

D15781.id43708.diff
No OneTemporary
Actions

D15781.id43708.diff
View Options

Index: head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
===================================================================
--- head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
+++ head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -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
Index: head/share/xml/trademarks.ent
===================================================================
--- head/share/xml/trademarks.ent
+++ head/share/xml/trademarks.ent
@@ -146,6 +146,7 @@
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 @@
<!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 -->

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 30, 3:13 AM (2 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32439378
Default Alt Text
D15781.id43708.diff (2 KB)

Event Timeline