Attached is the first draft of the patch. Once it has been debugged
I will open a bug report on it. Please, check carefully all the entries
in the patch and do not trust on my English skills. Some suggestions:
- replacing references to threads in the mailing lists (now the
thread subject) for its exact reference. There is a risk for
two threads having the same subject.
- there are some manual pages references (in the form command(section))
that are no links. Should these references to man pages be links?
diff -urNp www/faq1.html www.new/faq1.html
--- www/faq1.html 2006-12-07 17:05:55.000000000 +0100
+++ www.new/faq1.html 2006-12-07 18:55:51.000000000 +0100
@@ -275,7 +275,8 @@ Theo de Raadt, located in Canada.
The OpenBSD team makes a new release every six months, with target release
dates in May and November. More information on the development cycle
-can be found <a href="faq5.html#Flavors">here</a>.
+can be found in the <a href="faq5.html#Flavors">OpenBSD's Flavors</a>
+subsection of this FAQ.
<a name="Included"></a>
<h2>1.8 - What is included with OpenBSD?</h2>
@@ -362,7 +363,7 @@ Of course, additional applications can b
<!-- XXXrelease -->
The complete list of changes made to OpenBSD 3.9 to create OpenBSD 4.0
-can be found <a href="../plus40.html">here</a>, however here are a few
+can be found in the <a href="../plus40.html">OpenBSD 4.0 changes</a> list,
however here are a few
changes the OpenBSD team anticipate will require or warrant some special
note to people upgrading or installing OpenBSD 4.0 who are familiar with
older versions:
diff -urNp www/faq12.html www.new/faq12.html
--- www/faq12.html 2006-12-07 17:05:55.000000000 +0100
+++ www.new/faq12.html 2006-12-07 19:02:48.000000000 +0100
@@ -546,7 +546,7 @@ Yes!
<p>
The <a href="<A
HREF="http://simh.trailing-edge.com/";>http://simh.trailing-edge.com/</A>">SIMH</a>
VAX simulator
can be used to effectively emulate a real VAX.
-Instructions can be found <a
href="../vax-simh.html">here</a>.
+Instructions can be found in the <a
href="../vax-simh.html">OpenBSD/vax on the SIMH</a> VAX
simulator URL.
<p>
@@ -564,4 +564,4 @@ Instructions can be found <a href=&qu
<small>$OpenBSD: faq12.html,v 1.79 2006/11/01 03:07:32 nick Exp
$</small>
</body>
</html>
-</PRE>
\ No newline at end of file
+</PRE>
diff -urNp www/faq13.html www.new/faq13.html
--- www/faq13.html 2006-12-07 17:05:55.000000000 +0100
+++ www.new/faq13.html 2006-12-07 20:10:58.000000000 +0100
@@ -915,8 +915,8 @@ with normal DVD players.
<p>
The important thing is you use media which suit your DVD writer.
If you expect compatibility with other DVD players, watch your step and
-be sure to read
-<a href="<A
HREF="http://www.dvddemystified.com/dvdfaq.html";>http://www.dvddemystified.com/dvdfaq.html</A>#4.3.1">this
section</a>
+be sure to read the
+<a href="<A
HREF="http://www.dvddemystified.com/dvdfaq.html";>http://www.dvddemystified.com/dvdfaq.html</A>#4.3.1">compatibility
problems section</a>
of the DVD FAQ.
<h4>DVD writing speed</h4>
@@ -1294,9 +1294,9 @@ codecs).
Some Real Audio streams can be made to work on i386 using
<b>mplayer</b>
in conjunction with the
<tt>graphics/win32-codecs</tt> and
<tt>emulators/redhat/base</tt> ports
-(see
-<a href="<A
HREF="http://marc.theaimsgroup.com/?t=107060510300001";>http://marc.theaimsgroup.com/?t=107060510300001</A>&amp;r=1&amp;w=2">this
-thread</a> on the ports mailing list).
+(see the thread
+<a href="<A
HREF="http://marc.theaimsgroup.com/?t=107060510300001";>http://marc.theaimsgroup.com/?t=107060510300001</A>&amp;r=1&amp;w=2">Confusion
+with Mplayer (resend with data)</a> thread on the ports mailing list).
<a name="javaflash"></a>
<a name="javaplugin"></a>
@@ -1413,4 +1413,4 @@ this would be interesting, but lack of h
</body>
</html>
-</PRE>
\ No newline at end of file
+</PRE>
diff -urNp www/faq14.html www.new/faq14.html
--- www/faq14.html 2006-12-07 17:05:55.000000000 +0100
+++ www.new/faq14.html 2006-12-07 20:14:41.000000000 +0100
@@ -140,9 +140,8 @@ post-install, as well.
<p>
There is not one "right" way to label a disk, but there are many
wrong
ways.
-Before attempting to label your disk, see
-<a href="faq4.html#Partitioning">this discussion</a> on
partitioning and
-partition sizing.
+Before attempting to label your disk, see the FAQ
+<a href="faq4.html#Partitioning">section on partitioning and
partition sizing</a>.
<p>
For an example of using disklabel(8) during install, see the
@@ -1684,8 +1683,8 @@ man page</a>
<p>
Many OpenBSD <a href="../plat.html">platforms</a>
include support for
various hardware RAID products. The options vary by platform, see the
-appropriate hardware support page (listed
-<a href="../plat.html">here</a>).
+appropriate hardware support page (listed in the
+<a href="../plat.html">platforms page</a> at
http://www.openbsd.org/).
<p>
Another option available for many platforms is one of the many products
@@ -1866,8 +1865,8 @@ on this system, and during the install a
the native as well as the foreign filesystems was installed on the disk.
However, if you install foreign filesystems after the OpenBSD disklabel
was already installed on the disk, you need to add or modify them manually
-afterwards. This will be explained in <a
href="#foreignfsafter">this
-subsection</a>.
+afterwards. This will be explained in <a
href="#foreignfsafter">the
+partitions are not in my disklabel</a> subsection of the FAQ.
<blockquote><pre>
# <b>disklabel wd0</b>
@@ -2392,4 +2391,4 @@ they will get wiped and recreated on a r
</body>
</html>
-</PRE>
\ No newline at end of file
+</PRE>
diff -urNp www/faq4.html www.new/faq4.html
--- www/faq4.html 2006-12-07 17:05:55.000000000 +0100
+++ www.new/faq4.html 2006-12-07 20:21:14.000000000 +0100
@@ -616,8 +616,8 @@ complete reinstall.
</ul>
<!-- XXXversion -->
-More information on upgrading between releases can be found
-<a href="upgrade40.html">here</a>.
+More information on upgrading between releases can be found in the
+<a href="upgrade40.html">Upgrade Guide</a>.
<li><b>Shell:</b> Sometimes, you need to perform repairs or
maintenance
to a system which will not (or should not) boot to a normal kernel.
@@ -750,14 +750,15 @@ For the sake of this example, we will as
between OpenBSD and a pre-existing Windows 2000 partition, so we
take the default of "no", which will take us into the
<a href="<A
HREF="http://www.openbsd.org/cgi-bin/man.cgi?query=fdisk";>http://www.openbsd.org/cgi-bin/man.cgi?query=fdisk</A>&amp;sektion=8&amp;arch=i386">fdisk(8)</a>
-program. You can also get more information on fdisk(8)
-<a href="faq14.html#fdisk">here</a>.
+program. You can also get more information on fdisk(8) in the
+<a href="faq14.html#fdisk">Using fdisk(8)</a>
+section of the FAQ.
<p>
<b>Important Note:</b>
Users with a large hard disk (larger than was commonly available when your
computer was made) will want to
-see <a href="faq14.html#LargeDrive">this section</a>
before going any
+see the <a href="faq14.html#LargeDrive">section on partition
size restrictions</a> before going any
further.
<p>
@@ -1027,7 +1028,7 @@ Slicing up your disk properly is importa
"How should I partition my system?" is "Exactly how you need
it". This
will vary from application to application. There is no universal
answer. If you are unsure of how you want to partition your system, see
-<a href="#Partitioning">this discussion</a>.
+<a href="#Partitioning">the discussion on partition space
requirements</a>.
<p>
In this system, we have over 17G available for OpenBSD. That's a lot
@@ -1440,7 +1441,7 @@ You can do all kinds of nifty things her
all X components, if you changed your mind. In this case, we are going
to load all the sets. While the system will run with fewer sets, either
the starting default or installing all sets is recommended.
-More details on selecting sets <a
href="#FilesNeeded">here</a>.
+More details on selecting sets in the <a
href="#FilesNeeded">What files are needed for
installation</a> section.
<p>
Once you have successfully picked which file sets you want, you will be
@@ -1600,8 +1601,8 @@ through your choices.
</pre></td></tr></table>
<p>
-If you are concerned about very precise time, you may wish to read
-<a href="faq8.html#NTPerror">this</a>.
+If you are concerned about very precise time, you may wish to read the
+<a href="faq8.html#NTPerror">section on the time
offset</a>.
<p>
The last steps are for the system to create the <tt>/dev</tt>
directory
@@ -1885,7 +1886,7 @@ Some additional thoughts on partitioning
<a href="<A
HREF="http://www.openbsd.org/cgi-bin/man.cgi?query=fsck";>http://www.openbsd.org/cgi-bin/man.cgi?query=fsck</A>&amp;sektion=8">fsck(8)</a>
requires about 1M of RAM per gigabyte of filesystem size, and may be
very time-consuming or not even feasible on older, slower systems
- (please also refer to <a
href="faq14.html#LargeDrive">this section</a>).
+ (please also refer to the <a
href="faq14.html#LargeDrive">large drives section</a> of the
FAQ).
<li>If you permit users to write to <tt>/var/www</tt>
(i.e., personal
web pages), you might wish to put it on a separate partition, so you
can use <a href="faq10.html#Quotas">quotas</a>
to restrict the space
@@ -2190,9 +2191,9 @@ problem:
<ul>
<li><b>No partition was flagged active in fdisk(8).</b>
To fix this,
reboot the machine using the boot floppy or media, and "flag" a
-partition as "active" (bootable). See
-<a href="faq14.html#fdisk">here</a> and
-<a href="<A
HREF="http://www.openbsd.org/cgi-bin/man.cgi?query=fdisk";>http://www.openbsd.org/cgi-bin/man.cgi?query=fdisk</A>&amp;sektion=8&amp;arch=i386">here</a>.
+partition as "active" (bootable). See the fdisk(8)
+<a href="faq14.html#fdisk">section</a> and
+<a href="<A
HREF="http://www.openbsd.org/cgi-bin/man.cgi?query=fdisk";>http://www.openbsd.org/cgi-bin/man.cgi?query=fdisk</A>&amp;sektion=8&amp;arch=i386">manual
page</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
@@ -2214,7 +2215,8 @@ bootable.
<li><b>In some rare occasions, something may go wrong with the
second
stage boot loader install.</b> Reinstalling the second stage boot
-loader is discussed <a
href="faq14.html#InstBoot">here</a>.
+loader is discussed <a href="faq14.html#InstBoot">boot
blocks</a>
+section (this information is specific to i386 and amd64 architectures).
</ul>
@@ -2417,7 +2419,8 @@ Thus, you could boot from a
<a href="<A
HREF="http://www.openbsd.org/cgi-bin/man.cgi?query=restore";>http://www.openbsd.org/cgi-bin/man.cgi?query=restore</A>&amp;sektion=8">restore</a>
the desired configuration from tape or other media, and install the
<a href="faq14.html#InstBoot">boot blocks</a>. More
details
-<a href="faq14.html#Backup">here</a>.
+<a href="faq14.html#Backup">backing up and restoring</a>
+section of the FAQ.
<h3>Disk imaging</h3>
Unfortunately, there are no known disk imaging packages which are
@@ -2536,4 +2539,4 @@ server, where you can retrieve it later.
<small>$OpenBSD: faq4.html,v 1.237 2006/12/03 04:03:00 nick Exp
$</small>
</body>
</html>
-</PRE>
\ No newline at end of file
+</PRE>
diff -urNp www/faq5.html www.new/faq5.html
--- www/faq5.html 2006-12-07 17:05:55.000000000 +0100
+++ www.new/faq5.html 2006-12-07 19:44:07.000000000 +0100
@@ -363,7 +363,7 @@ you should start with:
It is recommended that you install the binary by using the "Upgrade"
option of the install media.
If that is not possible, you can also unpack the binaries as described
-<a href="upgrade40.html">here</a>.
+<a href="upgrade40.html">Upgrade Guide</a>.
Regardless, you must do the entire upgrade process, including creating
any users or other <tt>/etc</tt> directory changes needed.
@@ -1435,7 +1435,7 @@ Please do not make modifications to the
understand the implications of.
One "little" change in the kernel can have very large impact to the
entire rest of the system.
-Please re-read <a href="#Why">this</a>.
+Please re-read <a href="#Why">kernel customization
section</a> of the FAQ.
<a name="ProbObj"></a>
@@ -1696,4 +1696,4 @@ booting.
<small>$OpenBSD: faq5.html,v 1.144 2006/11/01 06:24:30 steven Exp
$</small>
</body>
</html>
-</PRE>
\ No newline at end of file
+</PRE>
diff -urNp www/faq6.html www.new/faq6.html
--- www/faq6.html 2006-12-07 17:05:55.000000000 +0100
+++ www.new/faq6.html 2006-12-07 19:48:50.000000000 +0100
@@ -1635,7 +1635,7 @@ CARP is an improvement over the Virtual
It was developed after VRRP was deemed to be not free enough because of
a possibly-overlapping Cisco patent.
For more information on CARP's origins and the legal issues surrounding
-VRRP, please visit <a href="../lyrics.html#35">this
page</a>.
+VRRP, please read the <a href="../lyrics.html#35">CARP
entry</a> in the OpenBSD lyrics page.
<p>
To avoid legal conflicts, Ryan McBride (with help from Michael
@@ -1955,8 +1955,8 @@ users, OpenNTPD is more than sufficient.
<p>
A more complete response to this by one of the maintainers of OpenNTPD
-can be read
-<a href="<A
HREF="http://www.advogato.org/person/dtucker/diary.html?start=52";>http://www.advogato.org/person/dtucker/diary.html?start=52</A>">here</a>.
+can be read at
+<a href="<A
HREF="http://www.advogato.org/person/dtucker/diary.html?start=52";>http://www.advogato.org/person/dtucker/diary.html?start=52</A>">http://www.advogato.org/person/dtucker/diary.html?start=52</a>.
<a name="OpenNTPDNoServe"></a>
<h3>6.12.3 - Why can't my other machines synchronize to
OpenNTPD?</h3>
@@ -2187,4 +2187,4 @@ table accordingly.
</body>
</html>
-</PRE>
\ No newline at end of file
+</PRE>
diff -urNp www/faq8.html www.new/faq8.html
--- www/faq8.html 2006-12-07 17:05:55.000000000 +0100
+++ www.new/faq8.html 2006-12-07 19:54:22.000000000 +0100
@@ -1102,7 +1102,7 @@ has chosen to run the main site at the U
<a name= "TrueType"></a>
<h2>8.20 - Antialiased and TrueType fonts in X</h2>
<p>
-See <a href="truetype.html">this document</a>.
+See the <a href="truetype.html">document on anti-aliasing and
TrueType fonts</a>.
<p>
<a name= "Journaling"></a>
@@ -1369,4 +1369,4 @@ See also:
</body>
</html>
-</PRE>
\ No newline at end of file
+</PRE>
diff -urNp www/truetype.html www.new/truetype.html
--- www/truetype.html 2006-12-07 17:05:55.000000000 +0100
+++ www.new/truetype.html 2006-12-07 19:55:26.000000000 +0100
@@ -104,7 +104,7 @@ the following:
</pre></blockquote>
At this point, the instructions for registering new fonts with X are
-listed in <a href="#manualfonts">another section</a>.
+listed in the <a href="#manualfonts">section about manually
adding fonts</a>.
<a name= "applications"></a>
<h2>Which applications can use it?</h2>
@@ -297,4 +297,4 @@ will not need to be restarted, but runni
<small>$OpenBSD: truetype.html,v 1.17 2005/07/09 02:13:25 nick Exp
$</small>
</body>
</html>
-</PRE>
\ No newline at end of file
+</PRE>
diff -urNp www/upgrade38.html www.new/upgrade38.html
--- www/upgrade38.html 2006-12-07 17:05:55.000000000 +0100
+++ www.new/upgrade38.html 2006-12-07 20:08:10.000000000 +0100
@@ -288,7 +288,7 @@ mail/aliases
</pre></blockquote>
The changes to these files are in <a
href="upgrade38.patch">this
-patch file</a>.
+patch file to etc/changelist for 3.8</a>.
You can attempt to use this by executing the following as root:
<blockquote><pre>
cd /
@@ -348,4 +348,4 @@ mtree -qdef /etc/mtree/4.4BSD.dist -p /
</body>
</html>
-</PRE>
\ No newline at end of file
+</PRE>
diff -urNp www/upgrade39.html www.new/upgrade39.html
--- www/upgrade39.html 2006-12-07 17:05:55.000000000 +0100
+++ www.new/upgrade39.html 2006-12-07 20:07:42.000000000 +0100
@@ -405,7 +405,7 @@ sysctl.conf
</pre></blockquote>
The changes to these files are in <a
href="upgrade39.patch">this
-patch file</a>.
+patch file to etc/changelist for 3.9</a>.
You can attempt to use this by executing the following as root:
<blockquote><pre>
<b>cd /</b>
@@ -500,4 +500,4 @@ chapter of the FAQ for more information.
</body>
</html>
-</PRE>
\ No newline at end of file
+</PRE>
diff -urNp www/upgrade40.html www.new/upgrade40.html
--- www/upgrade40.html 2006-12-07 17:05:55.000000000 +0100
+++ www.new/upgrade40.html 2006-12-07 20:07:55.000000000 +0100
@@ -381,7 +381,7 @@ ssh/sshd_config
</pre></blockquote>
The changes to these files are in <a
href="upgrade40.patch">this
-patch file</a>.
+patch file to etc/changelist for 4.0</a>.
You can attempt to use this by executing the following as root:
<blockquote><pre>
<b>cd /</b>
@@ -471,4 +471,4 @@ chapter of the FAQ for more information.
</body>
</html>
-</PRE>
\ No newline at end of file
+</PRE>
