diff --git a/share/doc/handbook/authors.sgml b/share/doc/handbook/authors.sgml index d66e5f20346a..b8733ff5e78f 100644 --- a/share/doc/handbook/authors.sgml +++ b/share/doc/handbook/authors.sgml @@ -1,58 +1,12 @@ - + -"> - -"> - -"> - -"> - -"> - -"> - -"> - -"> - -"> - -"> - -"> - "> diff --git a/share/doc/handbook/basics.sgml b/share/doc/handbook/basics.sgml index 732a2693a456..70fb65dfb8ff 100644 --- a/share/doc/handbook/basics.sgml +++ b/share/doc/handbook/basics.sgml @@ -1,4 +1,4 @@ - + Unix Basics @@ -66,7 +66,7 @@ using the apropos command.

So, you are looking at all those fancy commands in - /usr/bin but don't even have the faintest idea + /usr/bin but do not even have the faintest idea what most of them actually do? Simply do a % cd /usr/bin; man -f * diff --git a/share/doc/handbook/booting.sgml b/share/doc/handbook/booting.sgml index 8c258c316cb8..8145a74a16a7 100644 --- a/share/doc/handbook/booting.sgml +++ b/share/doc/handbook/booting.sgml @@ -3,7 +3,7 @@ This conversion has been made by Ollivier Robert. - $Id: booting.sgml,v 1.9 1996/01/31 14:25:57 mpp Exp $ + $Id: booting.sgml,v 1.10 1996/01/31 19:02:55 mpp Exp $ @@ -51,7 +51,7 @@ Dosboot was written by DI. Christian Gusenbauer, and is unfortunately at this time one of the few pieces of code that - isn't compilable under FreeBSD itself because it is written for + will not compile under FreeBSD itself because it is written for Microsoft compilers. Dosboot will boot the kernel from a MS-DOS file or from a FreeBSD @@ -83,7 +83,7 @@ MSDOS - While this is technically possible, it isn't particular useful, + While this is technically possible, it is not particular useful, because of ``FAT'' filesystems inability to make links, device nodes and such ``UNIXisms''. @@ -147,7 +147,7 @@ /nfs, chroots to /nfs and executes /sbin/init there - Now you run FreeBSD diskless, even though you don't control + Now you run FreeBSD diskless, even though you do not control the NFS server... + FreeBSD contributor list @@ -36,7 +36,7 @@ couple of FreeBSD hackers alive and busy. Thanks! Thanks also to Dermot McDonnell for his donation of a - Toshiba XM3401B CDROM drive. It's been most useful! + Toshiba XM3401B CDROM drive. It has been most useful! Thanks to Chuck Robey <chuckr@eng.umd.edu> who contributed his floppy tape streamer for experimental diff --git a/share/doc/handbook/ctm.sgml b/share/doc/handbook/ctm.sgml index 116789a1d076..1f73410647bd 100644 --- a/share/doc/handbook/ctm.sgml +++ b/share/doc/handbook/ctm.sgml @@ -3,7 +3,7 @@ # # Converted by Ollivier Robert # -# $Id: ctm.sgml,v 1.7 1996/02/02 05:27:24 wosch Exp $ +# $Id: ctm.sgml,v 1.8 1996/05/09 23:04:32 mpp Exp $ # # ---------------------------------------------------------------------------- # "THE BEER-WARE LICENSE" (Revision 42): @@ -66,7 +66,7 @@ If you only have access to electronic mail or are otherwise blocked from using FTP then you may wish to get your deltas via email: - Send email to Starting off with @@ -97,7 +97,7 @@ Megabytes of The bad news is that I am very busy, so any help in doing this will - be most welcome. And don't forget to tell me what you want also... + be most welcome. And do not forget to tell me what you want also... Miscellaneous stuff

