--- wikisrc/puffs.mdwn	2013/03/15 22:02:32	1.3
+++ wikisrc/puffs.mdwn	2020/09/09 19:54:25	1.4
@@ -42,7 +42,7 @@ The components themselves are:
    of the native puffs interface, which is offered by **librefuse**. The
    re-implementation of the FUSE functionality is designed to be source code
    compatible with FUSE, and it is further described in the
-   [refuse(3)](http://netbsd.gw.com/cgi-bin/man-cgi?refuse+3+NetBSD-current+i386)
+   [[!template id=man name="refuse" section="3"]]
    manpage.
 
 Examples for puffs and refuse filesystems can be found in the the NetBSD source
@@ -67,7 +67,7 @@ base system.
 ### psshfs, The NetBSD sshfs
 
 See the manpage for
-[psshfs(8)](http://netbsd.gw.com/cgi-bin/man-cgi?mount_psshfs+8+NetBSD-5.1+i386).
+[[!template id=man name="mount_psshfs" section="8"]].
 
     # mount_psshfs host.name.tld:/directory /puffs
     # ls /puffs
@@ -94,7 +94,7 @@ See the manpage for
 ### 9P file servers
 
 See the [Bell manpage](http://www.cs.bell-labs.com/sys/man/5/INDEX.html) and
-the [NetBSD manpage 9p(8)](http://netbsd.gw.com/cgi-bin/man-cgi?mount_9p+8+NetBSD-5.1+i386).
+the NetBSD manpage [[!template id=man name="mount_9p" section="8"]].
 
     # mount_9p nobody@192.168.1.2:/tmp /puffs
     # cd /puffs
@@ -165,7 +165,7 @@ A [paper](http://2008.asiabsdcon.org/pap
 implementation of distributed file systems on top of puffs was presented at 
 AsiaBSDCon 2008.
 
-The [puffs(3)](http://man.NetBSD.org/man/puffs+3) manual pages provide further 
+The [[!template id=man name="puffs" section="3"]] manual pages provide further 
 information from a development perspective.
 
 The source code in browsable form: