diff --git a/en_US.ISO8859-1/articles/dialup-firewall/article.sgml b/en_US.ISO8859-1/articles/dialup-firewall/article.sgml index a1dd71ce69..8ec0013ac1 100644 --- a/en_US.ISO8859-1/articles/dialup-firewall/article.sgml +++ b/en_US.ISO8859-1/articles/dialup-firewall/article.sgml @@ -1,7 +1,7 @@ - $Date: 2001-07-06 12:50:08 $ + $Date: 2001-07-06 13:02:48 $ This article documents how to setup a firewall using a PPP @@ -319,8 +319,7 @@ $fwcmd add 65435 deny log ip from any to any below. The original ruleset is backed up as fwrules_tun0. - - &prompt.user; cd /etc/firewall + &prompt.user; cd /etc/firewall /etc/firewall&prompt.user; su Password: /etc/firewall&prompt.root; mv fwrules fwrules_tun0 @@ -332,8 +331,7 @@ $fwcmd add 65435 deny log ip from any to any connection is up. E.g., for a connection made with &man.pppd.8; you would see something like this (showing only the relevant lines): - - &prompt.user; ifconfig + &prompt.user; ifconfig (skipped...) ppp0: flags=8051<UP,POINTOPOINT,RUNNING,MULTICAST> mtu 1524 inet xxx.xxx.xxx.xxx --> xxx.xxx.xxx.xxx netmask 0xff000000 @@ -344,8 +342,7 @@ $fwcmd add 65435 deny log ip from any to any (user-ppp) you should see something similar to this: - - &prompt.user; ifconfig + &prompt.user; ifconfig (skipped...) ppp0: flags=8010<POINTOPOINT,MULTICAST> mtu 1500 (skipped...) @@ -353,8 +350,7 @@ $fwcmd add 65435 deny log ip from any to any (IPv6 stuff skipped...) inet xxx.xxx.xxx.xxx --> xxx.xxx.xxx.xxx netmask 0xffffff00 Opened by PID xxxxx - (skipped...) - + (skipped...) diff --git a/en_US.ISO8859-1/articles/fonts/article.sgml b/en_US.ISO8859-1/articles/fonts/article.sgml index 8d8291fdae..a2f2b5a1a5 100644 --- a/en_US.ISO8859-1/articles/fonts/article.sgml +++ b/en_US.ISO8859-1/articles/fonts/article.sgml @@ -1,4 +1,4 @@ - + @@ -237,8 +237,7 @@ &man.vidcontrol.1;: - &prompt.user; vidcontrol VGA_80x60 - + &prompt.user; vidcontrol VGA_80x60 Various screen orientated programs, such as &man.vi.1;, must @@ -290,8 +289,7 @@ &prompt.user; cp /cdrom/fonts/atm/showboat/showboat.afm . Maintain an index to cross reference the fonts -&prompt.user; echo showboat - InfoMagic CICA, Dec 1994, /fonts/atm/showboat >>INDEX - +&prompt.user; echo showboat - InfoMagic CICA, Dec 1994, /fonts/atm/showboat >>INDEX Now, to use a new font with X11, one must make the font file @@ -309,8 +307,7 @@ | | | \ \ \ \ +- points | | | \ \ \ +- pixels | | | \ \ \ - foundry family weight slant width additional style - + foundry family weight slant width additional style A new name needs to be created for each new font. If you @@ -344,15 +341,13 @@ FontDirectory/Showboat known{/Showboat findfont dup/UniqueID known{dup 1991 by David Rakowski. Alle Rechte Vorbehalten.) readonly def end readonly def /FontName /Showboat def ---stdin-- - +--stdin-- Using this information, a possible name might be: - -type1-Showboat-medium-r-normal-decorative-0-0-0-0-p-0-iso8859-1 - + -type1-Showboat-medium-r-normal-decorative-0-0-0-0-p-0-iso8859-1 The components of our name are: @@ -471,8 +466,7 @@ showboat.pfb -type1-showboat-medium-r-normal-decorative-0-0-0-0-p-0-iso8859-1 &prompt.user; xset fp rehash Examine the new font -&prompt.user; xfontsel -pattern -type1-* - +&prompt.user; xfontsel -pattern -type1-* References: &man.xfontsel.1;, &man.xset.1;, The X @@ -518,8 +512,7 @@ Loading Showboat font from /usr/local/share/ghostscript/fonts/showboat.pfb... >>showpage, press <return> to continue<< >>showpage, press <return> to continue<< >>showpage, press <return> to continue<< -GS>quit - +GS>quit References: fonts.txt in the @@ -551,8 +544,7 @@ GS>quit :1c #!/usr/bin/perl -P- . -:wq - +:wq This tool will create the groff font file from the metrics @@ -568,8 +560,7 @@ We need to convert them to unix style ^J delimited lines Now create the groff font file &prompt.user; cd /usr/share/groff_font/devps -&prompt.user; /tmp/afmtodit.pl -d DESC -e text.enc /tmp/showboat.afm generate/textmap SHOWBOAT - +&prompt.user; /tmp/afmtodit.pl -d DESC -e text.enc /tmp/showboat.afm generate/textmap SHOWBOAT The font can now be referenced with the name @@ -590,8 +581,7 @@ We need to convert them to unix style ^J delimited lines Create the .pfa font file -&prompt.user; pfbtops /usr/local/share/fonts/type1/showboat.pfb >showboat.pfa - +&prompt.user; pfbtops /usr/local/share/fonts/type1/showboat.pfb >showboat.pfa Of course, if the .pfa file is already @@ -607,8 +597,7 @@ internalname Showboat :$a Showboat showboat.pfa . -:wq - +:wq To test the font: @@ -647,8 +636,7 @@ EOF &prompt.user; ghostview example.ps To print it -&prompt.user; lpr -Ppostscript example.ps - +&prompt.user; lpr -Ppostscript example.ps References: diff --git a/en_US.ISO8859-1/articles/multi-os/article.sgml b/en_US.ISO8859-1/articles/multi-os/article.sgml index 63394e6f5f..1a93cfe0a7 100644 --- a/en_US.ISO8859-1/articles/multi-os/article.sgml +++ b/en_US.ISO8859-1/articles/multi-os/article.sgml @@ -1,4 +1,4 @@ - +
@@ -202,8 +202,7 @@ When viewed with the Windows 95 fdisk utility, my hard drives should now look something like this: - ---------------------------------------------------------------------- + --------------------------------------------------------------------- Display Partition Information diff --git a/en_US.ISO8859-1/articles/new-users/article.sgml b/en_US.ISO8859-1/articles/new-users/article.sgml index 99f641c894..90bccba82d 100644 --- a/en_US.ISO8859-1/articles/new-users/article.sgml +++ b/en_US.ISO8859-1/articles/new-users/article.sgml @@ -1,4 +1,4 @@ - + @@ -47,8 +47,7 @@ >login: prompt) type - &prompt.root; exit - + &prompt.root; exit as often as necessary. Yes, press enter @@ -59,22 +58,19 @@ To shut down the machine type - &prompt.root; /sbin/shutdown -h now - + &prompt.root; /sbin/shutdown -h now Or to reboot type - &prompt.root; /sbin/shutdown -r now - + &prompt.root; /sbin/shutdown -r now or - &prompt.root; /sbin/reboot - + &prompt.root; /sbin/reboot You can also reboot with @@ -93,8 +89,7 @@ user now with - &prompt.root; adduser - + &prompt.root; adduser The first time you use adduser, it might ask for some @@ -110,8 +105,7 @@ jack into other groups, type wheel - Login group is ``jack''. Invite jack into other groups: wheel - + Login group is ``jack''. Invite jack into other groups: wheel This will make it possible to log in as @@ -379,8 +373,7 @@ &prompt.root; periodic weekly output omitted &prompt.root; periodic monthly -output omitted - +output omitted If you get tired of waiting, press @@ -430,8 +423,7 @@ /etc directory and do: - &prompt.root; cp rc.conf rc.conf.orig - + &prompt.root; cp rc.conf rc.conf.orig This would copy rc.conf to @@ -442,8 +434,7 @@ &prompt.root; mv rc.conf rc.conf.orig -&prompt.root; cp rc.conf.orig rc.conf - +&prompt.root; cp rc.conf.orig rc.conf because the mv command preserves the @@ -462,8 +453,7 @@ To edit a file, type - &prompt.root; vi filename - + &prompt.root; vi filename Move through the text with the arrow keys. @@ -618,8 +608,7 @@ The command - &prompt.user; man chmod | col -b > chmod.txt - + &prompt.user; man chmod | col -b > chmod.txt will remove formatting codes and send the man page to the @@ -628,8 +617,7 @@ drive a, su to root, and type - &prompt.root; /sbin/mount -t msdos /dev/fd0 /mnt - + &prompt.root; /sbin/mount -t msdos /dev/fd0 /mnt to mount the floppy drive on @@ -641,8 +629,7 @@ the floppy with: - &prompt.user; cp chmod.txt /mnt - + &prompt.user; cp chmod.txt /mnt and use ls /mnt to get a directory @@ -653,8 +640,7 @@ /sbin/dmesg by typing - &prompt.user; /sbin/dmesg > dmesg.txt - + &prompt.user; /sbin/dmesg > dmesg.txt and copying dmesg.txt to the floppy. @@ -670,8 +656,7 @@ disk out with - &prompt.root; /sbin/umount /mnt - + &prompt.root; /sbin/umount /mnt and reboot to go to DOS. Copy these files to a DOS @@ -771,8 +756,7 @@ with - &prompt.user; find /usr -name "filename" - + &prompt.user; find /usr -name "filename" You can use * as a wildcard in @@ -821,8 +805,7 @@ add that should be available to all users) with: - &prompt.root; cp -R /cdrom/ports/comm/kermit /usr/local - + &prompt.root; cp -R /cdrom/ports/comm/kermit /usr/local This should result in a @@ -844,8 +827,7 @@ Makefile. Type - &prompt.root; make all install - + &prompt.root; make all install During this process the port will ftp to get any compressed diff --git a/en_US.ISO8859-1/articles/programming-tools/article.sgml b/en_US.ISO8859-1/articles/programming-tools/article.sgml index eabcea2da8..12db95ba14 100644 --- a/en_US.ISO8859-1/articles/programming-tools/article.sgml +++ b/en_US.ISO8859-1/articles/programming-tools/article.sgml @@ -1,4 +1,4 @@ - + @@ -126,8 +126,7 @@ To get one of these packages, all you need to do is to click on the hotlink for the package, then run - &prompt.root; pkg_add package name - + &prompt.root; pkg_add package name as root. Obviously, you will need to have a fully functional FreeBSD 2.1.0 or later system for the package to @@ -371,15 +370,13 @@ cc is a front end that manages calling all these programs with the right arguments for you; simply typing - &prompt.user; cc foobar.c - + &prompt.user; cc foobar.c will cause foobar.c to be compiled by all the steps above. If you have more than one file to compile, just do something like - &prompt.user; cc foo.c bar.c - + &prompt.user; cc foo.c bar.c Note that the syntax checking is just that—checking the syntax. It will not check for any logical mistakes you may @@ -557,8 +554,7 @@ knows what you may be using in a few years time? - &prompt.user; cc -Wall -ansi -pedantic -o foobar foobar.c - + &prompt.user; cc -Wall -ansi -pedantic -o foobar foobar.c This will produce an executable foobar @@ -1002,8 +998,7 @@ free(foo); When you're working on a simple program with only one or two source files, typing in - &prompt.user; cc file1.c file2.c - + &prompt.user; cc file1.c file2.c is not too bad, but it quickly becomes very tedious when there are several files—and it can take a while to @@ -1013,8 +1008,7 @@ free(foo); recompile the source file if the source code has changed. So we could have something like: - &prompt.user; cc file1.o file2.o … file37.c &hellip - + &prompt.user; cc file1.o file2.o … file37.c &hellip if we'd changed file37.c, but not any of the others, since the last time we compiled. This may @@ -1118,8 +1112,7 @@ install: We can tell make which target we want to make by typing: - &prompt.user; make target - + &prompt.user; make target make will then only look at that target and ignore any others. For example, if we type @@ -1262,8 +1255,7 @@ DISTFILES= scheme-microcode+dist-7.3-freebsd.tgz for it in /usr/share/doc/psd/12.make. To view it, do - &prompt.user; zmore paper.ascii.gz - + &prompt.user; zmore paper.ascii.gz in that directory. @@ -1300,14 +1292,12 @@ DISTFILES= scheme-microcode+dist-7.3-freebsd.tgz gdb (GNU debugger). You start it up by typing - &prompt.user; gdb progname - + &prompt.user; gdb progname although most people prefer to run it inside Emacs. You can do this by: - M-x gdb RET progname RET - + M-x gdb RET progname RET Using a debugger allows you to run the program under more controlled circumstances. Typically, you can step through the @@ -1342,8 +1332,7 @@ DISTFILES= scheme-microcode+dist-7.3-freebsd.tgz see the name of the function you're in, instead of the source code. If you see a line like: - … (no debugging symbols found) … - + … (no debugging symbols found) … when gdb starts up, you'll know that the program wasn't compiled with the @@ -1398,8 +1387,7 @@ int bazz(int anint) { &prompt.user; cc -g -o temp temp.c &prompt.user; ./temp This is my program -anint = 4231 - +anint = 4231 That wasn't what we expected! Time to see what's going on! @@ -1419,8 +1407,7 @@ Breakpoint 1, main () at temp.c:9 gdb stops This is my program Program prints out (gdb) s step into bazz() bazz (anint=4231) at temp.c:17 gdb displays stack frame -(gdb) - +(gdb) Hang on a minute! How did anint get to be 4231? Didn't we set it to be @@ -1430,8 +1417,7 @@ bazz (anint=4231) at temp.c:17 gdb displays (gdb) up Move up call stack #1 0x1625 in main () at temp.c:11 gdb displays stack frame (gdb) p i Show us the value of i -$1 = 4231 gdb displays 4231 - +$1 = 4231 gdb displays 4231 Oh dear! Looking at the code, we forgot to initialise i. We meant to put @@ -1480,8 +1466,7 @@ main() { the usual way. Instead of typing break or run, type - (gdb) core progname.core - + (gdb) core progname.core If you're not in the same directory as the core file, you'll have to do dir @@ -1499,8 +1484,7 @@ Core was generated by `a.out'. Program terminated with signal 11, Segmentation fault. Cannot access memory at address 0x7020796d. #0 0x164a in bazz (anint=0x5) at temp.c:17 -(gdb) - +(gdb) In this case, the program was called a.out, so the core file is called @@ -1519,8 +1503,7 @@ Cannot access memory at address 0x7020796d. #0 0x164a in bazz (anint=0x5) at temp.c:17 #1 0xefbfd888 in end () #2 0x162c in main () at temp.c:11 -(gdb) - +(gdb) The end() function is called when a program crashes; in this case, the bazz() @@ -1541,8 +1524,7 @@ Cannot access memory at address 0x7020796d. use ps to find the process ID for the child, and do - (gdb) attach pid - + (gdb) attach pid in gdb, and then debug as usual. @@ -1562,8 +1544,7 @@ else if (pid == 0) { /* child */ sleep(10); /* Wait until someone attaches to us */ &hellip } else { /* parent */ - &hellip - + &hellip Now all you have to do is attach to the child, set PauseMode to 0, and wait @@ -2131,8 +2112,7 @@ in font-lock-auto-mode-list" Lisp. For example, if whizbang is a FreeBSD port, we can locate these files by doing - &prompt.user; find /usr/ports/lang/whizbang -name "*.el" -print - + &prompt.user; find /usr/ports/lang/whizbang -name "*.el" -print and install them by copying them into the Emacs site Lisp directory. On FreeBSD 2.1.0-RELEASE, this is @@ -2141,13 +2121,11 @@ in font-lock-auto-mode-list" So for example, if the output from the find command was - /usr/ports/lang/whizbang/work/misc/whizbang.el - + /usr/ports/lang/whizbang/work/misc/whizbang.el we would do - &prompt.root; cp /usr/ports/lang/whizbang/work/misc/whizbang.el /usr/local/share/emacs/site-lisp - + &prompt.root; cp /usr/ports/lang/whizbang/work/misc/whizbang.el /usr/local/share/emacs/site-lisp Next, we need to decide what extension whizbang source files have. Let's say for the sake of argument that they all diff --git a/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml index bab255c26d..cd0a35b2ce 100644 --- a/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml +++ b/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml @@ -1,7 +1,7 @@ @@ -118,8 +118,7 @@ KMOD=skeleton will create a file skeleton.ko that can be loaded into your system by typing : &prompt.root - kldload -v ./skeleton.ko - + kldload -v ./skeleton.ko @@ -332,18 +331,14 @@ DEV_MODULE(echo,echo_loader,NULL); To install this driver you will first need to make a node on your filesystem with a command such as : - - &prompt.root mknod /dev/echo c 33 0 - + &prompt.root mknod /dev/echo c 33 0 With this driver loaded you should now be able to type something like : - - &prompt.root echo -n "Test Data" > /dev/echo +&prompt.root echo -n "Test Data" > /dev/echo &prompt.root cat /dev/echo - Test Data - + Test Data Real hardware devices in the next chapter.. diff --git a/en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml index bab255c26d..cd0a35b2ce 100644 --- a/en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml +++ b/en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml @@ -1,7 +1,7 @@ @@ -118,8 +118,7 @@ KMOD=skeleton will create a file skeleton.ko that can be loaded into your system by typing : &prompt.root - kldload -v ./skeleton.ko - + kldload -v ./skeleton.ko @@ -332,18 +331,14 @@ DEV_MODULE(echo,echo_loader,NULL); To install this driver you will first need to make a node on your filesystem with a command such as : - - &prompt.root mknod /dev/echo c 33 0 - + &prompt.root mknod /dev/echo c 33 0 With this driver loaded you should now be able to type something like : - - &prompt.root echo -n "Test Data" > /dev/echo +&prompt.root echo -n "Test Data" > /dev/echo &prompt.root cat /dev/echo - Test Data - + Test Data Real hardware devices in the next chapter.. diff --git a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml index e6028b6cb3..2c1519e6b4 100644 --- a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml +++ b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml @@ -1,7 +1,7 @@ @@ -380,8 +380,7 @@ example, you may see something like: - - fe80:1::200:f8ff:fe01:6317 + fe80:1::200:f8ff:fe01:6317 in the routing table and interface address structure (struct @@ -443,12 +442,10 @@ Here is an output of netstat command: - -Internet6: +Internet6: Destination Gateway Flags Netif Expire fe80:1::%ed0/64 link#1 UC ed0 -fe80:2::%ep0/64 link#2 UC ep0 - +fe80:2::%ep0/64 link#2 UC ep0 Interfaces that has no IEEE802 address (pseudo interfaces like tunnel interfaces, or ppp interfaces) will borrow IEEE802 @@ -518,8 +515,7 @@ fe80:2::%ep0/64 link#2 UC ep0 To summarize the sysctl knob: - - accept_rtadv forwarding role of the node + accept_rtadv forwarding role of the node --- --- --- 0 0 host (to be manually configured) 0 1 router @@ -529,8 +525,7 @@ fe80:2::%ep0/64 link#2 UC ep0 with multiple interface is out-of-scope) 1 1 invalid, or experimental - (out-of-scope of spec) - + (out-of-scope of spec) RFC2462 has validation rule against incoming RA prefix information option, in 5.5.3 (e). This is to protect hosts from @@ -702,12 +697,10 @@ fe80:2::%ep0/64 link#2 UC ep0 statistics are incremented. You can see the statistics as output of &man.netstat.8; command with `-s -p ip6' option: - - &prompt.user; netstat -s -p ip6 + &prompt.user; netstat -s -p ip6 ip6: (snip) - 1 with data size < data length - + 1 with data size < data length So, kernel does not send an ICMPv6 error unless the erroneous packet is an actual Jumbo Payload, that is, its packet size is more @@ -834,8 +827,7 @@ fe80:2::%ep0/64 link#2 UC ep0 "cce0" violates the requirement. (For more information, refer to Section 2.) - - Mbuf statistics: + Mbuf statistics: 317 one mbuf two or more mbuf:: lo0 = 8 @@ -880,8 +872,7 @@ fe80:2::%ep0/64 link#2 UC ep0 The following table show the behavior of FreeBSD 4.x. - - listening side initiating side + listening side initiating side (AF_INET6 wildcard (connection to ::ffff:10.1.1.1) socket gets IPv4 conn.) --- --- @@ -932,8 +923,7 @@ FreeBSD 4.x configurable supported To resolve this issue more easily, there is system dependent &man.setsockopt.2; option, IPV6_BINDV6ONLY, used like below. - - int on; + int on; setsockopt(s, IPPROTO_IPV6, IPV6_BINDV6ONLY, (char *)&on, sizeof (on)) < 0)); @@ -1027,8 +1017,7 @@ FreeBSD 4.x configurable supported wildcard bind (enabled by default). You can disable it on each socket basis with &man.setsockopt.2; like below. - - int on; + int on; setsockopt(s, IPPROTO_IPV6, IPV6_BINDV6ONLY, (char *)&on, sizeof (on)) < 0)); @@ -1075,8 +1064,7 @@ FreeBSD 4.x configurable supported As a result, RFC2553 defines struct sockaddr_storage as follows: - - struct sockaddr_storage { + struct sockaddr_storage { u_char __ss_len; /* address length */ u_char __ss_family; /* address family */ /* and bunch of padding */ @@ -1085,8 +1073,7 @@ FreeBSD 4.x configurable supported On the contrary, XNET draft defines as follows: - - struct sockaddr_storage { + struct sockaddr_storage { u_char ss_len; /* address length */ u_char ss_family; /* address family */ /* and bunch of padding */ @@ -1118,8 +1105,7 @@ FreeBSD 4.x configurable supported never touch __ss_family. cast to sockaddr * and use sa_family like: - - struct sockaddr_storage ss; + struct sockaddr_storage ss; family = ((struct sockaddr *)&ss)->sa_family @@ -1207,8 +1193,7 @@ FreeBSD 4.x configurable supported is 3ffe:0501:0200:ffff::163.221.202.12, the connection will be relayed toward IPv4 destination 163.221.202.12. - - destination IPv4 node (163.221.202.12) + destination IPv4 node (163.221.202.12) ^ | IPv4 tcp toward 163.221.202.12 FAITH-relay dual stack node @@ -1526,7 +1511,6 @@ FreeBSD 4.x configurable supported more detail): - encapsulate decapsulate --- --- RFC2401 copy all TOS bits drop TOS bits on outer diff --git a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml index b08a119cb9..d56fa5aaba 100644 --- a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml +++ b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml @@ -1,7 +1,7 @@ @@ -576,8 +576,7 @@ Id Refs Address Size Name 1 4 0xc0100000 1c1678 kernel 2 1 0xc0a9e000 6000 linprocfs.ko 3 1 0xc0ad7000 2000 warp_saver.ko - 4 1 0xc0adc000 11000 linux.ko - + 4 1 0xc0adc000 11000 linux.ko If you are debugging a crash dump, you'll need to walk the linker_files list, starting at diff --git a/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml index f4c00f849b..acdd95e88e 100644 --- a/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml +++ b/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml @@ -987,13 +987,11 @@ int main() { daytime.c, then compile and run it: - -&prompt.user; cc -O3 -o daytime daytime.c +&prompt.user; cc -O3 -o daytime daytime.c &prompt.user; ./daytime 52079 01-06-19 02:29:25 50 0 1 543.9 UTC(NIST) * -&prompt.user; - +&prompt.user; In this case, the date was June 19, 2001, the time was 02:29:25 UTC. Naturally, your results @@ -1401,11 +1399,9 @@ int main() { d). After you have compiled it, try running it: - -&prompt.user; ./daytimed +&prompt.user; ./daytimed bind: Permission denied -&prompt.user; - +&prompt.user; What happened here? As you will recall, the daytime protocol uses port 13. But @@ -1416,19 +1412,15 @@ bind: Permission denied Try again, this time as the superuser: - -&prompt.root; ./daytimed -&prompt.root; - +&prompt.root; ./daytimed +&prompt.root; What... Nothing? Let us try again: - -&prompt.root; ./daytimed +&prompt.root; ./daytimed bind: Address already in use -&prompt.root; - +&prompt.root; Every port can only be bound by one program at a time. Our first attempt was indeed successful: It started @@ -1440,8 +1432,7 @@ bind: Address already in use it working? How do we know it is a proper daytime server? Simple: - -&prompt.user; telnet localhost 13 +&prompt.user; telnet localhost 13 Trying ::1... telnet: connect to address ::1: Connection refused @@ -1450,8 +1441,7 @@ Connected to localhost. Escape character is '^]'. 2001-06-19T21:04:42Z Connection closed by foreign host. -&prompt.user; - +&prompt.user; telnet tried the new IPv6, and failed. It retried with @@ -1464,8 +1454,7 @@ Connection closed by foreign host. static IP address, so this is what I did: - -&prompt.user; who +&prompt.user; who whizkid ttyp0 Jun 19 16:59 (216.127.220.143) xxx ttyp1 Jun 19 16:06 (xx.xx.xx.xx) @@ -1476,22 +1465,19 @@ Connected to r47.bfm.org. Escape character is '^]'. 2001-06-19T21:31:11Z Connection closed by foreign host. -&prompt.user; - +&prompt.user; Again, it worked. Will it work using the domain name? - -&prompt.user; telnet r47.bfm.org 13 +&prompt.user; telnet r47.bfm.org 13 Trying 216.127.220.143... Connected to r47.bfm.org. Escape character is '^]'. 2001-06-19T21:31:40Z Connection closed by foreign host. -&prompt.user; - +&prompt.user; By the way, telnet prints the Connection closed by foreign host @@ -1617,14 +1603,12 @@ int main(int argc, char *argv[]) { your own system. You can then compare the results and see how exact your system clock is: - -&prompt.user; daytime ; daytime localhost +&prompt.user; daytime ; daytime localhost 52080 01-06-20 04:02:33 50 0 0 390.2 UTC(NIST) * 2001-06-20T04:02:35Z -&prompt.user; - +&prompt.user; As you can see, my system was two seconds ahead of the NIST time. diff --git a/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml index 2ca3ecd8f2..2ec1bb5f83 100644 --- a/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml +++ b/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml @@ -1,7 +1,7 @@ @@ -113,8 +113,7 @@ To get one of these packages, all you need to do is to click on the hotlink for the package, then run - &prompt.root; pkg_add package name - + &prompt.root; pkg_add package name as root. Obviously, you will need to have a fully functional FreeBSD 2.1.0 or later system for the package to @@ -362,15 +361,13 @@ cc is a front end that manages calling all these programs with the right arguments for you; simply typing - &prompt.user; cc foobar.c - + &prompt.user; cc foobar.c will cause foobar.c to be compiled by all the steps above. If you have more than one file to compile, just do something like - &prompt.user; cc foo.c bar.c - + &prompt.user; cc foo.c bar.c Note that the syntax checking is just that—checking the syntax. It will not check for any logical mistakes you may @@ -548,8 +545,7 @@ knows what you may be using in a few years time? - &prompt.user; cc -Wall -ansi -pedantic -o foobar foobar.c - + &prompt.user; cc -Wall -ansi -pedantic -o foobar foobar.c This will produce an executable foobar @@ -1004,8 +1000,7 @@ free(foo); When you're working on a simple program with only one or two source files, typing in - &prompt.user; cc file1.c file2.c - + &prompt.user; cc file1.c file2.c is not too bad, but it quickly becomes very tedious when there are several files—and it can take a while to @@ -1015,8 +1010,7 @@ free(foo); recompile the source file if the source code has changed. So we could have something like: - &prompt.user; cc file1.o file2.o … file37.c &hellip - + &prompt.user; cc file1.o file2.o … file37.c &hellip if we'd changed file37.c, but not any of the others, since the last time we compiled. This may @@ -1120,8 +1114,7 @@ install: We can tell make which target we want to make by typing: - &prompt.user; make target - + &prompt.user; make target make will then only look at that target and ignore any others. For example, if we type @@ -1313,8 +1306,7 @@ DISTFILES= scheme-microcode+dist-7.3-freebsd.tgz for it in /usr/share/doc/psd/12.make. To view it, do - &prompt.user; zmore paper.ascii.gz - + &prompt.user; zmore paper.ascii.gz in that directory. @@ -1351,14 +1343,12 @@ DISTFILES= scheme-microcode+dist-7.3-freebsd.tgz gdb (GNU debugger). You start it up by typing - &prompt.user; gdb progname - + &prompt.user; gdb progname although most people prefer to run it inside Emacs. You can do this by: - M-x gdb RET progname RET - + M-x gdb RET progname RET Using a debugger allows you to run the program under more controlled circumstances. Typically, you can step through the @@ -1393,8 +1383,7 @@ DISTFILES= scheme-microcode+dist-7.3-freebsd.tgz see the name of the function you're in, instead of the source code. If you see a line like: - … (no debugging symbols found) … - + … (no debugging symbols found) … when gdb starts up, you'll know that the program wasn't compiled with the @@ -1449,8 +1438,7 @@ int bazz(int anint) { &prompt.user; cc -g -o temp temp.c &prompt.user; ./temp This is my program -anint = 4231 - +anint = 4231 That wasn't what we expected! Time to see what's going on! @@ -1470,8 +1458,7 @@ Breakpoint 1, main () at temp.c:9 gdb stops This is my program Program prints out (gdb) s step into bazz() bazz (anint=4231) at temp.c:17 gdb displays stack frame -(gdb) - +(gdb) Hang on a minute! How did anint get to be 4231? Didn't we set it to be @@ -1481,8 +1468,7 @@ bazz (anint=4231) at temp.c:17 gdb displays (gdb) up Move up call stack #1 0x1625 in main () at temp.c:11 gdb displays stack frame (gdb) p i Show us the value of i -$1 = 4231 gdb displays 4231 - +$1 = 4231 gdb displays 4231 Oh dear! Looking at the code, we forgot to initialise i. We meant to put @@ -1531,8 +1517,7 @@ main() { the usual way. Instead of typing break or run, type - (gdb) core progname.core - + (gdb) core progname.core If you're not in the same directory as the core file, you'll have to do dir @@ -1550,8 +1535,7 @@ Core was generated by `a.out'. Program terminated with signal 11, Segmentation fault. Cannot access memory at address 0x7020796d. #0 0x164a in bazz (anint=0x5) at temp.c:17 -(gdb) - +(gdb) In this case, the program was called a.out, so the core file is called @@ -1570,8 +1554,7 @@ Cannot access memory at address 0x7020796d. #0 0x164a in bazz (anint=0x5) at temp.c:17 #1 0xefbfd888 in end () #2 0x162c in main () at temp.c:11 -(gdb) - +(gdb) The end() function is called when a program crashes; in this case, the bazz() @@ -1592,8 +1575,7 @@ Cannot access memory at address 0x7020796d. use ps to find the process ID for the child, and do - (gdb) attach pid - + (gdb) attach pid in gdb, and then debug as usual. @@ -1613,8 +1595,7 @@ else if (pid == 0) { /* child */ sleep(10); /* Wait until someone attaches to us */ &hellip } else { /* parent */ - &hellip - + &hellip Now all you have to do is attach to the child, set PauseMode to 0, and wait @@ -2183,8 +2164,7 @@ in font-lock-auto-mode-list" Lisp. For example, if whizbang is a FreeBSD port, we can locate these files by doing - &prompt.user; find /usr/ports/lang/whizbang -name "*.el" -print - + &prompt.user; find /usr/ports/lang/whizbang -name "*.el" -print and install them by copying them into the Emacs site Lisp directory. On FreeBSD 2.1.0-RELEASE, this is @@ -2193,13 +2173,11 @@ in font-lock-auto-mode-list" So for example, if the output from the find command was - /usr/ports/lang/whizbang/work/misc/whizbang.el - + /usr/ports/lang/whizbang/work/misc/whizbang.el we would do - &prompt.root; cp /usr/ports/lang/whizbang/work/misc/whizbang.el /usr/local/share/emacs/site-lisp - + &prompt.root; cp /usr/ports/lang/whizbang/work/misc/whizbang.el /usr/local/share/emacs/site-lisp Next, we need to decide what extension whizbang source files have. Let's say for the sake of argument that they all diff --git a/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml index d5b2df1551..c7a74aa21d 100644 --- a/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml +++ b/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml @@ -15,7 +15,7 @@ author to assign us the copyright. For now, it is valuable content so it should stay. - $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml,v 1.3 2001/06/16 22:04:58 dd Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml,v 1.4 2001/06/23 06:56:59 dd Exp $ --> @@ -250,9 +250,7 @@ the system know about it. After your program is assembled and linked, you need to brand the executable: - -&prompt.user; brandelf -f Linux filename - +&prompt.user; brandelf -f Linux filename @@ -872,14 +870,12 @@ it in a file named hello.asm. You need If you do not have nasm, type: - -&prompt.user; su +&prompt.user; su Password:your root password &prompt.root; cd /usr/ports/devel/nasm &prompt.root; make install &prompt.root; exit -&prompt.user; - +&prompt.user; You may type make install clean instead of just @@ -906,13 +902,11 @@ page. You can still use it to assemble FreeBSD code. Now you can assemble, link, and run the code: - -&prompt.user; nasm -f elf hello.asm +&prompt.user; nasm -f elf hello.asm &prompt.user; ld -s -o hello hello.o &prompt.user; ./hello Hello, World! -&prompt.user; - +&prompt.user; @@ -1046,14 +1040,12 @@ control key and type D while holding the control key down): - -&prompt.user; nasm -f elf hex.asm +&prompt.user; nasm -f elf hex.asm &prompt.user; ld -s -o hex hex.o &prompt.user; ./hex Hello, World! 48 65 6C 6C 6F 2C 20 57 6F 72 6C 64 21 0A Here I come! -48 65 72 65 20 49 20 63 6F 6D 65 21 0A ^D &prompt.user; - +48 65 72 65 20 49 20 63 6F 6D 65 21 0A ^D &prompt.user; @@ -1142,16 +1134,14 @@ Once you have changed hex.asm to reflect these changes, type: - -&prompt.user; nasm -f elf hex.asm +&prompt.user; nasm -f elf hex.asm &prompt.user; ld -s -o hex hex.o &prompt.user; ./hex Hello, World! 48 65 6C 6C 6F 2C 20 57 6F 72 6C 64 21 0A Here I come! 48 65 72 65 20 49 20 63 6F 6D 65 21 0A -^D &prompt.user; - +^D &prompt.user; That looks better. But this code is quite inefficient! We @@ -1311,16 +1301,14 @@ input from, the system. Let us see how it works now: - -&prompt.user; nasm -f elf hex.asm +&prompt.user; nasm -f elf hex.asm &prompt.user; ld -s -o hex hex.o &prompt.user; ./hex Hello, World! Here I come! 48 65 6C 6C 6F 2C 20 57 6F 72 6C 64 21 0A 48 65 72 65 20 49 20 63 6F 6D 65 21 0A -^D &prompt.user; - +^D &prompt.user; Not what you expected? The program did not print the output @@ -1434,16 +1422,14 @@ write: Now, let us see how it works: - -&prompt.user; nasm -f elf hex.asm +&prompt.user; nasm -f elf hex.asm &prompt.user; ld -s -o hex hex.o &prompt.user; ./hex Hello, World! 48 65 6C 6C 6F 2C 20 57 6F 72 6C 64 21 0A Here I come! 48 65 72 65 20 49 20 63 6F 6D 65 21 0A -^D &prompt.user; - +^D &prompt.user; Not bad for a 644-byte executable, is it! @@ -2264,8 +2250,7 @@ Assemble and link it as usual: &prompt.user; nasm -f elf webvars.asm -&prompt.user; ld -s -o webvars webvars.o - +&prompt.user; ld -s -o webvars webvars.o To use it, you need to upload webvars to your @@ -2329,19 +2314,15 @@ to send the output to a different file. Most of the time, I end up using it like this: - -&prompt.user; tuc myfile tempfile -&prompt.user; mv tempfile myfile - +&prompt.user; tuc myfile tempfile +&prompt.user; mv tempfile myfile It would be nice to have a ftuc, i.e., fast tuc, and use it like this: - -&prompt.user; ftuc myfile - +&prompt.user; ftuc myfile In this chapter, then, we will write @@ -3316,9 +3297,7 @@ It produces meaningful error messages. Here is its usage message: - -Usage: csv [-t<delim>] [-c<comma>] [-p] [-o <outfile>] [-i <infile>] - +Usage: csv [-t<delim>] [-c<comma>] [-p] [-o <outfile>] [-i <infile>] All parameters are optional, and can appear in any order. @@ -3365,9 +3344,7 @@ specified. To get the 11th field of each record, I can now do: - -&prompt.user; csv '-t;' data.csv | awk '-F;' '{print $11}' - +&prompt.user; csv '-t;' data.csv | awk '-F;' '{print $11}' The code stores the options (except for the file descriptors) @@ -4262,9 +4239,7 @@ later) at the focal lengths of 100 mm, 150 mm, and 210 mm, we may want to enter something like this: - -100, 150, 210 - +100, 150, 210 Our program needs to consider more than a single byte of input at a time. When it sees the first 1, @@ -4303,19 +4278,16 @@ Plus, it allows me to break up the monotony of computing and type in a query instead of just a number: -What is the best pinhole diameter for the focal length of 150? - +What is the best pinhole diameter for the focal length of 150? There is no reason for the computer to spit out a number of complaints: - -Syntax error: What +Syntax error: What Syntax error: is Syntax error: the -Syntax error: best - +Syntax error: best Et cetera, et cetera, et cetera. @@ -4597,9 +4569,7 @@ the focal length as entered by the user. No, wait! Not as entered by the user. What if the user types in something like this: - -00000000150 - +00000000150 Clearly, we need to strip those leading zeros. @@ -4616,9 +4586,7 @@ But... What if the user types something like this: - -17459765723452353453534535353530530534563507309676764423 - +17459765723452353453534535353530530534563507309676764423 Ha! The packed decimal FPU format lets us input 18–digit numbers. But the @@ -4655,9 +4623,7 @@ What will we do? We will slap him in the face, in a manner of speaking: - -17459765723452353453534535353530530534563507309676764423 ??? ??? ??? ??? ??? - +17459765723452353453534535353530530534563507309676764423 ??? ??? ??? ??? ??? To achieve that, we will simply ignore any leading zeros. Once we find a non–zero digit, we will initialize a @@ -4730,9 +4696,7 @@ to the output, and perform another "slap in the face": - -0 ??? ??? ??? ??? ??? - +0 ??? ??? ??? ??? ??? Once we have displayed the focal length and determined it is valid @@ -6177,8 +6141,7 @@ we want to ask a couple of questions. Our session might look like this: - -&prompt.user; pinhole +&prompt.user; pinhole Computer, @@ -6193,8 +6156,7 @@ What size pinhole do I need for the focal length of 150? 156? 156 500 312 362 3047 12 That's it! Perfect! Thank you very much! -^D - +^D We have found that while for the focal length of 150, our pinhole diameter should be 490 @@ -6274,22 +6236,17 @@ We can set its permissions to execute, and run it as if it were a program: - -&prompt.user; chmod 755 medium -&prompt.user; ./medium - +&prompt.user; chmod 755 medium +&prompt.user; ./medium Unix will interpret that last command as: - -&prompt.user; /usr/local/bin/pinhole -b -i ./medium - +&prompt.user; /usr/local/bin/pinhole -b -i ./medium It will run that command and display: - -80 358 224 256 1562 11 +80 358 224 256 1562 11 30 219 137 128 586 9 40 253 158 181 781 10 50 283 177 181 977 10 @@ -6297,20 +6254,16 @@ It will run that command and display: 70 335 209 181 1367 10 100 400 250 256 1953 11 120 438 274 256 2344 11 -140 473 296 256 2734 11 - +140 473 296 256 2734 11 Now, let us enter: -&prompt.user; ./medium -c - +&prompt.user; ./medium -c Unix will treat that as: - -&prompt.user; /usr/local/bin/pinhole -b -i ./medium -c - +&prompt.user; /usr/local/bin/pinhole -b -i ./medium -c That gives it two conflicting options: -b and -c @@ -6321,8 +6274,7 @@ program will calculate everything using Connors' constant: - -80 331 242 256 1826 11 +80 331 242 256 1826 11 30 203 148 128 685 9 40 234 171 181 913 10 50 262 191 181 1141 10 @@ -6330,8 +6282,7 @@ using Connors' constant: 70 310 226 256 1598 11 100 370 270 256 2283 11 120 405 296 256 2739 11 -140 438 320 362 3196 12 - +140 438 320 362 3196 12 We decide we want to go with Bender's constant after all. We want to save its @@ -6350,8 +6301,7 @@ focal length in millimeters,pinhole diameter in microns,F-number,normalized F-nu 100,400,250,256,1953,11 120,438,274,256,2344,11 140,473,296,256,2734,11 -&prompt.user; - +&prompt.user; @@ -6429,8 +6379,7 @@ This is NEVER guaranteed under Unix. It is quite common for a Unix user to pipe and redirect program input and output: -&prompt.user; program1 | program2 | program3 > file1 - +&prompt.user; program1 | program2 | program3 > file1 If you have written program2, your input diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml index b9e7a4b580..5b6a27c7b8 100644 --- a/en_US.ISO8859-1/books/faq/book.sgml +++ b/en_US.ISO8859-1/books/faq/book.sgml @@ -17,7 +17,7 @@ The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.241 2001/06/29 02:30:44 chris Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.242 2001/06/29 03:51:48 chris Exp $ 1995 @@ -4116,8 +4116,7 @@ TAG Start DF [more TAG lines elided] - -TAG End DF + TAG End DF End Tag Successfully got 31 resources, 1 logical fdevs @@ -4278,8 +4277,7 @@ IO range check 0x00 activate 0x01 currently set to by: &prompt.root; sysctl kern.maxfiles -kern.maxfiles: 1064 - +kern.maxfiles: 1064 @@ -6278,8 +6276,7 @@ options SYSVMSG # enable for messaging convert it into a valid sendmail.cf is: - -&prompt.root; cd /usr/src/usr.sbin/sendmail/cf/cf + &prompt.root; cd /usr/src/usr.sbin/sendmail/cf/cf &prompt.root; make foo.cf &prompt.root; cp foo.cf /etc/sendmail.cf @@ -11583,8 +11580,7 @@ doc-all &prompt.root; cd /usr/src &prompt.root; make buildworld &prompt.root; cd /usr/src/release -&prompt.root; make release BUILDNAME=3.0-MY-SNAP CHROOTDIR=/some/big/filesystem/release - +&prompt.root; make release BUILDNAME=3.0-MY-SNAP CHROOTDIR=/some/big/filesystem/release Please note that you do not diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml index 1d1b221468..b5dd51e108 100644 --- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml @@ -1,7 +1,7 @@ @@ -1784,11 +1784,9 @@ ISDN BRI line all the servers in the NIS domain. Therefore, before we initialize the NIS maps, you should: - -&prompt.root; cp /etc/master.passwd /var/yp/master.passwd + &prompt.root; cp /etc/master.passwd /var/yp/master.passwd &prompt.root; cd /var/yp -&prompt.root; vi master.passwd - +&prompt.root; vi master.passwd You should remove all entries regarding system accounts (bin, tty, kmem, games, etc), as well as any accounts that you @@ -1814,8 +1812,7 @@ ISDN BRI line To generate the NIS maps, assuming you already performed the steps above, run: - -ellington&prompt.root; ypinit -m test-domain + ellington&prompt.root; ypinit -m test-domain Server Type: MASTER Domain: test-domain Creating an YP server will require that you answer a few questions. Questions will all be asked at the beginning of the procedure. @@ -1837,8 +1834,7 @@ Is this correct? [y/n: y] y [..output from map generation..] NIS Map update completed. -ellington has been setup as an YP master server without any errors. - +ellington has been setup as an YP master server without any errors. ypinit should have created /var/yp/Makefile from @@ -1849,9 +1845,7 @@ ellington has been setup as an YP master server without any errors. a slave server as well, you must edit /var/yp/Makefile: - -ellington&prompt.root; vi /var/yp/Makefile - + ellington&prompt.root; vi /var/yp/Makefile You should comment out the line that says `NOPUSH = "True"' (if it is not commented out already). @@ -1872,8 +1866,7 @@ ellington&prompt.root; vi /var/yp/Makefile master be passed to it as well, so our command line looks like: - -coltrane&prompt.root; ypinit -s ellington test-domain + coltrane&prompt.root; ypinit -s ellington test-domain Server Type: SLAVE Domain: test-domain Master: ellington @@ -2135,8 +2128,7 @@ nis_client_enable="YES" bill from logging on to basie we would: - -basie&prompt.root; vipw + basie&prompt.root; vipw [add -bill to the end, exit] vipw: rebuilding the database... vipw: done @@ -2303,9 +2295,7 @@ basie&prompt.root; default, but its NIS implementation will support it once it has been created. To create an empty map, simply type - -ellington&prompt.root; vi /var/yp/netgroup - + ellington&prompt.root; vi /var/yp/netgroup and start adding content. For our example, we need at least four netgroups: IT employees, IT apprentices, normal @@ -2375,10 +2365,8 @@ BIGGROUP BIGGRP1 BIGGRP2 BIGGRP3 Activating and distributing your new NIS map is easy: - -ellington&prompt.root; cd /var/yp -ellington&prompt.root; make - + ellington&prompt.root; cd /var/yp +ellington&prompt.root; make This will generate the three NIS maps netgroup, @@ -2386,11 +2374,9 @@ ellington&prompt.root; make netgroup.byuser. Use &man.ypcat.1; to check if your new NIS maps are available: - -ellington&prompt.user; ypcat -k netgroup + ellington&prompt.user; ypcat -k netgroup ellington&prompt.user; ypcat -k netgroup.byhost -ellington&prompt.user; ypcat -k netgroup.byuser - +ellington&prompt.user; ypcat -k netgroup.byuser The output of the first command should resemble the contents of /var/yp/netgroup. The second @@ -2578,8 +2564,7 @@ TWO (,hotel,test-domain) For example, if we needed to add a new user “jsmith” to the lab, we would: - -&prompt.root; pw useradd jsmith + &prompt.root; pw useradd jsmith &prompt.root; cd /var/yp &prompt.root; make test-domain @@ -2659,8 +2644,7 @@ TWO (,hotel,test-domain) /usr/lib. If the machine is configured to use the DES libraries, it will look something like this: - -&prompt.user; ls -l /usr/lib/*crypt* + &prompt.user; ls -l /usr/lib/*crypt* lrwxrwxrwx 1 root wheel 13 Jul 15 08:55 /usr/lib/libcrypt.a@ -> libdescrypt.a lrwxrwxrwx 1 root wheel 14 Jul 15 08:55 /usr/lib/libcrypt.so@ -> libdescrypt.so lrwxrwxrwx 1 root wheel 16 Jul 15 08:55 /usr/lib/libcrypt.so.2@ -> libdescrypt.so.2 @@ -2673,8 +2657,7 @@ lrwxr-xr-x 1 root wheel 16 Nov 8 14:27 /usr/lib/libdescrypt.so@ -> libdes If the machine is configured to use the standard FreeBSD MD5 crypt libraries they will look something like this: - -&prompt.user; ls -l /usr/lib/*crypt* + &prompt.user; ls -l /usr/lib/*crypt* lrwxrwxrwx 1 root wheel 13 Jul 15 08:55 /usr/lib/libcrypt.a@ -> libscrypt.a lrwxrwxrwx 1 root wheel 14 Jul 15 08:55 /usr/lib/libcrypt.so@ -> libscrypt.so lrwxrwxrwx 1 root wheel 16 Jul 15 08:55 /usr/lib/libcrypt.so.2@ -> libscrypt.so.2 @@ -3102,8 +3085,7 @@ dhcp_flags="" Be sure to &prompt.root; cd /etc/namedb -&prompt.root; sh make-localhost - +&prompt.root; sh make-localhost to properly create your local reverse dns zone file in /etc/namedb/localhost.rev. @@ -3112,7 +3094,7 @@ dhcp_flags="" <filename>/etc/namedb/named.conf</filename> - // $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.49 2001/06/26 00:09:52 murray Exp $ + // $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.50 2001/06/26 20:10:25 murray Exp $ // // Refer to the named(8) man page for details. If you are ever going // to setup a primary server, make sure you've understood the hairy @@ -3485,8 +3467,7 @@ www IN CNAME @ the /etc/namedb/sandbox directory the command line for named would look like this: - &prompt.root; /usr/sbin/named -u bind -g bind -t /etc/namedb/sandbox <path_to_named.conf> - + &prompt.root; /usr/sbin/named -u bind -g bind -t /etc/namedb/sandbox <path_to_named.conf> The following steps should be taken in order to successfully run named in a sandbox. Throughout the following diff --git a/en_US.ISO8859-1/books/handbook/boot/chapter.sgml b/en_US.ISO8859-1/books/handbook/boot/chapter.sgml index 234167ff5c..3d728b73c4 100644 --- a/en_US.ISO8859-1/books/handbook/boot/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/boot/chapter.sgml @@ -1,7 +1,7 @@ @@ -82,8 +82,7 @@ boot0 screenshot - -F1 DOS + F1 DOS F2 FreeBSD F3 Linux F4 ?? diff --git a/en_US.ISO8859-1/books/handbook/disks/chapter.sgml b/en_US.ISO8859-1/books/handbook/disks/chapter.sgml index a2a7aef698..a1c1392f7f 100644 --- a/en_US.ISO8859-1/books/handbook/disks/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/disks/chapter.sgml @@ -1,7 +1,7 @@ @@ -1105,8 +1105,7 @@ scsibus1: 1,4,0 104) * 1,5,0 105) 'YAMAHA ' 'CRW4260 ' '1.0q' Removable CD-ROM 1,6,0 106) 'ARTEC ' 'AM12S ' '1.06' Scanner - 1,7,0 107) * - + 1,7,0 107) * This lists the appropriate value for the devices on the list. Locate your CD burner, and use the three diff --git a/en_US.ISO8859-1/books/handbook/kerneldebug/chapter.sgml b/en_US.ISO8859-1/books/handbook/kerneldebug/chapter.sgml index b08a119cb9..d56fa5aaba 100644 --- a/en_US.ISO8859-1/books/handbook/kerneldebug/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/kerneldebug/chapter.sgml @@ -1,7 +1,7 @@ @@ -576,8 +576,7 @@ Id Refs Address Size Name 1 4 0xc0100000 1c1678 kernel 2 1 0xc0a9e000 6000 linprocfs.ko 3 1 0xc0ad7000 2000 warp_saver.ko - 4 1 0xc0adc000 11000 linux.ko - + 4 1 0xc0adc000 11000 linux.ko If you are debugging a crash dump, you'll need to walk the linker_files list, starting at diff --git a/en_US.ISO8859-1/books/handbook/kernelopts/chapter.sgml b/en_US.ISO8859-1/books/handbook/kernelopts/chapter.sgml index 1e91b5cae7..508e5e16cc 100644 --- a/en_US.ISO8859-1/books/handbook/kernelopts/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/kernelopts/chapter.sgml @@ -1,7 +1,7 @@ @@ -127,9 +127,7 @@ Finally, find out which kernel files depend on the new option. Unless you have just invented your option, and it does not exist - anywhere yet, -&prompt.user; find /usr/src/sys -type f | xargs fgrep NEW_OPTION - + anywhere yet, &prompt.user; find /usr/src/sys -type f | xargs fgrep NEW_OPTION is your friend in finding them. Go and edit all those files, and add #include "opt_foo.h" on top before all the #include <xxx.h> stuff. diff --git a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml index daa4c89c55..0723bd83b7 100644 --- a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml @@ -1,7 +1,7 @@ @@ -345,8 +345,7 @@ multi on Alternatively, you can simply set the default ELF brand to Linux for all unbranded binaries with the command: - &prompt.root; sysctl -w kern.fallback_elf_brand=3 - + &prompt.root; sysctl -w kern.fallback_elf_brand=3 This will make FreeBSD assume that unbranded ELF binaries use the Linux ABI and so you should be able to run the installer straight from the CDROM. diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml index 2d7a9ca646..909ec5f3b5 100644 --- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml @@ -1,7 +1,7 @@ @@ -1248,8 +1248,7 @@ Checking out something from -CURRENT (&man.ls.1;) and deleting it again: - -&prompt.user; setenv CVSROOT :pserver:anoncvs@anoncvs.FreeBSD.org:/home/ncvs + &prompt.user; setenv CVSROOT :pserver:anoncvs@anoncvs.FreeBSD.org:/home/ncvs &prompt.user; cvs login At the prompt, enter the password anoncvs. &prompt.user; cvs co ls @@ -1262,8 +1261,7 @@ Checking out the version of &man.ls.1; in the 3.X-STABLE branch: - -&prompt.user; setenv CVSROOT :pserver:anoncvs@anoncvs.FreeBSD.org:/home/ncvs + &prompt.user; setenv CVSROOT :pserver:anoncvs@anoncvs.FreeBSD.org:/home/ncvs &prompt.user; cvs login At the prompt, enter the password anoncvs. &prompt.user; cvs co -rRELENG_3 ls @@ -1275,8 +1273,7 @@ Creating a list of changes (as unified diffs) to &man.ls.1; - -&prompt.user; setenv CVSROOT :pserver:anoncvs@anoncvs.FreeBSD.org:/home/ncvs + &prompt.user; setenv CVSROOT :pserver:anoncvs@anoncvs.FreeBSD.org:/home/ncvs &prompt.user; cvs login At the prompt, enter the password anoncvs. &prompt.user; cvs rdiff -u -rRELENG_3_0_0_RELEASE -rRELENG_3_4_0_RELEASE ls @@ -1287,8 +1284,7 @@ Finding out what other module names can be used: - -&prompt.user; setenv CVSROOT :pserver:anoncvs@anoncvs.FreeBSD.org:/home/ncvs + &prompt.user; setenv CVSROOT :pserver:anoncvs@anoncvs.FreeBSD.org:/home/ncvs &prompt.user; cvs login At the prompt, enter the password anoncvs. &prompt.user; cvs co modules @@ -2272,8 +2268,7 @@ src-all the German applications, you can put the following in your refuse file: - - ports/chinese + ports/chinese ports/german ports/japanese ports/korean diff --git a/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml b/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml index 12485dcf49..06d6817232 100644 --- a/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml @@ -1,7 +1,7 @@ @@ -204,16 +204,14 @@ pcm0: <Aureal Vortex 8830> at memory 0xfeb40000 irq 5 (4p/1r +channels dup pcm0, su to root and do the following: - -&prompt.root; cd /dev + &prompt.root; cd /dev &prompt.root; sh MAKEDEV snd0 If it reported no errors and returned pcm1, su to root and do the following: - -&prompt.root; cd /dev + &prompt.root; cd /dev &prompt.root; sh MAKEDEV snd1 Please note that either of the above commands will diff --git a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml b/en_US.ISO8859-1/books/handbook/ports/chapter.sgml index f00b8540ce..5720fb0559 100644 --- a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/ports/chapter.sgml @@ -1,7 +1,7 @@ @@ -255,8 +255,7 @@ local: xchat-1.7.1.tgz remote: xchat-1.7.1.tgz 471488 bytes received in 5.37 seconds (85.70 KB/s) ftp> exit &prompt.root; pkg_add xchat-1.7.1.tgz -&prompt.root; - +&prompt.root; If you don't have a source of local packages (such as a @@ -266,8 +265,7 @@ ftp> exit and then to fetch and install the package from an FTP site. - &prompt.root; pkg_add -r xchat-1.7.1 - + &prompt.root; pkg_add -r xchat-1.7.1 This would download the correct package and add it without any further user intervention. @@ -294,8 +292,7 @@ ftp> exit Deleting a Package &prompt.root pkg_delete xchat-1.7.1 -&prompt.root - +&prompt.root &man.pkg.delete.1; is the utility for removing previously installed software package distributions. @@ -311,8 +308,7 @@ ftp> exit &prompt.root pkg_info cvsup-bin-16.1 A general network file distribution system optimized for CV docbook-1.2 Meta-port for the different versions of the DocBook DTD -... - +... &man.pkg.version.1; a utility that summarizes the versions of all installed packages. It compares the package version to the current version found in the ports tree. @@ -320,8 +316,7 @@ docbook-1.2 Meta-port for the different versions of the DocBook DTD &prompt.root pkg_version cvsup-bin = docbook = -... - +... The symbols in the second column indicate the relative age of the installed version and the version available in the local diff --git a/en_US.ISO8859-1/books/handbook/security/chapter.sgml b/en_US.ISO8859-1/books/handbook/security/chapter.sgml index 3aa8343290..a207a7cbec 100644 --- a/en_US.ISO8859-1/books/handbook/security/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/security/chapter.sgml @@ -1,7 +1,7 @@ @@ -2509,7 +2509,6 @@ options IPSEC_ESP #IP security (crypto; define w/IPSEC) - (1) HOST A ------> HOST B @@ -2535,27 +2534,23 @@ options IPSEC_ESP #IP security (crypto; define w/IPSEC) + Now, let's setup security association. Execute &man.setkey.8; on both HOST A and B: - &prompt.root; setkey -c add 10.2.3.4 10.6.7.8 ah-old 1000 -m transport -A keyed-md5 "MYSECRETMYSECRET" ; add 10.6.7.8 10.2.3.4 ah 2000 -m transport -A hmac-sha1 "KAMEKAMEKAMEKAMEKAME" ; add 10.6.7.8 10.2.3.4 esp 3000 -m transport -E des-cbc "PASSWORD" ; ^D - - + Actually, IPsec communication doesn't process until security policy entries will be defined. In this case, you must setup each host. - At A: &prompt.root; setkey -c @@ -2580,8 +2575,7 @@ spdadd 10.6.7.8 10.2.3.4 any -P out ipsec <========= new AH hmac-sha1 =========== <========= new ESP des-cbc ============ - - + @@ -2593,20 +2587,17 @@ spdadd 10.6.7.8 10.2.3.4 any -P out ipsec Host-A and Host-B. - ============ ESP ============ | | Host-A Host-B fec0::10 -------------------- fec0::11 - - + Encryption algorithm is blowfish-cbc whose key is "kamekame", and authentication algorithm is hmac-sha1 whose key is "this is the test key". Configuration at Host-A: - &prompt.root; setkey -c <<EOF spdadd fec0::10[any] fec0::11[110] tcp -P out ipsec esp/transport/fec0::10-fec0::11/use ; @@ -2621,13 +2612,11 @@ spdadd 10.6.7.8 10.2.3.4 any -P out ipsec -E blowfish-cbc "kamekame" -A hmac-sha1 "this is the test key" ; EOF - - + and at Host-B: - - &prompt.root; setkey -c <<EOF + &prompt.root; setkey -c <<EOF spdadd fec0::11[110] fec0::10[any] tcp -P out ipsec esp/transport/fec0::11-fec0::10/use ; spdadd fec0::10[any] fec0::11[110] tcp -P in ipsec @@ -2639,8 +2628,7 @@ spdadd 10.6.7.8 10.2.3.4 any -P out ipsec -E blowfish-cbc "kamekame" -A hmac-sha1 "this is the test key" ; EOF - - + Note the direction of SP. @@ -2655,18 +2643,15 @@ spdadd 10.6.7.8 10.2.3.4 any -P out ipsec authentication algorithm. - ======= AH ======= | | Network-A Gateway-A Gateway-B Network-B 10.0.1.0/24 ---- 172.16.0.1 ----- 172.16.0.2 ---- 10.0.2.0/24 - - + Configuration at Gateway-A: - &prompt.root; setkey -c <<EOF spdadd 10.0.1.0/24 10.0.2.0/24 any -P out ipsec ah/tunnel/172.16.0.1-172.16.0.2/require ; @@ -2678,8 +2663,7 @@ spdadd 10.6.7.8 10.2.3.4 any -P out ipsec -A keyed-md5 "this is the test" ; EOF - - + If port number field is omitted such above then "[any]" is employed. `-m' specifies the mode of SA to be used. "-m any" means @@ -2689,7 +2673,6 @@ spdadd 10.6.7.8 10.2.3.4 any -P out ipsec and at Gateway-B: - &prompt.root; setkey -c <<EOF spdadd 10.0.2.0/24 10.0.1.0/24 any -P out ipsec ah/tunnel/172.16.0.2-172.16.0.1/require ; @@ -2701,8 +2684,7 @@ spdadd 10.6.7.8 10.2.3.4 any -P out ipsec -A keyed-md5 "this is the test" ; EOF - - + Making SA bundle between two security gateways @@ -2711,14 +2693,12 @@ spdadd 10.6.7.8 10.2.3.4 any -P out ipsec and AH transport mode is next. - ========== AH ========= | ======= ESP ===== | | | | | Network-A Gateway-A Gateway-B Network-B fec0:0:0:1::/64 --- fec0:0:0:1::1 ---- fec0:0:0:2::1 --- fec0:0:0:2::/64 - - + @@ -2729,7 +2709,6 @@ spdadd 10.6.7.8 10.2.3.4 any -P out ipsec Configuration at Gateway-A: - &prompt.root; setkey -c <<EOF spdadd fec0:0:0:1::/64 fec0:0:0:2::/64 any -P out ipsec esp/tunnel/fec0:0:0:1::1-fec0:0:0:2::1/require @@ -2749,8 +2728,7 @@ spdadd 10.6.7.8 10.2.3.4 any -P out ipsec -A hmac-md5 "this is the test" ; EOF - - + Making SAs with the different end @@ -2761,19 +2739,16 @@ spdadd 10.6.7.8 10.2.3.4 any -P out ipsec hmac-md5. - ================== ESP ================= | ======= ESP ======= | | | | | Host-A Gateway-A Host-B fec0:0:0:1::1 ---- fec0:0:0:2::1 ---- fec0:0:0:2::2 - - + Configuration at Host-A: - &prompt.root; setkey -c <<EOF spdadd fec0:0:0:1::1[any] fec0:0:0:2::2[80] tcp -P out ipsec esp/transport/fec0:0:0:1::1-fec0:0:0:2::2/use @@ -2797,8 +2772,7 @@ spdadd 10.6.7.8 10.2.3.4 any -P out ipsec -A hmac-md5 "this is the test" ; EOF - - + @@ -2870,8 +2844,7 @@ spdadd 10.6.7.8 10.2.3.4 any -P out ipsec Host key not found from the list of known hosts. Are you sure you want to continue connecting (yes/no)? yes Host 'foobardomain.com' added to the list of known hosts. -user@foobardomain.com's password: ******* - +user@foobardomain.com's password: ******* The login will continue just as it would have if a session was created using rlogin or telnet. SSH utilizes a key fingerprint @@ -2901,8 +2874,7 @@ user@foobardomain.com's password: ******* user@foobardomain.com's password: COPYRIGHT 100% |*****************************| 4735 00:00 -&prompt.root - +&prompt.root Since the fingerprint was already saved for this host in the previous example, it is verified when using scp here. @@ -2943,8 +2915,7 @@ Enter file in which to save the key (/home/user/.ssh/identity): Enter passphrase: Enter the same passphrase again: Your identification has been saved in /home/user/.ssh/identity. -... - +... &man.ssh-keygen.1; will create a public and private key pair for use in authentication. The private key is stored in @@ -2979,8 +2950,7 @@ Your identification has been saved in /home/user/.ssh/identity. for telnet. &prompt.user; ssh -2 -N -f -L 5023:localhost:23 user@foo.bar.com -&prompt.user; - +&prompt.user; @@ -3030,8 +3000,7 @@ user@mailserver.foobar.com's password: ***** Trying 127.0.0.1... Connected to localhost. Escape character is '^]'. -220 mailserver.foobar.com ESMTP - +220 mailserver.foobar.com ESMTP This can be used in conjunction with an &man.ssh-keygen.1; and additional user accounts to create a more seamless/hassle-free diff --git a/en_US.ISO8859-1/books/handbook/sound/chapter.sgml b/en_US.ISO8859-1/books/handbook/sound/chapter.sgml index 12485dcf49..06d6817232 100644 --- a/en_US.ISO8859-1/books/handbook/sound/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/sound/chapter.sgml @@ -1,7 +1,7 @@ @@ -204,16 +204,14 @@ pcm0: <Aureal Vortex 8830> at memory 0xfeb40000 irq 5 (4p/1r +channels dup pcm0, su to root and do the following: - -&prompt.root; cd /dev + &prompt.root; cd /dev &prompt.root; sh MAKEDEV snd0 If it reported no errors and returned pcm1, su to root and do the following: - -&prompt.root; cd /dev + &prompt.root; cd /dev &prompt.root; sh MAKEDEV snd1 Please note that either of the above commands will diff --git a/en_US.ISO8859-1/books/handbook/x11/chapter.sgml b/en_US.ISO8859-1/books/handbook/x11/chapter.sgml index 4ccc91dd24..304a51c752 100644 --- a/en_US.ISO8859-1/books/handbook/x11/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/x11/chapter.sgml @@ -1,7 +1,7 @@ @@ -1337,9 +1337,7 @@ For further configuration, refer to /usr/X11R6/lib/X11/doc/README.Config./etc/X11/XF86Config file. - - Load "freetype" - +Load "freetype" For XFree86 3.3.X you will need @@ -1361,18 +1359,14 @@ For further configuration, refer to /usr/X11R6/lib/X11/doc/README.Config.ttmkfdir in /usr/ports/x11-fonts/ttmkfdir. - - &prompt.root; cd /usr/X11R6/lib/X11/fonts/TrueType - &prompt.root; ttmkfdir > fonts.dir - +&prompt.root; cd /usr/X11R6/lib/X11/fonts/TrueType + &prompt.root; ttmkfdir > fonts.dir Now you need to add your TrueType directory to your fonts path. The easiest way to do this is to add the following entries into your ~/.xinitrc file. - - &prompt.user; xset fp+ /usr/X11R6/lib/X11/fonts/TrueType - &prompt.user; xset fp rehash - +&prompt.user; xset fp+ /usr/X11R6/lib/X11/fonts/TrueType + &prompt.user; xset fp rehash That's it. Now Netscape, Gimp, StarOffice, and all of your other X applications should now recognize your installed @@ -1431,9 +1425,7 @@ For further configuration, refer to /usr/X11R6/lib/X11/doc/README.Config./etc/ttys file for running the xdm daemon on a virtual terminal: - -ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure - +ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure By default this entry is disabled, and in order to enable it you will need to change field 5 from off to @@ -1589,11 +1581,9 @@ ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure get XDM to listen for connections first comment out a line in the xdm-config file: - -! SECURITY: do not listen for XDMCP or Chooser requests +! SECURITY: do not listen for XDMCP or Chooser requests ! Comment out this line if you want to manage X terminals with xdm -DisplayManager.requestPort: 0 - +DisplayManager.requestPort: 0 and then restart XDM. Remember that comments in app-defaults files begin with a ! character, not a @@ -1801,21 +1791,18 @@ DisplayManager.requestPort: 0 /usr/X11R6/lib/X11/xdm/Xsession. You will come across a section in the middle looking like this (by default): - -case $# in +case $# in 1) case $1 in failsafe) exec xterm -geometry 80x24-0-0 ;; esac -esac - +esac You will need to add a few lines to this section. Assuming the labels you gave earlier were KDE2 and GNOME, the following will do: - -case $# in +case $# in 1) case $1 in KDE2) @@ -1828,16 +1815,13 @@ case $# in exec xterm -geometry 80x24-0-0 ;; esac -esac - +esac To make sure your KDE choice of a login-time desktop background is also honored, you will need to add the following line to /usr/X11R6/lib/X11/xdm/Xsetup_0: - - /usr/X11R6/bin/kdmdesktop - + /usr/X11R6/bin/kdmdesktop Now, you need only to make sure kdm is started at the next bootup. To learn how to do this, read the section on