@@ -174,7 +174,7 @@ There is a sequence of deltas for the + @@ -10,7 +10,7 @@ THE FREEBSD CURRENT POLICY -Last updated: $Date: 1996/02/11 00:16:12 $ +Last updated: $Date: 1996/05/09 23:04:33 $ This document attempts to explain the rationale behind FreeBSD-current, what you should expect should you decide to run it, @@ -32,9 +32,9 @@ desired functionality can literally be a matter of which part of any given 24 hour period you grabbed them in! Under certain circumstances we will sometimes make binaries for parts -of FreeBSD-current available, but only because we're interested in -getting something tested, not because we're in the business of -providing binary releases of current. If we don't offer, please don't +of FreeBSD-current available, but only because we are interested in +getting something tested, not because we are in the business of +providing binary releases of current. If we do not offer, please do not ask! It takes far too much time to do this as a general task. Who needs FreeBSD-current? @@ -72,10 +72,10 @@ ask! It takes far too much time to do this as a general task. ``legitimate'' FreeBSD-current categories, but we simply do not have the time to help every person who jumps into FreeBSD-current with more enthusiasm than knowledge of how to deal with - experimental system software. This is not because we're mean and - nasty people who don't like helping people out (we wouldn't even be - doing FreeBSD if we were), it's literally because we can't answer - 400 messages a day and actually work on FreeBSD! I'm sure + experimental system software. This is not because we are mean and + nasty people who do not like helping people out (we would not even be + doing FreeBSD if we were), it is literally because we cannot answer + 400 messages a day and actually work on FreeBSD! I am sure that, if given the choice between having us answer lots of questions or continuing to improve FreeBSD, most of you would vote for us improving it. @@ -84,9 +84,9 @@ ask! It takes far too much time to do this as a general task. Using FreeBSD-current

Join the freebsd-current and cvs-all - mailing lists. This is not just a good idea, it's - essential. If you aren't on the &a.current, you - won't see the comments that people are making about the + mailing lists. This is not just a good idea, it is + essential. If you are not on the &a.current, you + will not see the comments that people are making about the current state of the system and thus will probably end up stumbling over a lot of problems that others have already found and solved. Even more importantly, you will miss out on @@ -95,12 +95,10 @@ ask! It takes far too much time to do this as a general task. rebuild the kernel or your system will crash horribly!"). The cvs-all mailing list will allow you to see the commit log - entry for each change as it's made along with any pertinent + entry for each change as it is made along with any pertinent information on possible side-effects. - To join these lists, send mail to - and say: + To join these lists, send mail to &a.majordomo and specify: subscribe current subscribe cvs-all @@ -120,7 +118,7 @@ ask! It takes far too much time to do this as a general task. Use the CMU `sup' program (Software Update Protocol), also described below. This is the second most recommended method, since it allows - you to grab the entire collection once and then only what's + you to grab the entire collection once and then only what has changed from then on. Many people run sup from cron and keep their sources up-to-date automatically. @@ -146,7 +144,7 @@ ask! It takes far too much time to do this as a general task. communications bandwidth is not a consideration, use sup or ftp. Otherwise, use CTM. - If you're grabbing the sources to run, and not just look at, + If you are grabbing the sources to run, and not just look at, then grab all of current, not just selected portions. The reason for this is that various parts of the source depend on updates elsewhere, and trying to compile just a subset is almost @@ -159,7 +157,7 @@ ask! It takes far too much time to do this as a general task. bootstrapping procedures that sometimes become necessary as we move towards the next release. - Be active! If you're running FreeBSD-current, we want to know + Be active! If you are running FreeBSD-current, we want to know what you have to say about it, especially if you have suggestions for enhancements or bug fixes. Suggestions with accompanying code are received most enthusiastically! diff --git a/share/doc/handbook/dialup.sgml b/share/doc/handbook/dialup.sgml index c2bfcca390f8..7c7490314605 100644 --- a/share/doc/handbook/dialup.sgml +++ b/share/doc/handbook/dialup.sgml @@ -1,6 +1,6 @@ + Diskless operation @@ -117,7 +117,7 @@ hostname myclient.mydomain On HP-UX systems: The server should be running HP-UX 9.04 or later for HP9000/800 series - machines. Prior versions don't allow the + machines. Prior versions do not allow the creation of device files over NFS. When extracting /dev in diff --git a/share/doc/handbook/dma.sgml b/share/doc/handbook/dma.sgml index 249217e34fe6..2c2b20a7dfd6 100644 --- a/share/doc/handbook/dma.sgml +++ b/share/doc/handbook/dma.sgml @@ -1,4 +1,4 @@ - + + @@ -23,7 +23,7 @@ Mailing lists

Though many of the FreeBSD development members read USENET, we cannot -always guarantee that we'll get to your questions in a timely fashion +always guarantee that we will get to your questions in a timely fashion (or at all) if you post them only to one of the comp.unix.bsd.freebsd.* groups. By addressing your questions to the appropriate mailing list you will reach both us and a concentrated FreeBSD audience, invariably @@ -118,11 +118,7 @@ cvs-usrsbin /usr/src/usr.sbin System binaries given list you simply mail to listname@FreeBSD.ORG. It will then be redistributed to mailing list members world-wide. -To subscribe to a list, send mail to: - -majordomo@FreeBSD.ORG - -And include the keyword +To subscribe to a list, send mail to &a.majordomo and include subscribe [] @@ -151,9 +147,9 @@ list of available commands, do this: help ^D -Again, we'd like to request that you keep discussion in the technical mailing -lists on a technical track. If you're only interested in the "high points" -then it's suggested that you join freebsd-announce, which is intended only +Again, we would like to request that you keep discussion in the technical mailing +lists on a technical track. If you are only interested in the "high points" +then it is suggested that you join freebsd-announce, which is intended only for infrequent traffic. List charters diff --git a/share/doc/handbook/esdi.sgml b/share/doc/handbook/esdi.sgml index 5d784dfc72ff..858020bc2321 100644 --- a/share/doc/handbook/esdi.sgml +++ b/share/doc/handbook/esdi.sgml @@ -1,4 +1,4 @@ - + + %authors; + + +%lists; + %sections; diff --git a/share/doc/handbook/history.sgml b/share/doc/handbook/history.sgml index 7b250b4d9074..b93bf044354a 100644 --- a/share/doc/handbook/history.sgml +++ b/share/doc/handbook/history.sgml @@ -1,4 +1,4 @@ - + A brief history of FreeBSD @@ -9,11 +9,11 @@ The FreeBSD project had its genesis in the early part of 1993, partially as an outgrowth of the "Unofficial 386BSD Patchkit" by the patchkit's last 3 coordinators: Nate Williams, Rod Grimes and myself. David Greenman and Julian Elischer were also lurking in the background -around this time, though they didn't come fully into the project until +around this time, though they did not come fully into the project until a month or two after it was more or less officially launched. Our original goal was to produce an intermediate snapshot of 386BSD in order to fix a number of problems with it that the patchkit mechanism -just wasn't capable of solving. Some of you may remember the early +just was not capable of solving. Some of you may remember the early working title for the project being "386BSD 0.5" or "386BSD Interim" in reference to that fact. @@ -26,7 +26,7 @@ snapshot. Those plans came to a rude halt when Bill Jolitz suddenly decided to withdraw his sanction from the project and without any clear indication of what would be done instead. -It didn't take us long to decide that the goal remained worthwhile +It did not take us long to decide that the goal remained worthwhile even without Bill's support, and so we adopted the name "FreeBSD", which was coined by David Greenman. Our initial objectives were set after consulting with the system's current users, and once it became @@ -79,7 +79,7 @@ easier to install FreeBSD 2.0.5 release in June of 1995. Where to from here? We just released FreeBSD 2.1.0 on November 19th, 1995 and, by all -accounts, people are pretty happy with it. We'll therefore continue +accounts, people are pretty happy with it. We will therefore continue with the 2.1-STABLE branch of FreeBSD (which actually began with 2.0.5) well into Q1 of 1996 with at least one additional release: FreeBSD 2.1.1. @@ -90,7 +90,7 @@ where long term projects for everything from NFS v3 to PCCARD support are currently taking place. Preliminary timelines suggest that development in 2.2 will begin slowing down and early release engineering simulations (2.2 SNAPshots) started in Q1 of 1996. Given a favorable prognosis for 2.2's -general health, a migration to 2.2 will then begin in early Q2 of '96 and +general health, a migration to 2.2 will then begin in early Q2 of 1996 and a new 2.3 branch created for next-generation development. Around the time that 2.2-RELEASE is produced (late Q2 1996), the 2.1.x lineage will also be phased out. @@ -108,7 +108,7 @@ changes can propagate automatically to other users of FreeBSD. Our centralized development model is designed for the convenience of the users of FreeBSD, who are thereby provided with an easy way of tracking one central code base, not to keep potential contributors out! -Individuals who've shown a consistent and significant dedication to the project +Individuals who hae shown a consistent and significant dedication to the project are even often asked to join the FreeBSD core team to help in setting the project's overall directions and goals, so truly no part of the project is closed to additional members. All we ask of those wishing for closer diff --git a/share/doc/handbook/hw.sgml b/share/doc/handbook/hw.sgml index c095e78dc0ce..05011fd1e4d4 100644 --- a/share/doc/handbook/hw.sgml +++ b/share/doc/handbook/hw.sgml @@ -1,4 +1,4 @@ - + + + Kerberos @@ -30,7 +30,7 @@ Creating the initial database

This is done on the Kerberos server only. First make sure that your - don't have any old Kerberos databases around. You should change to the + do not have any old Kerberos databases around. You should change to the directory /etc/kerberosIV and check that only the following files are present: @@ -98,7 +98,7 @@ ARC.NASA.GOV trident.arc.nasa.gov realm. The rest of the lines show how to default systems of a particular subdomain to a named realm. - Now we're ready to create the database. This only needs to run on + Now we are ready to create the database. This only needs to run on the Kerberos server (or Key Distribution Centre). Issue the kdb_init command to do this: diff --git a/share/doc/handbook/kernelconfig.sgml b/share/doc/handbook/kernelconfig.sgml index 04d44906e3a4..06bc8c660d50 100644 --- a/share/doc/handbook/kernelconfig.sgml +++ b/share/doc/handbook/kernelconfig.sgml @@ -1,4 +1,4 @@ - + Configuring the FreeBSD Kernel @@ -77,7 +77,7 @@ Traditionally, this name is in all capital letters and, if you are maintaining multiple FreeBSD machines with - different hardware, it's a good idea to name it after + different hardware, it is a good idea to name it after your machine's hostname. We will call it MYKERNEL for the purpose of this example. @@ -91,11 +91,11 @@ here, but is covered well in many books in the . Feel free to change the comment lines at the top to reflect your configuration or the - changes you've made to differentiate it from GENERIC. + changes you have made to differentiate it from GENERIC. - If you've build a kernel under SunOS or some other BSD + If you have build a kernel under SunOS or some other BSD operating system, much of this file will be very familiar - to you. If you're coming from some other operating + to you. If you are coming from some other operating system such as DOS, on the other hand, the GENERIC configuration file might seem overwhelming to you, so follow the descriptions in the config(8) from the same place you got the new kernel sources. It is located in /usr/src/usr.sbin, so - you'll need to download those sources as well. Re-build and install + you will need to download those sources as well. Re-build and install it before running the next commands. - When you're finished, type the following to compile and + When you are finished, type the following to compile and install your kernel: # /usr/sbin/config MYKERNEL @@ -128,7 +128,7 @@ to recover in case your new kernel . - to your /dev directory before you can use them. @@ -160,7 +160,7 @@ be dependant upon an option gets this option out of an opt_foo.h declaration file created in the compile directory by config. The list of valid options - for config lives in two files: options that don't + for config lives in two files: options that do nott depend on the architecture are listed in /sys/conf/options, architecture-dependant ones in /sys/arch/conf/options.arch, @@ -210,7 +210,7 @@ this from GENERIC to whatever you named your kernel, in this example, MYKERNEL. The value you put in ident will print when you boot up - the kernel, so it's useful to give a kernel a + the kernel, so it is useful to give a kernel a different name if you want to keep it separate from your usual kernel (if you want to build an experimental kernel, for example). Note that, as @@ -219,7 +219,7 @@ contains any numbers. Since this name is passed to the C compiler as a - -D switch, don't use names like + -D switch, do not use names like DEBUG, or something that could be confused with another machine or CPU name, like vax. @@ -231,7 +231,7 @@ you expect to have on your machine. However, under normal circumstances, you will want to set maxusers to at least four, especially if - you're using X Windows or compiling software. The + you are using X Windows or compiling software. The reason is that the most important table set by maxusers is the maximum number of processes, which is set to 20 + 16 * @@ -336,7 +336,7 @@ Windows, which many graphics-intensive programs (such as the movie player XAnim, and Linux DOOM) will automatically take advantage of for extra - speed. If you use X Windows, you'll definitely + speed. If you use X Windows, you will definitely want to include this. options SYSVSEM @@ -505,7 +505,7 @@ wdc1 is a secondary IDE controller where you might have a third or fourth hard drive, or an IDE CD-ROM. Comment out the lines which do not - apply (if you have a SCSI hard drive, you'll + apply (if you have a SCSI hard drive, you will probably want to comment out all six lines, for example). @@ -625,11 +625,11 @@

This causes the kernel to pause 15 seconds before probing each SCSI device in your system. If you only have IDE hard - drives, you can ignore this, otherwise you'll + drives, you can ignore this, otherwise you will probably want to lower this number, perhaps to 5 seconds, to speed up booting. Of course if you do this, and FreeBSD has trouble recognizing your SCSI - devices, you'll have to raise it back up. + devices, you will have to raise it back up. controller scbus0 @@ -797,7 +797,7 @@

The next lines enable support for various Ethernet cards. If you do not have a network card, you can - comment out all of these lines. Otherwise, you'll + comment out all of these lines. Otherwise, you will want to leave in support for your particular Ethernet card(s): @@ -869,7 +869,7 @@ @@ -946,7 +946,7 @@

This is the first section containing lines that are not in the GENERIC kernel. To include sound card - support, you'll have to copy the appropriate lines from + support, you will have to copy the appropriate lines from the LINT kernel (which contains support for every device) as follows: @@ -1054,7 +1054,7 @@ pseudo-device pty number

pty is a ``pseudo-terminal'' or simulated - login port. It's used by incoming telnet + login port. It is used by incoming telnet and rlogin sessions, xterm, and some other applications such as emacs. The number indicates the number of ptys to create. @@ -1088,7 +1088,7 @@

This section describes some miscellaneous hardware devices supported by FreeBSD. Note that none of these - lines are included in the GENERIC kernel, you'll have + lines are included in the GENERIC kernel, you will have to copy them from this handbook or the LINT kernel (which contains support for every device): @@ -1106,7 +1106,7 @@ script that plays some simple songs, and /usr/games/piano which lets you play songs using the keyboard as a simple piano (this file - only exists if you've installed the games + only exists if you have installed the games package). Also, the excellent text role-playing game NetHack (in the ports collection) can be configured to use this device to play songs when @@ -1174,7 +1174,7 @@ controller wcd0

If the config command fails when you give it your kernel - description, you've probably made a simple error + description, you have probably made a simple error somewhere. Fortunately, config will print the line number that it had trouble with, so you can quickly skip to it with vi. For example, if @@ -1244,7 +1244,7 @@ config: line 17: syntax error Kernel works, but ps does not work any more! -

If you've installed a different version +

If you have installed a different version of the kernel from the one that the system utilities have been built with, for example, an experimental ``2.2.0'' kernel on a 2.1.0-RELEASE system, many diff --git a/share/doc/handbook/kerneldebug.sgml b/share/doc/handbook/kerneldebug.sgml index 7476cdc97024..b3b46946ad8e 100644 --- a/share/doc/handbook/kerneldebug.sgml +++ b/share/doc/handbook/kerneldebug.sgml @@ -1,4 +1,4 @@ - + Kernel Debugging @@ -70,10 +70,10 @@ and voila, you can debug the crash dump using the kernel sources just like you can for any other program. - Here's a script log of a kgdb session illustrating the + Here is a script log of a kgdb session illustrating the procedure. Long lines have been folded to improve readability, and the lines are - numbered for reference. Despite this, it's a real-world error + numbered for reference. Despite this, it is a real-world error trace taken during the development of the pcvt console driver. 1:Script started on Fri Dec 30 23:15:22 1994 @@ -169,10 +169,10 @@ Post-mortem analysis of a dump

What do you do if a kernel dumped core but you did not expect - it, and it's therefore not compiled using config -g? - Not everything is lost here. Don't panic! + it, and it is therefore not compiled using config -g? + Not everything is lost here. Do not panic! Of course, you still need to enable crash dumps. See above - on the options you've got in order to do this. + on the options you have to specify in order to do this. Go to your kernel compile directory, and edit the line containing COPTFLAGS?=-O. Add the -g option - there (but don't change anything on the level of + there (but do not change anything on the level of optimization). If you do already know roughly the probable location of the failing piece of code (e.g., the pcvt driver in the example above), remove all the object files for this code. Rebuild the kernel. Due to the time stamp change on the Makefile, there will be some other object files rebuild, for example trap.o. With a bit of luck, the added - -g option won't change anything for the generated - code, so you'll finally get a new kernel with similar code to + -g option will not change anything for the generated + code, so you will finally get a new kernel with similar code to the faulting one but some debugging symbols. You should at least verify the old and new sizes with the size(1) command. If there is a mismatch, you probably need to give up here. @@ -226,8 +226,8 @@ The most important ones being breakpointing and single-stepping kernel code. - If you need to do low-level debugging on your kernel, there's - an on- line debugger available called DDB. It allows to + If you need to do low-level debugging on your kernel, there is + an on-line debugger available called DDB. It allows to setting breakpoints, single-steping kernel functions, examining and changing kernel variables, etc. However, it cannot not access kernel source files, and only has access to the global @@ -255,7 +255,7 @@ The second scenario is a hot-key on the keyboard, usually Ctrl-Alt-ESC. For syscons, this can be remapped, and some of the distributed maps do this, so watch out. - There's an option + There is an option available for serial consoles that allows the use of a serial line BREAK on the console line to enter DDB (``options BREAK_TO_DEBUGGER'' @@ -314,7 +314,7 @@ n - Note: this is different from gdb's `next' statement, it's like + Note: this is different from gdb's `next' statement, it is like gdb's `finish'. To examine data from memory, use (for example): @@ -405,9 +405,9 @@ help - However, it's highly recommended to have a printed copy of the + However, it is highly recommended to have a printed copy of the ddb(4) manual page ready for a debugging session. - Remember that it's hard to read the on-line manual while + Remember that it is hard to read the on-line manual while single-stepping the kernel. diff --git a/share/doc/handbook/linuxemu.sgml b/share/doc/handbook/linuxemu.sgml index b6cdda899ef0..26581272321c 100644 --- a/share/doc/handbook/linuxemu.sgml +++ b/share/doc/handbook/linuxemu.sgml @@ -1,4 +1,4 @@ - + Linux Emulation @@ -7,7 +7,7 @@ How to install the Linux emulator -

Linux emulation in FreeBSD has reached a point where it's possible +

Linux emulation in FreeBSD has reached a point where it is possible to run a large fraction of Linux binaries in both a.out and ELF format. The linux emulation in the -STABLE branch is capable of running Linux DOOM and Mathematica; the version present in @@ -126,7 +126,7 @@ linux

In -current it is no longer necessary to specify options "LINUX" or options "COMPAT_LINUX". Linux emulation is done with an LKM (``Loadable Kernel Module'') so it can be installed on the fly without -having to reboot. You'll need the following things in your startup files, +having to reboot. You will need the following things in your startup files, however: In /etc/sysconfig, you need the following line: @@ -143,7 +143,7 @@ fi -

If you want to verify it's running, modstat will do that: +

If you want to verify it is running, modstat will do that: % modstat @@ -168,9 +168,9 @@ and Installing a Custom Kernel">. Installing using the linux_lib port -

Most linux applications use shared libraries, so you're still not -done untill you install the shared libraries. It's possible to do -this by hand, however, it's vastly simpler to just grab the +

Most linux applications use shared libraries, so you are still not +done untill you install the shared libraries. It is possible to do +this by hand, however, it is vastly simpler to just grab the linux_lib port: @@ -186,12 +186,12 @@ linux binaries linked against the ZMAGIC libraries; QMAGIC libraries Linuxulator heartburn. As of this writing (March 1996) ELF emulation is still in the formulative stages but seems to work pretty well. Also, expect some programs to complain about incorrect minor versions. In -general this doesn't seem to be a problem. +general this does not seem to be a problem. Installing libraries manually

If you don't have the ``ports'' distribution, you can install the -libraries by hand instead. You'll need the Linux shared libraries +libraries by hand instead. You will need the Linux shared libraries that the program depends on and the runtime linker. Also, you will need to create a "shadow root" directory, /compat/linux, for Linux libraries on your FreeBSD system. Any shared libraries opened by @@ -250,7 +250,7 @@ these files on your FreeBSD system:

Note that if you already have a Linux shared library with a matching major revision number to the first column of the 'ldd' -output, you won't need to copy the file named in the last column to +output, you will not need to copy the file named in the last column to your system, the one you already have should work. It is advisable to copy the shared library anyway if it is a newer version, though. You can remove the old one, as long as you make the symbolic link point to @@ -266,8 +266,8 @@ according to the output of ldd: libc.so.4 (DLL Jump 4.5pl26) -> libc.so.4.6.29 -If it's only one or two versions out of date in the in the trailing -digit then don't worry about copying /lib/libc.so.4.6.29 too, because +If it is only one or two versions out of date in the in the trailing +digit then do not worry about copying /lib/libc.so.4.6.29 too, because the program should work fine with the slightly older version. However, if you like you can decide to replace the libc.so anyway, and that should leave you with: @@ -278,7 +278,7 @@ that should leave you with:

Please note that the symbolic link mechanism is only needed for Linux binaries, the FreeBSD runtime linker takes care of -looking for matching major revision numbers itself, you don't need to +looking for matching major revision numbers itself, you do not need to worry about that. Configuring the ld.so -- for FreeBSD-current @@ -296,9 +296,9 @@ place on your FreeBSD system (to the /compat/linux tree): /compat/linux/etc/ld.so.config -

If you don't have access to a Linux system, you should get the +

If you do nott have access to a Linux system, you should get the extra files you need from various ftp sites. Information on where to -look for the various files is appended below. For now, let's assume +look for the various files is appended below. For now, let us assume you know where to get the files.

@@ -312,9 +312,9 @@ version mismatches), and install them under /compat/linux /lib/ld.so -

ldconfig and ldd don't necessarily need to be under /compat/linux, +

ldconfig and ldd do not necessarily need to be under /compat/linux, you can install them elsewhere in the system too. Just make sure they -don't conflict with their FreeBSD counterparts. A good idea would be +do not conflict with their FreeBSD counterparts. A good idea would be to install them in /usr/local/bin as ldconfig-linux and ldd-linux.

Create the file /compat/linux/etc/ld.so.conf, containing the @@ -339,7 +339,7 @@ in order for the emulator to find them. % /compat/linux/sbin/ldconfig -

Ldconfig is statically linked, so it doesn't need any shared +

Ldconfig is statically linked, so it does not need any shared libraries to run. It creates the file /compat/linux/etc/ld.so.cache which contains the names of all the shared libraries. It should rerun to recreate this file whenever you install additional shared @@ -347,7 +347,7 @@ libraries. On FreeBSD-stable do not install /compat/linux/etc/ld.so.cache or run ldconfig becuase in FreeBSD-stable the syscalls are implemented -differently and ldconfig isn't needed or used. +differently and ldconfig is not needed or used.

You should now be set up for Linux binaries which only need a shared libc. You can test this by running the Linux ldd on @@ -394,7 +394,7 @@ multi on where the order here specifies that /etc/hosts is searched first and -DNS is searched second. When /compat/linux/etc/host.conf isn't +DNS is searched second. When /compat/linux/etc/host.conf is not installed linux applications find FreeBSD's /etc/host.conf and complain about the incompatible FreeBSD syntax. You should remove `bind,' if you have not configured a name-server using the @@ -441,9 +441,9 @@ ftp.demon.co.uk:/pub/linux/distributions src.doc.ic.ac.uk:/packages/linux/distributions -

For simplicity, let's concentrate on Slackware here. This +

For simplicity, let us concentrate on Slackware here. This distribution consists of a number of subdirectories, containing -separate packages. Normally, they're controlled by an install +separate packages. Normally, they are controlled by an install program, but you can retrieve files "by hand" too. First of all, you will need to look in the "contents" subdir of the distribution. You will find a lot of small text files here describing the contents of the diff --git a/share/doc/handbook/lists.sgml b/share/doc/handbook/lists.sgml new file mode 100644 index 000000000000..5181df966ca3 --- /dev/null +++ b/share/doc/handbook/lists.sgml @@ -0,0 +1,57 @@ + + + + + +"> + +"> + +"> + +"> + +"> + +"> + +"> + +"> + +"> + +"> + +"> + +"> diff --git a/share/doc/handbook/memoryuse.sgml b/share/doc/handbook/memoryuse.sgml index 2cec37d4b213..5a4d9f4a88a9 100644 --- a/share/doc/handbook/memoryuse.sgml +++ b/share/doc/handbook/memoryuse.sgml @@ -1,4 +1,4 @@ - + PC memory utilization @@ -16,7 +16,7 @@ for the %cs selector, done by an ljmp.) It then loads the first 15 sectors at 0x10000 (segment BOOTSEG in the biosboot Makefile), and sets up the stack to work below 0x1fff0. After this, it jumps to the entry of boot2 within that code. I.e., it -jumps over itself and the (dummy) partition table, and it's going to +jumps over itself and the (dummy) partition table, and it is going to adjust the %cs selector---we are still in 16-bit mode there. boot2 asks for the boot file, and examines the a.out header. It masks diff --git a/share/doc/handbook/nfs.sgml b/share/doc/handbook/nfs.sgml index d79c6cee9085..c83047f913b2 100644 --- a/share/doc/handbook/nfs.sgml +++ b/share/doc/handbook/nfs.sgml @@ -1,4 +1,4 @@ - + NFS @@ -34,7 +34,7 @@ It should be noted that there is a different problem, sometimes mistaken for this one, when the NFS servers and clients are on different networks. If that is the case, make CERTAIN that your routers are routing the -necessary UDP information, or you won't get anywhere, no matter +necessary UDP information, or you will not get anywhere, no matter what else you are doing. In the following examples, "fastws" is the host (interface) name of a diff --git a/share/doc/handbook/nutshell.sgml b/share/doc/handbook/nutshell.sgml index 63b59563e268..e9ff625e3d65 100644 --- a/share/doc/handbook/nutshell.sgml +++ b/share/doc/handbook/nutshell.sgml @@ -1,4 +1,4 @@ - + FreeBSD in a nutshell @@ -77,7 +77,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's more than + be done with a commercial UNIX product then it is more than likely that you can do it with FreeBSD, too! FreeBSD also benefits significantly from the literally thousands of high quality applications developed by research centers and diff --git a/share/doc/handbook/porting.sgml b/share/doc/handbook/porting.sgml index 9870e49a65ca..1e31fb8b268e 100644 --- a/share/doc/handbook/porting.sgml +++ b/share/doc/handbook/porting.sgml @@ -1,4 +1,4 @@ - + Porting an existing piece of free software @@ -8,11 +8,11 @@

The porting of freely available software, while perhaps not as gratifying as developing your own from scratch, is still a vital part -of FreeBSD's growth and of great usefulness to those who wouldn't +of FreeBSD's growth and of great usefulness to those who would not otherwise know where to turn for it. All ported software is organized into a carefully organized hierarchy know as ``the ports collection''. The collection enables a new user to get a quick and complete overview -of what's available for FreeBSD in an easy-to-compile form. It also +of what is available for FreeBSD in an easy-to-compile form. It also saves considerable space by not actually containing the the majority of the sources being ported, but merely those differences required for running under FreeBSD. @@ -37,7 +37,7 @@ the ports collection. once the file has been loaded.

You may come across code that needs modifications or - conditional compilation based upon what version of UNIX it's + conditional compilation based upon what version of UNIX it is running under. If you need to make such changes to the code for conditional compilation, make sure you make the changes as general as possible so that we can back-port code to FreeBSD @@ -89,13 +89,13 @@ the ports collection. Berkeleyisms, not FreeBSD changes. In FreeBSD 2.x, __FreeBSD__ is defined to be - 2. In earlier versions, it's 1. + 2. In earlier versions, it is 1. If you need to tell the difference between a FreeBSD 1.x system and a FreeBSD 2.x system, usually the right answer is to use the BSD macros described above. If there actually is a FreeBSD specific change (such as special - shared library options when using `ld') then it's + shared library options when using `ld') then it is OK to use __FreeBSD__ and `#if __FreeBSD__ > 1' to detect a FreeBSD 2.x system. @@ -126,14 +126,14 @@ The pattern is the year followed by the month.

