Updated 5.1 Updater [Options] (markdown)

Thorin-Oakenpants 2022-02-25 03:43:15 +00:00
parent 050acc3464
commit 50d000c6f8

@ -78,8 +78,8 @@ The following example illustrates how `-merge` works:<br><br>
🔹 arkenfox user.js file contains this:
```js
/* 0103: set your "home" page (see 0102) ***/
// user_pref("browser.startup.homepage", "https://www.example.com/");
/* 0405: disable "ignore this warning" on SB warnings [FF45+] ***/
// user_pref("browser.safebrowsing.allowOverride", false);
/* 0801: disable location bar using search ***/
user_pref("keyword.enabled", false);
@ -94,7 +94,7 @@ user_pref("dom.netinfo.enabled", false);
🔹 user-overrides.js:
```js
/*** my user.js overrides ***/
user_pref("browser.startup.homepage", "https://www.foo.bar/"); // 01xx
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
@ -103,8 +103,8 @@ user_pref("dom.netinfo.enabled", false); // 25xx - enforcing false
🔹 final user.js after update + merging:
```js
/* 0103: set your "home" page (see 0102) ***/
// user_pref("browser.startup.homepage", "https://www.example.com/");
/* 0405: disable "ignore this warning" on SB warnings [FF45+] ***/
// user_pref("browser.safebrowsing.allowOverride", false);
/* 0801: disable location bar using search ***/
user_pref("keyword.enabled", true); // 0801 - I use a privacy respecting engine
@ -119,13 +119,13 @@ user_pref("dom.netinfo.enabled", false); // 25xx - enforcing false
// ***/
/*** my user.js overrides ***/
user_pref("browser.startup.homepage", "https://www.foo.bar/"); // 01xx
user_pref("browser.safebrowsing.allowOverride", false); // 0405 - remove SB bypass button
//// --- comment-out --- 'security.tls.version.max' -1202- wait until FF enables TLS1.3 for everyone
```
🔹 a couple things to note here:
* 0103 was not merged because it's inactive in the user.js. Instead the override was appended at the bottom.
* 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.
* 1202 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)