Merge branch 'master' into new_temlates

configuration-guides/tips-and-tricks.md

@@ -53,10 +53,3 @@ This applies also to any TemplateBasedVM relative to its parent TemplateVM, but
 
 Credit: [Joanna Rutkovska](https://twitter.com/rootkovska/status/832571372085850112)
 
-
-Trim for standalone AppVMs
----------------------
-The `qvm-trim-template` command is not available for a standalone AppVM.
-
-It is still possible to trim the AppVM disks by using the `fstrim --all` command from the appvm.
-You can also add the `discard` option to the mount line in `/etc/fstab` inside the standalone AppVM if you want trimming to be performed automatically, but there may be a performance impact on writes and deletes.

os-guides/pentesting/kali.md

@@ -148,16 +148,10 @@ There are multiple ways to create a Kali Linux VM:
        [user@kali ~]$ sudo apt-get dist-upgrade
        [user@kali ~]$ sudo apt-get autoremove
 
-8. Shutdown and trim `kali` template
-
-    - Shutdown `kali` template
+8. Shut down `kali` template
 
        [user@kali ~]$ sudo shutdown -h now
 
-    - In `dom0` console:
-
-            [user@dom0 ~]$ qvm-trim-template kali
-
 9. Start image
 
         [user@dom0 ~]$ qvm-start kali
@@ -285,10 +279,9 @@ These instructions will show you how to upgrade a Debian TemplateVM to Kali Linu
         [user@kali-rolling ~]$ sudo apt-get dist-upgrade
         [user@kali-rolling ~]$ sudo apt-get autoremove
  
-9. Shut down and trim the new template.
+9. Shut down the new template.
 
         [user@dom0 ~]$ qvm-shutdown kali-rolling
-        [user@dom0 ~]$ qvm-trim-template kali-rolling
 
 10. Ensure a terminal can be opened in the new template.
 

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

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