In the dozens of ports that have been done, there have only been one or two cases where __FreeBSD__ should have been used. Just because an earlier port - screwed up and used it in the wrong place doesn't mean + screwed up and used it in the wrong place does not mean you should do so too. Quick Porting

This section tells you how to do a quick port. In many - cases, it is not enough, but we'll see. + cases, it is not enough, but we will see.

First, get the original tarball and put it into ${DISTDIR}, which defaults to @@ -142,7 +142,7 @@ The pattern is the year followed by the month.

Note: The following assumes that the software compiled out-of-the-box, i.e., there was absolutely no change required for the port to work on your FreeBSD box. If you needed to - change something, you'll have to refer to the next section + change something, you will have to refer to the next section too. @@ -156,7 +156,7 @@ The pattern is the year followed by the month. # Date created: 5 December 1994 # Whom: asami # - # $Id: porting.sgml,v 1.18 1996/04/10 06:32:42 asami Exp $ + # $Id: porting.sgml,v 1.19 1996/05/09 23:04:48 mpp Exp $ # DISTNAME= oneko-1.1b @@ -170,7 +170,7 @@ The pattern is the year followed by the month. .include -

See if you can figure it out. Don't worry about the contents +

See if you can figure it out. Do not worry about the contents of the $Id$ line, it will be filled in automatically by CVS when the port is imported to our main ports tree. @@ -201,7 +201,7 @@ A cat chasing a mouse all over the screen sufficient. Note: This is not a manual nor an in-depth description on how to use or compile the port. In particular, please do not just copy the README - file here, unless, of course, it's a concise description + file here, unless, of course, it is a concise description of the port.

It is recommended that you sign the name at the end of @@ -257,7 +257,7 @@ lib/X11/oneko/mouse.xpm Submitting the port -

Now that you're happy with your port, the only thing +

