Hi tech@

_gypcio on IRC reported that pkg_sign uses a -s signify flag that was renamed in
-current to signify2. The entry in the FAQ showing that example also linked to a
pkg_sign man page from -current which lead to the confusion.

Here is a diff generated with:
  perl -pi.bak -e 
's|man.openbsd.org/(?!OpenBSD-6.0)|man.openbsd.org/OpenBSD-6.0/|g' faq*.html

that turns all links in faq*.html from untagged links resolving to -current to
explicit OpenBSD-6.0. I did not alter the ports & pf faq's, current & upgrade
guides. The regex skipps links already tagged with OpenBSD-6.0 but don't run it
blindly as it doens't protect from explicitly tagged 3.5, 3.6 etc (I did not hit
any in the faq*.html files).

Diff follows. On a side note it would be nice to have a OpenBSD-release
shorthand on man.openbsd.org pointing to the latest release. That would help
avoid a similar diff churn after 6.1 gets released.

Feedback? OK's?
Index: faq1.html
===================================================================
RCS file: /cvs/www/faq/faq1.html,v
retrieving revision 1.201
diff -u -p -r1.201 faq1.html
--- faq1.html   24 Sep 2016 03:22:12 -0000      1.201
+++ faq1.html   6 Dec 2016 18:31:28 -0000
@@ -311,7 +311,7 @@ Some of the more popular lists are:
   <li><b>announce</b> - Project announcements and errata notices.
       This is a low-volume list.
   <li><b>bugs</b> - Bugs received via
-      <a href="http://man.openbsd.org/sendbug";>sendbug(1)</a>
+      <a href="http://man.openbsd.org/OpenBSD-6.0/sendbug";>sendbug(1)</a>
       and discussion about them.
   <li><b>misc</b> - General user questions and answers.
       This is the most active list, and should be the "default" for most
@@ -332,7 +332,7 @@ While it might be the first time you hav
 others on the mailing lists may have seen the same question several times in 
the
 last week, and may not appreciate seeing it again.
 If asking a question possibly related to hardware, always include a full
-<a href="http://man.openbsd.org/dmesg";>dmesg(8)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/dmesg";>dmesg(8)</a>.
 
 <p>
 You can find several archives, other guidelines and more information on the
@@ -351,30 +351,30 @@ The man pages are the authoritative sour
 Here is a list of some useful manual pages for new users:
 
 <ul>
-  <li><a href="http://man.openbsd.org/afterboot";>afterboot(8)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/afterboot";>afterboot(8)</a>
   - things to check after the first complete boot.
-  <li><a href="http://man.openbsd.org/help";>help(1)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/help";>help(1)</a>
   - help for new users and administrators.
-  <li><a href="http://man.openbsd.org/hier";>hier(7)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/hier";>hier(7)</a>
   - layout of filesystems.
-  <li><a href="http://man.openbsd.org/man";>man(1)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/man";>man(1)</a>
   - display the manual pages.
-  <li><a href="http://man.openbsd.org/adduser";>adduser(8)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/adduser";>adduser(8)</a>
   - add new users.
-  <li><a href="http://man.openbsd.org/reboot";>reboot(8), halt(8)</a> and
-  <a href="http://man.openbsd.org/shutdown";>shutdown(8)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/reboot";>reboot(8), 
halt(8)</a> and
+  <a href="http://man.openbsd.org/OpenBSD-6.0/shutdown";>shutdown(8)</a>
   - stop and restart the system.
-  <li><a href="http://man.openbsd.org/dmesg";>dmesg(8)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/dmesg";>dmesg(8)</a>
   - redisplay the kernel boot messages.
-  <li><a href="http://man.openbsd.org/doas";>doas(1)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/doas";>doas(1)</a>
   - don't log in as root, but run commands as root.
-  <li><a href="http://man.openbsd.org/tmux";>tmux(1)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/tmux";>tmux(1)</a>
   - terminal multiplexer.
-  <li><a href="http://man.openbsd.org/ifconfig";>ifconfig(8)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/ifconfig";>ifconfig(8)</a>
   - configure network interface parameters.
-  <li><a href="http://man.openbsd.org/login.conf";>login.conf(5)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/login.conf";>login.conf(5)</a>
   - format of the login class configuration file.
-  <li><a href="http://man.openbsd.org/sendbug";>sendbug(1)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/sendbug";>sendbug(1)</a>
   - report a bug you've found.
 </ul>
 
@@ -440,10 +440,10 @@ Replace <tt>ps</tt> with <tt>pdf</tt> if
 <h3>What are info files?</h3>
 
 Some of the documentation for OpenBSD comes in the form of
-<a href="http://man.openbsd.org/info";>info(1)</a> files.
+<a href="http://man.openbsd.org/OpenBSD-6.0/info";>info(1)</a> files.
 This is an alternative form of documentation provided by GNU.
 For example, to view information about the GNU compiler,
-<a href="http://man.openbsd.org/gcc";>gcc(1)</a>, type:
+<a href="http://man.openbsd.org/OpenBSD-6.0/gcc";>gcc(1)</a>, type:
 
 <blockquote><pre>
 $ <b>info gcc</b>
@@ -453,7 +453,7 @@ After using info, you will really apprec
 
 <h3>How do I write my own manual page?</h3>
 
-Consult <a href="http://man.openbsd.org/mdoc";>mdoc(7)</a>.
+Consult <a href="http://man.openbsd.org/OpenBSD-6.0/mdoc";>mdoc(7)</a>.
 
 <h2 id="Bugs">Reporting bugs</h2>
 
@@ -495,14 +495,14 @@ See <a href="../report.html">this page</
 submitting bug reports.
 Include detailed information about what happened, the exact configuration of
 your system, and how to reproduce the problem.
-Please use <a href="http://man.openbsd.org/sendbug";>sendbug(1)</a> to report
+Please use <a href="http://man.openbsd.org/OpenBSD-6.0/sendbug";>sendbug(1)</a> 
to report
 your problems whenever possible, otherwise please include at least the
-<a href="http://man.openbsd.org/dmesg";>dmesg(8)</a> output of your system.
-The <a href="http://man.openbsd.org/sendbug";>sendbug(1)</a> command requires
+<a href="http://man.openbsd.org/OpenBSD-6.0/dmesg";>dmesg(8)</a> output of your 
system.
+The <a href="http://man.openbsd.org/OpenBSD-6.0/sendbug";>sendbug(1)</a> 
command requires
 that your system be able to send email.
 
 <p>
-The OpenBSD mail server uses <a 
href="http://man.openbsd.org/spamd";>spamd(8)</a>
+The OpenBSD mail server uses <a 
href="http://man.openbsd.org/OpenBSD-6.0/spamd";>spamd(8)</a>
 for greylisting, so it may take half an hour or so before the mail server
 accepts your bug report.
 Please be patient.
@@ -541,7 +541,7 @@ Unix variants.
       Some Unix-like operating systems mix System V and BSD characteristics.
       A common place where this causes confusion is the
       <a href="faq10.html#rc">startup scripts</a>.
-      OpenBSD uses the <a href="http://man.openbsd.org/rc";>rc(8)</a> system.
+      OpenBSD uses the <a 
href="http://man.openbsd.org/OpenBSD-6.0/rc";>rc(8)</a> system.
 
   <li>OpenBSD is a complete system, intended to be kept in sync.
       It is not a kernel plus utilities that can be upgraded separately from
@@ -577,12 +577,12 @@ Unix variants.
 
   <li>OpenBSD comes with <a href="pf/index.html">Packet Filter (PF)</a>.
       This means that Network Address Translation, queuing, and filtering are
-      handled through <a href="http://man.openbsd.org/pfctl";>pfctl(8)</a>,
-      <a href="http://man.openbsd.org/pf";>pf(4)</a> and
-      <a href="http://man.openbsd.org/pf.conf";>pf.conf(5)</a>.
+      handled through <a 
href="http://man.openbsd.org/OpenBSD-6.0/pfctl";>pfctl(8)</a>,
+      <a href="http://man.openbsd.org/OpenBSD-6.0/pf";>pf(4)</a> and
+      <a href="http://man.openbsd.org/OpenBSD-6.0/pf.conf";>pf.conf(5)</a>.
 
   <li>OpenBSD's default shell is
-      <a href="http://man.openbsd.org/ksh";>ksh(1)</a>, which is based on the
+      <a href="http://man.openbsd.org/OpenBSD-6.0/ksh";>ksh(1)</a>, which is 
based on the
       <a href="http://web.cs.mun.ca/~michael/pdksh/";>public domain Korn
       shell</a>.
       Shells such as bash and many others can be added from
Index: faq10.html
===================================================================
RCS file: /cvs/www/faq/faq10.html,v
retrieving revision 1.253
diff -u -p -r1.253 faq10.html
--- faq10.html  2 Oct 2016 21:19:04 -0000       1.253
+++ faq10.html  6 Dec 2016 18:31:28 -0000
@@ -50,14 +50,14 @@
 <h2 id="DupFS">Duplicating filesystems</h2>
 
 To duplicate everything under directory <tt>/SRC</tt> to directory 
<tt>/DST</tt>
-with <a href="http://man.openbsd.org/dump";>dump(8)</a> and
-<a href="http://man.openbsd.org/restore";>restore(8)</a>, do:
+with <a href="http://man.openbsd.org/OpenBSD-6.0/dump";>dump(8)</a> and
+<a href="http://man.openbsd.org/OpenBSD-6.0/restore";>restore(8)</a>, do:
 
 <blockquote><pre>
 # <b>cd /SRC && dump 0f - . | (cd /DST && restore -rf - )</b>
 </pre></blockquote>
 
-or use <a href="http://man.openbsd.org/tar";>tar(1)</a>:
+or use <a href="http://man.openbsd.org/OpenBSD-6.0/tar";>tar(1)</a>:
 
 <blockquote><pre>
 # <b>cd /SRC && tar cf - . | (cd /DST && tar xpf - )</b>
@@ -65,12 +65,12 @@ or use <a href="http://man.openbsd.org/t
 
 <h2 id="rc">The rc system startup script</h2>
 
-OpenBSD uses the <a href="http://man.openbsd.org/rc";>rc(8)</a> startup system.
+OpenBSD uses the <a href="http://man.openbsd.org/OpenBSD-6.0/rc";>rc(8)</a> 
startup system.
 Its man page contains a good overview and explains the various scripts and 
files
 involved.
 If you wish to enable or disable daemons, use
-<a href="http://man.openbsd.org/rcctl";>rcctl(8)</a> to manage your
-<a href="http://man.openbsd.org/rc.conf";>rc.conf.local(8)</a> file, as 
described
+<a href="http://man.openbsd.org/OpenBSD-6.0/rcctl";>rcctl(8)</a> to manage your
+<a href="http://man.openbsd.org/OpenBSD-6.0/rc.conf";>rc.conf.local(8)</a> 
file, as described
 below.
 
 <h3>Starting daemons and services that come with OpenBSD</h3>
@@ -84,20 +84,20 @@ You'll see lines similar to this:
 httpd_flags=NO
 </pre></blockquote>
 
-This shows that <a href="http://man.openbsd.org/httpd";>httpd(8)</a> is not to
-be started from <a href="http://man.openbsd.org/rc";>rc(8)</a> at boot time.
+This shows that <a 
href="http://man.openbsd.org/OpenBSD-6.0/httpd";>httpd(8)</a> is not to
+be started from <a href="http://man.openbsd.org/OpenBSD-6.0/rc";>rc(8)</a> at 
boot time.
 Each line has a comment showing you the flags for common usage of that daemon
 or service.
 
 <p>
-Do not alter <a href="http://man.openbsd.org/rc.conf";>rc.conf(8)</a> directly.
-Instead, use the <a href="http://man.openbsd.org/rcctl";>rcctl(8)</a> utility
+Do not alter <a 
href="http://man.openbsd.org/OpenBSD-6.0/rc.conf";>rc.conf(8)</a> directly.
+Instead, use the <a 
href="http://man.openbsd.org/OpenBSD-6.0/rcctl";>rcctl(8)</a> utility
 to maintain the <tt>/etc/rc.conf.local</tt> file.
 This makes future upgrades easier -- all the changes are in the one file that
 isn't touched during upgrade.
 
 <p>
-For example, to start the <a href="http://man.openbsd.org/apmd";>apmd(8)</a>
+For example, to start the <a 
href="http://man.openbsd.org/OpenBSD-6.0/apmd";>apmd(8)</a>
 daemon for CPU scaling, you might do:
 
 <blockquote><pre>
@@ -131,7 +131,7 @@ You will be able to see any errors on bo
 <h3>The <tt>/etc/rc.d</tt> directory</h3>
 
 OpenBSD's system daemons ("services") are started, stopped and controlled by
-<a href="http://man.openbsd.org/rc.d";>rc.d(8)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/rc.d";>rc.d(8)</a>.
 All system daemons are handled by these scripts, and most add-on
 <a href="faq15.html">packages</a> are as well.
 
@@ -148,7 +148,7 @@ variable to start on boot.
 The starting of system scripts is determined by entries in the
 <tt>/etc/rc.conf.local</tt> file.
 For example, <tt>/etc/rc.d/httpd</tt> does not start
-<a href="http://man.openbsd.org/httpd";>httpd(8)</a> unless 
<tt>/etc/rc.conf</tt>
+<a href="http://man.openbsd.org/OpenBSD-6.0/httpd";>httpd(8)</a> unless 
<tt>/etc/rc.conf</tt>
 or <tt>/etc/rc.conf.local</tt> contains a line defining the 
<tt>httpd_flags</tt>
 variable.
 
@@ -156,7 +156,7 @@ variable.
 Note that rather than having each script in rc.d managing the entire startup,
 shutdown, reload, restart, and check operations, most rc.d scripts can be
 reduced to specifying very few variables, and invoking the
-<a href="http://man.openbsd.org/rc.subr";>rc.subr(8)</a> script, which manages
+<a href="http://man.openbsd.org/OpenBSD-6.0/rc.subr";>rc.subr(8)</a> script, 
which manages
 most of the standard way of doing these tasks.
 
 <p>
@@ -180,7 +180,7 @@ and adding the daemon name to the <tt>pk
 
 One challenge system administrators face is the contradictory requirement
 of multiple people managing machines using logins that shouldn't be shared.
-The <a href="http://man.openbsd.org/doas";>doas(1)</a> tool can solve this
+The <a href="http://man.openbsd.org/OpenBSD-6.0/doas";>doas(1)</a> tool can 
solve this
 problem by permitting a certain subset of users to run predetermined commands
 as another user.
 Regular users can run administrative commands, only needing to authenticate
@@ -189,13 +189,13 @@ When using doas, all commands are logged
 
 <p>
 For example, if appropriately configured, the following command would display
-root's <a href="http://man.openbsd.org/crontab.5";>crontab(5)</a> file:
+root's <a href="http://man.openbsd.org/OpenBSD-6.0/crontab.5";>crontab(5)</a> 
file:
 
 <blockquote><pre>
 $ <b>doas crontab -l -u root</b>
 </pre></blockquote>
 
-Check the <a href="http://man.openbsd.org/doas.conf";>doas.conf(5)</a> manual
+Check the <a 
href="http://man.openbsd.org/OpenBSD-6.0/doas.conf";>doas.conf(5)</a> manual
 for configuration examples.
 
 <p>
@@ -208,25 +208,25 @@ as a <a href="faq15.html">package</a>. 
 OpenBSD offers several tools for managing users and groups on your system:
 
 <ul>
-  <li><a href="http://man.openbsd.org/adduser";>adduser(8)</a> and
-    <a href="http://man.openbsd.org/rmuser";>rmuser(8)</a> run in a
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/adduser";>adduser(8)</a> and
+    <a href="http://man.openbsd.org/OpenBSD-6.0/rmuser";>rmuser(8)</a> run in a
     self-explanatory interactive mode when invoked without any arguments.
-  <li>The <a href="http://man.openbsd.org/user";>user(8)</a> and
-    <a href="http://man.openbsd.org/group.8";>group(8)</a> utilities.
+  <li>The <a href="http://man.openbsd.org/OpenBSD-6.0/user";>user(8)</a> and
+    <a href="http://man.openbsd.org/OpenBSD-6.0/group.8";>group(8)</a> 
utilities.
 </ul>
 
 <h2 id="vipw">Editing the password file</h2>
 
 The main password file is <tt>/etc/master.passwd</tt>, which is only readable
 by root.
-The <a href="http://man.openbsd.org/pwd_mkdb";>pwd_mkdb(8)</a> utility generates
+The <a href="http://man.openbsd.org/OpenBSD-6.0/pwd_mkdb";>pwd_mkdb(8)</a> 
utility generates
 the publicly readable <tt>/etc/passwd</tt> file and the password databases
 <tt>/etc/pwd.db</tt> and <tt>/etc/spwd.db</tt> from 
<tt>/etc/master.passwd</tt>.
 The file format is described in
-<a href="http://man.openbsd.org/passwd.5";>passwd(5)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/passwd.5";>passwd(5)</a>.
 
 <p>
-Always use <a href="http://man.openbsd.org/vipw";>vipw(8)</a> to edit your
+Always use <a href="http://man.openbsd.org/OpenBSD-6.0/vipw";>vipw(8)</a> to 
edit your
 <tt>/etc/master.passwd</tt> file.
 vipw(8) will invoke your $EDITOR to edit a copy of <tt>/etc/master.passwd</tt>.
 After you are done editing, vipw(8) will first sanity check your changes, then
@@ -243,7 +243,7 @@ users and groups.
 
 <p>
 Use the keywords <tt>userquota</tt> and <tt>groupquota</tt> to mark each
-filesystem in <a href="http://man.openbsd.org/fstab";>fstab(5)</a> on which you
+filesystem in <a href="http://man.openbsd.org/OpenBSD-6.0/fstab";>fstab(5)</a> 
on which you
 want to enforce quotas.
 By default, the files <tt>quota.user</tt> and <tt>quota.group</tt> will be
 created at the root of those filesystems.
@@ -254,7 +254,7 @@ Here is an example <tt>/etc/fstab</tt> l
 </pre></blockquote>
 
 To set the users' quotas, use
-<a href="http://man.openbsd.org/edquota";>edquota(8)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/edquota";>edquota(8)</a>.
 For example, issue
 
 <blockquote><pre>
@@ -280,7 +280,7 @@ After the grace period is over, the soft
 This usually results in an allocation failure.
 
 <p>
-Use <a href="http://man.openbsd.org/quotaon";>quotaon(8)</a> to enable quotas:
+Use <a href="http://man.openbsd.org/OpenBSD-6.0/quotaon";>quotaon(8)</a> to 
enable quotas:
 
 <blockquote><pre>
 # <b>quotaon -a</b>
@@ -288,7 +288,7 @@ Use <a href="http://man.openbsd.org/quot
 
 This will scan through fstab(5) and enable quotas on the filesystems with quota
 options.
-View quota statistics with <a href="http://man.openbsd.org/quota";>quota(1)</a>.
+View quota statistics with <a 
href="http://man.openbsd.org/OpenBSD-6.0/quota";>quota(1)</a>.
 
 <h2 id="SKey">Using S/Key</h2>
 
@@ -296,9 +296,9 @@ S/Key is a "one-time password" authentic
 It generates a sequence of one-time (single use) passwords from a user's
 secret passphrase along with a challenge received from the server, by means of 
a
 hash function:
-<a href="http://man.openbsd.org/md5";>md5</a>,
-<a href="http://man.openbsd.org/sha1";>sha1</a> or
-<a href="http://man.openbsd.org/rmd160";>rmd160</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/md5";>md5</a>,
+<a href="http://man.openbsd.org/OpenBSD-6.0/sha1";>sha1</a> or
+<a href="http://man.openbsd.org/OpenBSD-6.0/rmd160";>rmd160</a>.
 
 <blockquote>
 <b>WARNING:</b>
