10 files changed, 23 insertions, 13 deletions

diff --git a/etc/profile-a-l/7z.profile b/etc/profile-a-l/7z.profile
index 76492c339..b2294c070 100644
--- a/etc/profile-a-l/7z.profile
+++ b/etc/profile-a-l/7z.profile
@@ -7,5 +7,8 @@ include 7z.local
 # Persistent global definitions
 include globals.local
 
+# Included in archiver-common.inc
 ignore include disable-shell.inc
+
+# Redirect
 include archiver-common.inc
diff --git a/etc/profile-a-l/ar.profile b/etc/profile-a-l/ar.profile
index c2b215807..f99934e66 100644
--- a/etc/profile-a-l/ar.profile
+++ b/etc/profile-a-l/ar.profile
@@ -7,4 +7,5 @@ include ar.local
 # Persistent global definitions
 include globals.local
 
+# Redirect
 include archiver-common.inc
diff --git a/etc/profile-a-l/atool.profile b/etc/profile-a-l/atool.profile
index 34af47df2..6e0ecb012 100644
--- a/etc/profile-a-l/atool.profile
+++ b/etc/profile-a-l/atool.profile
@@ -9,10 +9,12 @@ include globals.local
 
 # Allow perl (blacklisted by disable-interpreters.inc)
 include allow-perl.inc
-include archiver-common.inc
 
 noroot
 
 # without login.defs atool complains and uses UID/GID 1000 by default
 private-etc alternatives,group,login.defs,passwd
 private-tmp
+
+# Redirect
+include archiver-common.inc
diff --git a/etc/profile-a-l/balsa.profile b/etc/profile-a-l/balsa.profile
index d755fd803..573776a71 100644
--- a/etc/profile-a-l/balsa.profile
+++ b/etc/profile-a-l/balsa.profile
@@ -61,7 +61,7 @@ shell none
 tracelog
 
 # disable-mnt
-# Add "pinentry-curses,pinentry-emacs,pinentry-fltk,pinentry-gnome3,pinentry-gtk,pinentry-gtk2,pinentry-gtk-2,pinentry-qt,pinentry-qt4,pinentry-tty,pinentry-x2go,pinentry-kwallet" for gpg 
+# Add "pinentry-curses,pinentry-emacs,pinentry-fltk,pinentry-gnome3,pinentry-gtk,pinentry-gtk2,pinentry-gtk-2,pinentry-qt,pinentry-qt4,pinentry-tty,pinentry-x2go,pinentry-kwallet" for gpg
 # Add "ignore private-bin" for hyperlinks or have a look at the private-bins in firefox.profile and firefox-common.profile.
 private-bin balsa,balsa-ab,gpg,gpg-agent,gpg2,gpgsm
 private-cache
diff --git a/etc/profile-a-l/bsdtar.profile b/etc/profile-a-l/bsdtar.profile
index c37f4071e..fb4f643c8 100644
--- a/etc/profile-a-l/bsdtar.profile
+++ b/etc/profile-a-l/bsdtar.profile
@@ -6,6 +6,7 @@ include bsdtar.local
 # Persistent global definitions
 include globals.local
 
-include archiver-common.inc
-
 private-etc alternatives,group,localtime,passwd
+
+# Redirect
+include archiver-common.inc
diff --git a/etc/profile-a-l/calligragemini.profile b/etc/profile-a-l/calligragemini.profile
index 48527363d..006c307ab 100644
--- a/etc/profile-a-l/calligragemini.profile
+++ b/etc/profile-a-l/calligragemini.profile
@@ -5,8 +5,8 @@ include calligragemini.local
 # Persistent global definitions
 # added by included profile
 #include globals.local
-      
-noblacklist ${HOME}/.local/share/calligragemini      
-               
-# Redirect     
+
+noblacklist ${HOME}/.local/share/calligragemini
+
+# Redirect
 include calligra.profile
diff --git a/etc/profile-a-l/cpio.profile b/etc/profile-a-l/cpio.profile
index 785308ffd..0e0299655 100644
--- a/etc/profile-a-l/cpio.profile
+++ b/etc/profile-a-l/cpio.profile
@@ -10,4 +10,5 @@ include globals.local
 noblacklist /sbin
 noblacklist /usr/sbin
 
+# Redirect
 include archiver-common.inc
diff --git a/etc/profile-a-l/gzip.profile b/etc/profile-a-l/gzip.profile
index 9b59e57e7..035c6459c 100644
--- a/etc/profile-a-l/gzip.profile
+++ b/etc/profile-a-l/gzip.profile
@@ -7,7 +7,9 @@ include gzip.local
 # Persistent global definitions
 include globals.local
 
-# Arch Linux (based distributions) need access to /var/lib/pacman. As we drop all capabilities this is automatically read-only.
+# Arch Linux (based distributions) need access to /var/lib/pacman. As we drop
+# all capabilities this is automatically read-only.
 noblacklist /var/lib/pacman
 
+# Redirect
 include archiver-common.inc
diff --git a/etc/profile-a-l/kdiff3.profile b/etc/profile-a-l/kdiff3.profile
index 8290e07f2..41840e3b0 100644
--- a/etc/profile-a-l/kdiff3.profile
+++ b/etc/profile-a-l/kdiff3.profile
@@ -19,7 +19,7 @@ include disable-passwdmgr.inc
 #include disable-programs.inc
 include disable-shell.inc
 include disable-xdg.inc
-           
+
 include whitelist-runuser-common.inc
 # Uncomment the next lines (or put it into your kdiff3.local) if you don't need to compare files in /usr/share.
 #include whitelist-usr-share-common.inc
diff --git a/etc/profile-a-l/keepassxc.profile b/etc/profile-a-l/keepassxc.profile
index 3ad779a12..365db64aa 100644
--- a/etc/profile-a-l/keepassxc.profile
+++ b/etc/profile-a-l/keepassxc.profile
@@ -31,9 +31,9 @@ include disable-shell.inc
 include disable-xdg.inc
 
 # You can enable whitelisting for keepassxc by uncommenting (or adding to you keepassxc.local) the following lines.
-# If you do so, you MUST store your database under ${HOME}/Documents/KeePassXC/foo.kdbx
-#mkdir ${HOME}/Documents/KeePassXC
-#whitelist ${HOME}/Documents/KeePassXC
+# If you do so, you MUST store your database under ${DOCUMENTS}/KeePassXC/foo.kdbx
+#mkdir ${DOCUMENTS}/KeePassXC
+#whitelist ${DOCUMENTS}/KeePassXC
 # Needed for KeePassXC-Browser
 #mkfile ${HOME}/.config/BraveSoftware/Brave-Browser/NativeMessagingHosts/org.keepassxc.keepassxc_browser.json
 #whitelist ${HOME}/.config/BraveSoftware/Brave-Browser/NativeMessagingHosts/org.keepassxc.keepassxc_browser.json