From b8494fd2f54f651f857906446c130e44a8fbe938 Mon Sep 17 00:00:00 2001 From: "Simon L. B. Nielsen" Date: Thu, 18 Sep 2003 15:32:54 +0000 Subject: [PATCH] - Use trademark entities. - Add trademark attributions. - Don't join trademarks with other words, e.g. using hyphens. - Don't use trademarks as nouns (e.g. don't use "Windows NT's"). --- .../articles/multi-os/article.sgml | 84 +++++++++++-------- .../articles/new-users/article.sgml | 41 +++++---- en_US.ISO8859-1/articles/pam/article.sgml | 47 +++++------ en_US.ISO8859-1/articles/pxe/article.sgml | 15 +++- .../articles/releng-packages/article.sgml | 17 +++- en_US.ISO8859-1/articles/releng/article.sgml | 26 ++++-- .../articles/serial-uart/article.sgml | 14 +++- 7 files changed, 151 insertions(+), 93 deletions(-) diff --git a/en_US.ISO8859-1/articles/multi-os/article.sgml b/en_US.ISO8859-1/articles/multi-os/article.sgml index 8ead931d08..153f212121 100644 --- a/en_US.ISO8859-1/articles/multi-os/article.sgml +++ b/en_US.ISO8859-1/articles/multi-os/article.sgml @@ -3,6 +3,9 @@ %authors; + + +%trademarks; ]>
@@ -25,10 +28,19 @@ 6 August 1996 + + &tm-attrib.freebsd; + &tm-attrib.ibm; + &tm-attrib.linux; + &tm-attrib.microsoft; + &tm-attrib.powerquest; + &tm-attrib.general; + + This document discusses how to make FreeBSD coexist nicely - with other popular operating systems such as Linux, MS-DOS, - OS/2, and Windows 95. Special thanks to: Annelise Anderson + with other popular operating systems such as Linux, &ms-dos;, + &os2;, and &windows; 95. Special thanks to: Annelise Anderson andrsn@stanford.edu, Randall Hopper rhh@ct.picker.com, and &a.jkh;. @@ -55,7 +67,7 @@ URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/">ftp) useful. It lets you repartition your hard disk without destroying the data already on it. There is also a commercial - program available called Partition Magic, which lets you size + program available called &partitionmagic;, which lets you size and delete partitions without consequence. @@ -74,18 +86,18 @@ This is the default boot manager used with FreeBSD. It has the ability to boot most anything, including BSD, - OS/2 (HPFS), Windows 95 (FAT and FAT32), and Linux. + &os2; (HPFS), &windows; 95 (FAT and FAT32), and Linux. Partitions are selected with the function keys. - OS/2 Boot Manager + &os2; Boot Manager This will boot FAT, FAT32, HPFS, FFS (FreeBSD), and EXT2 (Linux). Partitions - are selected using arrow keys. The OS/2 Boot Manager is + are selected using arrow keys. The &os2; Boot Manager is the only one to use its own separate partition, unlike the others which use the master boot record (MBR). Therefore, it must be installed below the 1024th cylinder to avoid @@ -93,7 +105,7 @@ part of the boot sector, not the MBR. Go to Linux HOWTOs on the World Wide Web for more - information on booting Linux with OS/2's boot + information on booting Linux with the &os2; boot manager. @@ -129,7 +141,7 @@ FAT32 is the replacement to the FAT filesystem included in Microsoft's OEM SR2 Beta release, which started replacing FAT - on computers pre-loaded with Windows 95 towards the + on computers pre-loaded with &windows; 95 towards the end of 1996. It converts the normal FAT filesystem and allows you to use smaller cluster sizes for larger hard drives. FAT32 also modifies the traditional FAT boot sector @@ -142,7 +154,7 @@ A Typical Installation Let's say I have two large EIDE hard drives, and I want to - install FreeBSD, Linux, and Windows 95 on them. + install FreeBSD, Linux, and &windows; 95 on them. Here is how I might do it using these hard disks: @@ -160,16 +172,16 @@ - I boot from a MS-DOS or Windows 95 boot disk that + I boot from a &ms-dos; or &windows; 95 boot disk that contains the FDISK.EXE utility and make a small - 50 MB primary partition (35-40 for Windows 95, plus a + 50 MB primary partition (35-40 for &windows; 95, plus a little breathing room) on the first disk. Also create a - larger partition on the second hard disk for my Windows + larger partition on the second hard disk for my &windows; applications and data. - I reboot and install Windows 95 (easier said than done) + I reboot and install &windows; 95 (easier said than done) on the C: partition. @@ -197,13 +209,13 @@ rest of the hard drive (about 270 MB) for the /usr and / slices if I wish. The rest of the second hard disk (size depends on the amount of - my Windows application/data partition that I created in step + my &windows; application/data partition that I created in step 1) can go to the /usr/src slice and swap space. - When viewed with the Windows 95 fdisk + When viewed with the &windows; 95 fdisk utility, my hard drives should now look something like this: --------------------------------------------------------------------- @@ -242,7 +254,7 @@ Press Esc to continue Install FreeBSD. I make sure to boot with my first hard disk set at NORMAL in the BIOS. If it is not, I will have the enter my true disk geometry at boot time (to - get this, boot Windows 95 and consult Microsoft Diagnostics + get this, boot &windows; 95 and consult Microsoft Diagnostics (MSD.EXE), or check your BIOS) with the parameter hd0=1416,16,63 where 1416 is the number of cylinders on my hard @@ -259,7 +271,7 @@ Press Esc to continue When I reboot, Boot Easy should recognize my three - bootable partitions as DOS (Windows 95), Linux, and BSD + bootable partitions as DOS (&windows; 95), Linux, and BSD (FreeBSD). @@ -269,14 +281,14 @@ Press Esc to continue Special Considerations Most operating systems are very picky about where and how - they are placed on the hard disk. Windows 95 and DOS need to be - on the first primary partition on the first hard disk. OS/2 is + they are placed on the hard disk. &windows; 95 and DOS need to be + on the first primary partition on the first hard disk. &os2; is the exception. It can be installed on the first or second disk in a primary or extended partition. If you are not sure, keep the beginning of the bootable partitions below the 1024th cylinder. - If you install Windows 95 on an existing BSD system, it will + If you install &windows; 95 on an existing BSD system, it will destroy the MBR, and you will have to reinstall your previous boot manager. Boot Easy can be reinstalled by using the BOOTINST.EXE utility included in the \TOOLS directory on the @@ -286,16 +298,16 @@ Press Esc to continue partition editor. From there, mark the FreeBSD partition as bootable, select Boot Manager, and then type W to (W)rite out the information to the MBR. You can now reboot, and Boot Easy - should then recognize Windows 95 as DOS. + should then recognize &windows; 95 as DOS. - Please keep in mind that OS/2 can read FAT and HPFS + Please keep in mind that &os2; can read FAT and HPFS partitions, but not FFS (FreeBSD) or EXT2 (Linux) partitions. - Likewise, Windows 95 can only read and write to FAT and FAT32 + Likewise, &windows; 95 can only read and write to FAT and FAT32 (see ) partitions. FreeBSD can read most filesystems, but currently cannot read HPFS partitions. Linux can read HPFS partitions, but can not write to them. Recent - versions of the Linux kernel (2.x) can read and write to Windows - 95 VFAT partitions (VFAT is what gives Windows 95 long file + versions of the Linux kernel (2.x) can read and write to &windows; + 95 VFAT partitions (VFAT is what gives &windows; 95 long file names - it is pretty much the same as FAT). Linux can read and write to most filesystems. Got that? I hope so. @@ -306,14 +318,14 @@ Press Esc to continue (section needs work, please send your example to jayrich@sysc.com). - FreeBSD+Win95: If you installed FreeBSD after Windows 95, + FreeBSD + &windows; 95: If you installed FreeBSD after &windows; 95, you should see DOS on the Boot Easy menu. This is - Windows 95. If you installed Windows 95 after FreeBSD, read + &windows; 95. If you installed &windows; 95 after FreeBSD, read above. As long as your hard disk does not have 1024 cylinders you should not have a problem booting. If one of your partitions goes beyond the 1024th cylinder however, and you get messages like invalid system disk - under DOS (Windows 95) and FreeBSD will not boot, try looking + under DOS (&windows; 95) and FreeBSD will not boot, try looking for a setting in your BIOS called > 1024 cylinder support or NORMAL/LBA mode. DOS may need LBA (Logical Block Addressing) in order to boot correctly. If the @@ -322,14 +334,14 @@ Press Esc to continue FBSDBOOT.EXE utility on the CD (It should find your FreeBSD partition and boot it.) - FreeBSD+OS/2+Win95: Nothing new here. OS/2's boot manager + FreeBSD + &os2; + &windows; 95: Nothing new here. The &os2; boot manager can boot all of these operating systems, so that should not be a problem. - FreeBSD+Linux: You can also use Boot Easy to boot both + FreeBSD + Linux: You can also use Boot Easy to boot both operating systems. - FreeBSD+Linux+Win95: (see ) + FreeBSD + Linux + &windows; 95: (see ) @@ -342,7 +354,7 @@ Press Esc to continue The Linux+DOS+Win95+OS2 - mini-HOWTO offers help on configuring the OS/2 boot + mini-HOWTO offers help on configuring the &os2; boot manager, and the Linux+FreeBSD mini-HOWTO might be interesting as well. The The NT + URL="http://www.tburke.net/info/ntldr/ntldr_hacking_guide.htm">&windowsnt; Loader Hacking Guide provides good information on - multibooting Windows NT, '95, and DOS with other operating + multibooting &windowsnt;, &windows; 95, and DOS with other operating systems. And Hale Landis's How It Works document pack contains some @@ -497,7 +509,7 @@ Press Esc to continue 0A - OS/2 + &os2; @@ -713,7 +725,7 @@ Press Esc to continue - OS/2's boot manager + The &os2; boot manager diff --git a/en_US.ISO8859-1/articles/new-users/article.sgml b/en_US.ISO8859-1/articles/new-users/article.sgml index 5438d8d551..35529d9d68 100644 --- a/en_US.ISO8859-1/articles/new-users/article.sgml +++ b/en_US.ISO8859-1/articles/new-users/article.sgml @@ -8,6 +8,8 @@ %mailing-lists; %freebsd; + +%trademarks; ]>
@@ -28,14 +30,23 @@ August 15, 1997 + + &tm-attrib.freebsd; + &tm-attrib.ibm; + &tm-attrib.microsoft; + &tm-attrib.netscape; + &tm-attrib.opengroup; + &tm-attrib.general; + + Congratulations on installing FreeBSD! This introduction is for people new to both FreeBSD and - Un*x—so it starts with basics. It assumes you are using + &unix;—so it starts with basics. It assumes you are using version 2.0.5 or later of FreeBSD as distributed by BSDi or FreeBSD.org, your system (for now) has a single user - (you)—and you are probably pretty good with DOS/Windows - or OS/2. + (you)—and you are probably pretty good with DOS/&windows; + or &os2;. @@ -298,7 +309,7 @@ The manual page for text. The - major source of documentation for Un*x systems. + major source of documentation for &unix; systems. man ls will tell you all the ways to use the ls command. Press Enter to move through text, @@ -397,11 +408,11 @@ /var/log/messages. Running such commands is part of system - administration—and as a single user of a Unix system, + administration—and as a single user of a &unix; system, you are your own system administrator. Virtually everything you need to be root to do is system administration. Such responsibilities are not covered very well even in those big fat - books on Unix, which seem to devote a lot of space to pulling + books on &unix;, which seem to devote a lot of space to pulling down menus in windows managers. You might want to get one of the two leading books on systems administration, either Evi Nemeth et.al.'s UNIX System Administration @@ -671,7 +682,7 @@ and reboot to go to DOS. Copy these files to a DOS - directory, call them up with DOS EDIT, Windows Notepad or + directory, call them up with DOS EDIT, &windows; Notepad or Wordpad, or a word processor, make a minor change so the file has to be saved, and print as you normally would from DOS or Windows. Hope it works! manual pages come out best if printed @@ -759,7 +770,7 @@ man hier - manual page on the Unix filesystem + manual page on the &unix; filesystem @@ -780,10 +791,10 @@ file(s) on all mounted filesystems, including the CDROM and the DOS partition. - An excellent book that explains Unix commands and utilities + An excellent book that explains &unix; commands and utilities is Abrahams & Larson, Unix for the Impatient (2nd ed., Addison-Wesley, 1996). - There is also a lot of Unix information on the Internet. Try the + There is also a lot of &unix; information on the Internet. Try the Unix Reference Desk. @@ -877,16 +888,16 @@ messages when you use whereis or which, you might want to make additions to the list of directories in the path statement in .cshrc in your home - directory. The path statement in Unix does the same kind of + directory. The path statement in &unix; does the same kind of work it does in DOS, except the current directory is not (by default) in the path for security reasons; if the command you want is in the directory you are in, you need to type ./ before the command to make it work; no space after the slash.) - You might want to get the most recent version of Netscape + You might want to get the most recent version of &netscape; from their FTP site. - (Netscape requires the X Window System.) There is now a FreeBSD + (&netscape; requires the X Window System.) There is now a FreeBSD version, so look around carefully. Just use gunzip filename and tar xvf filename on it, move @@ -907,7 +918,7 @@ setenv XNLSPATH /usr/X11R6/lib/X11/nls /usr/X11R6/lib/X11; if they are not, find them and put them there. - If you originally got Netscape as a port using the CDROM (or + If you originally got &netscape; as a port using the CDROM (or FTP), do not replace /usr/local/bin/netscape with the new netscape binary; this is just a shell script that sets up the environment variables for you. Instead rename the @@ -973,7 +984,7 @@ setenv XNLSPATH /usr/X11R6/lib/X11/nls It can be dangerous to change root's shell to something other than sh or csh on - early versions of FreeBSD and many other versions of Unix; you + early versions of FreeBSD and many other versions of &unix;; you may not have a working shell when the system puts you into single user mode. The solution is to use su -m to become root, which will give you the diff --git a/en_US.ISO8859-1/articles/pam/article.sgml b/en_US.ISO8859-1/articles/pam/article.sgml index 6a63a7286d..9f81155977 100644 --- a/en_US.ISO8859-1/articles/pam/article.sgml +++ b/en_US.ISO8859-1/articles/pam/article.sgml @@ -1,6 +1,12 @@ %man; + + +%freebsd; + + +%trademarks; ]>