8 files changed, 12 insertions, 8 deletions

diff --git a/etc/emacs.profile b/etc/emacs.profile
index 0d87507df..24e800b5e 100644
--- a/etc/emacs.profile
+++ b/etc/emacs.profile
@@ -8,7 +8,8 @@ include globals.local
 
 noblacklist ${HOME}/.emacs
 noblacklist ${HOME}/.emacs.d
-# uncomment the following line if you need gpg
+# if you need gpg uncomment the following line
+# or put it into your emacs.local
 #noblacklist ${HOME}/.gnupg
 noblacklist ${HOME}/.python-history
 
diff --git a/etc/eog.profile b/etc/eog.profile
index f296cbcb4..d353fe127 100644
--- a/etc/eog.profile
+++ b/etc/eog.profile
@@ -40,6 +40,7 @@ tracelog
 
 # private-bin, private-etc and private-lib break 'Open With' / 'Open in file manager'
 # comment those if you need that functionality
+# or put 'ignore private-bin' and 'ignore private-etc' in your eog.local
 private-bin eog
 private-cache
 private-dev
diff --git a/etc/eom.profile b/etc/eom.profile
index 745e650aa..09327c9e1 100644
--- a/etc/eom.profile
+++ b/etc/eom.profile
@@ -37,6 +37,7 @@ tracelog
 
 # private-bin, private-etc and private-lib break 'Open With' / 'Open in file manager'
 # comment those if you need that functionality
+# or put 'ignore private-bin' and 'ignore private-etc' in your eog.local
 private-bin eom
 private-dev
 private-etc alternatives,fonts
diff --git a/etc/ffmpeg.profile b/etc/ffmpeg.profile
index a1c311e42..ee722bc54 100644
--- a/etc/ffmpeg.profile
+++ b/etc/ffmpeg.profile
@@ -25,8 +25,6 @@ caps.drop all
 ipc-namespace
 machine-id
 netfilter
-# no3d might break HW accelerated de/encoding - comment when appropriate
-no3d
 nodbus
 nodvd
 nogroups
diff --git a/etc/file-roller.profile b/etc/file-roller.profile
index ad52b0e97..95accdd36 100644
--- a/etc/file-roller.profile
+++ b/etc/file-roller.profile
@@ -22,6 +22,7 @@ machine-id
 # net none - breaks on older Ubuntu versions
 no3d
 # nodbus - makes settings immutable - comment if you need settings support
+# or put 'ignore nodbus' in your file-roller.local
 nodbus
 nodvd
 nogroups
diff --git a/etc/gnome-system-log.profile b/etc/gnome-system-log.profile
index c6af31ede..f0cb25d66 100644
--- a/etc/gnome-system-log.profile
+++ b/etc/gnome-system-log.profile
@@ -29,6 +29,7 @@ no3d
 nodvd
 # When using 'volatile' storage (https://www.freedesktop.org/software/systemd/man/journald.conf.html),
 # comment both 'nogroups' and 'noroot'
+# or put 'ignore nogroups' and 'ignore noroot' to your gnome-logs.local.
 nogroups
 nonewprivs
 noroot
diff --git a/etc/meld.profile b/etc/meld.profile
index 5e5c86368..14e0f238d 100644
--- a/etc/meld.profile
+++ b/etc/meld.profile
@@ -22,13 +22,13 @@ noblacklist ${HOME}/.git-credentials
 noblacklist ${HOME}/.ssh
 noblacklist ${HOME}/.subversion
 
-# Uncomment the next line if you don't need to compare files in disable-common.inc.
+# Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-common.inc.
 #include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
 include disable-interpreters.inc
 include disable-passwdmgr.inc
-# Uncomment the next line if you don't need to compare files in disable-programs.inc.
+# Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-programs.inc.
 #include disable-programs.inc
 
 include whitelist-var-common.inc
@@ -55,7 +55,7 @@ tracelog
 private-bin bzr,cvs,git,hg,meld,python*,svn
 private-cache
 private-dev
-# Uncomment the next line if you don't need to compare in /etc.
+# Uncomment the next line (or put it into your meld.local) if you don't need to compare in /etc.
 #private-etc alternatives,ca-certificates,crypto-policies,fonts,hostname,hosts,pki,resolv.conf,ssl,subversion
 private-tmp
 
diff --git a/etc/thunderbird.profile b/etc/thunderbird.profile
index c3358a9e8..be776e53e 100644
--- a/etc/thunderbird.profile
+++ b/etc/thunderbird.profile
@@ -40,8 +40,9 @@ writable-run-user
 # noblacklist /var/spool/mail
 # writable-var
 
+# Uncomment (or put in meld.local) if you use enigmail
+#ignore nodbus
+
 # allow browsers
 # Redirect
-# Uncomment if you use enigmail
-# ignore nodbus
 include firefox-common.profile