Finish integration.  Use mandoc_preconv, etc.
import complete (hopefully)

@@ -10,10 +10,11 @@
 #
 
 #
 # Copyright 2011, Richard Lowe
 # Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+# Copyright 2014 Garrett D'Amore <garrett@damore.org>
 #
 
 include         $(SRC)/Makefile.master
 
 MANSECT=        1

@@ -226,10 +227,11 @@
                 mailq.1                         \
                 mailstats.1                     \
                 mailx.1                         \
                 makekey.1                       \
                 man.1                           \
+                mandoc.1                        \
                 mconnect.1                      \
                 mcs.1                           \
                 mdb.1                           \
                 mesg.1                          \
                 mkdir.1                         \

@@ -408,11 +410,10 @@
                 volcheck.1                      \
                 volrmmount.1                    \
                 w.1                             \
                 wait.1                          \
                 wc.1                            \
-                whatis.1                        \
                 which.1                         \
                 who.1                           \
                 whocalls.1                      \
                 whois.1                         \
                 write.1                         \

@@ -553,16 +554,19 @@
                 valtime.1       \
                 valuid.1        \
                 valyorn.1       \
                 vax.1           \
                 vedit.1         \
+                whatis.1        \
                 whence.1        \
                 while.1         \
                 zcat.1
 
 intro.1         := LINKSRC = Intro.1
 
+whatis.1        := LINKSRC = apropos.1
+
 unalias.1       := LINKSRC = alias.1
 
 batch.1         := LINKSRC = at.1
 
 dirname.1       := LINKSRC = basename.1