Fix links

external/os-guides/windows/windows-vm.md

@@ -162,7 +162,7 @@ To avoid that error we temporarily have to switch the video adapter to 'cirrus':
 qvm-features win7new video-model cirrus
 ~~~
 
-The VM is now ready to be started; the best practice is to use an installation ISO [located in a VM](/doc/hvm/#installing-an-os-in-an-hvm-qube):
+The VM is now ready to be started; the best practice is to use an installation ISO [located in a VM](/doc/standalone-and-hvm/#installing-an-os-in-an-hvm):
 
 ~~~
 qvm-start --cdrom=untrusted:/home/user/windows_install.iso win7new

external/troubleshooting/remove-vm-manually.md

@@ -32,5 +32,5 @@ When a template is marked as 'installed by package manager', but cannot be unins
 - If `installed_by_rpm` remains `True`, reboot your computer to bring qubes.xml in sync with qubesd, and try again to remove the template.
 
 
-[normal method]: /doc/templates/#how-to-install-uninstall-reinstall-and-switch
+[normal method]: /doc/templates/#uninstalling
 

introduction/faq.md

@@ -421,7 +421,7 @@ For Debian:
 For Fedora:
 
 1. (Recommended) Clone an existing Fedora TemplateVM
-2. [Enable the appropriate RPMFusion repos in the desired Fedora TemplateVM.](/doc/software-update-vm/#rpmfusion-for-a-fedora-templatevm)
+2. [Enable the appropriate RPMFusion repos in the desired Fedora TemplateVM.](/doc/software-update-domu/#rpmfusion-for-fedora-templatevms)
 3. Install VLC in that TemplateVM:
 
        $ sudo dnf install vlc

user/advanced-configuration/disposablevm-customization.md

@@ -50,7 +50,7 @@ Additionally you may want to set it as default DisposableVM Template:
 
 The above default is used whenever a qube request starting a new DisposableVM and do not specify which one (for example `qvm-open-in-dvm` tool). This can be also set in qube settings and will affect service calls from that qube. See [qrexec documentation](/doc/qrexec/#specifying-vms-tags-types-targets-etc) for details.
 
-If you wish to use the `fedora-minimal` template as a DisposableVM Template, see the "DisposableVM Template" use case under [fedora-minimal customization](/doc/templates/fedora-minimal/#customization).
+If you wish to use a [Minimal TemplateVM](/doc/templates/minimal/) as a DisposableVM Template, please see the [Minimal TemplateVM](/doc/templates/minimal/) page.
 
 
 ## Customization of DisposableVM

user/downloading-installing-upgrading/testing.md

@@ -55,7 +55,7 @@ If you [report a bug] in a package that is in a testing repository, please refer
 [Version Scheme]: /doc/version-scheme/
 [Release Checklist]: /doc/releases/todo/
 [dom0 testing repositories]: /doc/software-update-dom0/#testing-repositories
-[TemplateVM testing repositories]: /doc/software-update-vm/#testing-repositories
+[TemplateVM testing repositories]: /doc/software-update-domu/#testing-repositories
 [automated build process]: https://github.com/QubesOS/qubes-infrastructure/blob/master/README.md
 [updates-status]: https://github.com/QubesOS/updates-status/issues
 [report a bug]: /doc/reporting-bugs/

user/managing-os/debian/debian.md

@@ -128,8 +128,8 @@ One solution is to add a dummy interface to allow the package to install correct
 [How to Reinstall a TemplateVM]: /doc/reinstall-template/
 [Update the TemplateVM]: /doc/software-update-vm/
 [switch]: /doc/templates/#switching
-[uninstall the old TemplateVM]: /doc/templates/#how-to-uninstall
+[uninstall the old TemplateVM]: /doc/templates/#uninstalling
-[Updating software in TemplateVMs]: /doc/software-update-domu/#updating-softare-in-templatevms
+[Updating software in TemplateVMs]: /doc/software-update-domu/#updating-software-in-templatevms
 [Upgrading Debian TemplateVMs]: /doc/template/debian/upgrade/
 [5149]: https://github.com/QubesOS/qubes-issues/issues/5149
 [install]: /doc/templates/#installing

user/managing-os/fedora/fedora.md

@@ -58,7 +58,7 @@ This section contains notes about specific Fedora releases.
 [Update the TemplateVM]: /doc/software-update-vm/
 [switch]: /doc/templates/#switching
 [uninstall the old TemplateVM]: /doc/templates/#uninstalling
-[Updating software in TemplateVMs]: /doc/software-update-domu/#updating-softare-in-templatevms
+[Updating software in TemplateVMs]: /doc/software-update-domu/#updating-software-in-templatevms
 [Upgrading Fedora TemplateVMs]: /doc/template/fedora/upgrade/
 [install]: /doc/templates/#installing
 

user/managing-os/standalone-and-hvm.md

@@ -1,7 +1,7 @@
 ---
 layout: doc
 title: StandaloneVMs and HVMs
-permalink: /doc/standalone-and-hvm
+permalink: /doc/standalone-and-hvm/
 redirect_from:
 - /doc/hvm/
 - /doc/hvm-create/

user/managing-os/templates.md

@@ -257,6 +257,6 @@ Note the word "clean" means in this context: the same as their template filesyst
 [Update the TemplateVM]: #updating
 [switch]: #switching
 [uninstall the old TemplateVM]: #uninstalling
-[Updating softare in TemplateVMs]: /doc/software-update-domu/#updating-softare-in-templatevms
+[Updating softare in TemplateVMs]: /doc/software-update-domu/#updating-software-in-templatevms
 [How to Reinstall a TemplateVM]: /doc/reinstall-template/
 

user/managing-os/windows.md

@@ -7,9 +7,9 @@ permalink: /doc/windows/
 Windows VMs in Qubes OS
 =======================
 
-Like any other unmodified OSes, Windows can be installed in Qubes as an [HVM](/doc/hvm/) domain.
+Like any other unmodified OSes, Windows can be installed in Qubes as an [HVM](/doc/standalone-and-hvm/) domain.
 
-Qubes Windows Tools are then usually installed to provide integration with the rest of the Qubes system; they also include Xen's paravirtualized (PV) drivers to increase performance compared to qemu emulated devices. Alternatively, only Xen's PV drivers can be installed if integration with Qubes isn't required or if the tools aren't supported on a give version of Windows. In the latter case, one would have to [enable inter-VM networking](https://www.qubes-os.org/doc/firewall/#enabling-networking-between-two-qubes) to be able to exchange files with HVMs. 
+Qubes Windows Tools are then usually installed to provide integration with the rest of the Qubes system; they also include Xen's paravirtualized (PV) drivers to increase performance compared to qemu emulated devices. Alternatively, only Xen's PV drivers can be installed if integration with Qubes isn't required or if the tools aren't supported on a give version of Windows. In the latter case, one would have to [enable inter-VM networking](/doc/firewall/#enabling-networking-between-two-qubes) to be able to exchange files with HVMs. 
 
 
 For more information about Windows VMs in Qubes OS, please see the specific guides below:

user/security-in-qubes/split-gpg.md

@@ -310,7 +310,7 @@ As always, exercise caution and use your good judgment.)
 [pasted]: /doc/copy-paste#on-copypaste-security
 [​MUA]: https://en.wikipedia.org/wiki/Mail_user_agent
 [covert channels]: /doc/data-leaks
-[trusting-templates]: /doc/software-update-vm/#notes-on-trusting-your-templatevms
+[trusting-templates]: /doc/templates/#notes-on-trusting-your-templatevms
 [openpgp-in-qubes-os]: https://groups.google.com/d/topic/qubes-users/Kwfuern-R2U/discussion
 [cabal]: https://alexcabal.com/creating-the-perfect-gpg-keypair/
 [luck]: https://gist.github.com/abeluck/3383449