diff --git a/5.1-Updater-[Options].md b/5.1-Updater-[Options].md index 6301c1b..86b553f 100644 --- a/5.1-Updater-[Options].md +++ b/5.1-Updater-[Options].md @@ -84,9 +84,6 @@ The following example illustrates how `-merge` works:

/* 0801: disable location bar using search ***/ user_pref("keyword.enabled", false); -/* 2503: disable giving away network info (FF31+) */ -user_pref("dom.netinfo.enabled", false); - /* 4504: enable RFP letterboxing [FF67+] ***/ user_pref("privacy.resistFingerprinting.letterboxing", true); // [HIDDEN PREF] ``` @@ -96,7 +93,6 @@ user_pref("privacy.resistFingerprinting.letterboxing", true); // [HIDDEN PREF] /*** my user.js overrides ***/ user_pref("browser.safebrowsing.allowOverride", false); // 0405 - remove SB bypass button user_pref("keyword.enabled", true); // 0801 - I use a privacy respecting engine -user_pref("dom.netinfo.enabled", false); // 25xx - enforcing false //// --- comment-out --- 'privacy.resistFingerprinting.letterboxing' -4504- too distracting ``` @@ -112,12 +108,6 @@ user_pref("keyword.enabled", true); // 0801 - I use a privacy respecting engine /* 4504: enable RFP letterboxing [FF67+] ***/ //user_pref("privacy.resistFingerprinting.letterboxing", true); // [HIDDEN PREF] -/*** 4600: RFP (4500) ALTERNATIVES [SETUP] ***/ -/* [NOTE] ESR52.x and non-RFP users replace the * with a slash on this line to enable these -// 4607: [2503] disable giving away network info (FF31+) -user_pref("dom.netinfo.enabled", false); // 25xx - enforcing false -// ***/ - /*** my user.js overrides ***/ user_pref("browser.safebrowsing.allowOverride", false); // 0405 - remove SB bypass button @@ -128,15 +118,9 @@ user_pref("browser.safebrowsing.allowOverride", false); // 0405 - remove SB bypa * `0405` was not merged because it's inactive in the user.js. Instead the override was appended at the bottom. * `0801` was merged with the override, including the comment from the overrides file. * `4504` was commented out and the original value and comment are kept intact -* the netinfo line was merged but the pref has been moved to 4600 in the updated user.js (see info below) * the special comment-out command was also appended at the bottom as a reminder that you gave that command -With `-merge` it's best to always add a comment behind your overrides to make them easily noticeable when you compare your new user.js with one of your backups. A good way is to use the number of the pref's section. That will also make it easier to spot when a pref you want to override gets moved to a commented-out section like `9999: DEPRECATED` or `7000: DON'T BOTHER`, resulting in your override becoming inactive, which may or may not be what you want. (see `dom.netinfo.enabled` in the example) If that's not what you want, you can prepend the `dom.netinfo.enabled` line with a TAB or JS multi-line-comment (or in v4.0+ one or more spaces also works), like this: -```js - user_pref("dom.netinfo.enabled", false); // 25xx - enforcing false -- prepended with a TAB -/* !!! */ user_pref("dom.netinfo.enabled", false); // 25xx - enforcing false -- or a JS-multi-line comment - user_pref("dom.netinfo.enabled", false); // 25xx - enforcing false -- for v4.0 space(s) also works -``` +With `-merge` it's best to always add a comment behind your overrides to make them easily noticeable when you compare your new user.js with one of your backups. A good way is to use the number of the pref's section. If you want the `-merge` function to comment-out a pref, you have to use this **exact** format: ```js