Now that you are happy with your port, the only thing remaining is to put it in the main FreeBSD ports tree and make everybody else happy about it too. To accomplish this, pack the necessary files (everything described in this @@ -276,8 +276,8 @@ ftp://ftp.FreeBSD.ORG/pub/FreeBSD/incoming/ Slow Porting -

Ok, so it wasn't that simple, and the port required some - modifications to get it to work. In this section, we'll +

Ok, so it was not that simple, and the port required some + modifications to get it to work. In this section, we will explain, step by step, how to modify it to get it to work with the ports paradigm. @@ -289,7 +289,7 @@ ftp://ftp.FreeBSD.ORG/pub/FreeBSD/incoming/ and you may find that having bsd.port.mk in another window while you read this really helps to understand it. -

But don't worry if you don't really understand what +

But do not worry if you do not really understand what bsd.port.mk is doing, not many people do... :> @@ -364,7 +364,7 @@ ftp://ftp.FreeBSD.ORG/pub/FreeBSD/incoming/ targets `do-<something>'. For example, the commands to extract a port are in the target `do-extract'. If you are not happy with the - default target, and you can't fix it by redefining the + default target, and you cannot fix it by redefining the `do-<something>' target in your Makefile.

Note that the `main' targets (e.g., extract, @@ -375,7 +375,7 @@ ftp://ftp.FreeBSD.ORG/pub/FreeBSD/incoming/ do-extract, but never ever touch extract!

Now that you understand what goes on when the user types - `make', let's go through the recommended steps to + `make', let us go through the recommended steps to create the perfect port. @@ -386,7 +386,7 @@ ftp://ftp.FreeBSD.ORG/pub/FreeBSD/incoming/ and copy it into ${DISTDIR}. Always use mainstream sources when and where you can. -

If you can't find a ftp site that is well-connected to the +

If you cannot find a ftp site that is well-connected to the net, or can only find sites that have irritatingly non-standard formats, we can `house' it ourselves by putting it on @@ -398,7 +398,7 @@ ftp://freefall.FreeBSD.ORG/pub/FreeBSD/LOCAL_PORTS/

If your port requires some additional `patches' that are available on the Internet, fetch them too and put them in - ${DISTDIR}. Don't worry if they come from + ${DISTDIR}. Do not worry if they come from site other than where you got the the main source tarball, we have a way to handle these situations (see the description of ${PATCHFILES} below). @@ -429,7 +429,7 @@ ftp://freefall.FreeBSD.ORG/pub/FreeBSD/LOCAL_PORTS/

In the preparation of the port, files that have been added or changed can be picked up with a recursive diff for later feeding to patch. This is the easiest kind of change to - make as it doesn't involve any mucking around with + make as it does not involve any mucking around with configuration files. Each set of patches you wish to apply should be collected into a file named `patch-<xx>' where <xx> @@ -499,7 +499,7 @@ ftp://freefall.FreeBSD.ORG/pub/FreeBSD/LOCAL_PORTS/ distribution file list (${DISTFILES}) to be named ${DISTNAME}${EXTRACT_SUFX} - by default which, if it's a normal tarball, is going to be + by default which, if it is a normal tarball, is going to be something like: foozolix-1.0.tar.gz @@ -544,11 +544,11 @@ work/foozolix-1.0/ record the directory containing the tarball in ${MASTER_SITES}. This will provide a backup site, as well as a direct pointer to the original source - location. Don't forget the trailing slash (/)! + location. Do not forget the trailing slash (/)!

The make macros will try to use this specification for grabbing the distribution file with ${NCFTP} - if they can't find it already on the system. + if they cannot find it already on the system.

It is recommended that you put multiple sites on this list, preferably from different continents. This will safeguard @@ -571,7 +571,7 @@ work/foozolix-1.0/ patch has an extra `foozolix-1.0/' in front of the filenames, then set `PATCH_DIST_STRIP=-p1'. -

Don't worry if the patches are compressed, they will be +

Do not worry if the patches are compressed, they will be decompressed automatically if the filenames end with `.gz' or `.Z'. @@ -590,13 +590,13 @@ work/foozolix-1.0/ depends on. It is a list of `lib:dir' pairs where lib is the name of the shared library, and dir is the directory in which to find it in case - it's not available. For example, + it is not available. For example, LIB_DEPENDS= tcl\\.7\\.:${PORTSDIR}/lang/tcl will check for a shared tcl library with major version 7, and descend into the lang/tcl subdirectory of - your ports tree to build and install it if it's not found. + your ports tree to build and install it if it is not found. Note that the lib part is just an argument given to `ldconfig -r | grep', so periods should be @@ -607,13 +607,13 @@ LIB_DEPENDS= tcl\\.7\\.:${PORTSDIR}/lang/tcl during run-time. It is a list of `exec:dir' pairs where exec is the name of the executable, and dir is the directory in which to find it in - case it's not available. For example, + case it is not available. For example, RUN_DEPENDS= wish:${PORTSDIR}/x11/tk will check for an executable called `wish', and descend into the x11/tk subdirectory of your - ports tree to build and install it if it's not found. + ports tree to build and install it if it is not found. The dependency is checked from within the install target. Also, the name of the dependency is put in to the @@ -629,7 +629,7 @@ BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip will check for an executable called `unzip', and descend into the archivers/unzip subdirectory of - your ports tree to build and install it if it's not found. + your ports tree to build and install it if it is not found. Note that `build' here means everything from extracting to compilation. The dependency is checked from within the @@ -644,13 +644,13 @@ FETCH_DEPENDS= ncftp2:${PORTSDIR}/net/ncftp2 will check for an executable called `ncftp2', and descend into the net/ncftp2 subdirectory of - your ports tree to build and install it if it's not found. + your ports tree to build and install it if it is not found. The dependency is checked from within the fetch target. DEPENDS -

If there is a dependency that doesn't fall into either of +

If there is a dependency that does not fall into either of the above four categories, or your port requires to have the source of the other port extracted (i.e., having them installed is not enough), then use this variable. This is @@ -681,7 +681,7 @@ FETCH_DEPENDS= ncftp2:${PORTSDIR}/net/ncftp2 NO_INSTALL_MANPAGES -

If the port uses imake but doesn't understand the +

If the port uses imake but does not understand the `install.man' target, `NO_INSTALL_MANPAGES=yes' should be set. In addition, the author of the original port should be shot. @@ -696,18 +696,18 @@ FETCH_DEPENDS= ncftp2:${PORTSDIR}/net/ncftp2

Note that it is your responsibility as a porter to read the licensing terms of the software and make sure that the FreeBSD - project won't held accountable of violating them by + project will not be held accountable of violating them by redistributing the source or compiled binaries either via ftp or CD-ROM. If in doubt, please contact the &a.ports;.

We usually get around this problem by setting ${NO_PACKAGE} in the Makefile, and not putting the distfile up for ftp. However, for most cases, you should - at least be able to make a port, so don't let the license + at least be able to make a port, so do not let the license scare you away!

Note: The GNU General Public License (GPL), both version 1 - and 2, shouldn't be a problem for ports. + and 2, should not be a problem for ports.

Note: If you are a committer, make sure you update the ports/LEGAL file too. @@ -719,15 +719,15 @@ FETCH_DEPENDS= ncftp2:${PORTSDIR}/net/ncftp2 Do's and Dont's -

Here's a list of common do's and dont's that you encounter +

Here is a list of common do's and dont's that you encounter during the porting process. WRKDIR -

Don't leave anything valuable lying around in the +

Do not leave anything valuable lying around in the `work' subdirectory, `make clean' will nuke it completely! If you need auxiliary files - that aren't scripts or patches, put them in the subdirectory + that are not scripts or patches, put them in the subdirectory `files' and use the post-extract target to copy them to the `work' subdirectory. @@ -745,7 +745,7 @@ FETCH_DEPENDS= ncftp2:${PORTSDIR}/net/ncftp2 post-install rule to do it yourself. Make sure that you check the variable NOMANCOMPRESS that the user can set in /etc/make.conf to disable man page - compression. Here's an example: + compression. Here is an example: post-install: strip ${PREFIX}/bin/xdl @@ -756,7 +756,7 @@ FETCH_DEPENDS= ncftp2:${PORTSDIR}/net/ncftp2

Use the file command on the installed executable to check whether the binary is stripped or not. If it - doesn't say `not stripped', it is stripped. + does not say `not stripped', it is stripped. Install additional documentation @@ -784,14 +784,14 @@ FETCH_DEPENDS= ncftp2:${PORTSDIR}/net/ncftp2 .endif -

Don't forget to add them to pkg/PLIST too! (Don't +

Do not forget to add them to pkg/PLIST too! (Do not worry about NOPORTDOCS here; there is currently no way for the packages to read variables from /etc/make.conf.) DIST_SUBDIR -

Don't let your port clutter /usr/ports/distfiles. If +

Do not let your port clutter /usr/ports/distfiles. If your port requires a lot of files (including patchfiles) to be fetched, or contains a file that has a name that might conflict with other ports (e.g., `Makefile'), set @@ -813,12 +813,12 @@ FETCH_DEPENDS= ncftp2:${PORTSDIR}/net/ncftp2 Custom utilities -

Don't rely on custom utilities in your local configure +

Do not rely on custom utilities in your local configure script or anything -- they may not be there on the user's system! If you really need something else to be installed before you can work, detect this from your configure script, print a helpful message and exit with a non-zero status! At - least you'll have given the user some idea of what's needed. + least you will have given the user some idea of what is needed. If the custom utility or package is actually part of the ports tree, this should be dealt by the dependency mechanism of ports. @@ -841,7 +841,7 @@ FETCH_DEPENDS= ncftp2:${PORTSDIR}/net/ncftp2 RCS strings -

Don't put RCS strings in patches. CVS will mangle them +

Do not put RCS strings in patches. CVS will mangle them when we put the files into the ports tree, and when we check them out again, they will come out different and the patch will fail. RCS strings are surrounded by dollar @@ -874,7 +874,7 @@ FETCH_DEPENDS= ncftp2:${PORTSDIR}/net/ncftp2 able to cater to the needs of other sites. For X ports that use imake, this is automatic; otherwise, this can often be done by simply replacing the occurrences of `/usr/local' (or - `/usr/X11R6' for X ports that don't use imake) in the + `/usr/X11R6' for X ports that do not use imake) in the various scripts/Makefiles in the port to read `${PREFIX}', as this variable is automatically passed down to every stage of the build and install processes. @@ -882,7 +882,7 @@ FETCH_DEPENDS= ncftp2:${PORTSDIR}/net/ncftp2

The variable ${PREFIX} can be reassigned in your Makefile or in the user's environment. However, it is strongly discouraged for individual ports to set this variable explicitly - in the Makefiles. (If your port is an X port but doesn't use + in the Makefiles. (If your port is an X port but does not use imake, set USE_X11=yes; this is quite different from setting PREFIX=/usr/X11R6.) @@ -933,14 +933,14 @@ lib/libtcl.so.7.3

Note: the `-m' option is new since 2.0.5 and - 2.1.0-950726-SNAP, so don't be alarmed if it doesn't work on + 2.1.0-950726-SNAP, so do not be alarmed if it does not work on your machine.

Never, ever, ever add a line that says `ldconfig' without any arguments to your Makefile or pkg/PLIST. This will reset the shared library cache to the contents of /usr/lib only, and will royally - screw up the user's machine ("Help, xinit doesn't run + screw up the user's machine ("Help, xinit does not run anymore after I install this port!"). Anybody who does this will be shot and cut into 65,536 pieces by a rusty knife and have his liver chopped out by a bunch of crows and will @@ -952,7 +952,7 @@ lib/libtcl.so.7.3

Do look at existing examples and the bsd.port.mk file before asking us questions! ;) -

Do ask us questions if you have any trouble! Don't just +

Do ask us questions if you have any trouble! Do not just beat your head against a wall! :) @@ -976,9 +976,9 @@ lib/libtcl.so.7.3 person who wrote this Makefile] # Whom: Satoshi Asami # - # $Id: porting.sgml,v 1.18 1996/04/10 06:32:42 asami Exp $ - [ ^^^^ don't worry about this...it will be automatically filled in by CVS when - it is committed to our repository] + # $Id: porting.sgml,v 1.19 1996/05/09 23:04:48 mpp Exp $ + [ ^^^^ do not worry about this...it will be automatically filled in by CVS + when it is committed to our repository] # [section to describe the package itself and main ftp site - DISTNAME @@ -987,7 +987,7 @@ lib/libtcl.so.7.3 DISTNAME= xdvi PKGNAME= xdvi-pl18 CATEGORIES+= printing - [don't forget the trailing slash ("/")!] + [do not forget the trailing slash ("/")!] MASTER_SITES= ftp://crl.dec.com/pub/X11/contrib/applications/ [set this if the source is not in the standard ".tar.gz" form] EXTRACT_SUFX= .tar.Z @@ -999,7 +999,7 @@ lib/libtcl.so.7.3 [maintainer; *mandatory*! This is the person (preferably with commit privileges) who a user can contact for questions and bug reports - this person should be the porter or someone who can forward questions to the - original porter reasonably promptly. If you really don't want to have your + original porter reasonably promptly. If you really do not want to have your address here, set it to "ports@FreeBSD.ORG".] MAINTAINER= asami@FreeBSD.ORG @@ -1007,8 +1007,8 @@ lib/libtcl.so.7.3 RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm - [this section is for other standard bsd.port.mk variables that don't belong to - any of the above] + [this section is for other standard bsd.port.mk variables that do not belong + to any of the above] [If it extracts to a directory other than ${DISTNAME}...] WRKSRC= ${WRKDIR}/xdvi-new [If it asks questions during configure, build, install...] @@ -1094,12 +1094,12 @@ xvgr-2.10pl1 xvgr-2.10.1 `pl' allowed only when no maj/minor numbers version. - That's It, Folks! + That is It, Folks!

Boy, this sure was a long tutorial, wasn't it? Thanks for following us to here, really. -

Well, now that you know how to do a port, let's go at it and +

