--- wikisrc/guide/fetch.mdwn	2013/03/21 11:11:21	1.4
+++ wikisrc/guide/fetch.mdwn	2015/06/19 19:18:31	1.5
@@ -8,7 +8,7 @@ To read the NetBSD sources from your loc
 of it, you need to download the NetBSD sources. This chapter explains how to get
 the NetBSD source using a number of different ways, although the preferred one
 is to get the tarballs and then update via
-[cvs(1)](http://netbsd.gw.com/cgi-bin/man-cgi?cvs+1+NetBSD-5.0.1+i386).
+[[!template id=man name="cvs" section="1"]].
 
 ## Preparing directories
 
@@ -47,9 +47,9 @@ graphs](http://www.NetBSD.org/releases/r
 ## Downloading tarballs
 
 It is sometimes faster to download a tarball and then continue updating with
-[cvs(1)](http://netbsd.gw.com/cgi-bin/man-cgi?cvs+1+NetBSD-5.0.1+i386). You can
+[[!template id=man name="cvs" section="1"]]. You can
 download tarballs (see
-[tar(1)](http://netbsd.gw.com/cgi-bin/man-cgi?tar+1+NetBSD-5.0.1+i386)) from
+[[!template id=man name="tar" section="1"]]) from
 ftp.NetBSD.org (or any other mirror) for a number of releases or branches.
 
 The only drawback is that the tarballs are updated less often. Normally, every
@@ -57,7 +57,7 @@ three days.
 
 Also, please note that these tarballs include the `CVS` directories, so you can
 download them and then update your source tree using
-[cvs(1)](http://netbsd.gw.com/cgi-bin/man-cgi?cvs+1+NetBSD-5.0.1+i386), as
+[[!template id=man name="cvs" section="1"]], as
 explained in the CVS section.
 
 ### Downloading sources for a NetBSD release
@@ -153,7 +153,7 @@ You may also want to fetch the X11 sourc
 CVS (Concurrent Versions System) can be used to fetch the NetBSD source tree or
 to keep the NetBSD source tree up to date with respect to changes made to the
 NetBSD sources. There are three trees maintained for which you can use
-[cvs(1)](http://netbsd.gw.com/cgi-bin/man-cgi?cvs+1+NetBSD-5.0.1+i386) to obtain
+[[!template id=man name="cvs" section="1"]] to obtain
 them or keep them up to date:
 
 The list of currently maintained branches is available under
@@ -204,7 +204,7 @@ NetBSD stable branches are also called *
 the [[Terminology|guide/fetch#term]].
 
 If you want to follow a stable branch, just pass the branch name to the
-[cvs(1)](http://netbsd.gw.com/cgi-bin/man-cgi?cvs+1+NetBSD-5.0.1+i386) `-r`
+[[!template id=man name="cvs" section="1"]] `-r`
 option.
 
 For example, if you want to fetch the most recent version of `netbsd-4`, you
@@ -277,7 +277,7 @@ for example, `5.1`:
     ftp://ftp.NetBSD.org/pub/NetBSD/iso/5.1/sourcecd-5.1.iso
 
 The next step is to burn the ISO image or mount it with the help of
-[vnconfig(8)](http://netbsd.gw.com/cgi-bin/man-cgi?vnconfig+8+NetBSD-5.0.1+i386).
+[[!template id=man name="vnconfig" section="8"]].
 Please see [[Using removable media|guide/rmmedia]], as it explains in detail how
 to do it.