diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 1919d77983..b54d2984a6 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -522,11 +522,11 @@ You will almost certainly get a conflict because - of the $Id: article.sgml,v 1.87 2001-10-23 21:19:23 murray Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.88 2001-10-31 23:10:30 chern Exp $ (or in FreeBSD's case, $FreeBSD$) lines, so you will have to edit the file to resolve the conflict (remove the marker lines and - the second $Id: article.sgml,v 1.87 2001-10-23 21:19:23 murray Exp $ line, leaving the original - $Id: article.sgml,v 1.87 2001-10-23 21:19:23 murray Exp $ line intact). + the second $Id: article.sgml,v 1.88 2001-10-31 23:10:30 chern Exp $ line, leaving the original + $Id: article.sgml,v 1.88 2001-10-31 23:10:30 chern Exp $ line intact). @@ -566,7 +566,7 @@ file the differences are and how many lines they span. This is followed by a number of lines; some (preceded by a blank) are context; some (preceded by a - sign) - are outtakes and some (preceded by a +) are + are out takes and some (preceded by a +) are additions. You can also diff against a different version @@ -1097,7 +1097,7 @@ docs:Documentation Bug:nik: about these you are encouraged to send them via the doc@FreeBSD.org mailing list. Committers interested in contributing to the documentation should familiarise - themself with the + themselves with the Documentation Project Primer. @@ -1618,7 +1618,7 @@ docs:Documentation Bug:nik: developers, so allow some time to elapse before merging unless the &os.stable; fix is critical, time sensitive or so obvious as to make further testing - unnecessary (spelling fixes to manpages, obvious bug/typo + unnecessary (spelling fixes to man pages, obvious bug/typo fixes, etc.) In other words, apply common sense. diff --git a/en_US.ISO8859-1/articles/console-server/article.sgml b/en_US.ISO8859-1/articles/console-server/article.sgml index 0218a9b4d0..fd85840f76 100644 --- a/en_US.ISO8859-1/articles/console-server/article.sgml +++ b/en_US.ISO8859-1/articles/console-server/article.sgml @@ -579,7 +579,7 @@ exit 0 hardware, so we did it ourselves. But if you are not set up for this, or you have a large number of cables to make, then you might consider getting some cables custom made. Look in the - yellow pages, there are a suprising number of places that do + yellow pages, there are a surprising number of places that do this! Getting custom-made cabling is good, and you can get much more professional results, but can be expensive. For example, the RJ-45 to DB-25 adapter kits described below are about $10 @@ -1225,7 +1225,7 @@ conventions Last modified: Thu Jul 19 10:19:28 EST 2001
-$Id: article.sgml,v 1.4 2001-10-23 21:23:00 murray Exp $ +$Id: article.sgml,v 1.5 2001-10-31 23:10:30 chern Exp $ diff --git a/en_US.ISO8859-1/articles/filtering-bridges/article.sgml b/en_US.ISO8859-1/articles/filtering-bridges/article.sgml index c288e370d5..8423777f91 100644 --- a/en_US.ISO8859-1/articles/filtering-bridges/article.sgml +++ b/en_US.ISO8859-1/articles/filtering-bridges/article.sgml @@ -29,7 +29,7 @@ either have a software routing component (a PPP daemon, specifically) that can do some filtering or can be combined with a filter on the machine running the link. But with DSL you only get a little white - box with some Blinkenlights on it and an Ethernet port that takes + box with some blinking lights on it and an Ethernet port that takes your traffic back and forth from the Internet and nothing else (to some extent the same can be said of other mass-market high speed connectivity methods, like cable modems or high speed wireless links @@ -74,7 +74,7 @@ RELENG_4 and -current have had bridging support for all Ethernet interfaces. This does not mean that any Ethernet interface will work. For them to work, they have to support a working promiscuous mode for - both reception and transmition -- that is, they have to be able to + both reception and transmission -- that is, they have to be able to transmit Ethernet packets with any source address, not just their own. In order to get good throughput, the cards should also be PCI bus mastering cards. The best choices still are the Intel EtherExpress Pro @@ -121,7 +121,7 @@ firewall_type="open" There is one more thing that is necessary. When running IP over Ethernet, there are actually two Ethernet protocols in use. One is IP, the other is ARP. ARP is used when a machine must figure out - what Ethernet address coresponds to a given IP address. ARP is not + what Ethernet address corresponds to a given IP address. ARP is not a part of the IP layer, since it only applies to IP when run over Ethernet. The standard ipfirewall rule for the open firewall is diff --git a/en_US.ISO8859-1/articles/pxe/article.sgml b/en_US.ISO8859-1/articles/pxe/article.sgml index 91f9248582..359e413683 100644 --- a/en_US.ISO8859-1/articles/pxe/article.sgml +++ b/en_US.ISO8859-1/articles/pxe/article.sgml @@ -37,7 +37,7 @@ This procedure will make the 'Server' both insecure and dangerous, it is best to just keep the 'Server' on its own hub and not in any way - accessable by any machines other than the 'Clients'. + accessible by any machines other than the 'Clients'. Terminology : @@ -220,7 +220,7 @@ - Put the install files in an NFS accessable location on the + Put the install files in an NFS accessible location on the Server. Make a directory corresponding the 'nfs' directive in the install.cfg file and mirror the FreeBSD install files there, you will want it to look somewhat like @@ -266,7 +266,7 @@ RELNOTES.TXT compat1x doc packages Inside your custom package dir you will want a file called PLIST which contains all the files that you wish to - install and be incorperated into your package. + install and be incorporated into your package. You will also want files called 'pre' and 'post' in the directory, these are shell scripts diff --git a/en_US.ISO8859-1/articles/serial-uart/article.sgml b/en_US.ISO8859-1/articles/serial-uart/article.sgml index 14a5d458cd..16dab9b955 100644 --- a/en_US.ISO8859-1/articles/serial-uart/article.sgml +++ b/en_US.ISO8859-1/articles/serial-uart/article.sgml @@ -179,7 +179,7 @@ connected to the UART is a modem, the modem may report the presence of a carrier on the phone line while the computer may be able to instruct the modem to reset itself or to not - take calls by asserting or disasserting one more of these + take calls by asserting or dis-asserting one more of these extra signals. The function of each of these additional signals is defined in the EIA RS232-C standard. diff --git a/en_US.ISO8859-1/articles/storage-devices/article.sgml b/en_US.ISO8859-1/articles/storage-devices/article.sgml index c403d15a3a..dbe4d493c8 100644 --- a/en_US.ISO8859-1/articles/storage-devices/article.sgml +++ b/en_US.ISO8859-1/articles/storage-devices/article.sgml @@ -1231,7 +1231,7 @@ Mar 29 21:16:37 yedi /kernel: st1: Archive Viper 150 is a known rogue In some cases you come across devices that use multiple logical units (LUNs) on a single SCSI ID. In most cases FreeBSD only probes devices for LUN 0. An example are so called bridge - boards that connect 2 non-SCSI harddisks to a SCSI bus (e.g. an + boards that connect 2 non-SCSI hard disks to a SCSI bus (e.g. an Emulex MD21 found in old Sun systems). This means that any devices with LUNs != 0 are not normally diff --git a/en_US.ISO8859-1/articles/vinum/article.sgml b/en_US.ISO8859-1/articles/vinum/article.sgml index 2dd11ce2c3..987f5940b9 100644 --- a/en_US.ISO8859-1/articles/vinum/article.sgml +++ b/en_US.ISO8859-1/articles/vinum/article.sgml @@ -20,8 +20,8 @@ 2001 Robert A. Van Valzah - $Date: 2001-10-29 23:20:40 $ GMT - $Id: article.sgml,v 1.2 2001-10-29 23:20:40 chern Exp $ + $Date: 2001-10-31 23:10:31 $ GMT + $Id: article.sgml,v 1.3 2001-10-31 23:10:31 chern Exp $ @@ -253,7 +253,7 @@ and failure resilience--but this comes at a loss in capacity. Both concatenation and striping bring their benefits over a - single spindle at the cost of increased likelyhood of failure since + single spindle at the cost of increased likelihood of failure since more than one spindle is now involved. When three or more spindles are present, @@ -1262,7 +1262,7 @@ ok boot -s &prompt.root; disklabel -R ad0s1 disklabel.ad0s1 &prompt.root; disklabel -R ad2s1 disklabel.ad2s1 - If you have additional spindles, repeate the + If you have additional spindles, repeat the above commands as appropriate for them. @@ -2087,7 +2087,7 @@ ok boot -s use strict; use FileHandle; -my $config_tag1 = '$Id: article.sgml,v 1.2 2001-10-29 23:20:40 chern Exp $'; +my $config_tag1 = '$Id: article.sgml,v 1.3 2001-10-31 23:10:31 chern Exp $'; # Copyright (C) 2001 Robert A. Van Valzah # # Bootstrap Vinum