Well, now that you know how to do a port, let us go at it and convert everything in the world into ports! That is the easiest way to start contributing to the FreeBSD Project! :) diff --git a/share/doc/handbook/ports.sgml b/share/doc/handbook/ports.sgml index a8a574f30eb3..584970ff713e 100644 --- a/share/doc/handbook/ports.sgml +++ b/share/doc/handbook/ports.sgml @@ -1,4 +1,4 @@ - + The Ports collection @@ -41,8 +41,8 @@ up less than twenty megabytes. on your system (usually /usr/ports/distfiles, though this value can be customized) for the associated set of original distribution files that have been ``ported''. Those not found locally are searched for -wherever they're generally provided on the Internet. If you have a -CDROM distribution of FreeBSD then you've already got them available +wherever they are generally provided on the Internet. If you have a +CDROM distribution of FreeBSD then you already have them available on your CD for ease of use. See if you have such a CDROM distribution, otherwise skip to /usr/ports to that directory. Then invoke the lndir(1) c the full pathname of the ``ports'' directory on the CDROM as an argument (this might be, for example, something like: lndir /cdrom/ports). Then you can build ports directly off the CDROM by -building them in the link tree you've created. +building them in the link tree you have created. -Note that there are some ports for which we can't provide the original +Note that there are some ports for which we cannot provide the original source in the CDROM due to licensing limitations. In that case, -you'll need to look at the next section (). Compiling ports using an Internet connection @@ -71,8 +71,8 @@ name="Compiling ports using an Internet connection">). your ports collection source tree up to date, updating the central ``distfiles'' version for you the next time you compile the port. - Of course, this assumes you have a permanent network link or don't -mind heavy usage of your telephone. If you don't want heavy network + Of course, this assumes you have a permanent network link or do not +mind heavy usage of your telephone. If you do not want heavy network usage when you compile your ports tree, you can pre-fetch the necessary tarballs beforehand and put them into /usr/ports/distfiles by hand. A good way to see what files a port is going to need is to @@ -86,15 +86,15 @@ line), or some FreeBSD mirror site also carrying a set of distfiles, as does the master FTP site on ftp.FreeBSD.org (aka ftp.cdrom.com) in the directory /pub/FreeBSD/distfiles. Note that the files in that directory are not guaranteed to be kept up to date - this is a -volunteer project! We can't make any guarantees about the mirror -sites either - they are obviously under independent control and don't +volunteer project! We canno make any guarantees about the mirror +sites either - they are obviously under independent control and do not even have to mirror the distfiles directory. If you have a non-permanent link, you can fetch all the distfiles by going to the top of the tree and typing ``make fetch''. -It doesn't work?! +It does not work?!

