19 files changed, 27 insertions, 23 deletions

diff --git a/etc/inc/feh-network.inc b/etc/inc/feh-network.inc
deleted file mode 100644
index e94e7205c..000000000
--- a/etc/inc/feh-network.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-ignore net none
-netfilter
-protocol unix,inet,inet6
-private-etc ca-certificates,crypto-policies,hosts,pki,resolv.conf,ssl
diff --git a/etc/profile-a-l/7z.profile b/etc/profile-a-l/7z.profile
index b2294c070..0d31255ad 100644
--- a/etc/profile-a-l/7z.profile
+++ b/etc/profile-a-l/7z.profile
@@ -7,8 +7,8 @@ include 7z.local
 # Persistent global definitions
 include globals.local
 
-# Included in archiver-common.inc
+# Included in archiver-common.profile
 ignore include disable-shell.inc
 
 # Redirect
-include archiver-common.inc
+include archiver-common.profile
diff --git a/etc/profile-a-l/ar.profile b/etc/profile-a-l/ar.profile
index f99934e66..5a20a8181 100644
--- a/etc/profile-a-l/ar.profile
+++ b/etc/profile-a-l/ar.profile
@@ -8,4 +8,4 @@ include ar.local
 include globals.local
 
 # Redirect
-include archiver-common.inc
+include archiver-common.profile
diff --git a/etc/inc/archiver-common.inc b/etc/profile-a-l/archiver-common.profile
index 74b0b6ef6..74b0b6ef6 100644
--- a/etc/inc/archiver-common.inc
+++ b/etc/profile-a-l/archiver-common.profile
diff --git a/etc/profile-a-l/atool.profile b/etc/profile-a-l/atool.profile
index 6e0ecb012..e377de2c8 100644
--- a/etc/profile-a-l/atool.profile
+++ b/etc/profile-a-l/atool.profile
@@ -17,4 +17,4 @@ private-etc alternatives,group,login.defs,passwd
 private-tmp
 
 # Redirect
-include archiver-common.inc
+include archiver-common.profile
diff --git a/etc/profile-a-l/bsdtar.profile b/etc/profile-a-l/bsdtar.profile
index fb4f643c8..d731a6a6e 100644
--- a/etc/profile-a-l/bsdtar.profile
+++ b/etc/profile-a-l/bsdtar.profile
@@ -9,4 +9,4 @@ include globals.local
 private-etc alternatives,group,localtime,passwd
 
 # Redirect
-include archiver-common.inc
+include archiver-common.profile
diff --git a/etc/inc/chromium-common-hardened.inc b/etc/profile-a-l/chromium-common-hardened.profile
index d756eec50..d756eec50 100644
--- a/etc/inc/chromium-common-hardened.inc
+++ b/etc/profile-a-l/chromium-common-hardened.profile
diff --git a/etc/profile-a-l/chromium-common.profile b/etc/profile-a-l/chromium-common.profile
index 1afb2c6e1..b81b1cb36 100644
--- a/etc/profile-a-l/chromium-common.profile
+++ b/etc/profile-a-l/chromium-common.profile
@@ -32,7 +32,7 @@ include whitelist-var-common.inc
 
 # Uncomment the next line (or add it to your chromium-common.local)
 # if your kernel allows unprivileged userns clone.
-#include chromium-common-hardened.inc
+#include chromium-common-hardened.profile
 
 # Uncomment or put in your chromium-common.local to allow screen sharing under
 # wayland.
diff --git a/etc/profile-a-l/cpio.profile b/etc/profile-a-l/cpio.profile
index 0e0299655..bdc4f21a6 100644
--- a/etc/profile-a-l/cpio.profile
+++ b/etc/profile-a-l/cpio.profile
@@ -11,4 +11,4 @@ noblacklist /sbin
 noblacklist /usr/sbin
 
 # Redirect
-include archiver-common.inc
+include archiver-common.profile
diff --git a/etc/profile-a-l/electron.profile b/etc/profile-a-l/electron.profile
index d3be07c9d..691616393 100644
--- a/etc/profile-a-l/electron.profile
+++ b/etc/profile-a-l/electron.profile
@@ -20,7 +20,7 @@ include whitelist-var-common.inc
 
 # Uncomment the next line (or add it to your chromium-common.local)
 # if your kernel allows unprivileged userns clone.
-#include chromium-common-hardened.inc
+#include chromium-common-hardened.profile
 
 apparmor
 caps.keep sys_admin,sys_chroot
