--- wikisrc/guide/updating.mdwn	2013/03/01 11:49:18	1.2
+++ wikisrc/guide/updating.mdwn	2021/01/01 18:22:22	1.6
@@ -1,3 +1,7 @@
+**Contents**
+
+[[!toc levels=3]]
+
 # Updating an existing system from sources
 
 A common mechanism for upgrading a NetBSD system to a newer version is by
@@ -46,7 +50,7 @@ The first step is to build the userland:
 The next step will build the kernel:
 
     $ cd /usr/src
-    $ ./build.sh -O ../obj -T ../tools kernel=<KERNEL>
+    $ ./build.sh -O ../obj -T ../tools -U kernel=<KERNEL>
 
 ### Installing the kernel and userland
 
@@ -69,7 +73,7 @@ booting the `netbsd.old` kernel.
 ### Updating the system configuration files
 
 Run the `etcupdate` script
-([etcupdate(8)](http://netbsd.gw.com/cgi-bin/man-cgi?etcupdate+8+NetBSD-5.0.1+i386))
+([[!template id=man name="etcupdate" section="8"]])
 and follow the instructions in the output for fixing obsolete files:
 
     # /usr/sbin/etcupdate -s /usr/src
@@ -203,7 +207,7 @@ under your unprivileged user. The upgrad
 
 The other alternative, in case you want to maintain your source trees in the
 locations described by
-[hier(7)](http://netbsd.gw.com/cgi-bin/man-cgi?hier+7+NetBSD-5.0.1+i386), is
+[[!template id=man name="hier" section="7"]], is
 to do the following as root:
 
     # mkdir -p /usr/src /usr/xsrc
@@ -240,7 +244,7 @@ commands of the form:
 
 ## More details about the updating of configuration and startup files
 
-[etcupdate(8)](http://netbsd.gw.com/cgi-bin/man-cgi?etcupdate+8+NetBSD-current)
+[[!template id=man name="etcupdate" section="8"]]
 is a script to help users compare, merge and install new configuration and
 startup files (files found in the `etc.tgz` distribution set) in `/dev`, `/etc`
 and `/root` after performing an operating system upgrade. The upgrade of the
@@ -267,13 +271,13 @@ update the configuration and startup fil
 
     # etcupdate -s /some/where/etc.tgz
 
-### Using `etcmanage` instead of `etcupdate`
+### Using etcmanage instead of etcupdate
 
 The `etcmanage` perl script (available from
 [pkgsrc/sysutils/etcmanage](http://pkgsrc.se/sysutils/etcmanage) or as binary
 package) is an alternative to etcupdate(8). It should be used in the following
 way, in combination with
-[postinstall(8)](http://netbsd.gw.com/cgi-bin/man-cgi?postinstall+8+NetBSD-5.0.1+i386):
+[[!template id=man name="postinstall" section="8"]]:
 
     # /usr/pkg/bin/etcmanage
     # /usr/sbin/postinstall