[diffs] fixes to recent 4.6 update
"Alan R. S. Bueno" <[email protected]>
| Newsgroups | gmane.os.openbsd.www |
|---|---|
| Message-ID | <[email protected]> |
Hi, I have some fixes, and some questions to do... :)
Fixes
=====
[donations.html]
- Punctuation fix.
[stable.html]
- Update to 4.6.
[faq/index.html]
- Kill double quotes in wrong place.
- Comment "scrub.html" (follow the same made in the PF User's Guide
index).
[faq/faq1.html]
- Remove full stop from items of the list (all other items have no
full stop).
[faq/faq4.html]
- Broken link: "#Multiboot" should be "#Multibooting".
- Use the new link "#MoreNetwork" ("#Network" replacement).
- Add missing <a name="BackMorefdisk"></a> in the section 4.5.3.
The "#BackMorefdisk" link is in the section 4.6.3.
- In the section 4.6.4 the "Back" link should be "#BackMoredisklabel",
not "#BackMorefdisk".
- s/back to where might have been/back to where we might have been/
- Use an link to httpd(8) in the "XXX". Ok?
- Kill some duplicate full stops.
- Add some missing full stops.
- Missing "KB".
- Put the removed <a name="trackoffset"></a> in the section 4.6.3.
The link #trackoffset is in the section 4.13.5.
I'm not sure about this.
- Missing "be". I'm not sure about this, but...
- The question "Use entire disk for OpenBSD?" is now
"Use (W)hole disk or (E)dit the MBR?". Maybe my wording need to be
changed.
[faq/faq5.html]
- Update config examples of the section 5.9.
My snip begin after the item 10, line break at column 80,
<strong></strong> in the commands.
Note: I ran config(8) against the "bsd" file of the 4.6 -release in
an running -current system; and in the second example I just changed
the device list with the new wi* numbers ("disable wi").
[faq/faq6.html]
- Missing "urtw" and "4" in the urtw(4) link.
[faq/faq7.html]
- Links for terminfo(5), "top", tetris(6), and vi(1).
[faq/faq14.html]
- "Use (W)hole disk or (E)dit the MBR?"...
- faq4.html#Disks should be faq4.html#InstDisks
Some Questions
==============
[faq/faq4.html]
1) Was FAQ 4's ToC left out of sync deliberately?
2) Can the changes "Added support in amd64 and i386 for using extended
partitions by handling chained EBRs correctly" and "Allow i386 and
amd64 to boot from extended DOS partitions" (from plus44.html)
change the sentence "Only one of the four primary MBR partitions can
be used for booting OpenBSD (i.e., extended partitions will not
work)."? That is, can OpenBSD be booted from an extended partition?
3) Why some <pre></pre> blocks in the section 4.6.3 are not
(or incorrectly) indented?
[faq/faq5.html]
1) Shouldn't "Processing History..." be in their own line?
[faq/faq6.html]
1) The PXEBOOT section will not be updated? (The current RAMDISK_CD
example is to the version 4.5.)
I don't have an environment to test the newest files and send diffs...
Diffs
=====
Index: donations.html
===================================================================
RCS file: /cvs/www/donations.html,v
retrieving revision 1.1109
diff -u donations.html
--- donations.html 20 Oct 2009 19:47:27 -0000 1.1109
+++ donations.html 22 Oct 2009 12:21:11 -0000
@@ -57,7 +57,7 @@
Simply send a donation cheque in CAD/EUR/USD funds made out to
Theo de Raadt, since<br>
cheques made out to "OpenBSD" cannot be cashed.
-(Or mail <a href="mailto:[email protected]">Theo de Raadt</a> for
other ideas).
+(Or mail <a href="mailto:[email protected]">Theo de Raadt</a> for
other ideas.)
<p>
Theo de Raadt<br>
OpenBSD<br>
Index: stable.html
===================================================================
RCS file: /cvs/www/stable.html,v
retrieving revision 1.26
diff -u stable.html
--- stable.html 1 May 2008 06:59:19 -0000 1.26
+++ stable.html 22 Oct 2009 12:21:11 -0000
@@ -95,12 +95,12 @@
described in the <b>Getting Started</b> section of the
<a href="anoncvs.html#starting">AnonCVS documentation</a>.
Note that patch branches do not help to upgrade from one release of
-OpenBSD to another, e.g. to go from 4.2 to 4.3. They only provide
+OpenBSD to another, e.g. to go from 4.5 to 4.6. They only provide
a means for staying up to date with the patches within a given release.
<p>
Do not attempt to go from one release to another via source.
-Instead, please visit the <a href="faq/upgrade43.html">upgrade guide</a>.
+Instead, please visit the <a href="faq/upgrade46.html">upgrade guide</a>.
Also, you cannot go backwards, from -current back to -stable, because of
library versioning problems and other changes.
Index: faq1.html
===================================================================
RCS file: /cvs/www/faq/faq1.html,v
retrieving revision 1.109
diff -u faq1.html
--- faq1.html 16 Oct 2009 19:07:37 -0000 1.109
+++ faq1.html 22 Oct 2009 12:14:33 -0000
@@ -390,7 +390,7 @@
<li><b><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=tmux&sektion=1"
>tmux(1)</a>
-has moved from being a port to being part of the base system.</b><br>
+has moved from being a port to being part of the base system</b><br>
For most users, tmux(1) is a functional replacement for the commonly
installed package, "screen" (and the almost never used program, window).
Users of "screen" are highly encouraged to check it out.
Index: faq14.html
===================================================================
RCS file: /cvs/www/faq/faq14.html,v
retrieving revision 1.189
diff -u faq14.html
--- faq14.html 16 Oct 2009 19:07:37 -0000 1.189
+++ faq14.html 22 Oct 2009 12:15:30 -0000
@@ -942,10 +942,11 @@
<ul>
<li><b>Bad/invalid/incompatible MBR:</b>
Usually, a used hard disk has some MBR code in place, but if the
-disk is new or moved from a different platform, AND you don't answer "Yes"
-to the "Use entire disk" question of the <a href="faq4.html#Disks">installation
-process</a>, you may end up with a disk without a valid MBR, and thus,
-will not be bootable, even though it has a valid partition table.
+disk is new or moved from a different platform, AND you don't answer "w"
+to the "Use (W)hole disk or (E)dit the MBR?" question of the
+<a href="faq4.html#InstDisks">installation process</a>, you may end up
+with a disk without a valid MBR, and thus, will not be bootable, even
+though it has a valid partition table.
<p>
You may install the OpenBSD MBR on your hard disk using the fdisk
Index: faq4.html
===================================================================
RCS file: /cvs/www/faq/faq4.html,v
retrieving revision 1.288
diff -u faq4.html
--- faq4.html 20 Oct 2009 00:05:21 -0000 1.288
+++ faq4.html 22 Oct 2009 12:14:51 -0000
@@ -652,7 +652,7 @@
<p>
This value, along with the DNS domain name (specified
-<a href="#Network">below</a>), will be saved in the
+<a href="#MoreNetwork">below</a>), will be saved in the
file <tt>/etc/myname</tt>, which is used during normal boot to set
the hostname of the system.
If you do not set the domain name of the system, the default value of
@@ -922,7 +922,7 @@
<li>You wish to retain other OS partitions
<li>You wish to retain "setup", "suspend to disk", or other system
partitions
-<li>You wish to build a <a href="#Multiboot">multi-booting</a>
+<li>You wish to build a <a href="#Multibooting">multi-booting</a>
system
</ul>
@@ -935,6 +935,7 @@
<p>
More information on fdisk partitioning your disk
<a href="#Morefdisk">below</a>.
+<a name="BackMorefdisk"></a>
<p>
Now we will break up our OpenBSD fdisk partition into OpenBSD
@@ -1095,7 +1096,7 @@
man46.tgz 100% |*************************************| 8047 KB 00:21
game46.tgz 100% |*************************************| 2558 KB 00:04
xbase46.tgz 100% |*************************************| 10160 KB 00:21
- xetc46.tgz 100% |*************************************| 69166 00:00
+ xetc46.tgz 100% |*************************************| 69166 KB 00:00
xshare46.tgz 100% |*************************************| 2861 KB 00:12
xfont46.tgz 100% |*************************************| 34745 KB 00:57
xserv46.tgz 100% |*************************************| 19789 KB 00:39
@@ -1266,7 +1267,7 @@
</pre></td></tr></table>
<p>
-<a href="#backMoreNetwork">(back to where might have been)</a>
+<a href="#backMoreNetwork">(back to where we might have been)</a>
<a name="MoreTimeZone"></a>
<h3>4.6.2 - Setting the Time Zone</h3>
@@ -1386,7 +1387,7 @@
</pre></td></tr></table>
IF the disk had a valid MBR in place, it would show you the existing
partition table, which can be a good way to show if a disk may have
-data on it already
+data on it already.
<table border=0 width="650"><tr><td nowrap bgcolor="#EEEEEE"><pre>
Use (W)hole disk or (E)dit the MBR? [whole] <b>e</b>
@@ -1493,6 +1494,7 @@
offset: [0] <b>63</b>
</pre></td></tr></table>
+<a name="trackoffset"></a>
<p>
The fdisk platforms need a one track gap before the first partition.
One track is one "sectors per track" number of sectors, the last of
@@ -1679,7 +1681,7 @@
<p>
All partitions which have native FFS partitions on them should be within
the OpenBSD fdisk(8) partition, however
-<a href="faq14.html#foreignfs">non-OpenBSD</a> partitions can (and
+<a href="faq14.html#foreignfs">non-OpenBSD</a> partitions can be (and
usually should be) outside the OpenBSD fdisk partition.
<p>
@@ -1895,7 +1897,7 @@
default to use all remaining available disk space.
With modern monstrously huge drives, this is usually a bad idea.
If you know you will never use it, don't allocate it, and save it for
-some future use..
+some future use.
<p>
Now, let's look at our results, using the "p" and "p m" commands:
@@ -1980,7 +1982,7 @@
</pre></td></tr></table>
<p>
-<a href="#BackMorefdisk">(Back to where we may have been)</a>
+<a href="#BackMoredisklabel">(Back to where we may have been)</a>
<p>
<a name= "FilesNeeded"></a>
@@ -2174,8 +2176,9 @@
<li><tt>/var/log</tt>: System logs.
<li><tt>/var/mail</tt>: Incoming mail boxes.
<li><tt>/var/spool</tt>: Outgoing mail (and other things)
- <li><tt>/var/www</tt>: OpenBSD's <a href="XXX">web server</a> lives
- here.
+ <li><tt>/var/www</tt>: OpenBSD's
+ <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=httpd&sektion=8">web
server</a>
+ lives here.
<li><tt>/var/tmp</tt>: This is a "persistent" temporary file directory,
as files placed here are NOT purged on reboot.
For example, vi(1) uses this directory for temporary storage, so
@@ -2188,7 +2191,7 @@
save a core dump in the swap partition before rebooting.
This core dump will then be saved to <tt>/var/crash</tt> upon
reboot, so <tt>/var</tt> will need at least as much free space as
- the system has RAM for this to work automatically..
+ the system has RAM for this to work automatically.
</ul>
<li><b>/usr:</b>
@@ -2214,7 +2217,7 @@
This directory holds the basic system source files, excluding X and
ports.
This directory is empty by default, you have to load it as detailed in
-<a href="faq5.html#BldGetSrc">FAQ 5</a>
+<a href="faq5.html#BldGetSrc">FAQ 5</a>.
<li><b>/usr/obj:</b>
This directory is populated during the build process with the object
@@ -2357,7 +2360,7 @@
with a line like: "<tt>boot hd2a:/bsd</tt>" to boot off the third
hard drive on your system. To boot from OpenBSD, slip your floppy in,
reboot. To boot from the other OS, eject the floppy, reboot.
-(You can, of course, use this floppy to make a bootable CD, too)
+(You can, of course, use this floppy to make a bootable CD, too.)
<p>
The
@@ -2794,9 +2797,9 @@
<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=fdisk&sektion=8&arch=i386">here</a>.
<li><b>No valid boot loader was ever put on the disk.</b>
-If you answer "Y" to the "Use entire disk for OpenBSD?" question during
-the install, or use the "<tt>reinit</tt>" option
-of fdisk(8), the
+If you hit "Enter" or answer "w" to the
+"Use (W)hole disk or (E)dit the MBR?" question during the install, or
+use the "<tt>reinit</tt>" option of fdisk(8), the
OpenBSD boot record is installed on the Master Boot Record of the disk;
otherwise, the existing master boot code is untouched. This will be a
problem if no other boot record existed.
Index: faq5.html
===================================================================
RCS file: /cvs/www/faq/faq5.html,v
retrieving revision 1.174
diff -u faq5.html
--- faq5.html 16 Oct 2009 19:07:37 -0000 1.174
+++ faq5.html 22 Oct 2009 12:15:00 -0000
@@ -1256,64 +1256,59 @@
<!--XXXver -->
<blockquote><pre>
$ <strong>sudo config -e /bsd</strong>
-OpenBSD 4.5 (GENERIC) #1749: Sat Feb 28 14:51:18 MST 2009
+OpenBSD 4.6 (GENERIC) #58: Thu Jul 9 21:24:42 MDT 2009
[email protected]:/usr/src/sys/arch/i386/compile/GENERIC
warning: no output file specified
Enter 'help' for information
-ukc> ?
- help Command help list
- add dev Add a device
- base 8|10|16 Base on large numbers
- change devno|dev Change device
- disable attr val|devno|dev Disable device
- enable attr val|devno|dev Enable device
- find devno|dev Find device
- list List configuration
- lines count # of lines per page
- show [attr [val]] Show attribute
- exit Exit, without saving changes
- quit Quit, saving current changes
- timezone [mins [dst]] Show/change timezone
- nmbclust [number] Show/change NMBCLUSTERS
- cachepct [number] Show/change BUFCACHEPERCENT
- nkmempg [number] Show/change NKMEMPAGES
- shmseg [number] Show/change SHMSEG
- shmmaxpgs [number] Show/change SHMMAXPGS
+ukc> <strong>?</strong>
+ help Command help list
+ add dev Add a device
+ base 8|10|16 Base on large numbers
+ change devno|dev Change device
+ disable attr val|devno|dev Disable device
+ enable attr val|devno|dev Enable device
+ find devno|dev Find device
+ list List configuration
+ lines count # of lines per page
+ show [attr [val]] Show attribute
+ exit Exit, without saving changes
+ quit Quit, saving current changes
+ timezone [mins [dst]] Show/change timezone
+ bufcachepercent [number] Show/change BUFCACHEPERCENT
+ nkmempg [number] Show/change NKMEMPAGES
+ shmseg [number] Show/change SHMSEG
+ shmmaxpgs [number] Show/change SHMMAXPGS
ukc> <strong>list</strong>
- 0 audio* at sb0|sb*|gus0|pas0|sp0|ess*|wss0|wss*|ym*|eap*|eso*|sv*|neo*|cmpci*
-|clcs*|clct*|auich*|autri*|auvia*|fms*|uaudio*|maestro*|esa*|yds*|emu*
flags 0x0
- 1 midi* at sb0|sb*|opl*|opl*|opl*|opl*|ym*|mpu*|autri* flags 0x0
- 2 nsphy* at aue*|xe*|ef*|gx*|stge*|bge*|nge*|sk*|ste*|sis*|sf*|wb*|tx*|tl*|vr*
-|ne0|ne1|ne2|ne*|ne*|ne*|dc*|dc*|rl*|fxp*|fxp*|xl*|xl*|ep0|ep0|ep0|ep*|ep*|ep*|e
-p*|ep* phy -1 flags 0x0
- 3 nsphyter* at
aue*|xe*|ef*|gx*|stge*|bge*|nge*|sk*|ste*|sis*|sf*|wb*|tx*|tl*|
-vr*|ne0|ne1|ne2|ne*|ne*|ne*|dc*|dc*|rl*|fxp*|fxp*|xl*|xl*|ep0|ep0|ep0|ep*|ep*|ep
-*|ep*|ep* phy -1 flags 0x0
- 4 qsphy* at aue*|xe*|ef*|gx*|stge*|bge*|nge*|sk*|ste*|sis*|sf*|wb*|tx*|tl*|vr*
-|ne0|ne1|ne2|ne*|ne*|ne*|dc*|dc*|rl*|fxp*|fxp*|xl*|xl*|ep0|ep0|ep0|ep*|ep*|ep*|e
-p*|ep* phy -1 flags 0x0
- 5 inphy* at aue*|xe*|ef*|gx*|stge*|bge*|nge*|sk*|ste*|sis*|sf*|wb*|tx*|tl*|vr*
-|ne0|ne1|ne2|ne*|ne*|ne*|dc*|dc*|rl*|fxp*|fxp*|xl*|xl*|ep0|ep0|ep0|ep*|ep*|ep*|e
-p*|ep* phy -1 flags 0x0
- 6 iophy* at aue*|xe*|ef*|gx*|stge*|bge*|nge*|sk*|ste*|sis*|sf*|wb*|tx*|tl*|vr*
-|ne0|ne1|ne2|ne*|ne*|ne*|dc*|dc*|rl*|fxp*|fxp*|xl*|xl*|ep0|ep0|ep0|ep*|ep*|ep*|e
-p*|ep* phy -1 flags 0x0
- 7 eephy* at aue*|xe*|ef*|gx*|stge*|bge*|nge*|sk*|ste*|sis*|sf*|wb*|tx*|tl*|vr*
-|ne0|ne1|ne2|ne*|ne*|ne*|dc*|dc*|rl*|fxp*|fxp*|xl*|xl*|ep0|ep0|ep0|ep*|ep*|ep*|e
-p*|ep* phy -1 flags 0x0
- 8 exphy* at aue*|xe*|ef*|gx*|stge*|bge*|nge*|sk*|ste*|sis*|sf*|wb*|tx*|tl*|vr*
-|ne0|ne1|ne2|ne*|ne*|ne*|dc*|dc*|rl*|fxp*|fxp*|xl*|xl*|ep0|ep0|ep0|ep*|ep*|ep*|e
-p*|ep* phy -1 flags 0x0
+ 0 video* at uvideo* flags 0x0
+ 1 audio* at uaudio*|btsco*|sb0|sb*|gus0|pas0|sp0|ess*|wss0|wss*|ym*|eap*|envy*
+|eso*|sv*|neo*|cmpci*|clcs*|clct*|auacer*|auglx*|auich*|auixp*|autri*|auvia*|aza
+lia*|fms*|maestro*|esa*|yds*|emu* flags 0x0
+ 2 midi* at umidi*|sb0|sb*|opl*|opl*|opl*|opl*|opl*|ym*|mpu*|mpu*|autri*|eap*
f
+lags 0x0
+ 3 midi* at pcppi0 flags 0x0
+ 4 drm* at inteldrm*|radeondrm* flags 0x0
+ 5 inteldrm* at vga0|vga* flags 0x0
+ 6 radeondrm* at vga0|vga* flags 0x0
+ 7 radio* at udsbr*|bktr0|fms* flags 0x0
+ 8 softraid0 at root flags 0x0
+ 9 nsphy* at url*|udav*|mos*|axe*|aue*|xe*|ef*|hme*|lii*|bce*|ale*|age*|jme*|et
+*|nfe*|stge*|vge*|bnx*|bge*|lge*|nge*|msk*|sk*|ste*|sis*|wb*|tl*|vr*|pcn*|sf*|ge
+m*|ne0|ne1|ne2|ne*|ne*|ne*|epic*|sm0|sm*|dc*|dc*|re*|re*|rl*|rl*|mtd*|fxp*|fxp*|
+xl*|xl*|ep0|ep0|ep0|ep*|ep*|ep*|ep*|ep* phy -1 flags 0x0
+ 10 nsphyter* at
url*|udav*|mos*|axe*|aue*|xe*|ef*|hme*|lii*|bce*|ale*|age*|jme*
+|et*|nfe*|stge*|vge*|bnx*|bge*|lge*|nge*|msk*|sk*|ste*|sis*|wb*|tl*|vr*|pcn*|sf*
+|gem*|ne0|ne1|ne2|ne*|ne*|ne*|epic*|sm0|sm*|dc*|dc*|re*|re*|rl*|rl*|mtd*|fxp*|fx
+p*|xl*|xl*|ep0|ep0|ep0|ep*|ep*|ep*|ep*|ep* phy -1 flags 0x0
[...snip...]
ukc> <strong>disable ep</strong>
- 93 ep0 disabled
- 94 ep* disabled
- 95 ep* disabled
-261 ep0 disabled
-262 ep0 disabled
-263 ep* disabled
-264 ep* disabled
-323 ep* disabled
+ 98 ep0 disabled
+ 99 ep* disabled
+100 ep* disabled
+278 ep0 disabled
+279 ep0 disabled
+280 ep* disabled
+281 ep* disabled
+344 ep* disabled
ukc> <strong>quit</strong>
not forced
</pre></blockquote>
@@ -1331,10 +1326,11 @@
<blockquote><pre>
$ <strong>sudo config -e -u -o bsd.new /bsd</strong>
-OpenBSD 4.5 (GENERIC) #1749: Sat Feb 28 14:51:18 MST 2009
+OpenBSD 4.6 (GENERIC) #58: Thu Jul 9 21:24:42 MDT 2009
[email protected]:/usr/src/sys/arch/i386/compile/GENERICProcessing
history...
-105 wi* disabled
-106 wi* disabled
+162 wi* disabled
+163 wi* disabled
+416 wi* disabled
Enter 'help' for information
ukc> <strong>quit</strong>
</pre></blockquote>
Index: faq6.html
===================================================================
RCS file: /cvs/www/faq/faq6.html,v
retrieving revision 1.279
diff -u faq6.html
--- faq6.html 16 Oct 2009 19:07:37 -0000 1.279
+++ faq6.html 22 Oct 2009 12:15:15 -0000
@@ -2063,7 +2063,7 @@
Atheros USB 802.11a/b/g
<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=upgt&sektion=4">upgt(4)</a>
Conexant/Intersil PrismGT SoftMAC USB 802.11b/g
-<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=&sektion=">urtw(4)</a>
+<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=urtw&sektion=4">urtw(4)</a>
Realtek RTL8187L USB 802.11b/g
<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&sektion=4">wi(4)</a>
Prism2/2.5/3. <sup>(AP)</sup>
Index: faq7.html
===================================================================
RCS file: /cvs/www/faq/faq7.html,v
retrieving revision 1.85
diff -u faq7.html
--- faq7.html 16 Oct 2009 19:07:37 -0000 1.85
+++ faq7.html 22 Oct 2009 12:15:19 -0000
@@ -610,9 +610,10 @@
<p>
A brief aside regarding terminals: on OpenBSD, applications are made aware of
the capabilities of the terminal by the TERM environment variable.
-This is set to the name of an entry in the terminfo(5) database and tells
-programs that the terminal, for example, supports colour, or has the ability to
-insert lines, or many other things.
+This is set to the name of an entry in the
+<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=terminfo&sektion=5">terminfo(5)</a>
+database and tells programs that the terminal, for example, supports colour,
+or has the ability to insert lines, or many other things.
An important thing to note is that the "xterm" entry in the database does not
include colour, so tmux will not use colour in xterm by default, TERM should be
set to "xterm-xfree86" instead if colour is desired (the "XTerm*termName" X
@@ -626,7 +627,8 @@
name of the window, and the "*" indicates this is the current window displayed
above the status line.
Any typing is passed on to the shell and any output displayed.
-For example, if you start "top":
+For example, if you start
+"<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=top&sektion=1">top</a>":
<blockquote><pre>
$ top
@@ -706,7 +708,9 @@
In this case the "new-window" command is needed.
Each command has a shorthand alias which may be used instead of typing the full
name, for "new-window" this is "neww".
-So, to create a new window running tetris(6), type:
+So, to create a new window running
+<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=tetris&sektion=6">tetris(6)</a>,
+type:
<blockquote><pre>
neww tetris
@@ -788,7 +792,8 @@
<p>
There are a large number of other options; another handy one is changing to
-vi(1)-style key bindings at the command prompt and in the window list and other
+<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=vi&sektion=1">vi(1)</a>-style
+key bindings at the command prompt and in the window list and other
tmux interactive modes:
<blockquote><pre>
Index: index.html
===================================================================
RCS file: /cvs/www/faq/index.html,v
retrieving revision 1.317
diff -u index.html
--- index.html 22 Oct 2009 06:10:35 -0000 1.317
+++ index.html 22 Oct 2009 12:14:30 -0000
@@ -441,7 +441,7 @@
<li>Advanced Configuration
<ul>
<li><a href="pf/options.html">Runtime Options</a>
- <li><a href="pf/scrub.html">Scrub (Packet Normalization)</a>
+<!-- <li><a href="pf/scrub.html">Scrub (Packet Normalization)</a> -->
<li><a href="pf/anchors.html">Anchors</a>
<li><a href="pf/queueing.html">Packet Queueing and Prioritization</a>
<li><a href="pf/pools.html">Address Pools and Load Balancing</a>
@@ -482,7 +482,7 @@
<ul>
<li><a href="faq13.html#audioserver">Setting up an audio server</a> -- new
<li>FAQ updated for 4.6
-<li><a href="faq4.html#Install">New install instructions for 4.6"</a>
+<li><a href="faq4.html#Install">New install instructions for 4.6</a>
<li><a href="faq7.html#tmux">What is tmux(1)?</a> -- new
<li><a href="faq4.html#Multibooting">Multibooting</a> -- updated
for Vista, Windows 7
Thank you!