@@ -321,7 +321,7 @@ If this directory doesn't exist, have th
 </pre></blockquote>
 
 Then use
-<a href="http://man.openbsd.org/skeyinit";>skeyinit(1)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/skeyinit";>skeyinit(1)</a>
 to initialize your S/Key.
 You will first be prompted for your login password, then you will be asked for
 your S/Key secret passphrase, which must be at least 10 characters long:
@@ -342,14 +342,14 @@ Next login password: HAUL BUS JAKE DING 
 
 Notice the information in the last two lines.
 The program used to create your S/Key password is
-<a href="http://man.openbsd.org/otp-md5";>otp-md5(1)</a>,
+<a href="http://man.openbsd.org/OpenBSD-6.0/otp-md5";>otp-md5(1)</a>,
 the sequence number is <tt>100</tt> and the secret key is <tt>oshi45820</tt>.
 The six small words <tt>HAUL BUS JAKE DING HOT HOG</tt> constitute the S/Key
 password with sequence number <tt>100</tt>.
 
 <h3>Generating S/Key passwords</h3>
 To generate the S/Key password for the next login, use
-<a href="http://man.openbsd.org/skeyinfo";>skeyinfo(1)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/skeyinfo";>skeyinfo(1)</a>
 to find out what command to run:
 
 <blockquote><pre>
@@ -396,8 +396,8 @@ ftp> <b>quit</b>
 </pre></blockquote>
 
 Similarly, for
-<a href="http://man.openbsd.org/ssh";>ssh(1)</a> or
-<a href="http://man.openbsd.org/telnet";>telnet(1)</a>:
+<a href="http://man.openbsd.org/OpenBSD-6.0/ssh";>ssh(1)</a> or
+<a href="http://man.openbsd.org/OpenBSD-6.0/telnet";>telnet(1)</a>:
 
 <blockquote><pre>
 $ <b>ssh -l ericj:skey localhost</b>
@@ -417,19 +417,19 @@ user credentials, group information and 
 Of course, you could use various directory services on OpenBSD.
 But YP is the only one that can be accessed directly using standard
 C-library functions like
-<a href="http://man.openbsd.org/getpwent";>getpwent(3)</a>,
-<a href="http://man.openbsd.org/getgrent";>getgrent(3)</a>,
-<a href="http://man.openbsd.org/gethostbyname";>gethostbyname(3)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/getpwent";>getpwent(3)</a>,
+<a href="http://man.openbsd.org/OpenBSD-6.0/getgrent";>getgrent(3)</a>,
+<a href="http://man.openbsd.org/OpenBSD-6.0/gethostbyname";>gethostbyname(3)</a>
 and so on.
 Thus, if you keep your data in a YP database, you do not need to copy it to
 local configuration files like
-<a href="http://man.openbsd.org/master.passwd";>master.passwd(5)</a> before you
+<a 
href="http://man.openbsd.org/OpenBSD-6.0/master.passwd";>master.passwd(5)</a> 
before you
 can use it, for example to authenticate system users.
 
 <p>
 YP is a directory service compatible with Sun Microsystems NIS
 (Network Information System).
-See <a href="http://man.openbsd.org/yp";>yp(8)</a> for an overview of the
+See <a href="http://man.openbsd.org/OpenBSD-6.0/yp";>yp(8)</a> for an overview 
of the
 available manual pages.
 Be careful, some operating systems contain directory services bearing similar
 names but all the same being incompatible, for example NIS+.
@@ -439,14 +439,14 @@ To use other directory services except Y
 configuration files from the directory, or you need a YP frontend to
 the directory.
 For example, you can use the <tt>sysutils/login_ldap</tt> port when you choose
-the former, while the <a href="http://man.openbsd.org/ypldap";>ypldap(8)</a>
+the former, while the <a 
href="http://man.openbsd.org/OpenBSD-6.0/ypldap";>ypldap(8)</a>
 daemon provides the latter.
 
 <p>
 For some applications, simply synchronizing a small number of configuration
 files among a group of machines using tools like
-<a href="http://man.openbsd.org/cron";>cron(8)</a>,
-<a href="http://man.openbsd.org/scp";>scp(1)</a> or
+<a href="http://man.openbsd.org/OpenBSD-6.0/cron";>cron(8)</a>,
+<a href="http://man.openbsd.org/OpenBSD-6.0/scp";>scp(1)</a> or
 <tt>rsync</tt> (available from ports) constitutes an easy and robust 
alternative
 to a full-blown directory service.
 
@@ -486,9 +486,9 @@ an option.
     name, so your choice might be restricted in a network including such hosts.
 
     <p>
-    Use the <a href="http://man.openbsd.org/domainname";>domainname(1)</a>
+    Use the <a 
href="http://man.openbsd.org/OpenBSD-6.0/domainname";>domainname(1)</a>
     utility to set the domain name, and put it into the
-    <a href="http://man.openbsd.org/defaultdomain";>defaultdomain(5)</a>
+    <a 
href="http://man.openbsd.org/OpenBSD-6.0/defaultdomain";>defaultdomain(5)</a>
     file to have it automatically set at system startup time.
 
     <blockquote><pre>
@@ -505,7 +505,7 @@ an option.
 
     At this point, it is not necessary to specify slave servers yet.
     To add slave servers, you can rerun
-    <a href="http://man.openbsd.org/ypinit";>ypinit(8)</a>
+    <a href="http://man.openbsd.org/OpenBSD-6.0/ypinit";>ypinit(8)</a>
     later, using the <tt>-u</tt> option.
 
     Setting up at least one slave server for each domain is useful to avoid
@@ -526,8 +526,8 @@ an option.
     The only inconvenience caused by changing the source directory is that you
     will not be able to add, remove and modify users and groups in the
     YP domain using utilities like
-    <a href="http://man.openbsd.org/user";>user(8)</a> and
-    <a href="http://man.openbsd.org/group";>group(8)</a>.
+    <a href="http://man.openbsd.org/OpenBSD-6.0/user";>user(8)</a> and
+    <a href="http://man.openbsd.org/OpenBSD-6.0/group";>group(8)</a>.
     Instead, you will have to edit the configuration files with a text editor.
 
     <p>
@@ -542,7 +542,7 @@ an option.
   <li>
     Consider customizing other variables in
     <tt>/var/yp/`domainname`/Makefile</tt>.
-    See <a href="http://man.openbsd.org/Makefile.yp";>Makefile.yp(8)</a>
+    See <a 
href="http://man.openbsd.org/OpenBSD-6.0/Makefile.yp";>Makefile.yp(8)</a>
     for details.
 
     <p>
@@ -572,12 +572,12 @@ an option.
   <li>
     Create the source directory and populate it with the configuration files
     you need.
-    See <a href="http://man.openbsd.org/Makefile.yp";>Makefile.yp(8)</a>
+    See <a 
href="http://man.openbsd.org/OpenBSD-6.0/Makefile.yp";>Makefile.yp(8)</a>
     to learn which YP maps require which source files.
     For the format of the individual configuration files, refer to
-    <a href="http://man.openbsd.org/passwd.5";>passwd(5)</a>,
-    <a href="http://man.openbsd.org/group.5";>group(5)</a>,
-    <a href="http://man.openbsd.org/hosts";>hosts(5)</a>
+    <a href="http://man.openbsd.org/OpenBSD-6.0/passwd.5";>passwd(5)</a>,
+    <a href="http://man.openbsd.org/OpenBSD-6.0/group.5";>group(5)</a>,
+    <a href="http://man.openbsd.org/OpenBSD-6.0/hosts";>hosts(5)</a>
     and so on, and look at the examples in <tt>/etc</tt>.
 
   <li>
@@ -589,14 +589,14 @@ an option.
     </pre></blockquote>
 
     Do not worry about error messages from
-    <a href="http://man.openbsd.org/yppush";>yppush(8)</a> right now.
+    <a href="http://man.openbsd.org/OpenBSD-6.0/yppush";>yppush(8)</a> right 
now.
     The YP server is not yet running.
 
   <li>
-    YP uses <a href="http://man.openbsd.org/rpc";>rpc(3)</a>
+    YP uses <a href="http://man.openbsd.org/OpenBSD-6.0/rpc";>rpc(3)</a>
     (remote procedure calls) to communicate with clients, so it is necessary
-    to enable <a href="http://man.openbsd.org/portmap";>portmap(8)</a>.
-    To do so, use <a href="http://man.openbsd.org/rcctl";>rcctl(8)</a>.
+    to enable <a 
href="http://man.openbsd.org/OpenBSD-6.0/portmap";>portmap(8)</a>.
+    To do so, use <a 
href="http://man.openbsd.org/OpenBSD-6.0/rcctl";>rcctl(8)</a>.
 
     <blockquote><pre>
     # <b>rcctl enable portmap</b>
@@ -605,8 +605,8 @@ an option.
 
   <li>
     Consider using either the
-    <a href="http://man.openbsd.org/securenet";>securenet(5)</a> or the
-    <a href="http://man.openbsd.org/ypserv.acl";>ypserv.acl(5)</a>
+    <a href="http://man.openbsd.org/OpenBSD-6.0/securenet";>securenet(5)</a> or 
the
+    <a href="http://man.openbsd.org/OpenBSD-6.0/ypserv.acl";>ypserv.acl(5)</a>
     security feature of the YP server daemon.
     But be aware that both of these only provide IP based access control.
     Thus, they only help as long as potential attackers have neither physical
@@ -637,7 +637,7 @@ an option.
   <li>
     If you wish to allow users to change their passwords from client machines,
     then you must enable
-    <a href="http://man.openbsd.org/yppasswdd";>yppasswdd(8)</a>:
+    <a href="http://man.openbsd.org/OpenBSD-6.0/yppasswdd";>yppasswdd(8)</a>:
 
     <blockquote><pre>
     # <b>rcctl set yppasswdd flags -d /etc/yp/src/puffynet</b>
@@ -695,7 +695,7 @@ from the YP server, but that data will n
 
   <li>
     The YP client daemon is called
-    <a href="http://man.openbsd.org/ypbind";>ypbind(8)</a>.
+    <a href="http://man.openbsd.org/OpenBSD-6.0/ypbind";>ypbind(8)</a>.
     Starting it manually will create the directory <tt>/var/yp/binding</tt>,
     such that it will be automatically restarted at boot time.
 
@@ -705,7 +705,7 @@ from the YP server, but that data will n
 
   <li>
     If all went well you should be able to query the YP server using
-    <a href="http://man.openbsd.org/ypcat";>ypcat(1)</a>
+    <a href="http://man.openbsd.org/OpenBSD-6.0/ypcat";>ypcat(1)</a>
     and see your passwd map returned.
 
     <blockquote><pre>
@@ -715,8 +715,8 @@ from the YP server, but that data will n
     </pre></blockquote>
 
     Other useful tools for debugging your YP setup include
-    <a href="http://man.openbsd.org/ypmatch";>ypmatch(1)</a> and
-    <a href="http://man.openbsd.org/yptest";>yptest(8)</a>.
+    <a href="http://man.openbsd.org/OpenBSD-6.0/ypmatch";>ypmatch(1)</a> and
+    <a href="http://man.openbsd.org/OpenBSD-6.0/yptest";>yptest(8)</a>.
 </ol>
 
 The second part of configuring a YP client involves editing local configuration
@@ -730,7 +730,7 @@ administrator.
 
 <p>
 For a list of standard YP maps and their standard usage, see
-<a href="http://man.openbsd.org/Makefile.yp";>Makefile.yp(8)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/Makefile.yp";>Makefile.yp(8)</a>.
 The most common use cases include:
 
 <ul>
@@ -745,9 +745,9 @@ The most common use cases include:
     </pre></blockquote>
 
     For details on selective inclusion and exclusion of user accounts, see
-    <a href="http://man.openbsd.org/passwd.5";>passwd(5)</a>.
+    <a href="http://man.openbsd.org/OpenBSD-6.0/passwd.5";>passwd(5)</a>.
     To test whether inclusion actually works, use the
-    <a href="http://man.openbsd.org/id";>id(1)</a> utility.
+    <a href="http://man.openbsd.org/OpenBSD-6.0/id";>id(1)</a> utility.
 
   <li>
     If you want to include all groups from the YP domain, append the default YP
@@ -758,7 +758,7 @@ The most common use cases include:
     </pre></blockquote>
 
     For details on selective group inclusion, see
-    <a href="http://man.openbsd.org/group";>group(5)</a>.
+    <a href="http://man.openbsd.org/OpenBSD-6.0/group";>group(5)</a>.
 </ul>
 
 <h2 id="Patches">Keeping OpenBSD up to date</h2>
@@ -805,7 +805,7 @@ there are two options:
     <br>
     Binary packages for -current snapshots are rebuilt on a regular basis,
     and these new packages will include any security fixes that were committed.
-    Simply call <a href="http://man.openbsd.org/pkg_add";>pkg_add(1)</a> with
+    Simply call <a 
href="http://man.openbsd.org/OpenBSD-6.0/pkg_add";>pkg_add(1)</a> with
     the <tt>-u</tt> flag after <a href="faq15.html#Easy">picking a mirror</a>
     to get the new files.
     Remember to use the <tt>/snapshots/</tt> directory!
@@ -836,9 +836,9 @@ Installing the new binaries will be the 
 
 <p>
 For our example here, we will look at patch 011 for OpenBSD 5.6, dealing with
-<a href="http://man.openbsd.org/pppoe";>pppoe(4)</a> connections.
+<a href="http://man.openbsd.org/OpenBSD-6.0/pppoe";>pppoe(4)</a> connections.
 Each patch is cryptographically signed with the
-<a href="http://man.openbsd.org/signify";>signify(1)</a> tool and contains
+<a href="http://man.openbsd.org/OpenBSD-6.0/signify";>signify(1)</a> tool and 
contains
 instructions on how to apply it properly.
 We will assume you have put this patch into your current working directory.
 
Index: faq11.html
===================================================================
RCS file: /cvs/www/faq/faq11.html,v
retrieving revision 1.129
diff -u -p -r1.129 faq11.html
--- faq11.html  3 Sep 2016 13:53:40 -0000       1.129
+++ faq11.html  6 Dec 2016 18:31:28 -0000
@@ -46,10 +46,10 @@ manager to present a user interface.
 Most of the "personality" one will feel from X will be due to the
 window manager, rather than X itself.
 OpenBSD ships with the
-<a href="http://man.openbsd.org/cwm";>cwm(1)</a>,
-<a href="http://man.openbsd.org/fvwm";>fvwm(1)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/cwm";>cwm(1)</a>,
+<a href="http://man.openbsd.org/OpenBSD-6.0/fvwm";>fvwm(1)</a>
 and
-<a href="http://man.openbsd.org/twm";>twm(1)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/twm";>twm(1)</a>
 window managers, although you may wish to use any of the others that are
 in <a href="faq15.html">ports and packages</a>.
 Search for "window manager" for a list of the many available options.
@@ -93,7 +93,7 @@ information in <tt>/usr/X11R6/README</tt
 
 <p>
 Several platforms require the
-<a href="http://man.openbsd.org/xf86";>xf86(4)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/xf86";>xf86(4)</a>
 X aperture driver, which provides access to the memory and I/O
 ports of a VGA board and the PCI configuration registers required
 by the X servers.
@@ -118,12 +118,12 @@ There are two common ways to run X:
 <h3>On Demand:</h3>
 
 Log in to a console as normal, then run
-<a href="http://man.openbsd.org/startx";>startx(1)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/startx";>startx(1)</a>.
 
 <h3>Boot directly into X:</h3>
 
 This is done using
-<a href="http://man.openbsd.org/xdm";>xdm(1)</a>,
+<a href="http://man.openbsd.org/OpenBSD-6.0/xdm";>xdm(1)</a>,
 the X Display Manager.
 xdm(1) is started as root, normally by <a href="faq10.html#rc">rc(8)</a>,
 and presents a login prompt.
@@ -139,13 +139,13 @@ your password</a>, and edit out the <tt>
 
 <p>
 On some platforms, you will need to disable the console
-<a href="http://man.openbsd.org/getty";>getty(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/getty";>getty(8)</a>
 to use xdm(1). This is not needed on amd64, i386 or macppc.
 
 <h3>X won't start, I get lots of error messages</h3>
 
 A common cause for X problems is the machdep.allowaperture
-<a href="http://man.openbsd.org/sysctl";>sysctl(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/sysctl";>sysctl(8)</a>
 setting.
 Since this defaults to being disabled on OpenBSD, this is a fairly likely
 cause of the problem.
@@ -154,7 +154,7 @@ cause of the problem.
 You need to edit <tt>/etc/sysctl.conf</tt> and set
 <b>machdep.allowaperture=2</b> (or <b>1</b>, depending upon your platform).
 This will allow X to access the aperture driver,
-<a href="http://man.openbsd.org/xf86";>xf86(4)</a>,
+<a href="http://man.openbsd.org/OpenBSD-6.0/xf86";>xf86(4)</a>,
 upon the next reboot.
 It can not be made available after boot.
 This can also be set during install if you answer "Y" when you are asked
@@ -182,13 +182,13 @@ environment), or change the applications
 
 <p>
 The default window manager in OpenBSD is
-<a href="http://man.openbsd.org/fvwm";>fvwm(1)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/fvwm";>fvwm(1)</a>.
 Fvwm is a good, general purpose window manager, but it is hardly your
 only choice; it isn't even the only window manager included with OpenBSD
 (see
-<a href="http://man.openbsd.org/cwm";>cwm(1)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/cwm";>cwm(1)</a>
 and
-<a href="http://man.openbsd.org/twm";>twm(1)</a>).
+<a href="http://man.openbsd.org/OpenBSD-6.0/twm";>twm(1)</a>).
 A large number of window managers are also available through
 <a href="faq15.html">packages and ports</a>.
 
@@ -237,14 +237,14 @@ cwm
 </pre></blockquote>
 
 That will start the
-<a href="http://man.openbsd.org/xconsole";>xconsole(1)</a>,
+<a href="http://man.openbsd.org/OpenBSD-6.0/xconsole";>xconsole(1)</a>,
 which provides a copy of any text that the kernel would have sent to the
 console (which is now covered by the graphical screen), an analog clock,
-<a href="http://man.openbsd.org/oclock";>oclock(1)</a>,
+<a href="http://man.openbsd.org/OpenBSD-6.0/oclock";>oclock(1)</a>,
 and sets the background to a solid grey background with
-<a href="http://man.openbsd.org/xsetroot";>xsetroot(1)</a>,
+<a href="http://man.openbsd.org/OpenBSD-6.0/xsetroot";>xsetroot(1)</a>,
 all before invoking the
-<a href="http://man.openbsd.org/cwm";>cwm(1)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/cwm";>cwm(1)</a>
 window manager.
 Note that only the window manager is not "backgrounded" with an "&amp;"
 character.
@@ -258,7 +258,7 @@ This file can provide you some additiona
 
 <h3>xdm(1) startup</h3>
 
-<a href="http://man.openbsd.org/xdm";>xdm(1)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/xdm";>xdm(1)</a>
 is usually started by the <a href="faq10.html#rc">system startup
 scripts</a>, but for testing purposes (recommended, until you know your
 have your X config right!), it can be run as root.
Index: faq13.html
===================================================================
RCS file: /cvs/www/faq/faq13.html,v
retrieving revision 1.196
diff -u -p -r1.196 faq13.html
--- faq13.html  25 Oct 2016 15:13:48 -0000      1.196
+++ faq13.html  6 Dec 2016 18:31:30 -0000
@@ -66,7 +66,7 @@ PERFORMANCE OF THIS DOCUMENTATION
 
 All supported audio drivers are already included in the GENERIC kernel, so
 there is no need for extra configuration or installation of drivers.
