summaryrefslogtreecommitdiffstats
path: root/wiki/src/contribute/design.mdwn
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-07-03 12:42:05 +0000
committerintrigeri <intrigeri@boum.org>2018-07-03 15:54:00 +0000
commitb52a55962e0077c485e21a5afc5e7762fd035617 (patch)
tree2818369b5cdbfae1b11351083c03d011a867a145 /wiki/src/contribute/design.mdwn
parentcbeee47aa601b916bd0cdb51a66f0e29f155d401 (diff)
Bundle our custom prefs into the Tor Browser's omni.ja (refs: #15023)
Shipping them in user.js has a few downsides: - They override whatever is in prefs.js so basically prefs in user.js are locked: any modification done in about:config will be reverted next time Tor Browser starts, which can be a PITA when developing Tails. - In about:config, all these prefs are listed as modified by the user, which feels wrong. - It makes it harder for derivatives to implement things properly.
Diffstat (limited to 'wiki/src/contribute/design.mdwn')
-rw-r--r--wiki/src/contribute/design.mdwn3
1 files changed, 2 insertions, 1 deletions
diff --git a/wiki/src/contribute/design.mdwn b/wiki/src/contribute/design.mdwn
index 06ed451..3e4b4f7 100644
--- a/wiki/src/contribute/design.mdwn
+++ b/wiki/src/contribute/design.mdwn
@@ -991,6 +991,7 @@ We only modify this Tor Browser installation slightly:
The default profile is split from the binaries and application data:
- [[!tails_gitweb_dir config/chroot_local-includes/etc/tor-browser]]
+- [[!tails_gitweb config/chroot_local-includes/usr/share/tails/tor-browser-prefs.js]]
As for extensions we have the following differences:
@@ -1032,7 +1033,7 @@ the Internet:
The remaining configuration differences can be found in:
-- [[!tails_gitweb_dir config/chroot_local-includes/etc/tor-browser/user.js]]
+- [[!tails_gitweb_dir config/chroot_local-includes/usr/share/tails/tor-browser-prefs.js]]
- [[!tails_gitweb config/chroot_local-hooks/14-generate-tor-browser-profile]]
- [[!tails_gitweb config/chroot_local-hooks/15-symlink-places.sqlite]]