diff --git a/etc/profile-a-l/feh-network.profile b/etc/profile-a-l/feh-network.profile
new file mode 100644
index 000000000..f35facd64
--- /dev/null
+++ b/etc/profile-a-l/feh-network.profile
@@ -0,0 +1,8 @@
+# This file is overwritten during software install.
+# Persistent customizations should go in a .local file.
+include feh-network.local
+
+ignore net none
+netfilter
+protocol unix,inet,inet6
+private-etc ca-certificates,crypto-policies,hosts,pki,resolv.conf,ssl
diff --git a/etc/profile-a-l/feh.profile b/etc/profile-a-l/feh.profile
index 8ac7755de..6d6287f7f 100644
--- a/etc/profile-a-l/feh.profile
+++ b/etc/profile-a-l/feh.profile
@@ -18,7 +18,7 @@ include disable-shell.inc
 # This profile disables network access
 # In order to enable network access,
 # uncomment the following or put it in your feh.local:
-# include feh-network.inc
+# include feh-network.profile
 
 caps.drop all
 net none
diff --git a/etc/profile-a-l/gzip.profile b/etc/profile-a-l/gzip.profile
index 035c6459c..b261c16f4 100644
--- a/etc/profile-a-l/gzip.profile
+++ b/etc/profile-a-l/gzip.profile
@@ -12,4 +12,4 @@ include globals.local
 noblacklist /var/lib/pacman
 
 # Redirect
-include archiver-common.inc
+include archiver-common.profile
diff --git a/etc/profile-m-z/tar.profile b/etc/profile-m-z/tar.profile
index 9d7a23d43..0d3a900e9 100644
--- a/etc/profile-m-z/tar.profile
+++ b/etc/profile-m-z/tar.profile
@@ -7,7 +7,7 @@ include tar.local
 # Persistent global definitions
 include globals.local
 
-# Included in archiver-common.inc
+# Included in archiver-common.profile
 ignore include disable-shell.inc
 
 # Arch Linux (based distributions) need access to /var/lib/pacman. As we drop
@@ -20,4 +20,4 @@ private-etc alternatives,group,localtime,login.defs,passwd
 writable-var
 
 # Redirect
-include archiver-common.inc
+include archiver-common.profile
diff --git a/etc/profile-m-z/unrar.profile b/etc/profile-m-z/unrar.profile
index 65f1a425a..9d3d9b40e 100644
--- a/etc/profile-m-z/unrar.profile
+++ b/etc/profile-m-z/unrar.profile
@@ -12,4 +12,4 @@ private-etc alternatives,group,localtime,passwd
 private-tmp
 
 # Redirect
-include archiver-common.inc
+include archiver-common.profile
diff --git a/etc/profile-m-z/unzip.profile b/etc/profile-m-z/unzip.profile
index c94416b87..0231e3dba 100644
--- a/etc/profile-m-z/unzip.profile
+++ b/etc/profile-m-z/unzip.profile
@@ -13,4 +13,4 @@ noblacklist ${HOME}/.local/share/gnome-shell
 private-etc alternatives,group,localtime,passwd
 
 # Redirect
-include archiver-common.inc
+include archiver-common.profile
diff --git a/etc/profile-m-z/xzdec.profile b/etc/profile-m-z/xzdec.profile
index c5e8d1631..79f71f2fd 100644
--- a/etc/profile-m-z/xzdec.profile
+++ b/etc/profile-m-z/xzdec.profile
@@ -8,4 +8,4 @@ include xzdec.local
 include globals.local
 
 # Redirect
-include archiver-common.inc
+include archiver-common.profile
diff --git a/etc/profile-m-z/zstd.profile b/etc/profile-m-z/zstd.profile
index 07a75f97f..faeb5c5c5 100644
--- a/etc/profile-m-z/zstd.profile
+++ b/etc/profile-m-z/zstd.profile
@@ -8,4 +8,4 @@ include zstd.local
 include globals.local
 
 # Redirect
-include archiver-common.inc
+include archiver-common.profile
diff --git a/src/man/jailtest.txt b/src/man/jailtest.txt
index 1b64097ea..b52fc5eed 100644
--- a/src/man/jailtest.txt
+++ b/src/man/jailtest.txt
@@ -14,7 +14,7 @@ These directories are build by firejail at startup using --private* and --whitel
 .TP
 \fB2. Noexec test
 jailtest inserts executable programs in /home/username, /tmp, and /var/tmp directories
-and tries to run them form inside the sandbox, thus testing if the directory is executable or not.
+and tries to run them from inside the sandbox, thus testing if the directory is executable or not.
 .TP
 \fB3. Read access test
 jailtest creates test files in the directories specified by the user and tries to read
@@ -29,10 +29,10 @@ The program is started as root using sudo.
 .SH OPTIONS
 .TP
 \fB\-\-debug
-Print debug messages
+Print debug messages.
 .TP
 \fB\-?\fR, \fB\-\-help\fR
-Print options end exit.
+Print options and exit.
 .TP
 \fB\-\-version
 Print program version and exit.