howto/fabric.md

@@ -3,10 +3,10 @@ be described as "make for sysadmins". It allows us to establish "best
 practices" for routine tasks like:
 
  * installing a server (TODO)
- * retiring a server ([howto/retire-a-host](howto/retire-a-host))
- * migrating machines ([service/ganeti](service/ganeti#Importing-external-instances))
+ * [retiring a server](howto/retire-a-host)
+ * migrating machines (e.g. [ganeti](service/ganeti#Importing-external-instances))
  * retiring a user (TODO)
- * reboots ([howto/reboots](howto/reboots#Kernel-upgrades-and-reboots))
+ * [reboots](howto/reboots#Kernel-upgrades-and-reboots)
  * ... etc
 
 Fabric makes easy things reproducible and hard things possible. It is
@@ -261,7 +261,7 @@ In case of the installer, this leads to significant variation and
 chaos in the installs, which results in instability and
 inconsistencies between servers. It was determined that the installs
 would be automated as part of [ticket 31239](https://bugs.torproject.org/31239) and that analysis and
-work is being done in [howto/new-machine](howto/new-machine).
+work is being done in [new-machine](howto/new-machine).
 
 It was later realised that *other* areas were suffering from a similar
 problem. The upgrade process, for example, has mostly been manual