Merge branch 'mount-pt-faq' of git://github.com/jpouellet/qubes-doc into jpouellet-mount-pt-faq

basics_user/user-faq.md

@@ -58,6 +58,7 @@ Qubes Users' FAQ
  * [I assigned a PCI device to a qube, then unassigned it/shut down the …](#i-assigned-a-pci-device-to-a-qube-then-unassigned-itshut-down-the-qube-why-isnt-the-device-available-in-dom0)
  * [How do I install Flash in a Debian qube?](#how-do-i-install-flash-in-a-debian-qube)
  * [How do I play video files?](#how-do-i-play-video-files)
+ * [How do I access my external drive?](#how-do-i-access-my-external-drive)
  * [My encrypted drive doesn't appear in Debian qube?](#my-encrypted-drive-doesnt-appear-in-debian-qube)
  * [Windows Update is stuck.](#windows-update-is-stuck)
  * [Fullscreen Firefox is frozen.](#fullscreen-firefox-is-frozen)
@@ -406,6 +407,14 @@ For Fedora:
 
 4. Use VLC to play your video files.
 
+### How do I access my external drive?
+
+External media such as external hard drives or flash drives plugged in via USB are available in the sys-usb VM.
+They can either be manually mounted with the `mount` command, or accessed conveniently via the graphical file manager which mounts them under `/run/media/user`.
+
+Devices which are passed from one VM to another via `qvm-block` show up as `/dev/xvd*` and must be mounted manually.
+See ["How to attach USB drives"](/doc/usb/#how-to-attach-usb-drives) for more information.
+
 ### My encrypted drive doesn't appear in Debian qube.
 
 This is an issue that affects qubes based on Debian Jessie. 

common-tasks/usb.md

@@ -7,6 +7,10 @@ redirect_from:
 - /en/doc/stick-mounting/
 - /doc/StickMounting/
 - /wiki/StickMounting/
+- /doc/external-device-mount-point/
+- /en/doc/external-device-mount-point/
+- /doc/ExternalDeviceMountPoint/
+- /wiki/ExternalDeviceMountPoint/
 - /doc/usbvm/
 - /en/doc/usbvm/
 - /doc/USBVM/

configuration/external-device-mount-point.md

@@ -1,17 +0,0 @@
----
-layout: doc
-title: External Device Mount Point
-permalink: /doc/external-device-mount-point/
-redirect_from:
-- /en/doc/external-device-mount-point/
-- /doc/ExternalDeviceMountPoint/
-- /wiki/ExternalDeviceMountPoint/
----
-
-All external storage devices connected to an AppVM using the Fedora template can be found under
-
-~~~
-/run/media/user/
-~~~
-
-...of that AppVM's filesystem.

doc.md

@@ -129,7 +129,6 @@ Configuration Guides
  * [Configuration Files](/doc/config-files/)
  * [How to set up a ProxyVM as a VPN Gateway](/doc/vpn/)
  * [Storing AppVMs on Secondary Drives](/doc/secondary-storage/)
- * [Where are my external storage devices mounted?](/doc/external-device-mount-point/)
  * [Multibooting](/doc/multiboot/)
  * [Resizing AppVM and HVM Disk Images](/doc/resize-disk-image/)
  * [Extending `root.img` Size](/doc/resize-root-disk-image/)