diff options
Diffstat (limited to 'release/doc/en_US.ISO8859-1')
-rw-r--r-- | release/doc/en_US.ISO8859-1/early-adopter/article.sgml | 21 | ||||
-rw-r--r-- | release/doc/en_US.ISO8859-1/errata/article.sgml | 19 | ||||
-rw-r--r-- | release/doc/en_US.ISO8859-1/readme/article.sgml | 22 |
3 files changed, 46 insertions, 16 deletions
diff --git a/release/doc/en_US.ISO8859-1/early-adopter/article.sgml b/release/doc/en_US.ISO8859-1/early-adopter/article.sgml index aa65b2a..796ea7e 100644 --- a/release/doc/en_US.ISO8859-1/early-adopter/article.sgml +++ b/release/doc/en_US.ISO8859-1/early-adopter/article.sgml @@ -14,6 +14,9 @@ <!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"> %mailing-lists; +<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"> +%trademarks; + <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"> %release; @@ -39,6 +42,14 @@ Engineering Team</holder> </copyright> + <legalnotice id="trademarks" role="trademarks"> + &tm-attrib.freebsd; + &tm-attrib.intel; + &tm-attrib.microsoft; + &tm-attrib.sparc; + &tm-attrib.general; + </legalnotice> + <abstract> <para>This article describes the status of &os; &release.current;, from the standpoint of users who may be new @@ -186,8 +197,8 @@ </listitem> <listitem> - <para>New architectures: Support for the sparc64 and ia64 - architectures, in addition to the i386, pc98, and + <para>New architectures: Support for the &sparc64; and ia64 + architectures, in addition to the &i386;, pc98, and alpha.</para> </listitem> @@ -390,7 +401,7 @@ &release.4x; but not in &release.5x;. These obsolete files may create some problems.</para> - <para>On the i386 and pc98 platforms, a UserConfig utility + <para>On the &i386; and pc98 platforms, a UserConfig utility exists on 4-STABLE to allow boot-time configuration of ISA devices when booting from installation media. Under &os; 5.0, this functionality has been replaced in part by the @@ -404,11 +415,11 @@ the usual <filename>kern.flp</filename> and <filename>mfsroot.flp</filename> floppy images.</para> - <para>CDROM-based installations on the i386 architecture now use + <para>CDROM-based installations on the &i386; architecture now use a <quote>no-emulation</quote> boot loader. This allows, among other things, the use of a <literal>GENERIC</literal> kernel, rather than the stripped-down kernel on the floppy images. In - theory, any system capable of booting the Microsoft Windows NT + theory, any system capable of booting the µsoft; &windowsnt; 4 installation CDROMs should be able to cope with the &os; &release.5x; CDROMs.</para> diff --git a/release/doc/en_US.ISO8859-1/errata/article.sgml b/release/doc/en_US.ISO8859-1/errata/article.sgml index f10506a..525a2b8 100644 --- a/release/doc/en_US.ISO8859-1/errata/article.sgml +++ b/release/doc/en_US.ISO8859-1/errata/article.sgml @@ -17,6 +17,8 @@ %authors; <!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"> %mlists; +<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"> +%trademarks; <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"> %release; ]> @@ -45,6 +47,13 @@ <year>2003</year> <holder role="mailto:doc@FreeBSD.org">The FreeBSD Documentation Project</holder> </copyright> + + <legalnotice id="trademarks" role="trademarks"> + &tm-attrib.freebsd; + &tm-attrib.intel; + &tm-attrib.sparc; + &tm-attrib.general; + </legalnotice> </articleinfo> <abstract> @@ -155,7 +164,7 @@ <para>The RAIDframe disk driver described in &man.raid.4; is non-functional for this release.</para> - <para>ACPI seems to make some i386 machines unstable. Turning off + <para>ACPI seems to make some &i386; machines unstable. Turning off ACPI support may help solve some of these problems; see an item in <xref linkend="late-news">.</para> @@ -185,11 +194,11 @@ <![ %release.type.snapshot [ <para>&man.ipfw.4; should work correctly on strict-alignment - 64-bit architectures such as alpha and sparc64.</para> + 64-bit architectures such as alpha and &sparc64;.</para> <para>The release notes should have stated that the <filename>libthr</filename> library is built by default for the - i386 platform.</para> + &i386; platform.</para> <para>&os; &release.prev; includes some new boot loader scripts designed to make booting &os; with different options easier. @@ -197,7 +206,7 @@ build on the existing Forth-based boot loader scripts (thus, <filename>/boot/loader.conf</filename> and other existing loader configuration files still apply). They are only installed by - default for new binary installs on i386 machines. The new + default for new binary installs on &i386; machines. The new scripts present a boot-time menu that controls how &os; is booted, and include options to turn off ACPI, a <quote>safe mode</quote> boot, single-user booting, and verbose booting. @@ -211,7 +220,7 @@ hw.ata.atapi_dma=0 # disable ATAPI/IDE DMA hw.ata.wc=0 # disable IDE disk write cache hw.eisa_slots=0 # disable probing for EISA devices</programlisting> - <para>For new installs on i386 architecture machines, + <para>For new installs on &i386; architecture machines, &man.sysinstall.8; will try to determine if ACPI was disabled via the new boot loader scripts mentioned above, and if so, ask if this change should be made permanent.</para> diff --git a/release/doc/en_US.ISO8859-1/readme/article.sgml b/release/doc/en_US.ISO8859-1/readme/article.sgml index c80f6e8..4fcf1ef 100644 --- a/release/doc/en_US.ISO8859-1/readme/article.sgml +++ b/release/doc/en_US.ISO8859-1/readme/article.sgml @@ -5,6 +5,8 @@ %authors; <!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"> %mlists; +<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"> +%trademarks; <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"> %release; <!ENTITY % misc PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"> @@ -26,6 +28,14 @@ <year>2003</year> <holder role="mailto:doc@FreeBSD.org">The FreeBSD Documentation Project</holder> </copyright> + + <legalnotice id="trademarks" role="trademarks"> + &tm-attrib.freebsd; + &tm-attrib.intel; + &tm-attrib.opengroup; + &tm-attrib.sparc; + &tm-attrib.general; + </legalnotice> </articleinfo> <abstract> @@ -47,10 +57,10 @@ <para>&os; is an operating system based on 4.4 BSD Lite for Intel, AMD, Cyrix or NexGen <quote>x86</quote> based PC - hardware (i386), NEC PC-9801/9821 series PCs and compatibles + hardware (&i386;), NEC PC-9801/9821 series PCs and compatibles (pc98), DEC/Compaq/HP Alpha computers (alpha), - and UltraSPARC machines (sparc64). Versions - for the IA64 (ia64), PowerPC (powerpc), and AMD + and &ultrasparc; machines (&sparc64;). Versions + for the IA64 (ia64), &powerpc; (&powerpc;), and AMD <quote>Hammer</quote> (amd64) architectures are currently under development as well. &os; works with a wide variety of peripherals and configurations and can be used for everything @@ -323,7 +333,7 @@ <filename>INSTALL.TXT</filename>) contain information that is specific to a particular hardware architecture. For example, the alpha release notes contain information not - applicable to the i386, and vice versa. The architecture + applicable to the &i386;, and vice versa. The architecture for which each document applies will be listed in that document's title.</para> </note> @@ -331,7 +341,7 @@ </para> <para>On platforms that support &man.sysinstall.8; (currently - alpha, i386, ia64, pc98, and sparc64), these documents are generally available via the + alpha, &i386;, ia64, pc98, and &sparc64;), these documents are generally available via the Documentation menu during installation. Once the system is installed, you can revisit this menu by re-running the &man.sysinstall.8; utility.</para> @@ -354,7 +364,7 @@ <sect2> <title>Manual Pages</title> - <para>As with almost all &unix;-like operating systems, &os; comes + <para>As with almost all &unix; like operating systems, &os; comes with a set of on-line manual pages, accessed through the &man.man.1; command or through the <ulink url="http://www.FreeBSD.org/cgi/man.cgi">hypertext manual |