merges

3 files changed, 15 insertions, 0 deletions

diff --git a/README b/README
index 762668a88..13331d2f4 100644
--- a/README
+++ b/README
@@ -147,6 +147,8 @@ announ (https://github.com/announ)
         - mpv and youtube-dl profile fixes
         - git profile fix
         - evince profile fix
+Antoine Catton (https://github.com/acatton)
+        - add keep-shell-rc command and option
 Anton Shestakov (https://github.com/antonv6)
         - add whitelist items for uim
         - allow /etc/vulkan in steam profile
@@ -753,6 +755,7 @@ mjudtmann (https://github.com/mjudtmann)
         - lock firejail configuration in disable-mgmt.inc
 Mohammed Anas  (https://github.com/mhmdanas)
         - fix dbus notifications
+        - fix libEGL warning for abiword
 m00nwtchr (https://github.com/m00nwtchr)
         - Whitelist electron-flags.conf for all versions of electron
         - electron profile updates
diff --git a/README.md b/README.md
index 7d1c88c65..0f6ca9b08 100644
--- a/README.md
+++ b/README.md
@@ -182,6 +182,17 @@ We also keep a list of profile fixes for previous released versions in [etc-fixe
 
 ## Current development version: 0.9.73
 
+### --keep-shell-rc
+`````
+       --keep-shell-rc
+              By default, when using a private home directory, firejail copies
+              files  from the system's user home template (/etc/skel) into it,
+              which overrides attempts to whitelist the original  files  (such
+              as  ~/.bashrc and ~/.zshrc).  This option disables this feature,
+              and enables the user to whitelist the original files.
+
+`````
+
 ### private-etc rework
 `````
        --private-etc, --private-etc=file,directory,@group
diff --git a/RELNOTES b/RELNOTES
index 9542ec6dc..90a6982e8 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -4,6 +4,7 @@ firejail (0.9.73) baseline; urgency=low
   * modif: Prevent sandbox name from containing only digits (#5578)
   * bugfix: qutebrowser: links will not open in the existing instance (#5601
     #5618)
+  * feature: added --keep-shell-rc command and profile option (#1127)
   * build: auto-generate syntax files (#5627)
   * build: mark most phony targets as such (#5637)
   * docs: remove apparmor options in --help when building without apparmor