-Running <a href="http://man.openbsd.org/mixerctl";>mixerctl(1)</a> with no
+Running <a href="http://man.openbsd.org/OpenBSD-6.0/mixerctl";>mixerctl(1)</a> 
with no
 arguments will list the device's mixer controls and current settings.
 
 <blockquote><pre>
@@ -138,7 +138,7 @@ outputs.headphones.mute=off
 
 To change the default audio output device, for example to use an external
 DAC rather than your motherboard's onboard audio, just change
-<a href="http://man.openbsd.org/sndiod";>sndiod(8)</a>'s startup flags to
+<a href="http://man.openbsd.org/OpenBSD-6.0/sndiod";>sndiod(8)</a>'s startup 
flags to
 use that device:
 
 <blockquote><pre>
@@ -150,7 +150,7 @@ This would make the second audio device 
 
 <h2 id="playaudio">Playing different kinds of audio</h2>
 
-OpenBSD comes with <a href="http://man.openbsd.org/aucat";>aucat(1)</a>,
+OpenBSD comes with <a 
href="http://man.openbsd.org/OpenBSD-6.0/aucat";>aucat(1)</a>,
 a program for recording and playing WAV, AIFF and AU files.
 The following example will play a WAV file.
 
@@ -175,7 +175,7 @@ To play an audio CD using the analog out
   <li>Connect the audio output at the back side of the drive to your audio 
card.
 </ul>
 
-Use the <a href="http://man.openbsd.org/cdio";>cdio(1)</a> utility to play a CD:
+Use the <a href="http://man.openbsd.org/OpenBSD-6.0/cdio";>cdio(1)</a> utility 
to play a CD:
 
 <blockquote><pre>
 $ <b>cdio play</b>
@@ -211,7 +211,7 @@ Many GUI CD players are in the <tt>audio
 
 <h2 id="recordaudio">Recording audio samples</h2>
 
-<a href="http://man.openbsd.org/aucat";>aucat(1)</a> comes with OpenBSD and
+<a href="http://man.openbsd.org/OpenBSD-6.0/aucat";>aucat(1)</a> comes with 
OpenBSD and
 can be used for recording.
 
 <blockquote><pre>
@@ -237,7 +237,7 @@ not what was expected, the mixer probabl
 Make sure that you select the right device to record from and that the
 source is unmuted.
 You can set the necessary parameters using
-<a href="http://man.openbsd.org/mixerctl";>mixerctl(1)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/mixerctl";>mixerctl(1)</a>.
 For example:
 
 <blockquote><pre>
@@ -264,7 +264,7 @@ This feature can be useful for screencas
 
 <p>
 Create the monitor sub-device <tt>mon</tt> for
-<a href="http://man.openbsd.org/sndiod";>sndiod(8)</a> by using:
+<a href="http://man.openbsd.org/OpenBSD-6.0/sndiod";>sndiod(8)</a> by using:
 
 <blockquote><pre>
 # <b>rcctl set sndiod flags -s default -m play,mon -s mon</b>
@@ -459,7 +459,7 @@ midi1 at umidi1: &lt;USB MIDI I/F&gt;
 </pre></blockquote>
 
 It shows three MIDI ports, known by
-<a href="http://man.openbsd.org/sndio";>sndio(7)</a> as:
+<a href="http://man.openbsd.org/OpenBSD-6.0/sndio";>sndio(7)</a> as:
 
 <ul>
   <li><tt>rmidi/0</tt> - synthesizer connected via USB
@@ -472,7 +472,7 @@ The latter devices are handy for testing
 software layers.
 
 To test your MIDI keyboard, you can use the
-<a href="http://man.openbsd.org/hexdump";>hexdump(1)</a> utility to display
+<a href="http://man.openbsd.org/OpenBSD-6.0/hexdump";>hexdump(1)</a> utility to 
display
 MIDI data you're playing on it:
 
 <blockquote><pre>
@@ -494,7 +494,7 @@ Now you can hear on the synthesizer what
 
 <p>
 The main utility to play standard MIDI files is
-<a href="http://man.openbsd.org/midiplay";>midiplay(1)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/midiplay";>midiplay(1)</a>.
 Playing a standard MIDI file, in this example through the synthesizer is as
 easy as:
 
@@ -502,7 +502,7 @@ easy as:
 $ <b>midiplay -f rmidi/0 file.mid</b>
 </pre></blockquote>
 
-The <a href="http://man.openbsd.org/sndiod";>sndiod(8)</a> server exposes MIDI
+The <a href="http://man.openbsd.org/OpenBSD-6.0/sndiod";>sndiod(8)</a> server 
exposes MIDI
 thru ports, allowing programs to send each other MIDI data.
 For instance, if you have no hardware synthesizer connected, you could
 start a software one (like the audio/fluidsynth port) and then use it as MIDI
@@ -548,7 +548,7 @@ because these tools may need further set
 With these utilities, it is possible to play the DVDs by directly accessing
 the raw device.
 Of course, it is also possible to mount a DVD using
-<a href="http://man.openbsd.org/mount_cd9660";>mount_cd9660(8)</a> and play
+<a href="http://man.openbsd.org/OpenBSD-6.0/mount_cd9660";>mount_cd9660(8)</a> 
and play
 the files directly.
 
 <p>
@@ -572,7 +572,7 @@ configured by the kernel.
 Most SCSI devices are supported.
 SATA, IDE/ATAPI and USB devices are supported through SCSI emulation.
 You can quickly find your device in the output of
-<a href="http://man.openbsd.org/dmesg";>dmesg(8)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/dmesg";>dmesg(8)</a>.
 Just look for lines beginning with "cd."
 For example:
 
@@ -589,7 +589,7 @@ By default, the OpenBSD installer create
 To start using your <tt>cd2</tt> device, you must create the necessary
 device nodes for it.
 The recommended way to do that is using the
-<a href="http://man.openbsd.org/MAKEDEV";>MAKEDEV(8)</a> script.
+<a href="http://man.openbsd.org/OpenBSD-6.0/MAKEDEV";>MAKEDEV(8)</a> script.
 
 <blockquote><pre>
 # <b>cd /dev</b>
@@ -618,7 +618,7 @@ copying files to your hard disk.
 
 First, you will want to create an ISO 9660 filesystem to put on a CD-ROM.
 To do this you can use the
