Thanks a lot to all the people that provided feedback on this matter.
Attached to this post is a new version of the patch.  I did a mistake
downloading the files used previously from the repository.  This time,
I choosed the right download method:

  $ cvs -d [EMAIL PROTECTED]:/cvs get www/faq

The new patch is cleaner and much easier to review.

Thanks a lot, again, for the excellent feedback.  There are, however,
some problems to be fixed:

  - some links (these to threads) are too large.
  - there are some references to manual pages that are not links.

Cheers,
Igor.
diff -ur faq/faq1.html faq.new/faq1.html
--- faq/faq1.html       2006-11-04 02:02:44.000000000 +0100
+++ faq.new/faq1.html   2006-12-08 01:31:16.000000000 +0100
@@ -275,7 +275,7 @@
 
 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">FAQ 5, OpenBSD's flavors</a> 
section.
 
 <a name="Included"></a>
 <h2>1.8 - What is included with OpenBSD?</h2>
@@ -362,7 +362,7 @@
 <!-- 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 -ur faq/faq12.html faq.new/faq12.html
--- faq/faq12.html      2006-11-01 04:07:32.000000000 +0100
+++ faq.new/faq12.html  2006-12-08 00:56:54.000000000 +0100
@@ -532,7 +532,7 @@
 <p>
 The <a href="http://simh.trailing-edge.com/";>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 <a href="../vax-simh.html">OpenBSD/vax on SIMH</a> 
page.
 
 
 <p>
diff -ur faq/faq13.html faq.new/faq13.html
--- faq/faq13.html      2006-11-01 06:06:03.000000000 +0100
+++ faq.new/faq13.html  2006-12-08 01:14:32.000000000 +0100
@@ -902,8 +902,8 @@
 <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="http://www.dvddemystified.com/dvdfaq.html#4.3.1";>this section</a>
+be sure to read the
+<a href="http://www.dvddemystified.com/dvdfaq.html#4.3.1";>subsection 4.3.1</a>
 of the DVD FAQ.
 
 <h4>DVD writing speed</h4>
@@ -1281,9 +1281,8 @@
 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="http://marc.theaimsgroup.com/?t=107060510300001&amp;r=1&amp;w=2";>this
-thread</a> on the ports mailing list).
+(see the thread
+<a 
href="http://marc.theaimsgroup.com/?t=107060510300001&amp;r=1&amp;w=2";>http://marc.theaimsgroup.com/?t=107060510300001&amp;r=1&amp;w=2</a>
 on the ports mailing list).
 
 <a name="javaflash"></a>
 <a name="javaplugin"></a>
diff -ur faq/faq14.html faq.new/faq14.html
--- faq/faq14.html      2006-11-09 04:36:59.000000000 +0100
+++ faq.new/faq14.html  2006-12-08 00:55:55.000000000 +0100
@@ -125,9 +125,9 @@
 <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
+<a href="faq4.html#Partitioning">partitioning and partition sizing</a>
+section.
 
 <p>
 For an example of using disklabel(8) during install, see the
@@ -1669,8 +1669,8 @@
 <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</a> page).
 
 <p>
 Another option available for many platforms is one of the many products
@@ -1851,8 +1851,7 @@
 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 <a href="#foreignfsafter">below</a>.
 
 <blockquote><pre>
 # <b>disklabel wd0</b>
diff -ur faq/faq4.html faq.new/faq4.html
--- faq/faq4.html       2006-12-03 05:03:00.000000000 +0100
+++ faq.new/faq4.html   2006-12-08 01:07:17.000000000 +0100
@@ -602,8 +602,8 @@
 
 </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 on 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.  
@@ -736,14 +736,14 @@
 between OpenBSD and a pre-existing Windows 2000 partition, so we
 take the default of "no", which will take us into the 
 <a 
href="http://www.openbsd.org/cgi-bin/man.cgi?query=fdisk&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
+<a href="faq14.html#fdisk">FAQ 14, fdisk</a>.
 
 <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 <a href="faq14.html#LargeDrive">FAQ 14, largedrive</a> before going any
 further.
 
 <p>
@@ -1013,7 +1013,7 @@
 "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>.
+the section on <a href="#Partitioning">partitioning and partition sizing</a>.
 
 <p>
 In this system, we have over 17G available for OpenBSD.  That's a lot 
@@ -1426,7 +1426,8 @@
 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">install files</a>
+section.
 
 <p>
 Once you have successfully picked which file sets you want, you will be
@@ -1587,7 +1588,7 @@
 
 <p>
 If you are concerned about very precise time, you may wish to read
-<a href="faq8.html#NTPerror">this</a>.
+<a href="faq8.html#NTPerror">FAQ 8, time offset</a>.
 
 <p>
 The last steps are for the system to create the <tt>/dev</tt> directory 
@@ -1822,8 +1823,8 @@
   limit (for example, 2G, 8G, or 128G on i386 systems).
   As the kernel can end up anywhere within
   the root partition, the entire root partition should be within this
