4.0 updates

adjust title to "Private" vs. counterpart document "Root"
add 4.0 content
add placeholder procedure for Shrinking private disk image (Linux VM, R4.0)
remove outdated, root.img specific content
misc. spelling/grammar

configuration/resize-disk-image.md

@@ -1,6 +1,6 @@
 ---
 layout: doc
-title: Resize Disk Image
+title: Resize Private Disk Image
 permalink: /doc/resize-disk-image/
 redirect_from:
 - /en/doc/resize-disk-image/
@@ -8,16 +8,29 @@ redirect_from:
 - /wiki/ResizeDiskImage/
 ---
 
-Resize Disk Image
+Resize Private Disk Image
 -----------------
 
-There are several disk images which can be easily extended. But pay attention to the overall consumed space of your sparse disk images.
+There are several disk images which can be easily extended, but pay attention to the overall consumed space of your sparse disk images. See also additional information and caveats about [resizing the root disk image](/doc/resize-root-disk-image/).
 
-### Private disk image
 
-1048576 MB is the maximum size which can be assigned to a private storage through qubes-manager.
+### Private disk image (R4.0)
 
-To grow the private disk image of a AppVM beyond this limit [qubes-grow-private](/doc/dom0-tools/qvm-grow-private/) can be used:
+1048576 MiB is the maximum size which can be assigned to a private storage through Qube Manager.
+
+To grow the private disk image of an AppVM beyond this limit, [qvm-volume](/doc/dom0-tools/qvm-volume/) can be used:
+
+~~~
+qvm-volume extend <vm_name>:private <size>
+~~~
+
+Note: Size is the target size (i.e. 4096MB or 16GB, ...), not the size to add to the existing disk.
+
+### Private disk image (R3.2)
+
+1048576 MB is the maximum size which can be assigned to a private storage through Qubes Manager.
+
+To grow the private disk image of an AppVM beyond this limit, [qvm-grow-private](/doc/dom0-tools/qvm-grow-private/) can be used:
 
 ~~~
 qvm-grow-private <vm-name> <size>
@@ -25,16 +38,25 @@ qvm-grow-private <vm-name> <size>
 
 Note: Size is the target size (i.e. 4096MB or 16GB, ...), not the size to add to the existing disk. 
 
-### Shrinking private disk image (Linux VM)
+### Shrinking private disk image (Linux VM, R4.0)
 
-**This operation is dangerous and this is why it isn't available in standard Qubes tools. If you have enough disk space, it is safer to create new VM with smaller disk and move the data.**
+1.  Create a new qube with smaller disk using Qube Manager or qvm-create
+2.  Move data using OS tools
+3.  Delete old qube using Qube Manager or qvm-remove
+
+### Shrinking private disk image (Linux VM, R3.2)
+
+**This operation is dangerous and this is why it isn't available in standard Qubes tools. If you have enough disk space, it is safer to create a new VM with a smaller disk and move the data.**
 
 The basic idea is to:
 
 1.  Shrink filesystem on the private disk image.
 2.  Then shrink the image.
 
-Ext4 does not support online shrinking, so can't be done as convenient as image grown. Note that we don't want to touch the VM filesystem directly in dom0 for security reasons. First you need to start VM without `/rw` mounted. One of the possibility is to interrupt its normal startup by adding `rd.break` kernel option:
+Ext4 does not support online shrinking, so it can't be done as conveniently as growing the image.
+Note that we don't want to touch the VM filesystem directly in dom0 for security reasons. 
+First you need to start VM without `/rw` mounted. One possibility is to interrupt its normal startup
+by adding the `rd.break` kernel option:
 
 ~~~
 qvm-prefs -s <vm-name> kernelopts rd.break
@@ -76,37 +98,11 @@ Done.
 >With no argument, resize2fs grows the filesystem to match the underlying block device (the .img file you just shrunk)
 
 
-### Template disk image
+OS Specific Follow-up Instructions
+-----------------
 
-If you want install a lot of software in your TemplateVM, you may need to increase the amount of disk space your TemplateVM can use. See also additional information and caveats about [resizing the root disk image].
+After resizing volumes, the partition table and file-system may need to be adjusted.
-
+Use tools appropriate to the OS in your qube. Brief instructions for Windows 7,
-1.  Make sure that all the VMs based on this template are shut off (including netvms etc).
-2.  Sanity check: verify that none of loop device are pointing at this template root.img. Run this in dom0: `sudo losetup -a`
-3.  Resize root.img file. Run this in dom0: `truncate -s <desired size> <path to root.img>` (the root.img path can be obtained from qvm-prefs).
-4.  If any netvm/proxyvm used by this template is based on it, set template netvm to none.
-5.  Start the template.
-6.  Execute `sudo resize2fs /dev/mapper/dmroot` in the template.
-7.  Verify available space in the template using `df -h`
-8.  Shutdown the template.
-9.  Restore original netvm setting (if changed), check firewall settings (setting netvm to none causes firewall reset to "block all")
-
-### HVM disk image
-
-In this example we will grow the disk image of an HVM to 30GB.
-
-First, stop/shutdown the HVM.
-
-Then, from a Dom0 terminal (in KDE: System Tools -\> Terminal Emulator) do the following:
-
-~~~
-cd /var/lib/qubes/appvms/<yourHVM>/
-ls -lh root.img  (<--verify current size of disk image)
-truncate -s 30GB root.img
-ls -lh root.img  (<--verify new size of disk image)
-~~~
-
-The partition table and file-system must be adjusted after this change.
-Use tools appropriate to the OS in your HVM. Brief instructions for Windows 7,
 FreeBSD, and Linux are provided below.
 
 #### Windows 7
@@ -129,8 +125,6 @@ zpool online -e poolname ada0
 
 #### Linux
 
+Qubes will automatically grow the filesystem for you on AppVMs but not HVMs.
 You will see that there is unallocated free space at the end of your primary disk.
 You can use standard linux tools like fdisk and mkfs to make this space available.
-
-
-[resizing the root disk image]: /doc/resize-root-disk-image/