Eliminate superfluous subdirectory

ConfigFiles.md

@@ -1,8 +1,10 @@
 ---
 layout: doc
 title: ConfigFiles
-permalink: /doc/UserDoc/ConfigFiles/
+permalink: /doc/ConfigFiles/
-redirect_from: /wiki/UserDoc/ConfigFiles/
+redirect_from: \
+  /doc/UserDoc/ConfigFiles/
+  /wiki/UserDoc/ConfigFiles/
 ---
 
 Qubes specific VM config files

DispVMCustomization.md

@@ -1,8 +1,10 @@
 ---
 layout: doc
 title: DispVMCustomization
-permalink: /doc/UserDoc/DispVMCustomization/
+permalink: /doc/DispVMCustomization/
-redirect_from: /wiki/UserDoc/DispVMCustomization/
+redirect_from: \
+  /doc/UserDoc/DispVMCustomization/
+  /wiki/UserDoc/DispVMCustomization/
 ---
 
 Changing the template used as a basis for Disposable VM

OpenPGP.md

@@ -1,8 +1,10 @@
 ---
 layout: doc
 title: OpenPGP
-permalink: /doc/UserDoc/OpenPGP/
+permalink: /doc/OpenPGP/
-redirect_from: /wiki/UserDoc/OpenPGP/
+redirect_from: \
+  /doc/UserDoc/OpenPGP/
+  /wiki/UserDoc/OpenPGP/
 ---
 
 **Note 2014-08-03: This page is deprecated by [SplitGpg](/wiki/UserDoc/SplitGpg). The content of this page has been integrated into that page.**

SplitGpg.md

@@ -1,8 +1,10 @@
 ---
 layout: doc
 title: SplitGpg
-permalink: /doc/UserDoc/SplitGpg/
+permalink: /doc/SplitGpg/
-redirect_from: /wiki/UserDoc/SplitGpg/
+redirect_from: \
+  /doc/UserDoc/SplitGpg/
+  /wiki/UserDoc/SplitGpg/
 ---
 
 Qubes Split GPG

TorVM.md

@@ -1,8 +1,10 @@
 ---
 layout: doc
 title: TorVM
-permalink: /doc/UserDoc/TorVM/
+permalink: /doc/TorVM/
-redirect_from: /wiki/UserDoc/TorVM/
+redirect_from: \
+  /doc/UserDoc/TorVM/
+  /wiki/UserDoc/TorVM/
 ---
 
 Known issues:

XFCE.md

@@ -1,8 +1,10 @@
 ---
 layout: doc
 title: XFCE
-permalink: /doc/UserDoc/XFCE/
+permalink: /doc/XFCE/
-redirect_from: /wiki/UserDoc/XFCE/
+redirect_from: \
+  /doc/UserDoc/XFCE/
+  /wiki/UserDoc/XFCE/
 ---
 
 XFCE installtion in dom0