diff --git a/en_US.ISO8859-1/books/handbook/book.sgml b/en_US.ISO8859-1/books/handbook/book.sgml index 322c50d932..9b5baa9bfa 100644 --- a/en_US.ISO8859-1/books/handbook/book.sgml +++ b/en_US.ISO8859-1/books/handbook/book.sgml @@ -21,6 +21,8 @@ %teams; %mailing-lists; %newsgroups; + +%trademarks; %txtfiles; @@ -77,9 +79,35 @@ The FreeBSD Documentation Project - &bookinfo.trademarks; - &bookinfo.legalnotice; + + + &tm-attrib.freebsd; + &tm-attrib.3com; + &tm-attrib.adobe; + &tm-attrib.apple; + &tm-attrib.corel; + &tm-attrib.creative; + &tm-attrib.ibm; + &tm-attrib.ieee; + &tm-attrib.intel; + &tm-attrib.intuit; + &tm-attrib.linux; + &tm-attrib.macromedia; + &tm-attrib.microsoft; + &tm-attrib.netscape; + &tm-attrib.opengroup; + &tm-attrib.oracle; + &tm-attrib.powerquest; + &tm-attrib.realnetworks; + &tm-attrib.redhat; + &tm-attrib.sap; + &tm-attrib.sun; + &tm-attrib.symantec; + &tm-attrib.waterloomaple; + &tm-attrib.wolframresearch; + &tm-attrib.general; + Welcome to FreeBSD! This handbook covers the installation and day @@ -124,7 +152,7 @@ - Teach you some Unix basics. + Teach you some &unix; basics. @@ -133,7 +161,7 @@ - Introduce you to X, the Unix windowing system, and + Introduce you to X, the UNIX windowing system, and detail how to configure a desktop environment that makes you more productive. diff --git a/en_US.ISO8859-1/books/handbook/install/chapter.sgml b/en_US.ISO8859-1/books/handbook/install/chapter.sgml index a1f848dd6d..f3359c55c9 100644 --- a/en_US.ISO8859-1/books/handbook/install/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/install/chapter.sgml @@ -73,7 +73,7 @@ In general, these installation instructions are written - for i386 (PC compatible) architecture + for &i386; (PC compatible) architecture computers. Where applicable, instructions specific to other platforms (for example, Alpha) will be listed. @@ -97,7 +97,7 @@ your configuration. If you already have another operating system installed, such as - Windows or Linux, it is a good idea to use the facilities provided + &windows; or Linux, it is a good idea to use the facilities provided by those operating systems to see how your hardware is already configured. If you are really not sure what settings an expansion card is using, you may find it printed on the card itself. Popular IRQ @@ -175,7 +175,7 @@ N/A - Intel 10/100 + &intel; 10/100 @@ -185,7 +185,7 @@ N/A - 3Com 56K faxmodem, on COM1 + &t3com; 56K faxmodem, on COM1 @@ -219,7 +219,7 @@ laid out on the disk, and how this affects you. - Disk Layouts for the i386 + Disk Layouts for the &i386; A PC disk can be divided into discrete chunks. These chunks are called partitions. By design, the PC only @@ -265,7 +265,7 @@ want a graphical user interface. If you intend to install a lot of third party software as well, then you will need more space. - You can use a commercial tool such as PartitionMagic® + You can use a commercial tool such as &partitionmagic; to resize your partitions to make space for FreeBSD. The tools directory on the CDROM contains two free software tools which can carry out this task, namely @@ -314,7 +314,7 @@ - Use one of the tools such as PartitionMagic®, + Use one of the tools such as PartitionMagic, described above, to shrink your Windows partition. @@ -617,7 +617,7 @@ pqb0.0.1.4.0 PQB0 PCI EIDE url="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/">tools directory on the FreeBSD FTP site. - If you are writing the floppies on a Unix system (such as + If you are writing the floppies on a &unix; system (such as another FreeBSD system) you can use the &man.dd.1; command to write the image files directly to disk. On FreeBSD, you would run: @@ -627,7 +627,7 @@ pqb0.0.1.4.0 PQB0 PCI EIDE On FreeBSD, /dev/fd0 refers to the first floppy disk (the A: drive). /dev/fd1 would be the - B: drive, and so on. Other Unix + B: drive, and so on. Other UNIX variants might have different names for the floppy disk devices, and you will need to check the documentation for the system as necessary. @@ -663,7 +663,7 @@ We can take no responsibility for lost disk contents! Booting - Booting for the i386 + Booting for the &i386; @@ -1416,7 +1416,7 @@ Mounting root from ufs:/dev/md0c Begin a Standard Installation The Standard installation is the - option recommended for those new to Unix or FreeBSD. Use the arrow + option recommended for those new to &unix; or FreeBSD. Use the arrow keys to select Standard and then press Enter to start the installation. @@ -1450,7 +1450,7 @@ Mounting root from ufs:/dev/md0c DOS Microsoft Windows In a PC running a BIOS-dependent operating system such as - MS-DOS or Microsoft Windows, the BIOS is able to abstract the + &ms-dos; or µsoft.windows;, the BIOS is able to abstract the normal disk drive order, and the operating system goes along with the change. This allows the user to boot from a disk drive other than the so-called primary @@ -1458,7 +1458,7 @@ Mounting root from ufs:/dev/md0c found that the simplest and cheapest way to keep a system backup is to buy an identical second hard drive, and perform routine copies of the first drive to the second drive using - Ghost or XCOPY + Ghost or XCOPY . Then, if the first drive fails, or is attacked by a virus, or is scribbled upon by an operating system defect, he can easily recover by instructing the BIOS @@ -1580,7 +1580,7 @@ Mounting root from ufs:/dev/md0c So far this is probably similar to any other operating system you may have used. There are a few differences; for example, DOS uses - \ to separate file and directory names, while MacOS + \ to separate file and directory names, while &macos; uses :. FreeBSD does not use drive letters, or other drive names in the @@ -1794,7 +1794,7 @@ Mounting root from ufs:/dev/md0c Filesystems are contained in partitions. This does not have the same meaning as the earlier usage of the term partition in this - chapter, because of FreeBSD's Unix heritage. Each partition is + chapter, because of FreeBSD's &unix; heritage. Each partition is identified by a letter from a through to h. Each partition can contain only one filesystem, which means that filesystems are often described by either their @@ -1865,7 +1865,7 @@ Mounting root from ufs:/dev/md0c Each partition-that-contains-a-filesystem is stored in what FreeBSD calls a slice. Slice is FreeBSD's term for what were earlier called partitions, and again, this is because of - FreeBSD's Unix background. Slices are numbered, starting at 1, + FreeBSD's UNIX background. Slices are numbered, starting at 1, through to 4. slices @@ -2189,7 +2189,7 @@ Mounting root from ufs:/dev/md0c appropriate figure and press Enter. If you have already made space for FreeBSD (perhaps by using a - tool such as PartitionMagic®) then you can + tool such as &partitionmagic;) then you can press C to create a new slice. Again, you will be prompted for the size of slice you would like to create. @@ -2648,7 +2648,7 @@ Mounting root from ufs:/dev/md0c on the intended use of the system and the amount of disk space available. The predefined options range from installing the smallest possible configuration to everything. Those who are - new to Unix and/or FreeBSD should almost certainly select one + new to &unix; and/or FreeBSD should almost certainly select one of these canned options. Customizing a distribution set is typically for the more experienced user. @@ -4961,7 +4961,7 @@ Please press any key to reboot. The following section covers basic installation troubleshooting, such as common problems people have reported. There are also a few questions and answers for people wishing to dual-boot FreeBSD with - MS-DOS. + &ms-dos;. What to Do If Something Goes Wrong @@ -5045,15 +5045,15 @@ Please press any key to reboot. DOS Many users wish to install &os; on PCs inhabited by - Microsoft™ based operating systems. For those instances, &os; has a + µsoft; based operating systems. For those instances, &os; has a utility known as FIPS. This utility can be found in the tools directory on the install CD-ROM, or downloaded from one of various &os; mirrors. The FIPS utility allows you to split an - existing MS-DOS partition into two pieces, preserving the original + existing &ms-dos; partition into two pieces, preserving the original partition and allowing you to install onto the second free piece. - You first need to defragment your MS-DOS partition using the Windows™ + You first need to defragment your MS-DOS partition using the &windows;; Disk Defragmenter utility (go into Explorer, right-click on the hard drive, and choose to defrag your hard drive), or use Norton Disk Tools. Now you can run the @@ -5065,7 +5065,7 @@ Please press any key to reboot. There is also a very useful product from PowerQuest (http://www.powerquest.com) called - PartitionMagic®. This application has far more + &partitionmagic;. This application has far more functionality than FIPS, and is highly recommended if you plan to add/remove operating systems often. It does cost money, so if you plan to install &os; and keep it installed, FIPS @@ -5240,7 +5240,7 @@ Please press any key to reboot. url="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/">tools directory on the FreeBSD FTP site. - If you are writing the floppies on a Unix system (such + If you are writing the floppies on a &unix; system (such as another FreeBSD system) you can use the &man.dd.1; command to write the image files directly to disk. On FreeBSD you would run: @@ -5250,7 +5250,7 @@ Please press any key to reboot. On FreeBSD /dev/fd0 refers to the first floppy disk (the A: drive). /dev/fd1 would be the - B: drive, and so on. Other Unix + B: drive, and so on. Other UNIX variants might have different names for the floppy disk devices, and you will need to check the documentation for the system as necessary. @@ -5355,7 +5355,7 @@ Please press any key to reboot. There may be some situations in which you need to create your own FreeBSD installation media and/or source. This might be physical media, such as a tape, or a source that sysinstall - can use to retrieve the files, such as a local FTP site, or an MS-DOS + can use to retrieve the files, such as a local FTP site, or an &ms-dos; partition. For example: @@ -5368,7 +5368,7 @@ Please press any key to reboot. You have a FreeBSD disk, FreeBSD does not recognize your CD/DVD - drive, but DOS/Windows does. You want to copy the FreeBSD + drive, but DOS/&windows; does. You want to copy the FreeBSD installations files to a DOS partition on the same computer, and then install FreeBSD using those files. diff --git a/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml b/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml index dc3fa7fd16..49421264c2 100644 --- a/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml @@ -53,7 +53,7 @@ FreeBSD is a 4.4BSD-Lite based operating system for Intel (x86), DEC Alpha, and Sun - UltraSparc computers. Ports to other + &ultrasparc; computers. Ports to other architectures are also underway. For a brief overview of FreeBSD, see the next section. You can also read about the history of FreeBSD, @@ -162,7 +162,7 @@ Thousands of additional and easy-to-port applications are available on the Internet. FreeBSD is source code compatible with most - popular commercial Unix systems and thus most applications + popular commercial &unix; systems and thus most applications require few, if any, changes to compile. @@ -242,7 +242,7 @@ limited only by your own imagination. From software development to factory automation, inventory control to azimuth correction of remote satellite antennae; if it can be done with a commercial - Unix product then it is more than likely that you can do it with + UNIX product then it is more than likely that you can do it with FreeBSD too! FreeBSD also benefits significantly from literally thousands of high quality applications developed by research centers and universities around the world, often @@ -847,14 +847,14 @@ Computer Systems Research Group (CSRG) FreeBSD is a freely available, full source 4.4BSD-Lite based - release for Intel i386, i486, Pentium, - Pentium Pro, - Celeron, - Pentium II, - Pentium III, - Pentium IV (or compatible), - Xeon, DEC Alpha - and Sun UltraSparc based computer + release for Intel &i386;, &i486;, &pentium;, + &pentium; Pro, + &celeron;, + &pentium; II, + &pentium; III, + &pentium; 4 (or compatible), + &xeon;, DEC Alpha + and Sun &ultrasparc; based computer systems. It is based primarily on software from U.C. Berkeley's CSRG group, with some enhancements from NetBSD, OpenBSD, 386BSD, and the Free Software Foundation. diff --git a/share/sgml/trademarks.ent b/share/sgml/trademarks.ent index f5cebfa5f3..735c6a1fc0 100644 --- a/share/sgml/trademarks.ent +++ b/share/sgml/trademarks.ent @@ -92,6 +92,10 @@ Linux is a registered trademarks of Linus Torvalds in the United States."> +Macromedia and Flash are + trademarks or registered trademarks of Macromedia, Inc. in the + United States and/or other countries."> + Microsoft, FrontPage, MS-DOS, Outlook, Windows, Windows Media, and Windows NT are either registered trademarks or trademarks of Microsoft Corporation in the