-  area. For more details, see <a href="faq14.html#LargeDrive">this
-  section</a>.  A good guideline might be to keep your / partition
+  area. For more details, see <a href="faq14.html#LargeDrive">FAQ 14,
+  largedrive</a>.  A good guideline might be to keep your / partition
   completely below 2G, unless you know your platform (and particular
   machine) can handle more (or less) than that.
 </ul>
@@ -1871,7 +1872,7 @@
    <a 
href="http://www.openbsd.org/cgi-bin/man.cgi?query=fsck&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 <a href="faq14.html#LargeDrive">FAQ 14, 
largedrive</a>).
  <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
@@ -2177,8 +2178,8 @@
 <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="http://www.openbsd.org/cgi-bin/man.cgi?query=fdisk&amp;sektion=8&amp;arch=i386";>here</a>.
+<a href="faq14.html#fdisk">FAQ 14, fdisk</a> and the fdisk(8)
+<a 
href="http://www.openbsd.org/cgi-bin/man.cgi?query=fdisk&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
@@ -2200,7 +2201,7 @@
 
 <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 in <a href="faq14.html#InstBoot">FAQ 14, installboot</a>.
 
 </ul>
 
@@ -2402,8 +2403,8 @@
 <a href="faq14.html#disklabel">disklabel</a>, and
 <a 
href="http://www.openbsd.org/cgi-bin/man.cgi?query=restore&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#InstBoot">boot blocks</a>. More details in
+<a href="faq14.html#Backup">FAQ 14, backup</a>.
 
 <h3>Disk imaging</h3>
 Unfortunately, there are no known disk imaging packages which are
diff -ur faq/faq5.html faq.new/faq5.html
--- faq/faq5.html       2006-11-01 07:24:30.000000000 +0100
+++ faq.new/faq5.html   2006-12-08 01:01:27.000000000 +0100
@@ -350,7 +350,7 @@
 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.
 
@@ -1422,7 +1422,7 @@
 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 the section on <a href="#Why">kernel customization</a>.
 
 
 <a name="ProbObj"></a>
diff -ur faq/faq6.html faq.new/faq6.html
--- faq/faq6.html       2006-12-03 23:49:00.000000000 +0100
+++ faq.new/faq6.html   2006-12-08 01:17:41.000000000 +0100
@@ -1622,7 +1622,8 @@
 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
@@ -1942,8 +1943,8 @@
 
 <p>
 A more complete response to this by one of the maintainers of OpenNTPD
-can be read
-<a href="http://www.advogato.org/person/dtucker/diary.html?start=52";>here</a>.
+can be read at
+<a 
href="http://www.advogato.org/person/dtucker/diary.html?start=52";>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>
diff -ur faq/faq8.html faq.new/faq8.html
--- faq/faq8.html       2006-11-03 23:02:21.000000000 +0100
+++ faq.new/faq8.html   2006-12-08 01:04:25.000000000 +0100
@@ -1087,7 +1087,7 @@
 <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">Antialiased and TrueType fonts</a> document.
 
 <p>
 <a name= "Journaling"></a>
diff -ur faq/truetype.html faq.new/truetype.html
--- faq/truetype.html   2005-07-09 04:13:25.000000000 +0200
+++ faq.new/truetype.html       2006-12-08 01:00:43.000000000 +0100
@@ -90,7 +90,7 @@
 </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 section on <a href="#manualfonts">manually adding fonts</a>.
 
 <a name= "applications"></a>
 <h2>Which applications can use it?</h2>
diff -ur faq/upgrade38.html faq.new/upgrade38.html
--- faq/upgrade38.html  2006-05-01 02:57:59.000000000 +0200
+++ faq.new/upgrade38.html      2006-12-08 01:29:35.000000000 +0100
@@ -273,7 +273,7 @@
 mail/aliases
 </pre></blockquote>
 
-The changes to these files are in <a href="upgrade38.patch">this
+The changes to these files are in <a href="upgrade38.patch">upgrade38
 patch file</a>.
 You can attempt to use this by executing the following as root:
 <blockquote><pre>
diff -ur faq/upgrade39.html faq.new/upgrade39.html
--- faq/upgrade39.html  2006-11-01 02:44:10.000000000 +0100
+++ faq.new/upgrade39.html      2006-12-08 01:29:50.000000000 +0100
@@ -390,7 +390,7 @@
 sysctl.conf
 </pre></blockquote>
 
-The changes to these files are in <a href="upgrade39.patch">this
+The changes to these files are in <a href="upgrade39.patch">upgrade39
 patch file</a>.
 You can attempt to use this by executing the following as root:
 <blockquote><pre>
diff -ur faq/upgrade40.html faq.new/upgrade40.html
--- faq/upgrade40.html  2006-10-02 01:18:15.000000000 +0200
+++ faq.new/upgrade40.html      2006-12-08 01:30:07.000000000 +0100
@@ -366,7 +366,7 @@
 ssh/sshd_config
 </pre></blockquote>
 
-The changes to these files are in <a href="upgrade40.patch">this
+The changes to these files are in <a href="upgrade40.patch">upgrade40
 patch file</a>.
 You can attempt to use this by executing the following as root:
 <blockquote><pre>

Reply via email to