Oh. You can do one of four (4) things : @@ -105,17 +105,17 @@ going to the top of the tree and typing ``make fetch''. Gripe. This is done by e-mail *ONLY*! The people at Walnut Creek are in no way responsible for the functionality (or lack thereof) of the FreeBSD system as a whole, and especially the ports system, which - is mainly contributed by 3rd parties. (If you don't believe me, check + is mainly contributed by 3rd parties. (If you do not believe me, check the catalogue, especially the line saying "We cannot offer tech-support on this product") - The e-mail address is Ports@FreeBSD.org. Please include details of + The e-mail address is the &a.ports;. Please include details of the port, where you got both the port source & distfile(s) from, and what the error was. - Note: At time of writing, lang/Sather doesn't seem to work on Pentium + Note: At time of writing, lang/Sather does not seem to work on Pentium machines due to the Intel Curse (aka the Floating Point Division Bug). - Please don't tell us about this - gripe to Intel instead - it's their + Please do not tell us about this - gripe to Intel instead - it is their bug! Forget it. This is the easiest for most - very few of the programs in @@ -132,12 +132,12 @@ going to the top of the tree and typing ``make fetch''. install them to your system. -I've ported a program and I want to make a port out of it. What now? +I have ported a program and I want to make a port out of it. What now?

See the that contain details of the procedure and structure involved. -I've got a good port, what now? +I have got a good port, what now?

Upload the fixed version to ftp://freefall.cdrom.com/pub/incoming or ftp://ftp.FreeBSD.org/pub/FreeBSD/incoming and send e-mail to @@ -146,7 +146,7 @@ all-volunteer `ports committee' will (hopefully) look it over and commit it to the ports collection if they like the looks of it. -I want to leave the compile going overnight, but some ports don't like this. +I want to leave the compile going overnight, but some ports do not like this.

There is a way around this. Before starting the compilation, type: @@ -176,8 +176,8 @@ minute. The most up-to-date copy can be found in: If you find that you still need to go in there and alter things, -by all means do so, and then send the diffs to ports@FreeBSD.org if -you'd like them to be a part of the default distribution. Please also +by all means do so, and then send the diffs to the &a.ports if +you would like them to be a part of the default distribution. Please also remember that any changes must respect backwards-compatibility with any and all older Makefiles, unless you want a real nightmare of /usr/ports munging ahead of you! Large scale changes will generally @@ -187,7 +187,7 @@ alteration. Sorry! This FAQ is weak. What can I do? -

Send changes to ports@FreeBSD.org. Changes are most welcome! +

Send changes to the &a.ports;. Changes are most welcome! This FAQ is also very green and should be considered no more than a `good start' for now. Authors? You can come out of hiding any time now! :-) @@ -202,7 +202,7 @@ and type: This will print a summary of all ports in the tree. -I've heard of a new checksum system. What is this for? +I have heard of a new checksum system. What is this for?

For various reasons, when using FTP over the Internet to obtain the source code, you may not always end up with the same copy of the code @@ -223,7 +223,7 @@ checksum routine. The same technique can be applied to a single port. for that port. Not all ports currently have checksums, but this should be cured soon. - Some older versions of the system don't recognize the ``checksum'' + Some older versions of the system do not recognize the ``checksum'' target. In that case, try the command make check-md5 diff --git a/share/doc/handbook/ppp.sgml b/share/doc/handbook/ppp.sgml index 157f03d47895..0383cc739958 100644 --- a/share/doc/handbook/ppp.sgml +++ b/share/doc/handbook/ppp.sgml @@ -1,4 +1,4 @@ - + Setting up kernel PPP @@ -246,7 +246,7 @@ exit This /etc/ppp/kermit.dial script is used for dialing and authorizing on remote host. You will need to customize it for your needs. -Put your login and password in this script , also you'll need +Put your login and password in this script , also you will need to change input statement depending on responses from your modem and remote host. diff --git a/share/doc/handbook/printing.sgml b/share/doc/handbook/printing.sgml index 1aa5955e1c28..75e67741ce79 100644 --- a/share/doc/handbook/printing.sgml +++ b/share/doc/handbook/printing.sgml @@ -1,7 +1,7 @@ + + @@ -68,7 +68,7 @@ host2.foobar.com link#1 UC 0 0 (10.20.30.255 is the broadcast address for the subnet 10.20.30, and foobar.com is the domain name associated with that subnet). The designation link#1 - refers to the first ethernet card in the machine. You'll + refers to the first ethernet card in the machine. You will notice no additional interface is specified for those. Both of these groups (local network hosts and local @@ -150,7 +150,7 @@ host2.foobar.com link#1 UC 0 0 world, then the default route will be the gateway machine at your Internet Service Provider's (ISP) site. - Let's look at an example of default routes. This is a + Let us look at an example of default routes. This is a common configuration: [Local2] <--ether--> [Local1] <--PPP--> [ISP-Serv] <--ether--> [T1-GW] diff --git a/share/doc/handbook/scsi.sgml b/share/doc/handbook/scsi.sgml index 7335b49e209d..2e86fe264d6d 100644 --- a/share/doc/handbook/scsi.sgml +++ b/share/doc/handbook/scsi.sgml @@ -1,4 +1,4 @@ - + +

There are three different sorts of passwords which we will talk about in the discussion below. The first is your usual UNIX-style or Kerberos -password; we'll call this a ``UNIX password''. The second sort is the +password; we will call this a ``UNIX password''. The second sort is the one-time password which is generated by the S/Key `The secret password does not necessarily have anything to do with your @@ -73,7 +73,7 @@ one-way hash function is used, it is not possible to generate future one-time passwords having overheard one which was successfully used; the iteration count is decremented after each successful login to keep the user and login program in sync. (When you get the iteration count -down to 1, it's time to reinitialize S/Key.) +down to 1, it is time to reinitialize S/Key.)

There are four programs involved in the S/Key system which we will discuss below. The ` + Setting up a SLIP client @@ -11,8 +11,8 @@ address changes each time you dial up), you probably need to do something much fancier. @@ -27,7 +27,7 @@ Make sure you have pseudo-device sl 1 in your kernel's config file. It is included in the GENERIC kernel, -so this won't be a problem unless you deleted it. +so this will not be a problem unless you deleted it. Things you have to do only once @@ -43,7 +43,7 @@ so this won't be a problem unless you deleted it. 128.32.136.12 ns2.Berkeley.edu ns2 By the way, silvia is the name of the car that I had when I was - back in Japan (it's called 2?0SX here in U.S.). + back in Japan (it is called 2?0SX here in U.S.). Make sure you have "hosts" before "bind" in your /etc/host.conf. Otherwise, funny things may happen. @@ -91,7 +91,7 @@ nameserver 128.32.136.12 actual domain names and addresses depend on your environment. Set the password for root and toor (and any other accounts that - doesn't have a password). Use passwd, don't edit the /etc/passwd + does not have a password). Use passwd, do not edit the /etc/passwd or /etc/master.passwd files! Reboot your machine and make sure it comes up with the correct @@ -124,7 +124,7 @@ output ***\x0d, echo \x0aCONNECTED\x0a get connected. Note: leaving your password in plain text anywhere in the - filesystem is generally a BAD idea. Do it at your own risk. I'm + filesystem is generally a BAD idea. Do it at your own risk. I am just too lazy. Leave the kermit there (you can suspend it by "z") and as root, @@ -133,7 +133,7 @@ output ***\x0d, echo \x0aCONNECTED\x0a slattach -h -c -s 115200 /dev/modem if you are able to "ping" hosts on the other side of the router, - you are connected! If it doesn't work, you might want to try "-a" + you are connected! If it does not work, you might want to try "-a" instead of "-c" as an argument to slattach. @@ -144,7 +144,7 @@ slattach -h -c -s 115200 /dev/modem and exit from it ("q"). The slattach man page says you have to use "ifconfig sl0 down" to - mark the interface down, but this doesn't seem to make any + mark the interface down, but this does not seem to make any difference for me. ("ifconfig sl0" reports the same thing.) Some times, your modem might refuse to drop the carrier (mine @@ -153,7 +153,7 @@ slattach -h -c -s 115200 /dev/modem Troubleshooting -

If it doesn't work, feel free to ask me. The things that people +

If it does not work, feel free to ask me. The things that people tripped over so far: Not using "-c" or "-a" in slattach (I have no idea why this can be diff --git a/share/doc/handbook/slips.sgml b/share/doc/handbook/slips.sgml index 3f6c2b919d88..3156e98b46b3 100644 --- a/share/doc/handbook/slips.sgml +++ b/share/doc/handbook/slips.sgml @@ -46,9 +46,9 @@ Administration published by O'Reilly & Associates, Inc. (ISBN Number 0-937175-82-X), or Douglas Comer's books on the TCP/IP protocol. -It's further assumed that you have already setup your modem(s) and +It is further assumed that you have already setup your modem(s) and configured the appropriate system files to allow logins through your -modems. If you haven't prepared your system for this yet, please see +modems. If you have not prepared your system for this yet, please see the tutorial for configuring dialup services; if you have a World-Wide Web browser available, browse the list of tutorials at http://www.freebsd.org/; otherwise, check the place @@ -116,7 +116,7 @@ goes into /var/log/messages (see the manual pages for /etc/syslog.conf to see to which files syslogd is logging). -OK, enough of the examples -- let's dive into setting up the system. +OK, enough of the examples -- let us dive into setting up the system. Kernel Configuration

@@ -148,13 +148,13 @@ Internet RFC requirements for Internet hosts (see RFC's 1009 [Requirements for Internet Hosts -- Communication Layers], and perhaps 1127 [A Perspective on the Host Requirements RFCs]), so if you want your FreeBSD SLIP Server to act as a -router, you'll have to add the line +router, you will have to add the line sysctl -w net.inet.ip.forwarding = 0 to your rc.local file. -You'll notice that near the end of the default kernel configuration +You will notice that near the end of the default kernel configuration file (/sys/i386/conf/GENERIC) is a line that reads: @@ -231,9 +231,9 @@ included code to make use of the flags). Your choice of local and remote addresses for your SLIP links depends on whether you are going to dedicate a TCP/IP subnet or if you are -going to use ``proxy ARP'' on your SLIP server (it's not ``true'' +going to use ``proxy ARP'' on your SLIP server (it is not ``true'' proxy ARP, but that is the terminology used in this document to -describe it). If you're not sure which method to select or how to +describe it). If you are not sure which method to select or how to assign IP addresses, please refer to the TCP/IP books referenced in the section and/or consult your IP network manager. @@ -249,7 +249,7 @@ subnet. Otherwise, if you will use the ``proxy ARP'' method, you will need to assign your SLIP client's IP addresses out of your SLIP server's -Ethernet subnet, and you'll also need to adjust your +Ethernet subnet, and you will also need to adjust your /etc/sliphome/slip.login and /etc/sliphome/slip.logout scripts to use arp(8) to manage the proxy-ARP entries in the SLIP server's ARP table. @@ -337,7 +337,7 @@ will be unable to execute it.

-/etc/sliphome/slip.logout isn't strictly needed (unless you +/etc/sliphome/slip.logout is not strictly needed (unless you are implementing ``proxy ARP''), but if you decide to create it, this is an example of a basic slip.logout script: @@ -357,7 +357,7 @@ is an example of a basic slip.logout script: ----- end /etc/sliphome/slip.logout ----- -If you are using ``proxy ARP'', you'll want to have +If you are using ``proxy ARP'', you will want to have /etc/sliphome/slip.logout remove the ARP entry for the SLIP client: @@ -401,7 +401,7 @@ routers via appropriate routing protocols about your SLIP subnet.

Adding static routes to your nearest default routers can be -troublesome (or impossible, if you don't have authority to do so...). +troublesome (or impossible, if you do not have authority to do so...). If you have a multiple-router network in your organization, some routers, such as Cisco and Proteon, may not only need to be configured with the static route to the SLIP subnet, but also need to be told @@ -423,7 +423,7 @@ FreeBSD ``out-of-the-box''. Complete information and documentation on gated is available on the Web starting at http://www.gated.cornell.edu/. Compile and install it, and then write a /etc/gated.conf file to configure your gated; -here's a sample, similar to what the author used on a FreeBSD SLIP +here is a sample, similar to what the author used on a FreeBSD SLIP server: @@ -472,17 +472,17 @@ import proto rip interface ed { The above sample gated.conf file broadcasts routing information regarding the SLIP subnet xxx.xxx.yy via RIP onto the Ethernet; if you are using a different Ethernet driver than the -/var/tmp/gated.output for debugging gated's activity; you can certainly turn off the tracing options if -gated works OK for you. You'll need to change the +gated works OK for you. You will need to change the xxx.xxx.yy's into the network address of your own SLIP subnet (be sure to change the net mask in the proto direct clause as well). When you get gated built and installed and create a -configuration file for it, you'll need to run gated in place +configuration file for it, you will need to run gated in place of routed on your FreeBSD system; change the routed/gated startup parameters in /etc/netstart as appropriate for your system. Please see the manual page for diff --git a/share/doc/handbook/stable.sgml b/share/doc/handbook/stable.sgml index 8e1eb530d04a..18acd26fd565 100644 --- a/share/doc/handbook/stable.sgml +++ b/share/doc/handbook/stable.sgml @@ -1,4 +1,4 @@ - + @@ -10,7 +10,7 @@ THE FREEBSD STABLE POLICY -Last updated: $Date: 1996/01/31 14:26:01 $ +Last updated: $Date: 1996/02/11 00:16:17 $ This document attempts to explain the rationale behind FreeBSD-stable, what you should expect should you decide to run it, @@ -27,9 +27,9 @@ branch (see ). Who needs FreeBSD-stable? -

If you're a commercial user or someone who puts maximum stability of +

If you are a commercial user or someone who puts maximum stability of their FreeBSD system before all other concerns, you should consider tracking -stable. This is especially true if you've installed the most +stable. This is especially true if you have installed the most recent release ( at the time of this writing) since the stable branch is effectively a bug-fix stream relative to the previous release. @@ -53,8 +53,7 @@ next section). the users a chance to respond if they have any issues to raise concerning the proposed change. - To join this list, send mail to and say: + To join this list, send mail to &a.majordomo and say: subscribe freebsd-stable @@ -73,7 +72,7 @@ next section). Use the CMU `sup' program (Software Update Protocol), also described below. This is the second most recommended method, since it allows - you to grab the entire collection once and then only what's + you to grab the entire collection once and then only what has changed from then on. Many people run sup from cron and keep their sources up-to-date automatically. diff --git a/share/doc/handbook/submitters.sgml b/share/doc/handbook/submitters.sgml index 15e1666e6fa1..6e9150aaaeac 100644 --- a/share/doc/handbook/submitters.sgml +++ b/share/doc/handbook/submitters.sgml @@ -1,17 +1,17 @@ - + Contributing to FreeBSD

Contributed by &a.jkh;. -

So you want to contribute something to FreeBSD? That's great! +

So you want to contribute something to FreeBSD? That is great! We can always use the help, and FreeBSD is one of those systems that relies on the contributions of its user base in order -to survive. Your contributions are not only appreciated, they're +to survive. Your contributions are not only appreciated, they are vital to FreeBSD's continued growth! -

Contrary to what some people might also have you believe, you don't +

Contrary to what some people might also have you believe, you do not need to be a hot-shot programmer or a close personal friend of the FreeBSD core team in order to have your contributions accepted. The FreeBSD Project's development is done by a large and growing number of @@ -24,28 +24,28 @@ system environment (and its installation) rather than just a kernel or a few scattered utilities, our "TODO" list also spans a very wide range of tasks, from documentation, beta testing and presentation to highly specialized types of kernel development. No matter what your -skill level, there's almost certainly something you can do to help the +skill level, there is almost certainly something you can do to help the project!

Commercial entities engaged in FreeBSD-related enterprises are also encouraged to contact us. Need a special extension to make your -product work? You'll find us receptive to your requests, given that -they aren't too outlandish. Working on a value-added product? Please +product work? You will find us receptive to your requests, given that +they are not too outlandish. Working on a value-added product? Please let us know! We may be able to work cooperatively on some aspect of it. The free software world is challenging a lot of existing assumptions about how software is developed, sold, and maintained throughout its life cycle, and we urge you to at least give it a second look. -What's needed +What is needed

The following list of tasks and sub-projects represents something of an amalgam of the various core team TODO lists and user requests -we've collected over the last couple of months. Where possible, tasks -have been ranked by degree of urgency. If you're interested in +we have collected over the last couple of months. Where possible, tasks +have been ranked by degree of urgency. If you are interested in working on one of the tasks you see here, send mail to the coordinator listed by clicking on their names. If no coordinator has been -appointed, maybe you'd like to volunteer? +appointed, maybe you would like to volunteer? High priority tasks

The following tasks are considered to be urgent, usually because @@ -133,7 +133,7 @@ your hardware, etc. Low priority tasks

The following tasks are purely cosmetic or represent such an -investment of work that it's not likely that anyone will get them done +investment of work that it is not likely that anyone will get them done anytime soon:

The first 20 items are from Terry Lambert <terry@lambert.org> @@ -198,7 +198,7 @@ as opportunity permits. SCO and Solaris are good candidates, followed by UnixWare, etc. Processor emulation environments for execution of foreign binaries. -This is easier than it sounds if the system call interface doesn't +This is easier than it sounds if the system call interface does not change much. Streams to allow the use of commercial streams drivers. @@ -220,7 +220,7 @@ PCMCIA). Reorganization of the source tree for multiple platform ports. A "make world" that "makes the world" (rename the current one -to "make regress" if that's all it is good for). +to "make regress" if that is all it is good for). A 4M (preferably smaller!) memory footprint. @@ -241,8 +241,7 @@ the following 6 categories: in such things (and a tolerance for a high volume of mail!) may subscribe to the hackers mailing list by sending mail to - . + &a.majordomo;. See for more information about this and other mailing lists. @@ -251,7 +250,7 @@ the following 6 categories: you for various fields to fill in. Simply go to the fields surrounded by <>'s and fill in your own information in place of - what's suggested there. You should receive confirmation of your + what is suggested there. You should receive confirmation of your bug report and a tracking number. Keep this tracking number and use it in any subsequent correspondence. If you do not receive confirmation in a timely fashion (3 days to @@ -307,8 +306,8 @@ diff -c -r olddir newdir likely get back in touch with you in 24 hours or less, assuming of course that your diffs are interesting! :-) - If your changes don't express themselves well as diffs alone - (e.g. you've perhaps added, deleted or renamed files as well) + If your changes do not express themselves well as diffs alone + (e.g. you have perhaps added, deleted or renamed files as well) then you may be better off bundling any new files, diffs and instructions for deleting/renaming others into a tar file and running the uuencode(1) program on it before @@ -317,8 +316,8 @@ diff -c -r olddir newdir information on bundling files this way. If your change is of a potentially sensitive nature, e.g. - you're unsure of copyright issues governing its further distribution - or you're simply not ready to release it without a tighter review first, + you are unsure of copyright issues governing its further distribution + or you are simply not ready to release it without a tighter review first, then you should send it to rather than the &a.hackers The core mailing list @@ -348,7 +347,7 @@ diff -c -r olddir newdir who might eventually be inclined to invest something of their own into FreeBSD. - The GNU Public License, or ``GPL''. This license isn't quite + The GNU Public License, or ``GPL''. This license is not quite as popular with us due to the amount of extra effort demanded of anyone using the code for commercial purposes, but given the sheer quantity of GPL'd code we currently require (compiler, @@ -400,7 +399,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $Id: submitters.sgml,v 1.25 1996/05/09 23:04:50 mpp Exp $ + $Id: submitters.sgml,v 1.26 1996/05/09 23:32:44 jkh Exp $ For your convenience, a copy of this text can be found in /usr/share/examples/etc/bsd-style-copyright. @@ -408,7 +407,7 @@ For your convenience, a copy of this text can be found in &porting; Money, Hardware or Internet access -

We're always very happy to accept donations to further the cause of +

We are always very happy to accept donations to further the cause of the FreeBSD Project and, in a volunteer effort like ours, a little can go a long way! Donations of hardware are also very important to expanding our list of supported peripherals since we generally lack the funds to @@ -464,20 +463,20 @@ systems should be sent to the FreeBSD, Inc. address listed in the We are currently trying to put together a testing lab of all components that FreeBSD supports so that proper regression testing can be done with each new release. We are still lacking many important pieces (network cards, -motherboards, etc) and if you'd like to make such a donation, please contact +motherboards, etc) and if you would like to make such a donation, please contact &a.davidg for information on which items are still required. -Hardware currently unsupported by FreeBSD for which you'd like to +Hardware currently unsupported by FreeBSD for which you would like to see such support added. Please contact the before sending -such items as we'll need to find a developer willing to take on the task +such items as we will need to find a developer willing to take on the task before we can accept delivery of them. Donating Internet access

We can always use new mirror sites for FTP, WWW or sup. -If you'd like to be such a mirror, please contact +If you would like to be such a mirror, please contact for more information. @@ -502,7 +501,7 @@ like to publically thank them here! has donated almost more than we can say (see the document for more details). - In particular, we'd like to thank them for the hardware used for + In particular, we would like to thank them for the hardware used for freefall.FreeBSD.ORG, our primary development machine, and for thud.FreeBSD.ORG, our testing and build box. We are also indebted to them for funding various contributors over diff --git a/share/doc/handbook/sup.sgml b/share/doc/handbook/sup.sgml index 48ac680f63b3..4b3ce9569209 100644 --- a/share/doc/handbook/sup.sgml +++ b/share/doc/handbook/sup.sgml @@ -1,4 +1,4 @@ - + @@ -28,9 +28,9 @@ track changes to the -stable release, refer to /usr/share/examples/sup/stable-supfile instead. -If you're inside the United States, you may also uncomment +If you are inside the United States, you may also uncomment the `secure' and `eBones' collection lines to grab the DES code. -If you're outside the +If you are outside the U.S., you should NOT sup this code from sup.FreeBSD.ORG as this will violate U.S. export restrictions. Instead you should use the secure-supfile found within the above directory. This will @@ -45,7 +45,7 @@ listed in the above example files is currently overloaded and any traffic that can be transfered to a different host will help relieve some of the strain. -Once this is setup, you're ready to go. To start sup type: +Once this is setup, you are ready to go. To start sup type: sup supfile @@ -54,7 +54,7 @@ like so: sup -v supfile -Thats all there is to it! Remember that if you're running current, +Thats all there is to it! Remember that if you are running current, which is what you will have if you sup with the standard-supfile, please join the &a.current mailing list. You should also be sure to read @@ -125,7 +125,7 @@ ports-x11: /usr/ports/x11 X11 software

If you want to keep updated on the original source of the ports, you can also add this to your supfile. But note that this collection is enormous, and unless you are an ftp site mirroring the -entire FreeBSD tree (but can't use ``mirror'' for some reason), you +entire FreeBSD tree (but cannot use ``mirror'' for some reason), you (and us) are much better off not using sup to collect these: ports-distfiles: /usr/ports/distfiles original tarballs diff --git a/share/doc/handbook/troubleshooting.sgml b/share/doc/handbook/troubleshooting.sgml index 07efb816fbfd..788beef25575 100644 --- a/share/doc/handbook/troubleshooting.sgml +++ b/share/doc/handbook/troubleshooting.sgml @@ -1,4 +1,4 @@ - + Troubleshooting @@ -13,16 +13,16 @@

Problem: A device is conflicting with - another or doesn't match the kernel's compiled-in IRQ or + another or does not match the kernel's compiled-in IRQ or address. Cause: While most device drivers in FreeBSD are now smart enough to match themselves to your hardware settings dynamically, there are a few that still require fairly rigid configuration parameters to be - compiled in (and matched by the hardware) before they'll - work. We're working hard to eliminate as many of these - last hold-outs as we can, but it's not always as easy as + compiled in (and matched by the hardware) before they will + work. We are working hard to eliminate as many of these + last hold-outs as we can, but it is not always as easy as it looks. Solution: There are several possible @@ -40,16 +40,16 @@ You can use this utility to reset the IRQ, memory address, IO address or a number of other device configuration parameters. You can also disable a device - entirely if it's causing problems for other devices you'd + entirely if it is causing problems for other devices you would much rather have work. Another solution is, obviously, to remove the offending hardware or simply strip the system down to the bare essentials until the problem (hopefully) goes away. Once - you're up, you can do the same thing mentioned + you are up, you can do the same thing mentioned above---compile a kernel more suited to your hardware, or incrementally try to figure out what it was about your - original hardware configuration that didn't work. + original hardware configuration that did not work. @@ -62,8 +62,8 @@ Solution: You should re-enter the installation process, invoke the (F)disk editor and chose the (W)rite option. - This won't hurt an existing installation and will make + This will not hurt an existing installation and will make sure that the new boot blocks get written to the drive. - If you're installing for the first time, don't forget to + If you are installing for the first time, do not forget to (W)rite out your new boot blocks! :-) diff --git a/share/doc/handbook/userppp.sgml b/share/doc/handbook/userppp.sgml index 69f92342c3c8..2cecb4912d80 100644 --- a/share/doc/handbook/userppp.sgml +++ b/share/doc/handbook/userppp.sgml @@ -1,4 +1,4 @@ - + Setting up user PPP

This document assumes you're in roughly this position: +

This document assumes you are in roughly this position: You have an account with an Internet Service Provider (ISP) which lets you use PPP. Further, you have a modem (or other device) connected and @@ -77,7 +77,7 @@ your kernel. Check for more information on how to acquire these. - In addition, I've assumed that because your connection to the Internet is + In addition, I have assumed that because your connection to the Internet is not full time you are not running a name server (named(8)). Building a ppp ready kernel @@ -92,7 +92,7 @@ pseudo-device tun 1 in it somewhere. The stock GENERIC kernel has this as standard, so if you - have not installed a custom kernel you don't have to change anything. + have not installed a custom kernel you do not have to change anything. If your kernel configuration file does not have this line in it then you should add the line, re-compile and then re-install the kernel. Boot from this new kernel. @@ -159,7 +159,7 @@ bind and then to consult the DNS if the name was not found in the /etc/hosts file. - It's probably a good idea to make sure you are not running the ``named'' + It is probably a good idea to make sure you are not running the ``named'' service. Check your /etc/sysconfig file for the line that refers to ``namedflags'', and make sure the line reads @@ -170,7 +170,7 @@ namedflags="NO"

This file should contain the IP addresses and names of machines on your network. At a bare minimum it should contain entries for the machine - which will be running ppp. Assuming that you're machine is called + which will be running ppp. Assuming that your machine is called foo.bar.com with the IP address 10.0.0.1, /etc/hosts should contain: @@ -228,7 +228,7 @@ nameserver 158.152.1.65 10 set timeout 120 11 set ifaddr x.x.x.x y.y.y.y - Don't include the line numbers, they're just for this discussion. + Do not include the line numbers, they are just for this discussion. chat(8) language. Check the manual page for information on the features @@ -247,10 +247,10 @@ nameserver 158.152.1.65 J. Random Provider @@ -298,8 +298,8 @@ set ifaddr 0 0 Final system configuration -

You now have PPP configured, but there's a few more things to do before - it's ready to work. They all involve editing the /etc/sysconfig +

You now have PPP configured, but there are a few more things to do before + it is ready to work. They all involve editing the /etc/sysconfig file. Working from the top down in this file, make sure the ``hostname='' line @@ -330,7 +330,7 @@ ifconfig_tun0="inet foo.bar.com y.y.y.y netmask 0xffffffff" routedflags=-s - It's probably worth your while ensuring that the ``sendmail_flags'' line + It is probably worth your while ensuring that the ``sendmail_flags'' line does not include the ``-q'' option, otherwise sendmail will attempt to do a network lookup every now and then, possibly causing your machine to dial out. My sendmail line looks like @@ -343,7 +343,7 @@ sendmail_flags="-bd" # /usr/sbin/sendmail -q That should be about all you need to do to get PPP working with a static - IP address. All that's left is to reboot the machine. During startup the + IP address. All that is left is to reboot the machine. During startup the tun0 device should be detected, and two lines like the following should be printed,