-<a href="http://man.openbsd.org/mkhybrid";>mkhybrid(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/mkhybrid";>mkhybrid(8)</a>
 utility in the base system, or the <tt>mkisofs</tt> utility from the
 <tt>cdrtools</tt> <a href="faq15.html#PkgMgmt">package</a>.
 In the examples below, we will use <tt>mkhybrid</tt>, although <tt>mkisofs</tt>
@@ -664,7 +664,7 @@ After creating the filesystem, you can v
 <a href="faq14.html#MountImage">mounting the ISO 9660 image</a>.
 If all is well, you are now ready to burn the CD-R(W).
 The easiest way to do this is to use the
-<a href="http://man.openbsd.org/cdio";>cdio(1)</a> utility.
+<a href="http://man.openbsd.org/OpenBSD-6.0/cdio";>cdio(1)</a> utility.
 
 <p>
 If you are using multi-write media such as CD-RW, you will need to blank the
@@ -698,7 +698,7 @@ CD-ROM drive, which in this case is stil
 <h4>Creating audio CDs</h4>
 
 To burn audio CDs, you can again use
-<a href="http://man.openbsd.org/cdio";>cdio(1)</a> with the <tt>tao -a</tt>
+<a href="http://man.openbsd.org/OpenBSD-6.0/cdio";>cdio(1)</a> with the <tt>tao 
-a</tt>
 option.
 
 <p>
@@ -906,7 +906,7 @@ which is much slower.
 It means you are somehow not getting enough throughput on whatever bus
 your DVD writer is using.
 In the above example, the USB DVD writer was attached to a machine on which
-the <a href="http://man.openbsd.org/ehci";>ehci(4)</a> driver, used by USB 2.0
+the <a href="http://man.openbsd.org/OpenBSD-6.0/ehci";>ehci(4)</a> driver, used 
by USB 2.0
 controllers, failed to initialize properly.
 As always, you are welcome to provide patches and test results.
 The DVD writer fell back to the slower USB 1.1 interface, which causes
Index: faq14.html
===================================================================
RCS file: /cvs/www/faq/faq14.html,v
retrieving revision 1.337
diff -u -p -r1.337 faq14.html
--- faq14.html  5 Dec 2016 20:09:43 -0000       1.337
+++ faq14.html  6 Dec 2016 18:31:31 -0000
@@ -63,17 +63,17 @@ OpenBSD handles mass storage with two dr
 depending upon the normal command set that kind of device supports:
 
 <ul>
-  <li><a href="http://man.openbsd.org/wd";>wd(4)</a>:
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/wd";>wd(4)</a>:
     IDE-like disks: IDE, SATA, MFM or ESDI disks, or a flash device
     with an appropriate adapter, attached to a
-    <a href="http://man.openbsd.org/wdc";>wdc(4)</a>
+    <a href="http://man.openbsd.org/OpenBSD-6.0/wdc";>wdc(4)</a>
     or
-    <a href="http://man.openbsd.org/pciide";>pciide(4)</a>
+    <a href="http://man.openbsd.org/OpenBSD-6.0/pciide";>pciide(4)</a>
     interface.
-  <li><a href="http://man.openbsd.org/sd";>sd(4)</a>:
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/sd";>sd(4)</a>:
     SCSI-like disks:
     Devices that utilize SCSI commands, USB disks, SATA disks attached to an
-    <a href="http://man.openbsd.org/ahci";>ahci(4)</a>
+    <a href="http://man.openbsd.org/OpenBSD-6.0/ahci";>ahci(4)</a>
     interface, and disk arrays attached to a RAID controller.
 </ul>
 
@@ -105,10 +105,10 @@ two different things in OpenBSD:
 
 <ul>
   <li>
-    <a href="http://man.openbsd.org/disklabel";>disklabel(8)</a>
+    <a href="http://man.openbsd.org/OpenBSD-6.0/disklabel";>disklabel(8)</a>
     partitions, often called filesystem partitions.
   <li>
-    <a href="http://man.openbsd.org/fdisk";>fdisk(8)</a>
+    <a href="http://man.openbsd.org/OpenBSD-6.0/fdisk";>fdisk(8)</a>
     partitions, often called Master Boot Record (MBR) partitions.
 </ul>
 
@@ -145,7 +145,7 @@ and <tt>/dev/rsd0a</tt> for the raw (cha
 Remembering whether a rarely used command needs a block or a character device
 is difficult.
 Therefore, many commands make use of the
-<a href="http://man.openbsd.org/opendev";>opendev(3)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/opendev";>opendev(3)</a>
 function, which automatically expands <tt>sd0</tt> to <tt>/dev/rsd0c</tt> or
 <tt>wd0a</tt> to <tt>/dev/wd0a</tt>, as appropriate.
 
@@ -161,7 +161,7 @@ of other drives until reboot.
 
 Disks can also be identified by Disklabel Unique Identifiers (DUIDs), a
 16 hex digit number, managed by the
-<a href="http://man.openbsd.org/diskmap";>diskmap(4)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/diskmap";>diskmap(4)</a>
 device.
 This number is a random number generated when a disklabel is first created.
 These UIDs are persistent -- if you identify your disks this way,
@@ -175,7 +175,7 @@ to the system, or what kind of interface
 
 <h2 id="fdisk">Using fdisk</h2>
 
-Be sure to check the <a href="http://man.openbsd.org/fdisk";>fdisk(8)</a>
+Be sure to check the <a 
href="http://man.openbsd.org/OpenBSD-6.0/fdisk";>fdisk(8)</a>
 man page.
 
 <p>
@@ -251,7 +251,7 @@ fdisk: 1>
 <h3 id="disklabel.1">What is disklabel?</h3>
 
 First, be sure to read the
-<a href="http://man.openbsd.org/disklabel";>disklabel(8)</a> man page.
+<a href="http://man.openbsd.org/OpenBSD-6.0/disklabel";>disklabel(8)</a> man 
page.
 
 <p>
 The details of setting up disks in OpenBSD varies somewhat between
@@ -272,7 +272,7 @@ geometry and information about the files
 The disklabel is then used by the bootstrap program to access the drive and
 to know where filesystems are contained on the drive.
 You can read more in-depth information about disklabel in the
-<a href="http://man.openbsd.org/disklabel.5";>disklabel(5)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/disklabel.5";>disklabel(5)</a>
 man page.
 
 <p>
@@ -280,7 +280,7 @@ On some platforms, disklabel helps overc
 disk partitioning.
 For example, on i386, you can have four primary partitions.
 With
-<a href="http://man.openbsd.org/disklabel";>disklabel(8)</a>,
+<a href="http://man.openbsd.org/OpenBSD-6.0/disklabel";>disklabel(8)</a>,
 you use one of these primary partitions to store all of your OpenBSD 
partitions,
 and you will still have 3 more partitions available for other OSs.
 
@@ -356,7 +356,7 @@ that you can get your data off.
 
 <p>
 The first tool you need is
-<a href="http://man.openbsd.org/scan_ffs";>scan_ffs(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/scan_ffs";>scan_ffs(8)</a>
 which will look through a disk, and try and find partitions.
 It will also tell you what information it finds about them.
 You can use this information to recreate the disklabel.
@@ -365,36 +365,36 @@ If you just want <tt>/var</tt> back, you
 from that.
 
 <p>
-<a href="http://man.openbsd.org/disklabel";>disklabel(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/disklabel";>disklabel(8)</a>
 will update both the kernel's understanding of the disklabel, and
 then attempt to write the label to disk.
 Therefore, even if the area of the disk containing the disklabel is
 unreadable, you will be able to
-<a href="http://man.openbsd.org/mount";>mount(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/mount";>mount(8)</a>
 it until the next reboot.
 
 <h2 id="BootAmd64">The amd64 boot process</h2>
 
 Details on the amd64 bootstrapping procedures are given in the
-<a href="http://man.openbsd.org/boot_amd64";>boot_amd64(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/boot_amd64";>boot_amd64(8)</a>
 man page.
 There are four key pieces to the boot process:
 
 <ol>
   <li><b>Master Boot Record (MBR) and GUID Partition Table (GPT):</b>
     The
-    <a href="http://man.openbsd.org/fdisk";>fdisk(8)</a>
+    <a href="http://man.openbsd.org/OpenBSD-6.0/fdisk";>fdisk(8)</a>
     man page contains detailed explanations.
   <li><b>Partition Boot Record (PBR):</b>
     The first-stage boot loader
-    <a href="http://man.openbsd.org/biosboot";>biosboot(8)</a>
+    <a href="http://man.openbsd.org/OpenBSD-6.0/biosboot";>biosboot(8)</a>
     occupies the first 512 bytes of the OpenBSD partition of the disk
     and is therefore called the PBR.
     It is installed by
-    <a href="http://man.openbsd.org/installboot";>installboot(8)</a>.
+    <a 
href="http://man.openbsd.org/OpenBSD-6.0/installboot";>installboot(8)</a>.
   <li><b>Second Stage Boot Loader <tt>/boot</tt>:</b>
     The
-    <a href="http://man.openbsd.org/boot";>boot(8)</a>
+    <a href="http://man.openbsd.org/OpenBSD-6.0/boot";>boot(8)</a>
     program is loaded by the PBR and has the task of accessing the OpenBSD
     file system through the machine's BIOS.
     It locates and loads the kernel.
@@ -437,11 +437,11 @@ A large increase is seen in diskwriting 
 <p>
 Enabling soft updates must be done with a mount-time option.
 When mounting a partition with the
-<a href="http://man.openbsd.org/mount";>mount(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/mount";>mount(8)</a>
 utility, you can specify that you wish to have soft updates enabled on
 that partition.
 Below is a sample
-<a href="http://man.openbsd.org/fstab";>fstab(5)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/fstab";>fstab(5)</a>
 entry that has one partition <tt>sd0a</tt> that we wish to have mounted
 with soft updates.
 
@@ -452,13 +452,13 @@ with soft updates.
 <h2 id="altroot">Duplicating your root partition: <tt>/altroot</tt></h2>
 
 OpenBSD provides an <tt>/altroot</tt> facility in the
-<a href="http://man.openbsd.org/daily";>daily(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/daily";>daily(8)</a>
 scripts.
 If the environment variable <tt>ROOTBACKUP=1</tt> is set in either
 <tt>/etc/daily.local</tt> or root's
-<a href="http://man.openbsd.org/crontab.5";>crontab(5)</a>,
+<a href="http://man.openbsd.org/OpenBSD-6.0/crontab.5";>crontab(5)</a>,
 and a partition is specified in
-<a href="http://man.openbsd.org/fstab";>fstab(5)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/fstab";>fstab(5)</a>
 as mounting to <tt>/altroot</tt> with the mount options of <tt>xx</tt>, every
 night the entire contents of the root partition will be duplicated to the
 <tt>/altroot</tt> partition.
@@ -481,7 +481,7 @@ and set the appropriate environment vari
 As the <tt>/altroot</tt> process will capture your <tt>/etc</tt> directory, 
this
 will make sure any configuration changes there are updated daily.
 This is a "disk image" copy done with
-<a href="http://man.openbsd.org/dd";>dd(1)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/dd";>dd(1)</a>
 not a file-by-file copy, so your <tt>/altroot</tt> partition should be at least
 the same size as your root partition.
 Generally, you will want your <tt>/altroot</tt> partition to be on a different
@@ -492,11 +492,11 @@ disk fail.
 
 Yes.
 Start with the
-<a href="http://man.openbsd.org/mount";>mount(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/mount";>mount(8)</a>
 manual which contains examples explaining how to mount some of the
 most commonly used filesystems.
 A partial list of
-<a href="http://man.openbsd.org/?query=mount_&amp;sec=8&amp;apropos=1";>
+<a 
href="http://man.openbsd.org/OpenBSD-6.0/?query=mount_&amp;sec=8&amp;apropos=1";>
 supported filesystems</a>
 and related commands can be obtained with
 
@@ -509,7 +509,7 @@ Note that support may be limited to read
 <h2 id="MountImage">Mounting disk images</h2>
 
 To mount a disk image in OpenBSD you must configure a
-<a href="http://man.openbsd.org/vnd";>vnd(4)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/vnd";>vnd(4)</a>
 device.
 For example, if you have an ISO image located at <tt>/tmp/ISO.image</tt>,
 you would take the following steps to mount the image.
@@ -531,19 +531,19 @@ To unmount the image and unconfigure the
 </pre></blockquote>
 
 For more information, refer to
-<a href="http://man.openbsd.org/vnconfig";>vnconfig(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/vnconfig";>vnconfig(8)</a>
 and
-<a href="http://man.openbsd.org/mount";>mount(8)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/mount";>mount(8)</a>.
 
 <h2 id="NegSpace">Why does df tell me I have over 100% of my disk used?</h2>
 
 People are sometimes surprised to find they have negative available disk space,
 or more than 100% of a filesystem in use, as shown by
-<a href="http://man.openbsd.org/df";>df(1)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/df";>df(1)</a>.
 
 <p>
 When a filesystem is created with
-<a href="http://man.openbsd.org/newfs";>newfs(8)</a>,
+<a href="http://man.openbsd.org/OpenBSD-6.0/newfs";>newfs(8)</a>,
 some of the available space is held in reserve from normal users.
 This provides a margin of error when you accidentally fill the disk, and
 helps keep disk fragmentation to a minimum.
@@ -553,15 +553,15 @@ available capacity in use.
 
 <p>
 If the 5% value is not appropriate for you, you can change it with the
-<a href="http://man.openbsd.org/tunefs";>tunefs(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/tunefs";>tunefs(8)</a>
 command.
 
 <h2 id="softraid">RAID and disk encryption</h2>
 
-The <a href="http://man.openbsd.org/softraid";>softraid(4)</a> subsystem works
-by emulating a <a href="http://man.openbsd.org/scsibus";>scsibus(4)</a>
-with <a href="http://man.openbsd.org/sd";>sd(4)</a> devices made by combining a
-number of OpenBSD <a href="http://man.openbsd.org/disklabel";>disklabel(8)</a>
+The <a href="http://man.openbsd.org/OpenBSD-6.0/softraid";>softraid(4)</a> 
subsystem works
+by emulating a <a 
href="http://man.openbsd.org/OpenBSD-6.0/scsibus";>scsibus(4)</a>
+with <a href="http://man.openbsd.org/OpenBSD-6.0/sd";>sd(4)</a> devices made by 
combining a
+number of OpenBSD <a 
href="http://man.openbsd.org/OpenBSD-6.0/disklabel";>disklabel(8)</a>
 partitions into a virtual disk with the desired RAID level.
 Note that only RAID0, RAID1, RAID5 and crypto are fully supported at the 
moment.
 This virtual disk is treated as any other disk, first partitioned with
@@ -640,9 +640,9 @@ All the steps will be explained in detai
 
 <p>
 The install kernel only has the <tt>/dev</tt> entries for one
-<a href="http://man.openbsd.org/wd";>wd(4)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/wd";>wd(4)</a>
 device and one
-<a href="http://man.openbsd.org/sd";>sd(4)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/sd";>sd(4)</a>
 device on boot, so you will need to manually create more disk devices
 if your desired softraid setup requires them.
 
@@ -665,9 +665,9 @@ You now have full support for the <tt>sd
 
 <p>
 Next, we'll initialize the disks with
-<a href="http://man.openbsd.org/fdisk";>fdisk(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/fdisk";>fdisk(8)</a>
 and create the softraid partition with
-<a href="http://man.openbsd.org/disklabel";>disklabel(8)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/disklabel";>disklabel(8)</a>.
 An "a" partition will be made on both of the drives for the new RAID device.
 
 <blockquote><pre>
@@ -689,7 +689,7 @@ No label changes.
 You'll notice that we initialized both disks, but only created a partition
 layout on the first drive.
 That's because you can easily import the drive's configuration directly with 
the
-<a href="http://man.openbsd.org/disklabel";>disklabel(8)</a> command.
+<a href="http://man.openbsd.org/OpenBSD-6.0/disklabel";>disklabel(8)</a> 
command.
 
 <blockquote><pre>
 # <b>disklabel sd0 > layout</b>
@@ -701,7 +701,7 @@ The "layout" file in this example can be
 
 <p>
 Next, create the mirror with the
-<a href="http://man.openbsd.org/bioctl";>bioctl(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/bioctl";>bioctl(8)</a>
 command.
 
 <blockquote><pre>
@@ -783,8 +783,8 @@ or from the <a href="faq4.html#bsd.rd">i
 <h3 id="softraidFDE">Full disk encryption</h3>
 
 Much like RAID, full disk encryption in OpenBSD is handled by the
-<a href="http://man.openbsd.org/softraid";>softraid(4)</a> subsystem and
-<a href="http://man.openbsd.org/bioctl";>bioctl(8)</a> command.
+<a href="http://man.openbsd.org/OpenBSD-6.0/softraid";>softraid(4)</a> 
subsystem and
+<a href="http://man.openbsd.org/OpenBSD-6.0/bioctl";>bioctl(8)</a> command.
 This section covers installing OpenBSD to a single encrypted disk, and is a
 very similar process to the previous one.
 Note that <b>using both RAID and disk encryption on the same device is not
@@ -816,8 +816,8 @@ adversary to deduce how much space is ac
 
 <p>
 Next, we'll initialize the disk with
-<a href="http://man.openbsd.org/fdisk";>fdisk(8)</a> and create the softraid
-partition with <a href="http://man.openbsd.org/disklabel";>disklabel(8)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/fdisk";>fdisk(8)</a> and create the 
softraid
+partition with <a 
href="http://man.openbsd.org/OpenBSD-6.0/disklabel";>disklabel(8)</a>.
 
 <blockquote><pre>
 # <b>fdisk -iy sd0</b>
@@ -893,8 +893,8 @@ An outline of the steps is as follows:
       attaching the container are done with the same bioctl(8) command)
   <li>Zero the first megabyte of the new pseudo-partition
   <li>Create a filesystem on the pseudo-device with
-  <a href="http://man.openbsd.org/newfs";>newfs(8)</a>
-  <li>Unlock and <a href="http://man.openbsd.org/mount";>mount(8)</a> the new
+  <a href="http://man.openbsd.org/OpenBSD-6.0/newfs";>newfs(8)</a>
+  <li>Unlock and <a 
href="http://man.openbsd.org/OpenBSD-6.0/mount";>mount(8)</a> the new
       pseudo-device
   <li>Access the files as needed
   <li>Unmount the drive and detach the encrypted container
Index: faq15.html
===================================================================
RCS file: /cvs/www/faq/faq15.html,v
retrieving revision 1.147
diff -u -p -r1.147 faq15.html
--- faq15.html  25 Oct 2016 14:16:32 -0000      1.147
+++ faq15.html  6 Dec 2016 18:31:31 -0000
@@ -142,13 +142,13 @@ third party software.
 Packages can be managed easily with the help of several utilities,
 also referred to as the pkg* tools:
 <ul>
-  <li><a href="http://man.openbsd.org/pkg_add";>pkg_add(1)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/pkg_add";>pkg_add(1)</a>
   - a utility for installing and upgrading software packages
-  <li><a href="http://man.openbsd.org/pkg_delete";>pkg_delete(1)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/pkg_delete";>pkg_delete(1)</a>
   - a utility for deleting previously installed software packages
-  <li><a href="http://man.openbsd.org/pkg_info";>pkg_info(1)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/pkg_info";>pkg_info(1)</a>
   - a utility for displaying information about software packages
-  <li><a href="http://man.openbsd.org/pkg_create";>pkg_create(1)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/pkg_create";>pkg_create(1)</a>
   - a utility for creating software packages
 </ul>
 
@@ -166,7 +166,7 @@ Packages look like simple <tt>.tgz</tt> 
 Basically they are just that, but there is one crucial difference:
 they contain some extra <i>packing information</i>.
 This information is used by
-<a href="http://man.openbsd.org/pkg_add";>pkg_add(1)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/pkg_add";>pkg_add(1)</a>
 for several purposes:
 
 <ul>
@@ -187,7 +187,7 @@ by a careless user.
 
 You can make things easy by defining your preferred
 <a href="../ftp.html">mirror</a> in the <tt>PKG_PATH</tt> environment variable
-or <a href="http://man.openbsd.org/pkg.conf";>pkg.conf(5)</a> file.
+or <a href="http://man.openbsd.org/OpenBSD-6.0/pkg.conf";>pkg.conf(5)</a> file.
 
 <p>
 <b>Example 1:</b> fetching packages with <tt>PKG_PATH</tt>:
@@ -198,7 +198,7 @@ or <a href="http://man.openbsd.org/pkg.c
 </pre></blockquote>
 
 It's a good idea to add a similar "export" line to your <tt>~/.profile</tt>.
-If you're using <a href="http://man.openbsd.org/doas";>doas(1)</a>, note that
+If you're using <a href="http://man.openbsd.org/OpenBSD-6.0/doas";>doas(1)</a>, 
note that
 you will need to pass <tt>setenv { PKG_PATH }</tt> in the config file for
 this variable to stick.
 You can specify multiple locations, separated by colons.
@@ -208,13 +208,13 @@ If all entries fail, an error is produce
 
 <p>
 The <tt>-r</tt> and <tt>-p</tt> flags to
-<a href="http://man.openbsd.org/uname";>uname(1)</a> will expand to the version
+<a href="http://man.openbsd.org/OpenBSD-6.0/uname";>uname(1)</a> will expand to 
the version
 of OpenBSD you're running and your CPU architecture.
 If you are using snapshots, replace "$(uname -r)" with "snapshots" instead.
 
 <p>
 <b>Example 2:</b> fetching packages with 
-<a href="http://man.openbsd.org/pkg.conf";>pkg.conf(5)</a>:
+<a href="http://man.openbsd.org/OpenBSD-6.0/pkg.conf";>pkg.conf(5)</a>:
 
 <blockquote><pre>
 # <b>echo 'installpath = a.local.mirror' > /etc/pkg.conf</b>
@@ -255,7 +255,7 @@ For example: database support, support f
 additions like SSL and IPv6.
 Every flavor of a package will have a different suffix in its package name.
 For detailed information about package names, please refer to
-<a href="http://man.openbsd.org/packages-specs";>packages-specs(7)</a>.
+<a 
href="http://man.openbsd.org/OpenBSD-6.0/packages-specs";>packages-specs(7)</a>.
 
 <p>
 <b>Note:</b>
@@ -274,7 +274,7 @@ section of this document.
 
 <h3 id="PkgInstall">Installing new packages</h3>
 
-The <a href="http://man.openbsd.org/pkg_add";>pkg_add(1)</a> utility is used
+The <a href="http://man.openbsd.org/OpenBSD-6.0/pkg_add";>pkg_add(1)</a> 
utility is used
 to install packages.
 If you have <a href="#Easy">made things easy</a> for yourself by setting
 <tt>PKG_PATH</tt> or configuring <tt>/etc/pkg.conf</tt>, you can just call
@@ -409,7 +409,7 @@ and choose to (U)pgrade your complete sy
 <h3 id="PkgList">Listing installed packages</h3>
 
 You can see a list of installed packages by using the
-<a href="http://man.openbsd.org/pkg_info";>pkg_info(1)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/pkg_info";>pkg_info(1)</a>
 utility.
 
 <blockquote><pre>
@@ -479,7 +479,7 @@ the new version, by calling pkg_add(1) w
 To delete a package, simply take the proper name of the package as shown
 by pkg_info(1) (see <a href="#PkgList">listing installed packages</a>
 above) and use
-<a href="http://man.openbsd.org/pkg_delete";>pkg_delete(1)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/pkg_delete";>pkg_delete(1)</a>
 to remove the package.
 In the example below, the screen package is being removed.
 Notice that there are sometimes instructions about extra items which need
@@ -606,7 +606,7 @@ for source patches and additional files,
 
 <p>
 When a user issues
-<a href="http://man.openbsd.org/make";>make(1)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/make";>make(1)</a>
 in the subdirectory of a specific port, the system will recursively
 walk its dependency tree, check whether the required dependencies are
 installed, build and install any missing dependencies, and then
@@ -634,10 +634,10 @@ that package."
 More information about the ports system may be found in these man pages:
 
 <ul>
-  <li><a href="http://man.openbsd.org/ports";>ports(7)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/ports";>ports(7)</a>
   - describes the different stages (make targets) of port installation,
   the use of flavors and subpackages and some other options.
-  <li><a href="http://man.openbsd.org/bsd.port.mk";>bsd.port.mk(5)</a>
+  <li><a 
href="http://man.openbsd.org/OpenBSD-6.0/bsd.port.mk";>bsd.port.mk(5)</a>
   - in-depth information about all the make targets, variables, the fake
   (installation directory) framework, etc.
 </ul>
@@ -752,7 +752,7 @@ application.
 <p>
 <ul>
 <li>You can set up
-<a href="http://man.openbsd.org/doas";>doas(1)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/doas";>doas(1)</a>
 and have the ports system use it for tasks requiring superuser permissions.
 This requires granting three permissions:
 
@@ -763,13 +763,13 @@ This requires granting three permissions
   to pass certain environment variables used by the ports system
   from the shell calling doas to the privileged shell,
   see the <tt>setenv</tt> and <tt>keepenv</tt> options in
-  <a href="http://man.openbsd.org/doas.conf";>doas.conf(5)</a>.
+  <a href="http://man.openbsd.org/OpenBSD-6.0/doas.conf";>doas.conf(5)</a>.
   <li>The ports system needs permission to invoke doas(1).
   This can be granted by setting the <tt>SUDO</tt> variable defined in
-  <a href="http://man.openbsd.org/bsd.port.mk";>bsd.port.mk(5)</a>
+  <a href="http://man.openbsd.org/OpenBSD-6.0/bsd.port.mk";>bsd.port.mk(5)</a>
   in the environment, which can be made permanent
   by adding the following line to
-  <a href="http://man.openbsd.org/mk.conf";>mk.conf(5)</a>:
+  <a href="http://man.openbsd.org/OpenBSD-6.0/mk.conf";>mk.conf(5)</a>:
 
   <blockquote><pre>
   SUDO=/usr/bin/doas
@@ -1043,7 +1043,7 @@ rm -f /usr/ports/packages/i386/all/rsnap
 <h3 id="PortsFlavors">Using flavors and subpackages</h3>
 
 Please read the
-<a href="http://man.openbsd.org/ports";>ports(7)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/ports";>ports(7)</a>
 man page, which gives a good overview of this topic.
 There are two mechanisms to control the packaging of software according
 to different needs.
@@ -1123,7 +1123,7 @@ $ <b>make show=MULTI_PACKAGES</b>
 It is possible to select which subpackage(s) to install from within the
 ports tree.
 After some tests, this procedure will just call
-<a href="http://man.openbsd.org/pkg_add";>pkg_add(1)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/pkg_add";>pkg_add(1)</a>
 to install the desired subpackage(s).
 
 <blockquote><pre>
@@ -1140,7 +1140,7 @@ You must use flavors for that purpose.
 When you need to build more than one or two ports at a time, you can
 use the <tt>/usr/ports/infrastructure/bin/dpb</tt> tool.
 
-<a href="http://man.openbsd.org/dpb";>dpb(1)</a> takes a list of ports to build
+<a href="http://man.openbsd.org/OpenBSD-6.0/dpb";>dpb(1)</a> takes a list of 
ports to build
 and automatically builds them all in an optimal order, making use of as much
 parallelism as possible.
 It can also use multiple machines to perform the building, and produces
@@ -1152,7 +1152,7 @@ detailed logs of the build process for t
 </pre></blockquote>
 
 This command will read the list of
-<a href="http://man.openbsd.org/pkgpath";>pkgpaths</a> in <tt>~/localports</tt>
+<a href="http://man.openbsd.org/OpenBSD-6.0/pkgpath";>pkgpaths</a> in 
<tt>~/localports</tt>
 and build all the packages.
 It can also install the packages after they have been built.
 The <tt>~/localports</tt> file might look something like this:
@@ -1164,12 +1164,12 @@ editors/vim
 </pre></blockquote>
 
 If you do not provide a list of ports to build on the command line or via
-<tt>-P</tt> or <tt>-I</tt>, <a href="http://man.openbsd.org/dpb";>dpb(1)</a>
+<tt>-P</tt> or <tt>-I</tt>, <a 
href="http://man.openbsd.org/OpenBSD-6.0/dpb";>dpb(1)</a>
 will build all the ports in the ports tree.
 If run as root, dpb will automatically drop privileges to dedicated users
 for fetching distfiles and building ports.
 This is the recommended way to use it, but it can also run as a regular user.
-Additionally, the <a href="http://man.openbsd.org/proot";>proot(1)</a> utility
+Additionally, the <a 
href="http://man.openbsd.org/OpenBSD-6.0/proot";>proot(1)</a> utility
 can be used to further isolate building operations.
 
 <h3 id="PortsSecurity">Security updates (-stable)</h3>
@@ -1196,7 +1196,7 @@ being taken up in the <i>-stable</i> bra
 Signatures are a good way to make sure packages are legitimate and not
 corrupted.
 OpenBSD offers official signed packages using
-<a href="http://man.openbsd.org/signify";>signify(1)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/signify";>signify(1)</a>.
 No extra effort is needed on the user's part to ensure packages haven't
 been tampered with -- pkg_add does this silently and automatically.
 
@@ -1212,7 +1212,7 @@ Note the names: keys for signing package
 
 <p>
 Then we may sign existing packages after building them with
-<a href="http://man.openbsd.org/pkg_sign";>pkg_sign(1)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/pkg_sign";>pkg_sign(1)</a>.
 
 <blockquote><pre>
 # <b>cd /usr/ports/packages/$(uname -p)</b>
@@ -1489,13 +1489,13 @@ Alternatively, you can:
 
 <ul>
   <li>Use
-  <a href="http://man.openbsd.org/script";>script(1)</a>
+  <a href="http://man.openbsd.org/OpenBSD-6.0/script";>script(1)</a>
   to create a complete build transcript.
   Do not remove the configure information.
   <li>Attach the output of
-  <a href="http://man.openbsd.org/pkg_info";>pkg_info(1)</a>
+  <a href="http://man.openbsd.org/OpenBSD-6.0/pkg_info";>pkg_info(1)</a>
   if it seems even remotely relevant.
-  <li><a href="http://man.openbsd.org/gcc";>gcc(1)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/gcc";>gcc(1)</a>
   internal compiler errors ask you to report the bug to the gcc
   mailing list.
   It does save time if you follow their direction, and provide at least
Index: faq4.html
===================================================================
RCS file: /cvs/www/faq/faq4.html,v
retrieving revision 1.479
diff -u -p -r1.479 faq4.html
--- faq4.html   3 Sep 2016 13:53:40 -0000       1.479
+++ faq4.html   6 Dec 2016 18:31:32 -0000
@@ -71,7 +71,7 @@ The OpenBSD installer is a <a href="#bsd
   <li><b>Network:</b>
     Some platforms support booting over a network, for example using
     <a href="faq6.html#PXE">PXE</a> or other
-    <a href="http://man.openbsd.org/diskless";>network boot</a>.
+    <a href="http://man.openbsd.org/OpenBSD-6.0/diskless";>network boot</a>.
   <li><b>Floppy disk:</b>
     Images for making <a href="#MkInsMedia">bootable floppies</a>
     are also provided.
@@ -181,8 +181,8 @@ There are numerous international mirror 
 releases and snapshots.
 You should always use the site nearest to you.
 Before you begin fetching a release or snapshot, you may wish to use
-<a href="http://man.openbsd.org/ping";>ping(8)</a> and
-<a href="http://man.openbsd.org/traceroute";>traceroute(8)</a> to determine
+<a href="http://man.openbsd.org/OpenBSD-6.0/ping";>ping(8)</a> and
+<a href="http://man.openbsd.org/OpenBSD-6.0/traceroute";>traceroute(8)</a> to 
determine
 which mirror site is nearest to you, and whether that mirror is performing
 adequately.
 Access information can be found <a href= "../ftp.html">here</a>.
@@ -193,14 +193,14 @@ In the same directory as the installatio
 named <tt>SHA256</tt> that contains checksums of the various installation
 files.
 You can confirm that none of the downloaded files were mangled in transit
-using the <a href="http://man.openbsd.org/sha256";>sha256(1)</a> command.
+using the <a href="http://man.openbsd.org/OpenBSD-6.0/sha256";>sha256(1)</a> 
command.
 
 <blockquote><pre>
 $ <b>sha256 -c SHA256</b>
 </pre></blockquote>
 
 However, this only checks for <i>accidental</i> corruption.
-You can use <a href="http://man.openbsd.org/signify";>signify(1)</a>
+You can use <a href="http://man.openbsd.org/OpenBSD-6.0/signify";>signify(1)</a>
 to cryptographically verify the downloaded files.
 
 <blockquote><pre>
@@ -242,7 +242,7 @@ As an example, these are the installatio
 <h3 id="MkFlash">Flash drives</h3>
 
 A bootable USB flash drive can be created by attaching the target device and
-copying over the image with <a href="http://man.openbsd.org/dd";>dd(1)</a>.
+copying over the image with <a 
href="http://man.openbsd.org/OpenBSD-6.0/dd";>dd(1)</a>.
 
 <p>
 Using OpenBSD, assuming the device was recognized as <tt>sd6</tt>:
@@ -261,7 +261,7 @@ In some Linux variants, the entire seven
 
 You can create a CD-ROM using the <tt>cdXX.iso</tt> or <tt>installXX.iso</tt>
 files.
-In OpenBSD, use <a href="http://man.openbsd.org/cdio";>cdio(1)</a>:
+In OpenBSD, use <a href="http://man.openbsd.org/OpenBSD-6.0/cdio";>cdio(1)</a>:
 
 <blockquote><pre>
 # <b>cdio tao cd*.iso</b>
@@ -270,9 +270,9 @@ In OpenBSD, use <a href="http://man.open
 <h3 id="MkFlop">Floppies</h3>
 
 Creating floppies in OpenBSD can be done with
-<a href="http://man.openbsd.org/fdformat";>fdformat(1)</a> to prep the disk,
-<a href="http://man.openbsd.org/dd";>dd(1)</a> to write the image, then
-<a href="http://man.openbsd.org/cmp";>cmp(1)</a> to verify the write was good.
+<a href="http://man.openbsd.org/OpenBSD-6.0/fdformat";>fdformat(1)</a> to prep 
the disk,
+<a href="http://man.openbsd.org/OpenBSD-6.0/dd";>dd(1)</a> to write the image, 
then
+<a href="http://man.openbsd.org/OpenBSD-6.0/cmp";>cmp(1)</a> to verify the 
write was good.
 A similar process can be used on other Unix platforms.
 
 <h2 id="Boot">Booting the install media</h2>
@@ -344,12 +344,12 @@ Read it.
 <p>
 Whatever your means of <a href="#Boot">booting</a> is, it is now time to use 
it.
 When your boot is successful, you will see a lot of text messages scroll by.
-This text is the <a href="http://man.openbsd.org/dmesg";>dmesg(8)</a>,
+This text is the <a 
href="http://man.openbsd.org/OpenBSD-6.0/dmesg";>dmesg(8)</a>,
 the kernel telling you what devices have been found and how they are
 hooked to other devices.
 
 <p>
-After the <a href="http://man.openbsd.org/dmesg";>dmesg(8)</a>, you will see the
+After the <a href="http://man.openbsd.org/OpenBSD-6.0/dmesg";>dmesg(8)</a>, you 
will see the
 first installer question:
 
 <blockquote><pre>
@@ -440,9 +440,9 @@ Some of the reasons for doing so are:
 <ul>
   <li><b>Security:</b>
     You can mark some filesystems with
-    <a href="http://man.openbsd.org/mount";>mount(8)</a> options such as as
+    <a href="http://man.openbsd.org/OpenBSD-6.0/mount";>mount(8)</a> options 
such as as
     <tt>nosuid</tt>, <tt>nodev</tt>, <tt>noexec</tt>, <tt>wxallowed</tt> or
-    <tt>readonly</tt> in <a href="http://man.openbsd.org/fstab";>fstab(5)</a>.
+    <tt>readonly</tt> in <a 
href="http://man.openbsd.org/OpenBSD-6.0/fstab";>fstab(5)</a>.
   <li><b>Stability:</b>
     A user or a misbehaved program can fill a filesystem with garbage if they
     have write permissions for it.
@@ -454,15 +454,15 @@ Some of the reasons for doing so are:
   <li><b>Integrity:</b>
     If one filesystem is corrupted for some reason, then your other filesystems
     are most likely still OK.
-  <li><b><a href="http://man.openbsd.org/fsck";>fsck(8)</a>:</b>
+  <li><b><a href="http://man.openbsd.org/OpenBSD-6.0/fsck";>fsck(8)</a>:</b>
     You can mount partitions that you never or rarely need to write to as
     <tt>readonly</tt> most of the time, which will eliminate the need for
     fsck(8) after a crash or power interruption.
 </ul>
 
 Read the section on automatic disk allocation in
-<a href="http://man.openbsd.org/disklabel";>disklabel(8)</a> and the
-<a href="http://man.openbsd.org/hier";>hier(7)</a> man page before making
+<a href="http://man.openbsd.org/OpenBSD-6.0/disklabel";>disklabel(8)</a> and the
+<a href="http://man.openbsd.org/OpenBSD-6.0/hier";>hier(7)</a> man page before 
making
 decisions about custom partitioning schemes.
 
 <h2 id="AddThoughts">Additional thoughts on partitioning</h2>
@@ -480,12 +480,12 @@ decisions about custom partitioning sche
     If you outgrow a partition, you can allocate a new partition from your
     unused space.
     Then <a href="faq10.html#DupFS">duplicate</a> your existing partition to 
the
-    new partition, change <a href="http://man.openbsd.org/fstab";>fstab(5)</a>
+    new partition, change <a 
href="http://man.openbsd.org/OpenBSD-6.0/fstab";>fstab(5)</a>
     to point to the new partition, remount, you now have more space.
   <li>If you make your partitions too close to the minimum size required, you
     will probably regret it later, when it is time to upgrade your system.
   <li>If you make very large partitions, keep in mind that performing
-    filesystem checks using <a href="http://man.openbsd.org/fsck";>fsck(8)</a>
+    filesystem checks using <a 
href="http://man.openbsd.org/OpenBSD-6.0/fsck";>fsck(8)</a>
     requires about 1MB of RAM per gigabyte of filesystem size.
   <li>A <tt>/home</tt> partition can be nice.
     New version of the OS?
@@ -493,7 +493,7 @@ decisions about custom partitioning sche
     untouched.
     Remember to save a copy of your configuration files.
   <li>You may also want to create an <tt>/altroot</tt> partition, as
-    described in <a href="http://man.openbsd.org/daily";>daily(8)</a> and the
+    described in <a 
href="http://man.openbsd.org/OpenBSD-6.0/daily";>daily(8)</a> and the
     <a href="faq14.html#altroot">altroot</a> section of the FAQ.
   <li>A system exposed to the Internet or other hostile forces should have a
     separate <tt>/var</tt> and maybe even a separate <tt>/var/log</tt>.
@@ -611,11 +611,11 @@ Thus, you must <a href="#Download">verif
 The OpenBSD install and upgrade scripts allow the selection of a user-created
 set called <tt>siteXX.tgz</tt>, where <tt>XX</tt> is the release version.
 Like the official <a href="#FilesNeeded">file sets</a>, this is a
-<a href="http://man.openbsd.org/tar";>tar(1)</a> archive rooted in
+<a href="http://man.openbsd.org/OpenBSD-6.0/tar";>tar(1)</a> archive rooted in
 <tt>/</tt> and untarred with the <tt>-xzphf</tt> options.
 It is installed last, so it can be used to complement and modify the files from
 a default install. Furthermore, it is possible to use
-<a href="http://man.openbsd.org/hostname";>hostname(1)</a>-dependent
+<a href="http://man.openbsd.org/OpenBSD-6.0/hostname";>hostname(1)</a>-dependent
 sets named <tt>siteXX-$(hostname -s).tgz</tt>.
 
 <p>
@@ -628,7 +628,7 @@ It will then be an option at install tim
 
 If the <tt>siteXX.tgz</tt> file set contains an executable file
 <tt>/install.site</tt>, the installer runs it with
-<a href="http://man.openbsd.org/chroot";>chroot(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/chroot";>chroot(8)</a>
 based at the freshly installed system's root.
 Similarly, the upgrade script runs <tt>/upgrade.site</tt>.
 The latter can be placed in the system's root before rebooting for the upgrade.
@@ -637,13 +637,13 @@ The latter can be placed in the system's
 Example usages:
 <ul>
   <li>Use
-  <a href="http://man.openbsd.org/rdate";>rdate(8)</a> to set the system
+  <a href="http://man.openbsd.org/OpenBSD-6.0/rdate";>rdate(8)</a> to set the 
system
     time.
   <li>Do an immediate backup/archive of the new system before you expose it to
     the rest of the world.
   <li>Have a set of arbitrary commands be run after the first boot.
     This will happen if install.site is used to append any such commands to an
-    <a href="http://man.openbsd.org/rc.firsttime";>rc.firsttime(8)</a>
+    <a 
href="http://man.openbsd.org/OpenBSD-6.0/rc.firsttime";>rc.firsttime(8)</a>
     file (appending to this file is necessary since the installer itself may
     write to this file).
     At boot time, rc.firsttime is executed once then deleted.
@@ -665,7 +665,7 @@ drive on a dedicated machine.
 More information is in the FAQ section on the
 <a href="faq14.html#BootAmd64">OpenBSD boot process</a>.
 An example showing how to use the installer to set up a custom
-<a href="http://man.openbsd.org/fdisk";>fdisk(8)</a> configuration for dual
+<a href="http://man.openbsd.org/OpenBSD-6.0/fdisk";>fdisk(8)</a> configuration 
for dual
 booting with Windows is provided later in this document.
 
 <p>
@@ -718,7 +718,7 @@ for more information.
 Set the active partition in whatever OS you are currently using to be the one
 you want to boot by default when you next boot.
 Virtually every OS offers a program to do this.
-OpenBSD's is <a href="http://man.openbsd.org/fdisk";>fdisk(8)</a>,
+OpenBSD's is <a href="http://man.openbsd.org/OpenBSD-6.0/fdisk";>fdisk(8)</a>,
 and similarly named programs are in many other operating systems.
 Also see the section on <a href="faq14.html#fdisk">using OpenBSD's fdisk</a>.
 
@@ -732,7 +732,7 @@ On that drive create an <tt>/etc/boot.co
 </pre></blockquote>
 
 This line instructs
-<a href="http://man.openbsd.org/OpenBSD-current/i386/boot";>boot(8)</a>
+<a 
href="http://man.openbsd.org/OpenBSD-6.0/OpenBSD-current/i386/boot";>boot(8)</a>
 to load the system from hard drive 0,
 <a href="faq14.html#disklabel">disklabel(8) partition</a> <tt>a</tt> and run 
the
 kernel file <tt>/bsd</tt>.
@@ -815,7 +815,7 @@ In addition to your existing system's na
 may be useful for deleting or resizing existing partitions.
 
 <p>
-A brief introduction to <a href="http://man.openbsd.org/fdisk";>fdisk(8)</a>
+A brief introduction to <a 
href="http://man.openbsd.org/OpenBSD-6.0/fdisk";>fdisk(8)</a>
 is in the section on <a href="faq14.html#fdisk">using OpenBSD's fdisk</a>.
 
 <p>
Index: faq5.html
===================================================================
RCS file: /cvs/www/faq/faq5.html,v
retrieving revision 1.285
diff -u -p -r1.285 faq5.html
--- faq5.html   15 Nov 2016 10:51:28 -0000      1.285
+++ faq5.html   6 Dec 2016 18:31:32 -0000
@@ -202,12 +202,12 @@ in the upgrade instructions of the relea
 
 OpenBSD uses the <a href="https://savannah.nongnu.org/projects/cvs";>CVS</a>
 version control system to manage its source.
-The <a href="http://man.openbsd.org/cvs";>cvs(1)</a> program is used to pull a
+The <a href="http://man.openbsd.org/OpenBSD-6.0/cvs";>cvs(1)</a> program is 
used to pull a
 copy of the desired source to your local machine for compilation.
 You can also maintain a local CVS repository using the
 <a href="../cvsync.html">CVSync</a> or rsync programs, available as
 <a href="faq15.html#PkgMgmt">packages</a>.
-An introduction to <a href="http://man.openbsd.org/cvs";>cvs(1)</a>
+An introduction to <a href="http://man.openbsd.org/OpenBSD-6.0/cvs";>cvs(1)</a>
 and detailed instructions for fetching the source trees are on the
 <a href="../anoncvs.html">anonymous CVS</a> page.
 
@@ -218,10 +218,10 @@ updated files to your local tree.
 
 <h4 id="wsrc">Avoiding root privileges</h4>
 
-Avoid running <a href="http://man.openbsd.org/cvs";>cvs(1)</a> as root.
+Avoid running <a href="http://man.openbsd.org/OpenBSD-6.0/cvs";>cvs(1)</a> as 
root.
 The <tt>/usr/src</tt> directory (where your source will typically go) is
 writable by the <tt>wsrc</tt> group by default, so add users that need
-to use <a href="http://man.openbsd.org/cvs";>cvs(1)</a> to that group.
+to use <a href="http://man.openbsd.org/OpenBSD-6.0/cvs";>cvs(1)</a> to that 
group.
 
 <blockquote><pre>
 # <b>user mod -G wsrc exampleuser</b>
@@ -321,7 +321,7 @@ that contains the list of all the files 
 </pre></blockquote>
 
 If you'd like to cryptographically sign the sets you created, the
-<a href="http://man.openbsd.org/signify";>signify(1)</a> man page has details
+<a href="http://man.openbsd.org/OpenBSD-6.0/signify";>signify(1)</a> man page 
has details
 on how to do so.
 
 <h2 id="Xbld">Building X</h2>
@@ -347,13 +347,13 @@ The official instructions for building X
 <h3>Further reading on the build process</h3>
 
 <ul>
-  <li><a href="http://man.openbsd.org/mk.conf";>mk.conf(5)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/mk.conf";>mk.conf(5)</a>
   <li><a href="http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/Makefile";>
     <tt>src/Makefile</tt></a>
   <li><a 
href="http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/share/mk/bsd.README";>
     <tt>/usr/share/mk/bsd.README</tt></a>
-  <li><a href="http://man.openbsd.org/config";>config(8)</a>
-  <li><a href="http://man.openbsd.org/options";>options(4)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/config";>config(8)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/options";>options(4)</a>
 </ul>
 
 <h2 id="buildprobs">Common problems when compiling</h2>
@@ -423,7 +423,7 @@ If you build often, one benefit is simpl
 <h3>How do I skip building parts of the tree?</h3>
 
 Use the <tt>SKIPDIR</tt> option of
-<a href="http://man.openbsd.org/mk.conf";>mk.conf(5)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/mk.conf";>mk.conf(5)</a>.
 
 <h3>Can I cross-compile?</h3>
 
@@ -445,27 +445,27 @@ There are three ways to customize a kern
 
 <ul>
   <li>boot-time configuration using
-    <a href="http://man.openbsd.org/boot_config";>boot_config(8)</a>
+    <a href="http://man.openbsd.org/OpenBSD-6.0/boot_config";>boot_config(8)</a>
   <li>permanent modification of a compiled kernel using
-    <a href="http://man.openbsd.org/config";>config(8)</a>
+    <a href="http://man.openbsd.org/OpenBSD-6.0/config";>config(8)</a>
   <li>compilation of a custom kernel
 </ul>
 
 It is recommended that you read
-<a href="http://man.openbsd.org/config";>config(8)</a> first.
+<a href="http://man.openbsd.org/OpenBSD-6.0/config";>config(8)</a> first.
 
 <h3 id="BootConfig">Boot-time configuration</h3>
 
 Sometimes when booting your system you might notice that the kernel finds
 your device but maybe at the wrong IRQ.
 Without rebuilding the kernel, you can use OpenBSD's boot time kernel
-configuration, <a href="http://man.openbsd.org/boot_config";>boot_config(8)</a>.
+configuration, <a 
href="http://man.openbsd.org/OpenBSD-6.0/boot_config";>boot_config(8)</a>.
 
 <p>
 However, this will only correct your problem for one time.
 If you reboot, you will have to repeat this procedure.
 So, this is only a temporary fix, and you should correct the problem using
-<a href="http://man.openbsd.org/config";>config(8)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/config";>config(8)</a>.
 
 <p>
 To boot into the User Kernel Config, or UKC, use the <tt>-c</tt> option at
@@ -481,7 +481,7 @@ Type <b><tt>help</tt></b> for a list of 
 <h3 id="config">Using config(8) to change your kernel</h3>
 
 The <tt>-e</tt> and <tt>-u</tt> options of
-<a href="http://man.openbsd.org/config";>config(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/config";>config(8)</a>
 can be extremely helpful and save wasted time compiling your kernel.
 The <tt>-e</tt> flag allows you to enter the UKC or User Kernel Config on
 a running system.
@@ -497,7 +497,7 @@ For example: <tt>config -e -o bsd.new /b
 <tt>bsd.new</tt>.
 
 Kernel modification examples are given in the
-<a href="http://man.openbsd.org/config";>config(8)</a> man page.
+<a href="http://man.openbsd.org/OpenBSD-6.0/config";>config(8)</a> man page.
 
 <h3 id="Options">Building a custom kernel</h3>
 
@@ -510,8 +510,8 @@ Reporting a problem on a customized kern
 you being told to try to reproduce the problem with a <tt>GENERIC</tt> kernel.
 
 <p>
-Read the <a href="http://man.openbsd.org/config";>config(8)</a> and the
-<a href="http://man.openbsd.org/options";>options(4)</a> man pages first.
+Read the <a href="http://man.openbsd.org/OpenBSD-6.0/config";>config(8)</a> and 
the
+<a href="http://man.openbsd.org/OpenBSD-6.0/options";>options(4)</a> man pages 
first.
 The following steps are part of compiling a custom kernel:
 
 <blockquote><pre>
@@ -526,7 +526,7 @@ $ <b>make</b>
 <h2 id="CVSTips">CVS tips</h2>
 
 <ul>
-  <li>Some <a href="http://man.openbsd.org/cvs";>cvs(1)</a>
+  <li>Some <a href="http://man.openbsd.org/OpenBSD-6.0/cvs";>cvs(1)</a>
     options are mandatory to get a valid OpenBSD <tt>src</tt> tree:
 
     <p>
@@ -557,7 +557,7 @@ $ <b>make</b>
 
     <p>
     Note also that the <tt>CVSROOT</tt> environment variable is only used if
-    <a href="http://man.openbsd.org/cvs";>cvs(1)</a>
+    <a href="http://man.openbsd.org/OpenBSD-6.0/cvs";>cvs(1)</a>
     would throw an error without it.
 
   <li>As the source trees consist of large numbers of mostly small files,
Index: faq6.html
===================================================================
RCS file: /cvs/www/faq/faq6.html,v
retrieving revision 1.419
diff -u -p -r1.419 faq6.html
--- faq6.html   8 Oct 2016 03:17:45 -0000       1.419
+++ faq6.html   6 Dec 2016 18:31:32 -0000
@@ -57,8 +57,8 @@
 <h2 id="Intro">Background</h2>
 
 For the bulk of this document, it helps if you have read and at least partially
-understand the <a href="http://man.openbsd.org/ifconfig";>ifconfig(8)</a> and
-<a href="http://man.openbsd.org/netstat";>netstat(1)</a> man pages.
+understand the <a 
href="http://man.openbsd.org/OpenBSD-6.0/ifconfig";>ifconfig(8)</a> and
+<a href="http://man.openbsd.org/OpenBSD-6.0/netstat";>netstat(1)</a> man pages.
 
 <p>
 If you are a network administrator, setting up routing protocols, using your
@@ -91,7 +91,7 @@ All network configuration is done using 
 In OpenBSD, interfaces are named for the type of card, not for the type of
 connection.
 For example, here is the part of the
-<a href="http://man.openbsd.org/dmesg";>dmesg(8)</a> for an Intel Fast Ethernet
+<a href="http://man.openbsd.org/OpenBSD-6.0/dmesg";>dmesg(8)</a> for an Intel 
Fast Ethernet
 network card, which uses the device name <tt>fxp</tt>.
 
 <blockquote><pre>
@@ -99,15 +99,15 @@ fxp0 at pci0 dev 10 function 0 "Intel 82
 inphy0 at fxp0 phy 1: i82555 10/100 media interface, rev. 4
 </pre></blockquote>
 
-This device uses the <a href="http://man.openbsd.org/fxp";>fxp(4)</a> driver, 
and
+This device uses the <a 
href="http://man.openbsd.org/OpenBSD-6.0/fxp";>fxp(4)</a> driver, and
 is assigned the number 0 here.
 
 <p>
 You can find out what network interfaces have been identified by using the
-<a href="http://man.openbsd.org/ifconfig";>ifconfig(8)</a> utility.
+<a href="http://man.openbsd.org/OpenBSD-6.0/ifconfig";>ifconfig(8)</a> utility.
 The following command will show all network interfaces on a system.
 This sample output shows us only one physical Ethernet interface, an
-<a href="http://man.openbsd.org/fxp";>fxp(4)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/fxp";>fxp(4)</a>.
 
 <blockquote><pre>
 $ <b>ifconfig</b>
@@ -130,16 +130,16 @@ pflog0: flags=141&lt;UP,RUNNING,PROMISC&
         groups: pflog
 </pre></blockquote>
 
-As you can see here, <a href="http://man.openbsd.org/ifconfig";>ifconfig(8)</a>
+As you can see here, <a 
href="http://man.openbsd.org/OpenBSD-6.0/ifconfig";>ifconfig(8)</a>
 gives us a lot more information than we need at this point.
 In the above example, an IP network is configured on <tt>fxp0</tt>, hence the
 values <tt>inet 10.0.0.38 netmask 0xffffff00 broadcast 10.0.0.255</tt>.
 Also, the <tt>UP</tt> and <tt>RUNNING</tt> flags are set.
 
 <p>
-The <a href="http://man.openbsd.org/netstart";>netstart(8)</a> script configures
+The <a href="http://man.openbsd.org/OpenBSD-6.0/netstart";>netstart(8)</a> 
script configures
 network interfaces at boot time using
-<a href="http://man.openbsd.org/hostname.if";>hostname.if(5)</a> files, where
+<a href="http://man.openbsd.org/OpenBSD-6.0/hostname.if";>hostname.if(5)</a> 
files, where
 "if" is replaced by the full name of each interface.
 The example above would use the file <tt>/etc/hostname.fxp0</tt>:
 
@@ -154,8 +154,8 @@ Note that this <tt>hostname.fxp0</tt> fi
 # <b>ifconfig fxp0 10.0.0.38 255.255.255.0</b>
 </pre></blockquote>
 
-See <a href="http://man.openbsd.org/hostname.if";>hostname.if(5)</a> for the
-precise relation with <a 
href="http://man.openbsd.org/ifconfig";>ifconfig(8)</a>.
+See <a 
href="http://man.openbsd.org/OpenBSD-6.0/hostname.if";>hostname.if(5)</a> for the
+precise relation with <a 
href="http://man.openbsd.org/OpenBSD-6.0/ifconfig";>ifconfig(8)</a>.
 
 <p>
 Finally, you will notice several other interfaces come enabled by default.
@@ -163,62 +163,62 @@ These are virtual interfaces that serve 
 The following manual pages describe them:
 
 <ul>
-  <li><a href="http://man.openbsd.org/lo";>lo</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/lo";>lo</a>
     - loopback interface
-  <li><a href="http://man.openbsd.org/pflog";>pflog</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/pflog";>pflog</a>
     - Packet Filter logging interface
-  <li><a href="http://man.openbsd.org/enc";>enc</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/enc";>enc</a>
     - encapsulating interface
 </ul>
 
 Other virtual interfaces can be added with the
-<a href="http://man.openbsd.org/ifconfig";>ifconfig(8)</a> <tt>create</tt>
+<a href="http://man.openbsd.org/OpenBSD-6.0/ifconfig";>ifconfig(8)</a> 
<tt>create</tt>
 command.
 These include, but are not limited to:
 
 <ul>
-  <li><a href="http://man.openbsd.org/ppp";>ppp</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/ppp";>ppp</a>
     - Point-to-Point Protocol interface
-  <li><a href="http://man.openbsd.org/tun";>tun</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/tun";>tun</a>
     - Tunnel network interface
-  <li><a href="http://man.openbsd.org/bridge";>bridge</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/bridge";>bridge</a>
     - Ethernet bridge interface
-  <li><a href="http://man.openbsd.org/vlan";>vlan</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/vlan";>vlan</a>
     - IEEE 802.1Q encapsulation interface
-  <li><a href="http://man.openbsd.org/svlan";>svlan</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/svlan";>svlan</a>
     - IEEE 802.1AD provider bridges (QinQ)
-  <li><a href="http://man.openbsd.org/gre";>gre</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/gre";>gre</a>
     - GRE/MobileIP encapsulation interface
-  <li><a href="http://man.openbsd.org/gif";>gif</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/gif";>gif</a>
     - Generic IPv4/IPv6 tunnel interface
-  <li><a href="http://man.openbsd.org/carp.4";>carp</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/carp.4";>carp</a>
     - Common Address Redundancy Protocol interface
-  <li><a href="http://man.openbsd.org/mpe";>mpe</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/mpe";>mpe</a>
     - MPLS Provider Edge
-  <li><a href="http://man.openbsd.org/vether";>vether</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/vether";>vether</a>
     - Virtual Ethernet interface
-  <li><a href="http://man.openbsd.org/trunk";>trunk</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/trunk";>trunk</a>
     - Link aggregation and link failover interface
-  <li><a href="http://man.openbsd.org/vxlan";>vxlan</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/vxlan";>vxlan</a>
     - Virtual eXtensible Local Area Network tunnel Interface
 </ul>
 
 For a complete listing of virtual interfaces, refer to the
-<a href="http://man.openbsd.org/ifconfig";>ifconfig(8)</a> man page.
+<a href="http://man.openbsd.org/OpenBSD-6.0/ifconfig";>ifconfig(8)</a> man page.
 
 <h3 id="Setup.gateway">Default hostname and gateway</h3>
 
 The <tt>/etc/myname</tt> and <tt>/etc/mygate</tt> files are read by the
-<a href="http://man.openbsd.org/netstart";>netstart(8)</a> script.
+<a href="http://man.openbsd.org/OpenBSD-6.0/netstart";>netstart(8)</a> script.
 Both of these files consist of a single line, specifying the fully qualified
 domain name of the system and the address of the gateway host, respectively.
 The <tt>/etc/mygate</tt> file need not exist on all systems.
-See <a href="http://man.openbsd.org/myname";>myname(5)</a> for more details.
+See <a href="http://man.openbsd.org/OpenBSD-6.0/myname";>myname(5)</a> for more 
details.
 
 <h3 id="Setup.resolver">DNS resolution</h3>
 
 DNS resolution is controlled by
-<a href="http://man.openbsd.org/resolv.conf";>resolv.conf(5)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/resolv.conf";>resolv.conf(5)</a>.
 
 <blockquote><pre>
 $ <b>cat /etc/resolv.conf</b>
@@ -230,17 +230,17 @@ lookup file bind
 
 Here, the default domain name will be <tt>example.com</tt>, there will be two
 DNS resolvers, <tt>125.2.3.4</tt> and <tt>125.2.3.5</tt>, and the
-<a href="http://man.openbsd.org/hosts";>hosts(5)</a> file will be consulted
+<a href="http://man.openbsd.org/OpenBSD-6.0/hosts";>hosts(5)</a> file will be 
consulted
 before the DNS resolvers are.
 
 <p>
 If you are using DHCP, you'll want to read <a href="#DHCP">DHCP</a>, taking 
note
-of <a href="http://man.openbsd.org/resolv.conf.tail";>resolv.conf.tail(5)</a>.
+of <a 
href="http://man.openbsd.org/OpenBSD-6.0/resolv.conf.tail";>resolv.conf.tail(5)</a>.
 
 <h3 id="Setup.activate">Activating the changes</h3>
 
 From here, you can either reboot or run the
-<a href="http://man.openbsd.org/netstart";>netstart(8)</a> script:
+<a href="http://man.openbsd.org/OpenBSD-6.0/netstart";>netstart(8)</a> script:
 
 <blockquote><pre>
 # <b>sh /etc/netstart</b>
@@ -248,7 +248,7 @@ From here, you can either reboot or run 
 
 Note that a few warnings may be produced when running this script if you are
 reconfiguring interfaces that have already been configured.
-Use <a href="http://man.openbsd.org/ifconfig";>ifconfig(8)</a> to make sure that
+Use <a href="http://man.openbsd.org/OpenBSD-6.0/ifconfig";>ifconfig(8)</a> to 
make sure that
 your interfaces were set up correctly.
 
 <p>
@@ -264,8 +264,8 @@ configuration will fail.
 <h3 id="Setup.chkroute">Checking routes</h3>
 
 You can check your routes via
-<a href="http://man.openbsd.org/netstat";>netstat(1)</a> or
-<a href="http://man.openbsd.org/route";>route(8)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/netstat";>netstat(1)</a> or
+<a href="http://man.openbsd.org/OpenBSD-6.0/route";>route(8)</a>.
 If you are having routing problems, you may want to use the <tt>-n</tt> flag to
 route(8), which prints the IP addresses rather than doing a DNS lookup and
 displaying the hostname.
@@ -302,7 +302,7 @@ localhost          localhost          UH
 
 OpenBSD has a simple mechanism for setting up IP aliases on an interface.
 To do this, simply edit the
-<a href="http://man.openbsd.org/hostname.if";>hostname.if(5)</a> file of that
+<a href="http://man.openbsd.org/OpenBSD-6.0/hostname.if";>hostname.if(5)</a> 
file of that
 interface.
 
 <p>
@@ -338,8 +338,8 @@ that is configured by a DHCP server.
 
 <h3 id="DHCPclient">DHCP client</h3>
 
-To use <a href="http://man.openbsd.org/dhclient";>dhclient(8)</a>, edit the
-<a href="http://man.openbsd.org/hostname.if";>hostname.if(5)</a> file of your
+To use <a href="http://man.openbsd.org/OpenBSD-6.0/dhclient";>dhclient(8)</a>, 
edit the
+<a href="http://man.openbsd.org/OpenBSD-6.0/hostname.if";>hostname.if(5)</a> 
file of your
 interface.
 The <a href="#Wireless">wireless networking</a> section explains how to
 set up wireless interfaces.
@@ -365,10 +365,10 @@ where <tt>xl0</tt> is the interface on w
 
 <p>
 Once the interface is configured, dhclient(8) will overwrite the
-<a href="http://man.openbsd.org/resolv.conf";>resolv.conf(5)</a> file.
+<a href="http://man.openbsd.org/OpenBSD-6.0/resolv.conf";>resolv.conf(5)</a> 
file.
 You can customize the resolver configuration by using settings in
-<a href="http://man.openbsd.org/dhclient.conf";>dhclient.conf(5)</a> and using
-<a href="http://man.openbsd.org/resolv.conf.tail";>resolv.conf.tail(5)</a>.
+<a 
href="http://man.openbsd.org/OpenBSD-6.0/dhclient.conf";>dhclient.conf(5)</a> 
and using
+<a 
href="http://man.openbsd.org/OpenBSD-6.0/resolv.conf.tail";>resolv.conf.tail(5)</a>.
 
 <p>
 For example, to prevent the DHCP server from overriding the DNS server you
@@ -387,14 +387,14 @@ There are several useful configuration s
 <h3 id="DHCPserver">DHCP server</h3>
 
 If you want to use OpenBSD as a DHCP server, enable the
-<a href="http://man.openbsd.org/dhcpd";>dhcpd(8)</a> daemon at startup.
+<a href="http://man.openbsd.org/OpenBSD-6.0/dhcpd";>dhcpd(8)</a> daemon at 
startup.
 
 <blockquote><pre>
 # <b>rcctl enable dhcpd</b>
 </pre></blockquote>
 
 On the next boot, dhcpd will run and attach to all NICs that have valid
-configurations in <a 
href="http://man.openbsd.org/dhcpd.conf";>dhcpd.conf(5)</a>.
+configurations in <a 
href="http://man.openbsd.org/OpenBSD-6.0/dhcpd.conf";>dhcpd.conf(5)</a>.
 You may specify individual interfaces instead by naming them explicitly.
 
 <blockquote><pre>
@@ -422,7 +422,7 @@ subnet 172.16.0.0 netmask 255.255.255.0 
 There are two subnets in this example: a home network and a guest network.
 Clients will automatically be given an IP address and pointed to the gateway
 and DNS servers you specify.
-See <a href="http://man.openbsd.org/dhcp-options";>dhcp-options(5)</a> for more
+See <a 
href="http://man.openbsd.org/OpenBSD-6.0/dhcp-options";>dhcp-options(5)</a> for 
more
 options.
 
 <h2 id="PXE">PXE booting (i386, amd64)</h2>
@@ -440,26 +440,26 @@ Upon starting the boot process, the PXE-
 over the network.
 The DHCP server will assign the adapter an IP address.
 Then it will specify the name of a file to be retrieved from the tftp server
-<a href="http://man.openbsd.org/tftpd";>tftpd(8)</a> and then execute it.
+<a href="http://man.openbsd.org/OpenBSD-6.0/tftpd";>tftpd(8)</a> and then 
execute it.
 This file then conducts the rest of the boot process.
 On OpenBSD, this file is known as
-<a href="http://man.openbsd.org/pxeboot";>pxeboot(8)</a>, and it takes the
-place of the standard <a href="http://man.openbsd.org/boot";>boot(8)</a> file.
+<a href="http://man.openbsd.org/OpenBSD-6.0/pxeboot";>pxeboot(8)</a>, and it 
takes the
+place of the standard <a 
href="http://man.openbsd.org/OpenBSD-6.0/boot";>boot(8)</a> file.
 pxeboot(8) is then able to load and execute a kernel from the same TFTP server.
 
 <p>
 Details on how to set up PXE booting can be found in the
-<a href="http://man.openbsd.org/pxeboot";>pxeboot(8)</a> manual.
-See also <a href="http://man.openbsd.org/tftpd";>tftpd(8)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/pxeboot";>pxeboot(8)</a> manual.
+See also <a href="http://man.openbsd.org/OpenBSD-6.0/tftpd";>tftpd(8)</a>.
 
 <h2 id="Wireless">Wireless networking</h2>
 
 OpenBSD has support for
-<a href="http://man.openbsd.org/?query=wireless&amp;apropos=1";> a number of
+<a href="http://man.openbsd.org/OpenBSD-6.0/?query=wireless&amp;apropos=1";> a 
number of
 wireless chipsets</a>.
 Further supported devices can be found in
-<a href="http://man.openbsd.org/usb";>usb(4)</a> and
-<a href="http://man.openbsd.org/pci";>pci(4)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/usb";>usb(4)</a> and
+<a href="http://man.openbsd.org/OpenBSD-6.0/pci";>pci(4)</a>.
 The precise extent of their support is described in the driver man pages.
 
 <p>
@@ -467,26 +467,26 @@ The following cards support Host-based A
 them to be used as a wireless access point.
 
 <ul>
-  <li><a href="http://man.openbsd.org/acx";>acx(4)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/acx";>acx(4)</a>
     TI ACX100/ACX111
-  <li><a href="http://man.openbsd.org/ath";>ath(4)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/ath";>ath(4)</a>
     Atheros 802.11a/b/g
-  <li><a href="http://man.openbsd.org/athn";>athn(4)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/athn";>athn(4)</a>
     Atheros 802.11/a/g/n devices
-  <li><a href="http://man.openbsd.org/pgt";>pgt(4)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/pgt";>pgt(4)</a>
     Conexant/Intersil Prism GT Full-MAC 802.11a/b/g
-  <li><a href="http://man.openbsd.org/ral";>ral(4)</a>
-    and <a href="http://man.openbsd.org/ural";>ural(4)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/ral";>ral(4)</a>
+    and <a href="http://man.openbsd.org/OpenBSD-6.0/ural";>ural(4)</a>
     Ralink Technology RT25x0 802.11a/b/g
-  <li><a href="http://man.openbsd.org/rtw";>rtw(4)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/rtw";>rtw(4)</a>
     Realtek 8180 802.11b
-  <li><a href="http://man.openbsd.org/rum";>rum(4)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/rum";>rum(4)</a>
     Ralink Technology RT2501USB
-  <li><a href="http://man.openbsd.org/wi";>wi(4)</a>
+  <li><a href="http://man.openbsd.org/OpenBSD-6.0/wi";>wi(4)</a>
     Prism2/2.5/3
 </ul>
 
-The <a href="http://man.openbsd.org/ifconfig";>ifconfig(8)</a> <tt>media</tt>
+The <a href="http://man.openbsd.org/OpenBSD-6.0/ifconfig";>ifconfig(8)</a> 
<tt>media</tt>
 subcommand shows media capabilities of network interfaces.
 For wireless devices, it displays supported 802.11a/b/g/n media modes and the
 supported operating modes (<tt>hostap</tt>, <tt>ibss</tt>, <tt>monitor</tt>).
@@ -497,7 +497,7 @@ $ <b>ifconfig ath0 media</b>
 </pre></blockquote>
 
 In order to use some wireless cards, you will need to acquire firmware files
-with <a href="http://man.openbsd.org/fw_update";>fw_update(1)</a>.
+with <a href="http://man.openbsd.org/OpenBSD-6.0/fw_update";>fw_update(1)</a>.
 Some manufacturers refuse to allow <a href="faq1.html#ReallyFree">free</a>
 distribution of their firmware, so it can't be included with OpenBSD.
 
@@ -511,11 +511,11 @@ is most effective, which is often not di
 
 Adapters based on supported chips can be used like any other network interface.
 To connect an OpenBSD system to an existing wireless network, use the
-<a href="http://man.openbsd.org/ifconfig";>ifconfig(8)</a> utility.
+<a href="http://man.openbsd.org/OpenBSD-6.0/ifconfig";>ifconfig(8)</a> utility.
 
 <p>
 Some examples of wireless
-<a href="http://man.openbsd.org/hostname.if";>hostname.if(5)</a> files might be:
+<a href="http://man.openbsd.org/OpenBSD-6.0/hostname.if";>hostname.if(5)</a> 
files might be:
 
 <blockquote><pre>
 inet 10.0.0.157 255.255.255.0
@@ -546,19 +546,19 @@ locations.
 <p>
 You could set up both interfaces with DHCP, but then you would have to wait for
 the unused interface to time out while booting (see the <tt>link-timeout</tt>
-option of <a href="http://man.openbsd.org/dhclient.conf";>dhclient.conf(5)</a>).
+option of <a 
href="http://man.openbsd.org/OpenBSD-6.0/dhclient.conf";>dhclient.conf(5)</a>).
 Things would be a little confusing if you had both resources available, and
 switching between the two resources would be a bit annoying.
 
 <p>
-Using a <a href="http://man.openbsd.org/trunk";>trunk(4)</a> device may simplify
+Using a <a href="http://man.openbsd.org/OpenBSD-6.0/trunk";>trunk(4)</a> device 
may simplify
 your life.
 Trunks are virtual interfaces consisting of one or more network interfaces.
 
 <p>
 In the rest of this section, we will use a laptop with a wired
-<a href="http://man.openbsd.org/bge";>bge0</a> and a wireless
-<a href="http://man.openbsd.org/iwn";>iwn0</a> interface.
+<a href="http://man.openbsd.org/OpenBSD-6.0/bge";>bge0</a> and a wireless
+<a href="http://man.openbsd.org/OpenBSD-6.0/iwn";>iwn0</a> interface.
 Using these two interfaces, we will build a <tt>trunk0</tt> interface, then use
 DHCP to get an IP address for this virtual interface.
 
@@ -615,9 +615,9 @@ When properly configured, IPsec protects
 
 <h3>Setting up an NFS server</h3>
 
-The <a href="http://man.openbsd.org/portmap";>portmap(8)</a>,
-<a href="http://man.openbsd.org/mountd";>mountd(8)</a> and
-<a href="http://man.openbsd.org/nfsd";>nfsd(8)</a>
+The <a href="http://man.openbsd.org/OpenBSD-6.0/portmap";>portmap(8)</a>,
+<a href="http://man.openbsd.org/OpenBSD-6.0/mountd";>mountd(8)</a> and
+<a href="http://man.openbsd.org/OpenBSD-6.0/nfsd";>nfsd(8)</a>
 services must be enabled on the server:
 
 <blockquote><pre>
@@ -637,7 +637,7 @@ Then configure the list of filesystems t
 In this example, we have a server with IP address <tt>10.0.0.1</tt>.
 This server will be serving NFS only to clients within its own subnet.
 This is configured in the following
-<a href="http://man.openbsd.org/exports";>exports(5)</a> file:
+<a href="http://man.openbsd.org/OpenBSD-6.0/exports";>exports(5)</a> file:
 
 <blockquote><pre>
 $ <b>cat /etc/exports</b>
@@ -682,8 +682,8 @@ Just HUP mountd and the changes will tak
 <h3>Mounting NFS Filesystems</h3>
 
 NFS filesystems should be mounted via
-<a href="http://man.openbsd.org/mount_nfs";>mount(8)</a>, or more specifically,
-<a href="http://man.openbsd.org/mount_nfs";>mount_nfs(8)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/mount_nfs";>mount(8)</a>, or more 
specifically,
+<a href="http://man.openbsd.org/OpenBSD-6.0/mount_nfs";>mount_nfs(8)</a>.
 
 <p>
 To mount the <tt>/work</tt> filesystem on host <tt>10.0.0.1</tt> to local
@@ -697,14 +697,14 @@ Note that you don't need to use an IP ad
 
 <p>
 To have that filesystem mounted at boot, append a line to your
-<a href="http://man.openbsd.org/fstab";>fstab(5)</a>:
+<a href="http://man.openbsd.org/OpenBSD-6.0/fstab";>fstab(5)</a>:
 
 <blockquote><pre>
 # <b>echo '10.0.0.1:/work /mnt nfs rw,nodev,nosuid 0 0' >> /etc/fstab</b>
 </pre></blockquote>
 
 It is important that you use <tt>0 0</tt> at the end of this line so that your
-computer does not try to <a href="http://man.openbsd.org/fsck";>fsck(8)</a> the
+computer does not try to <a 
href="http://man.openbsd.org/OpenBSD-6.0/fsck";>fsck(8)</a> the
 NFS filesystem on boot.
 
 <p>
@@ -726,13 +726,13 @@ access is denied.
 
 <p>
 The user and group that root are mapped to are configurable via the
-<a href="http://man.openbsd.org/export";>exports(5)</a> file on the NFS server.
+<a href="http://man.openbsd.org/OpenBSD-6.0/export";>exports(5)</a> file on the 
NFS server.
 
 <h3>Checking Stats on NFS</h3>
 
 One thing to check to ensure NFS is operating properly is that all the daemons
 have properly registered with RPC.
-To do this, use <a href="http://man.openbsd.org/rpcinfo";>rpcinfo(8)</a>.
+To do this, use <a 
href="http://man.openbsd.org/OpenBSD-6.0/rpcinfo";>rpcinfo(8)</a>.
 
 <blockquote><pre>
 $ <b>rpcinfo -p 10.0.0.1</b>
@@ -750,14 +750,14 @@ $ <b>rpcinfo -p 10.0.0.1</b>
 </pre></blockquote>
 
 There are a few utilities that allow you to see what is happening with NFS.
-<a href="http://man.openbsd.org/showmount";>showmount(8)</a> allows you to view
+<a href="http://man.openbsd.org/OpenBSD-6.0/showmount";>showmount(8)</a> allows 
you to view
 what is currently mounted by whom.
-There is also <a href="http://man.openbsd.org/nfsstat";>nfsstat(1)</a>, which
+There is also <a 
href="http://man.openbsd.org/OpenBSD-6.0/nfsstat";>nfsstat(1)</a>, which
 shows much more verbose statistics.
 
 <h2 id="Bridge">Setting up a network bridge</h2>
 
-A <a href="http://man.openbsd.org/bridge";>bridge(4)</a> is a link between two 
or
+A <a href="http://man.openbsd.org/OpenBSD-6.0/bridge";>bridge(4)</a> is a link 
between two or
 more separate networks.
 Unlike a router, packets transfer through the bridge "invisibly" -- logically,
 the two network segments appear to be one segment to nodes on either side of 
the
@@ -814,16 +814,16 @@ up media 10base2
 </pre></blockquote>
 
 Here, we are instructing the system to activate this interface using
-<a href="http://man.openbsd.org/ifconfig";>ifconfig(8)</a> and setting it to
+<a href="http://man.openbsd.org/OpenBSD-6.0/ifconfig";>ifconfig(8)</a> and 
setting it to
 10BASE-2 (coax).
 No IP address or similar information needs to be specified for this interface.
 The options the <tt>ep</tt> card accepts are detailed in its
-<a href="http://man.openbsd.org/ep";>man page</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/ep";>man page</a>.
 
 <p>
 Now, we need to set up the bridge.
 Bridges are initialized by the existence of a file named something like
-<a href="http://man.openbsd.org/hostname.if";><tt>hostname.bridge0</tt></a>.
+<a 
href="http://man.openbsd.org/OpenBSD-6.0/hostname.if";><tt>hostname.bridge0</tt></a>.
 Here is an example for my situation here:
 
 <blockquote><pre>
@@ -846,7 +846,7 @@ Reboot and you now have a functioning br
 <h3>A bridge acting as a DHCP server</h3>
 
 Let's say we have a small system which has four
-<a href="http://man.openbsd.org/vr";>vr(4)</a> interfaces, <tt>vr0</tt> through
+<a href="http://man.openbsd.org/OpenBSD-6.0/vr";>vr(4)</a> interfaces, 
<tt>vr0</tt> through
 <tt>vr3</tt>.
 We want to bridge <tt>vr1</tt>, <tt>vr2</tt> and <tt>vr3</tt> together, leaving
 out <tt>vr0</tt> for an uplink (a cable modem for instance).
@@ -860,10 +860,10 @@ It is not possible to assign an IP addre
 The IP address should be added to one of the member interfaces, but we cannot
 use a physical interface as the link might be down, in which case the address
 would not be reachable.
-Fortunately, there is the <a href="http://man.openbsd.org/vether";>vether(4)</a>
+Fortunately, there is the <a 
href="http://man.openbsd.org/OpenBSD-6.0/vether";>vether(4)</a>
 virtual Ethernet interface driver that can be used for this purpose.
 We will add it to the bridge, assign the IP address to it and make
-<a href="http://man.openbsd.org/dhcpd";>dhcpd(8)</a> listen there.
+<a href="http://man.openbsd.org/OpenBSD-6.0/dhcpd";>dhcpd(8)</a> listen there.
 
 <p>
 Notes:
@@ -951,7 +951,7 @@ Other results could be had by filtering 
 
 <p>
 To monitor and control the bridge you have created, use the
-<a href="http://man.openbsd.org/ifconfig";>ifconfig(8)</a> command, which can
+<a href="http://man.openbsd.org/OpenBSD-6.0/ifconfig";>ifconfig(8)</a> command, 
which can
 also be used to create a bridge after boot.
 
 <h3>Tips on bridging</h3>
@@ -962,8 +962,8 @@ also be used to create a bridge after bo
     very well to do it right.
 
   <li>By using the <tt>blocknonip</tt> option of
-    <a href="http://man.openbsd.org/ifconfig";>ifconfig(8)</a> or in
-    <a href="http://man.openbsd.org/hostname.if";>hostname.bridge0</a>, you can
+    <a href="http://man.openbsd.org/OpenBSD-6.0/ifconfig";>ifconfig(8)</a> or in
+    <a 
href="http://man.openbsd.org/OpenBSD-6.0/hostname.if";>hostname.bridge0</a>, you 
can
     prevent non-IP traffic (such as IPX or NETBEUI) from slipping around your
     filters.
     This may be important in some situations, but you should be aware that
@@ -986,7 +986,7 @@ In most scenarios, multipath routing is 
 connections, e.g., redundant connections to the internet.
 
 <p>
-The <a href="http://man.openbsd.org/route";>route(8)</a> command is used to
+The <a href="http://man.openbsd.org/OpenBSD-6.0/route";>route(8)</a> command is 
used to
 add/change/delete routes in the routing table.
 The <tt>-mpath</tt> argument is used when adding multipath routes.
 
@@ -1008,9 +1008,9 @@ In this example we can see that one defa
 the other points to <tt>10.132.0.1</tt>, which is accessible via <tt>fxp2</tt>.
 
 <p>
-Since the <a href="http://man.openbsd.org/mygate";>mygate(5)</a> file does not
+Since the <a href="http://man.openbsd.org/OpenBSD-6.0/mygate";>mygate(5)</a> 
file does not
 yet support multipath default routes, the above commands should be added to the
-bottom of the <a href="http://man.openbsd.org/hostname.if";>hostname.if(5)</a>
+bottom of the <a 
href="http://man.openbsd.org/OpenBSD-6.0/hostname.if";>hostname.if(5)</a>
 files for the <tt>fxp1</tt> and <tt>fxp2</tt> interfaces.
 The <tt>/etc/mygate</tt> file should then be deleted.
 
@@ -1022,14 +1022,14 @@ $ <b>tail -1 /etc/hostname.fxp2</b>
 </pre></blockquote>
 
 Lastly, don't forget to activate the use of multipath routes by enabling the
-proper <a href="http://man.openbsd.org/sysctl";>sysctl(8)</a> variable.
+proper <a href="http://man.openbsd.org/OpenBSD-6.0/sysctl";>sysctl(8)</a> 
variable.
 
 <blockquote><pre>
 # <b>sysctl net.inet.ip.multipath=1</b>
 # <b>sysctl net.inet6.ip6.multipath=1</b>
 </pre></blockquote>
 
-Be sure to edit <a href="http://man.openbsd.org/sysctl.conf";>sysctl.conf(5)</a>
+Be sure to edit <a 
href="http://man.openbsd.org/OpenBSD-6.0/sysctl.conf";>sysctl.conf(5)</a>
 to make the changes permanent.
 
 <p>
@@ -1062,7 +1062,7 @@ It's worth noting that if an interface u
 route that points to that interface.
 This traffic will of course be blackholed and end up going nowhere.
 It's highly recommended to use
-<a href="http://man.openbsd.org/ifstated";>ifstated(8)</a> to check for
+<a href="http://man.openbsd.org/OpenBSD-6.0/ifstated";>ifstated(8)</a> to check 
for
 unavailable interfaces and adjust the routing table accordingly.
 
 <h2 id="Replace">Adding and replacing NICs</h2>
@@ -1101,8 +1101,8 @@ Here are some cases:
     In this case, simply rename the old <tt>hostname.if</tt> file to match the
     new device.
     For example, if you replace an
-    <a href="http://man.openbsd.org/fxp";>fxp(4)</a> device which was
-    <tt>fxp0</tt> with a <a href="http://man.openbsd.org/re";>re(4)</a> device,
+    <a href="http://man.openbsd.org/OpenBSD-6.0/fxp";>fxp(4)</a> device which 
was
+    <tt>fxp0</tt> with a <a 
href="http://man.openbsd.org/OpenBSD-6.0/re";>re(4)</a> device,
     which would end up as <tt>re0</tt>, you could rename
     <tt>/etc/hostname.fxp0</tt> to <tt>/etc/hostname.re0</tt> and your new
     device would take over the configuration of the old device.
@@ -1113,7 +1113,7 @@ Here are some cases:
     Let's assume you have a machine with <tt>fxp0</tt>, <tt>fxp1</tt> and
     <tt>fxp2</tt>, and <tt>fxp0</tt> fails.
     Unfortunately, you don't have a spare similar fxp card, so you need to
-    replace it with an <a href="http://man.openbsd.org/em";>em(4)</a> card.
+    replace it with an <a 
href="http://man.openbsd.org/OpenBSD-6.0/em";>em(4)</a> card.
     This gets a little ugly, as <tt>fxp1</tt> and <tt>fxp2</tt> will rename
     themselves:
 
@@ -1137,8 +1137,8 @@ Here are some cases:
     If your added NIC is of a different type, it will be the "0" device of
     whatever driver it is.
     For example, if you are adding a
-    <a href="http://man.openbsd.org/bge";>bge(4)</a> device to a machine with
-    only an <a href="http://man.openbsd.org/rl";>rl(4)</a> device, life is easy
+    <a href="http://man.openbsd.org/OpenBSD-6.0/bge";>bge(4)</a> device to a 
machine with
+    only an <a href="http://man.openbsd.org/OpenBSD-6.0/rl";>rl(4)</a> device, 
life is easy
     -- the new device will be <tt>bge0</tt>, so create an appropriate
     <tt>/etc/hostname.bge0</tt>.
 
@@ -1162,12 +1162,12 @@ Here are some cases:
 
     <p>
     The first thing to note is that
-    <a href="http://man.openbsd.org/ifconfig";>ifconfig(8)</a> will tell you 
both
+    <a href="http://man.openbsd.org/OpenBSD-6.0/ifconfig";>ifconfig(8)</a> will 
tell you both
     the MAC address and the link status of each port.
     So the first trick might be to mark add-in cards with their MAC addresses.
     Another trick in a confused situation can be to simply attach ONE unknown
     NIC to a switch port at a time, and look for which NIC in
-    <a href="http://man.openbsd.org/ifconfig";>ifconfig(8)</a> is now showing a
+    <a href="http://man.openbsd.org/OpenBSD-6.0/ifconfig";>ifconfig(8)</a> is 
now showing a
     link.
     Once you have a few ports identified, you will often figure out the rest
     quickly.
Index: faq7.html
===================================================================
RCS file: /cvs/www/faq/faq7.html,v
retrieving revision 1.143
diff -u -p -r1.143 faq7.html
--- faq7.html   22 Sep 2016 06:24:55 -0000      1.143
+++ faq7.html   6 Dec 2016 18:31:32 -0000
@@ -41,12 +41,12 @@
 
 <h2 id="Keyboard">Remapping the keyboard</h2>
 
-The <a href="http://man.openbsd.org/kbd";>kbd(8)</a> utility can be used to
+The <a href="http://man.openbsd.org/OpenBSD-6.0/kbd";>kbd(8)</a> utility can be 
used to
 change the keyboard encoding.
 Most keyboard options can be controlled using the
-<a href="http://man.openbsd.org/wsconsctl";>wsconsctl(8)</a> utility.
+<a href="http://man.openbsd.org/OpenBSD-6.0/wsconsctl";>wsconsctl(8)</a> 
utility.
 For example, to change keymappings with
-<a href="http://man.openbsd.org/wsconsctl";>wsconsctl(8)</a>,
+<a href="http://man.openbsd.org/OpenBSD-6.0/wsconsctl";>wsconsctl(8)</a>,
 one would execute the following:
 
 <blockquote><pre>
@@ -60,14 +60,14 @@ Remap <tt>[Caps Lock]</tt> to be <tt>[Co
 </pre></blockquote>
 
 To make changes permanent, use the
-<a href="http://man.openbsd.org/wsconsctl.conf";>wsconsctl.conf(5)</a> file.
+<a 
href="http://man.openbsd.org/OpenBSD-6.0/wsconsctl.conf";>wsconsctl.conf(5)</a> 
file.
 
 <h2 id="ConsoleMouse">Console mouse support</h2>
 
 For the <a href="../alpha.html">alpha</a>, <a href="../amd64.html">amd64</a>
 and <a href="../i386.html">i386</a> platforms, OpenBSD provides
-<a href="http://man.openbsd.org/wsmoused";>wsmoused(8)</a>.
-It can be enabled with the <a href="http://man.openbsd.org/rcctl";>rcctl(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/wsmoused";>wsmoused(8)</a>.
+It can be enabled with the <a 
href="http://man.openbsd.org/OpenBSD-6.0/rcctl";>rcctl(8)</a>
 utility.
 See also the FAQ on the <a href="faq10.html#rc">rc script</a>.
 
@@ -83,14 +83,14 @@ Switching consoles will clear the scroll
 Due to space limitations, the install kernels do not have this feature.
 
 <p>
-This is a feature of the <a href="http://man.openbsd.org/vga";>vga(4)</a> 
driver,
+This is a feature of the <a 
href="http://man.openbsd.org/OpenBSD-6.0/vga";>vga(4)</a> driver,
 so it will not work without a VGA card, or on hardware that uses
-<a href="http://man.openbsd.org/drm";>drm(4)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/drm";>drm(4)</a>.
 
 <h2 id="SwitchConsole">Switching consoles</h2>
 
 On alpha, amd64 and i386 systems with
-<a href="http://man.openbsd.org/vga";>vga(4)</a> cards, OpenBSD provides six
+<a href="http://man.openbsd.org/OpenBSD-6.0/vga";>vga(4)</a> cards, OpenBSD 
provides six
 virtual terminals by default, <tt>/dev/ttyC0</tt> through <tt>/dev/ttyC5</tt>.
 You can switch between them using <tt>[CTRL]+[ALT]</tt> together with
 <tt>[F1]</tt> through <tt>[F6]</tt>.
@@ -99,7 +99,7 @@ leaving five text consoles available.
 
 <p>
 If you wish to have more than the default number of virtual consoles, use the
-<a href="http://man.openbsd.org/wsconscfg";>wsconscfg(8)</a> command to create
+<a href="http://man.openbsd.org/OpenBSD-6.0/wsconscfg";>wsconscfg(8)</a> 
command to create
 screens for <tt>ttyC6</tt>, <tt>ttyC7</tt> and above.
 For example:
 
@@ -110,16 +110,16 @@ For example:
 This will create a virtual terminal for <tt>ttyC6</tt>, accessed by
 <tt>[CTRL]+[ALT]+[F7]</tt>.
 To get a <tt>login:</tt> prompt on the newly created virtual console, you need
-to set it to <tt>on</tt> in <a href="http://man.openbsd.org/ttys";>ttys(5)</a>,
-and either reboot or send <a href="http://man.openbsd.org/init";>init(8)</a>
-a HUP signal using <a href="http://man.openbsd.org/kill";>kill(1)</a>.
-Add this command to <a href="http://man.openbsd.org/rc.local";>rc.local(8)</a>
+to set it to <tt>on</tt> in <a 
href="http://man.openbsd.org/OpenBSD-6.0/ttys";>ttys(5)</a>,
+and either reboot or send <a 
href="http://man.openbsd.org/OpenBSD-6.0/init";>init(8)</a>
+a HUP signal using <a 
href="http://man.openbsd.org/OpenBSD-6.0/kill";>kill(1)</a>.
+Add this command to <a 
href="http://man.openbsd.org/OpenBSD-6.0/rc.local";>rc.local(8)</a>
 if you want the extra screen the next time you boot the computer.
 
 <h2 id="Blanker">Blanking the console after a period of inactivity</h2>
 
 If you wish to blank your console after a period of inactivity without using X,
-modify the following <a href="http://man.openbsd.org/wscons";>wscons(4)</a>
+modify the following <a 
href="http://man.openbsd.org/OpenBSD-6.0/wscons";>wscons(4)</a>
 variables:
 
 <ul>
@@ -145,7 +145,7 @@ display.screen_off -> 60000
 </pre></blockquote>
 
 Set them permanently by editing
-<a href="http://man.openbsd.org/wsconsctl.conf";>wsconsctl.conf(5)</a>.
+<a 
href="http://man.openbsd.org/OpenBSD-6.0/wsconsctl.conf";>wsconsctl.conf(5)</a>.
 The blanker is activated when either <tt>display.kbdact</tt> or
 <tt>display.outact</tt> is set to <tt>on</tt>.
 Note that one of those two must be <tt>off</tt>.
@@ -153,25 +153,25 @@ Note that one of those two must be <tt>o
 <h2 id="Size80x50">Changing console font and resolution</h2>
 
 alpha, amd64 and i386 users with VGA but
-non-<a href="http://man.openbsd.org/drm";>drm(4)</a> display adapters normally
+non-<a href="http://man.openbsd.org/OpenBSD-6.0/drm";>drm(4)</a> display 
adapters normally
 get a console screen of 25 lines of 80 characters.
 However, many VGA video cards are capable of displaying a higher text
 resolution of 50 lines of 80 characters.
 
 <p>
 First, a font that supports the desired resolution must be loaded using the
-<a href="http://man.openbsd.org/wsfontload";>wsfontload(8)</a> command.
+<a href="http://man.openbsd.org/OpenBSD-6.0/wsfontload";>wsfontload(8)</a> 
command.
 The standard 80x25 text screen uses 8x16 pixel fonts; to double the number of
 lines, we will have to use 8x8 pixel fonts.
 
 <p>
 After that, we will have to delete and recreate a
 <a href="#SwitchConsole">virtual console</a> at the desired screen resolution,
-using the <a href="http://man.openbsd.org/wsconscfg";>wsconscfg(8)</a> command.
+using the <a 
href="http://man.openbsd.org/OpenBSD-6.0/wsconscfg";>wsconscfg(8)</a> command.
 
 <p>
 This can be done automatically at boot by adding the following lines to
-the end of your <a href="http://man.openbsd.org/rc.local";>rc.local(8)</a> file:
+the end of your <a 
href="http://man.openbsd.org/OpenBSD-6.0/rc.local";>rc.local(8)</a> file:
 
 <blockquote><pre>
 wsfontload -h 8 -e ibm /usr/share/misc/pcvtfonts/vt220l.808
@@ -208,11 +208,11 @@ As one might expect, all these commands 
 <p>
 <b>Note: this will not work on all video cards.</b>
 Unfortunately, not all video cards support the uploaded fonts that
-<a href="http://man.openbsd.org/wscons";>wscons(4)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/wscons";>wscons(4)</a>
 requires to achieve the 80x50 text mode.
 In these cases, you might wish to consider running X.
 Cards supported by the
-<a href="http://man.openbsd.org/drm";>drm(4)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/drm";>drm(4)</a>
 driver will have a higher resolution anyway, but can not use these uploaded
 fonts.
 
@@ -253,7 +253,7 @@ This part is fairly similar between plat
 
 <p>
 Terminal sessions are controlled by the
-<a href="http://man.openbsd.org/ttys";>ttys(5)</a> file.
+<a href="http://man.openbsd.org/OpenBSD-6.0/ttys";>ttys(5)</a> file.
 Before OpenBSD will give you a <tt>login:</tt> prompt at a device, it has to be
 enabled in <tt>/etc/ttys</tt>.
 After all, there are uses for a serial port other than for a terminal.
@@ -273,11 +273,11 @@ tty00   "/usr/libexec/getty std.9600"   
 </pre></blockquote>
 
 Here, <tt>tty00</tt> is the serial port we are using as a console.
-<tt>vt220</tt> is the <a href="http://man.openbsd.org/termcap.5";>termcap(5)</a>
+<tt>vt220</tt> is the <a 
href="http://man.openbsd.org/OpenBSD-6.0/termcap.5";>termcap(5)</a>
 entry that matches your terminal.
 Other likely options might include <tt>vt100</tt>, <tt>xterm</tt>, etc.
 The <tt>on</tt> bit activates the
-<a href="http://man.openbsd.org/getty";>getty(8)</a> for that serial port, so
+<a href="http://man.openbsd.org/OpenBSD-6.0/getty";>getty(8)</a> for that 
serial port, so
 that a <tt>login:</tt> prompt will be presented.
 The <tt>secure</tt> bit permits a <tt>root</tt> (uid 0) login at this console.
 The <tt>9600</tt> bit is the terminal baud rate.
@@ -299,7 +299,7 @@ available.
 
 <h3>amd64 and i386</h3>
 To direct the boot process to use the serial port as a console, create or edit
-your <a href="http://man.openbsd.org/boot.conf";>boot.conf(5)</a> file to 
include
+your <a href="http://man.openbsd.org/OpenBSD-6.0/boot.conf";>boot.conf(5)</a> 
file to include
 the line
 
 <blockquote><pre>
@@ -311,7 +311,7 @@ This can be changed with a <tt>/etc/boot
 option.
 This file is put on your boot drive, which could also be your install media, or
 the command can be entered at the <tt>boot&gt;</tt> prompt of
-<a href="http://man.openbsd.org/boot";>boot(8)</a> for a one-time serial console
+<a href="http://man.openbsd.org/OpenBSD-6.0/boot";>boot(8)</a> for a one-time 
serial console
 usage.
 
 <h4>amd64 and i386 notes:</h4>
@@ -423,7 +423,7 @@ is no longer compatible with this usage.
 
 <p>
 From
-<a href="http://man.openbsd.org/cua";>cua(4)</a>:
+<a href="http://man.openbsd.org/OpenBSD-6.0/cua";>cua(4)</a>:
 
 <p>
 For hardware terminal ports, dial-out is supported through matching
@@ -437,15 +437,15 @@ hardware signal to indicate to the syste
 dial-out device (the cua) does not, and hence can communicate unimpeded
 with a device such as a modem</i>.
 This means that a process like
-<a href="http://man.openbsd.org/getty";>getty(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/getty";>getty(8)</a>
 will wait on a dial-in device until a connection is established.
 Meanwhile, a dial-out connection can be established on the dial-out
 device (for the very same hardware terminal port) without disturbing
 anything else on the system.
-The <a href="http://man.openbsd.org/getty";>getty(8)</a>
+The <a href="http://man.openbsd.org/OpenBSD-6.0/getty";>getty(8)</a>
 process does not even notice that anything is happening on the terminal port.
 If a connecting call comes in after the dial-out connection has finished, the
-<a href="http://man.openbsd.org/getty";>getty(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/getty";>getty(8)</a>
 process will deal with it properly, without having noticed the intervening
 dial-out action.
 
Index: faq8.html
===================================================================
RCS file: /cvs/www/faq/faq8.html,v
retrieving revision 1.309
diff -u -p -r1.309 faq8.html
--- faq8.html   21 Sep 2016 15:13:21 -0000      1.309
+++ faq8.html   6 Dec 2016 18:31:34 -0000
@@ -44,7 +44,7 @@
 
 The basic process to regain root is to boot into single user mode, mount the
 <tt>/</tt> and <tt>/usr</tt> partitions and run
-<a href="http://man.openbsd.org/passwd";>passwd(1)</a> to change the root
+<a href="http://man.openbsd.org/OpenBSD-6.0/passwd";>passwd(1)</a> to change 
the root
 password:
 
 <ul>
@@ -53,7 +53,7 @@ password:
     to platform.
     For amd64 and i386 platforms, the
     <a href="faq14.html#BootAmd64">second stage boot loader</a>,
-    <a href="http://man.openbsd.org/OpenBSD-current/i386/boot";>boot(8)</a>,
+    <a 
href="http://man.openbsd.org/OpenBSD-6.0/OpenBSD-current/i386/boot";>boot(8)</a>,
     pauses for a few seconds to give you a chance to provide parameters
     to the kernel.
 
@@ -72,7 +72,7 @@ password:
     # <b>fsck -p /usr &amp;&amp; mount /usr</b>
     </pre></blockquote>
 
-  <li><b>Run <a href="http://man.openbsd.org/passwd";>passwd(1)</a>
+  <li><b>Run <a href="http://man.openbsd.org/OpenBSD-6.0/passwd";>passwd(1)</a>
     to change the root password.</b>
     From being in single-user mode, you already have root privileges, so it
     will not ask you to provide your current password.
@@ -80,11 +80,11 @@ password:
   <li><b>Boot into multiuser mode.</b>
     This can be done by either entering "CTRL-D" to resume the normal boot
     process, or by entering the
-    <a href="http://man.openbsd.org/reboot";>reboot(8)</a> command.
+    <a href="http://man.openbsd.org/OpenBSD-6.0/reboot";>reboot(8)</a> command.
 </ul>
 
 If this is a non-personal machine, you should probably use
-<a href="http://man.openbsd.org/doas";>doas(1)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/doas";>doas(1)</a>
 to give multiple (trusted) people the ability to execute root commands.
 
 <p>
@@ -92,9 +92,9 @@ to give multiple (trusted) people the ab
 If an attacker has physical access to your system, they win, regardless of the
 OS on the computer.
 There are ways to force the use of a password on single-user mode, see
-<a href="http://man.openbsd.org/ttys";>ttys(5)</a>,
+<a href="http://man.openbsd.org/OpenBSD-6.0/ttys";>ttys(5)</a>,
 or eliminate the pause on i386/amd64, see
-<a href="http://man.openbsd.org/boot.conf";>boot.conf(8)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/boot.conf";>boot.conf(8)</a>.
 Getting around those tricks is also pretty easy.
 One way would be to boot from a CD or USB drive and edit (or replace) the
 password file.
@@ -114,7 +114,7 @@ The console management system is likely 
 <h2 id="Bootloader">The boot loader</h2>
 
 The OpenBSD boot loader is documented in the architecture-specific
-<a href="http://man.openbsd.org/boot.8";>boot(8)</a> man page.
+<a href="http://man.openbsd.org/OpenBSD-6.0/boot.8";>boot(8)</a> man page.
 If no commands are issued at the <tt>boot&gt;</tt> prompt, the boot loader will
 automatically try to boot <tt>/bsd</tt>.
 You can specify a kernel by typing:
@@ -146,9 +146,9 @@ The format is <tt>boot [image [-acds]]</
 
 <a href="http://www.openntpd.org";>OpenNTPD</a> is a trivial-to-administer, safe
 and simple NTP-compatible way to have accurate time on your computer.
-OpenBSD's <a href="http://man.openbsd.org/ntpd";>ntpd(8)</a> is controlled with 
a
+OpenBSD's <a href="http://man.openbsd.org/OpenBSD-6.0/ntpd";>ntpd(8)</a> is 
controlled with a
 simple configuration file,
-<a href="http://man.openbsd.org/ntpd.conf";>ntpd.conf(5)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/ntpd.conf";>ntpd.conf(5)</a>.
 
 <p>
 The OpenNTPD daemon is enabled by default at install time, which results in 
your
@@ -166,7 +166,7 @@ accurately set your system clock.
 
 OpenNTPD does not listen on any address by default.
 In order to use it as a server, you have to add a <tt>listen on *</tt> line to
-<a href="http://man.openbsd.org/ntpd.conf";>/etc/ntpd.conf</a> and restart the
+<a href="http://man.openbsd.org/OpenBSD-6.0/ntpd.conf";>/etc/ntpd.conf</a> and 
restart the
 daemon.
 Of course, if you want it to listen on a particular IP address rather than all
 available addresses and interfaces, replace the "*" with the desired address.
@@ -186,7 +186,7 @@ at the start.
 <h2 id="NTPerror">Why is my clock off by twenty-some seconds?</h2>
 
 When using
-<a href="http://man.openbsd.org/rdate";>rdate(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/rdate";>rdate(8)</a>
 to synchronize your clock to a NTP server, you may find your clock is
 off by twenty-some seconds from your local definition of time.
 
@@ -204,7 +204,7 @@ UTC TAI</tt>.
 Addressing the problem is fairly simple.
 In most countries you will get the correct time if you use the <tt>-c</tt>
 parameter to
-<a href="http://man.openbsd.org/rdate";>rdate(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/rdate";>rdate(8)</a>
 and use a time zone out of the directory <tt>/usr/share/zoneinfo/right</tt>.
 For example, if you are located in Germany, you could use these commands:
 
@@ -229,7 +229,7 @@ this problem altogether.
 <p>
 If having the hardware clock set to UTC is a problem, you can change the
 default behavior of OpenBSD using
-<a href="http://man.openbsd.org/config";>config(8)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/config";>config(8)</a>.
 For example, to configure OpenBSD to use a hardware clock set to
 US/Eastern (5 hours behind UTC, so 300 minutes):
 
@@ -244,7 +244,7 @@ Saving modified kernel.
 </pre></blockquote>
 
 See
-<a href="http://man.openbsd.org/options";>options(4)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/options";>options(4)</a>
 and search for option "TIMEZONE=value" for more information.
 
 <p>
@@ -258,7 +258,7 @@ zone:
 # <b>ln -fs /usr/share/zoneinfo/EST5EDT /etc/localtime</b>
 </pre></blockquote>
 
-See also the <a href="http://man.openbsd.org/date";>date(1)</a> manual and the
+See also the <a href="http://man.openbsd.org/OpenBSD-6.0/date";>date(1)</a> 
manual and the
 section on <a href="#OpenNTPD">OpenNTPD</a> above.
 
 <h2 id="locales">Character sets and localization</h2>
@@ -271,9 +271,9 @@ can be used to handle them.
 <p>
 The level of UTF-8 support and the default encoding configuration vary greatly
 with the program or library.
-For example, <a href="http://man.openbsd.org/xterm";>xterm(1)</a> has full UTF-8
+For example, <a href="http://man.openbsd.org/OpenBSD-6.0/xterm";>xterm(1)</a> 
has full UTF-8
 support enabled by default, while the
-<a href="http://man.openbsd.org/re_format";>regular expression library</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/re_format";>regular expression 
library</a>
 does not have any UTF-8 support yet.
 
 <p>
@@ -282,7 +282,7 @@ To use the Unicode character set in UTF-
 
 <ul>
   <li>
-    If logging in via <a href="http://man.openbsd.org/xdm";>xdm(1)</a>, add
+    If logging in via <a 
href="http://man.openbsd.org/OpenBSD-6.0/xdm";>xdm(1)</a>, add
     <tt>export LC_CTYPE="en_US.UTF-8"</tt> to your <tt>~/.xsession</tt> before
     starting the window manager.
     See <a href="faq11.html#CustomizingX">customizing X</a> for more details.
@@ -294,12 +294,12 @@ To use the Unicode character set in UTF-
 </ul>
 
 When logging into remote systems with
-<a href="http://man.openbsd.org/ssh";>ssh(1)</a>, the <tt>LC_CTYPE</tt>
+<a href="http://man.openbsd.org/OpenBSD-6.0/ssh";>ssh(1)</a>, the 
<tt>LC_CTYPE</tt>
 environment variable is not propagated, and you have to make sure that the 
local
 terminal is set to the character encoding used by the remote server before
 starting the ssh(1) client program.
 If that encoding is unknown or unsupported by OpenBSD, make sure you use the
-default <a href="http://man.openbsd.org/xterm";>xterm(1)</a> configuration and
+default <a href="http://man.openbsd.org/OpenBSD-6.0/xterm";>xterm(1)</a> 
configuration and
 set <tt>LC_CTYPE=en_US.UTF-8</tt> in the remote shell after connecting.
 
 <p>
@@ -314,10 +314,10 @@ Some ports may respect other <tt>LC_*</t
 
 Many new users to OpenBSD experience a two minute login delay when using
 services such as
-<a href="http://man.openbsd.org/ssh";>ssh(1)</a> or
-<a href="http://man.openbsd.org/ftp";>ftp(1)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/ssh";>ssh(1)</a> or
+<a href="http://man.openbsd.org/OpenBSD-6.0/ftp";>ftp(1)</a>.
 This can also be experienced when using a proxy, such as
-<a href="http://man.openbsd.org/ftp-proxy";>ftp-proxy(8)</a>,
+<a href="http://man.openbsd.org/OpenBSD-6.0/ftp-proxy";>ftp-proxy(8)</a>,
 or when sending mail.
 
 <p>
@@ -332,9 +332,9 @@ This is known as a Reverse DNS entry.
 In order to provide better logging, OpenBSD performs a reverse DNS
 lookup on any machine that attaches to it in many different ways,
 including
-<a href="http://man.openbsd.org/ssh";>ssh(1)</a>,
-<a href="http://man.openbsd.org/ftp";>ftp(1)</a>,
-<a href="http://man.openbsd.org/ftp-proxy";>ftp-proxy(8)</a>.
+<a href="http://man.openbsd.org/OpenBSD-6.0/ssh";>ssh(1)</a>,
+<a href="http://man.openbsd.org/OpenBSD-6.0/ftp";>ftp(1)</a>,
+<a href="http://man.openbsd.org/OpenBSD-6.0/ftp-proxy";>ftp-proxy(8)</a>.
 Unfortunately, in some cases, the machine that is making the connection
 does not have a proper reverse DNS entry.
 
@@ -353,9 +353,9 @@ they end up with a two minute delay befo
 From a workstation behind the NAT of the gateway with an
 <a href="http://tools.ietf.org/html/rfc1918";>unregistered IP</a>
 address of 192.168.1.35, the user uses
-<a href="http://man.openbsd.org/ssh";>ssh(1)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/ssh";>ssh(1)</a>
 to access the gateway system.
-The <a href="http://man.openbsd.org/ssh";>ssh(1)</a>
+The <a href="http://man.openbsd.org/OpenBSD-6.0/ssh";>ssh(1)</a>
 client prompts for username and password, and sends them to the gateway box.
 The gateway then tries to figure out who is trying to log in by performing a
 reverse DNS lookup of 192.168.1.35.
@@ -370,7 +370,7 @@ In this case, you will find yourself wai
 time out, which takes about two minutes before the login will be permitted to
 continue.
 In the case of
-<a href="http://man.openbsd.org/ftp-proxy";>ftp-proxy(8)</a>,
+<a href="http://man.openbsd.org/OpenBSD-6.0/ftp-proxy";>ftp-proxy(8)</a>,
 some ftp clients will timeout before the reverse DNS query
 times out, leading to the impression that ftp-proxy isn't working.
 
@@ -382,16 +382,16 @@ Fortunately, it is an easy thing to fix.
 
 The simplest fix is as follows:
 Populate your
-<a href="http://man.openbsd.org/hosts";>hosts(5)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/hosts";>hosts(5)</a>
 file with all the workstations you have in your internal network.
 Make sure that your
-<a href="http://man.openbsd.org/resolv.conf";>resolv.conf(5)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/resolv.conf";>resolv.conf(5)</a>
 file contains the line <tt>lookup file bind</tt>.
 This tells the resolver to start with the
-<a href="http://man.openbsd.org/hosts";>hosts(5)</a> file,
+<a href="http://man.openbsd.org/OpenBSD-6.0/hosts";>hosts(5)</a> file,
 and failing that, to use the DNS servers specified by the <tt>nameserver</tt>
 lines in your
-<a href="http://man.openbsd.org/resolv.conf";>resolv.conf(5)</a> file.
+<a href="http://man.openbsd.org/OpenBSD-6.0/resolv.conf";>resolv.conf(5)</a> 
file.
 
 <p>
 Your <tt>/etc/hosts</tt> file will look something like this:
@@ -440,7 +440,7 @@ the top of the file.
 <p>
 If your gateway must use DHCP for configuration, you may well find you
 have a problem --
-<a href="http://man.openbsd.org/dhclient";>dhclient(8)</a>
+<a href="http://man.openbsd.org/OpenBSD-6.0/dhclient";>dhclient(8)</a>
 will overwrite your <tt>/etc/resolv.conf</tt> every time the lease is
 renewed, which will remove the <tt>lookup file bind</tt> line.
 This can be solved by putting the line <tt>lookup file bind</tt> in the file
@@ -523,7 +523,7 @@ end up with a totally different product 
 
 <p>
 For example, many early wireless network adapters were based on the Prism2
-chipset, using the <a href="http://man.openbsd.org/wi";>wi(4)</a>
+chipset, using the <a href="http://man.openbsd.org/OpenBSD-6.0/wi";>wi(4)</a>
 driver, but later, when lower-cost chips became available, many manufacturers
 changed their product to use chips for which no open source drivers exist,
 but never changed their model numbers.

Reply via email to