| @@ -0,0 +1,106 @@
+Index: browser/app/profile/firefox.js
+================================================================================
+--- browser/app/profile/firefox.js
++++ browser/app/profile/firefox.js
+@@ -77,65 +77,6 @@
+ // Dictionary download preference
+ pref("browser.dictionaries.download.url", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/firefox/%VERSION%/dictionaries/");
+
+-// App-specific update preferences
+-
+-// Whether or not app updates are enabled
+-pref("app.update.enabled", true);
+-
+-// This preference turns on app.update.mode and allows automatic download and
+-// install to take place. We use a separate boolean toggle for this to make
+-// the UI easier to construct.
+-pref("app.update.auto", true);
+-
+-// Defines how the Application Update Service notifies the user about updates:
+-//
+-// AUM Set to: Minor Releases: Major Releases:
+-// 0 download no prompt download no prompt
+-// 1 download no prompt download no prompt if no incompatibilities
+-// 2 download no prompt prompt
+-//
+-// See chart in nsUpdateService.js.in for more details
+-//
+-pref("app.update.mode", 1);
+-
+-// If set to true, the Update Service will present no UI for any event.
+-pref("app.update.silent", false);
+-
+-// Update service URL:
+-pref("app.update.url", "https://aus2.mozilla.org/update/2/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/update.xml");
+-// app.update.url.manual is in branding section
+-// app.update.url.details is in branding section
+-
+-// User-settable override to app.update.url for testing purposes.
+-//pref("app.update.url.override", "");
+-
+-// Interval: Time between checks for a new version (in seconds)
+-// default=1 day
+-pref("app.update.interval", 86400);
+-// Interval: Time before prompting the user to download a new version that
+-// is available (in seconds) default=1 day
+-pref("app.update.nagTimer.download", 86400);
+-// Interval: Time before prompting the user to restart to install the latest
+-// download (in seconds) default=30 minutes
+-pref("app.update.nagTimer.restart", 1800);
+-// Interval: When all registered timers should be checked (in milliseconds)
+-// default=5 seconds
+-pref("app.update.timer", 600000);
+-
+-// Whether or not we show a dialog box informing the user that the update was
+-// successfully applied. This is off in Firefox by default since we show a
+-// upgrade start page instead! Other apps may wish to show this UI, and supply
+-// a whatsNewURL field in their brand.properties that contains a link to a page
+-// which tells users what's new in this new update.
+-pref("app.update.showInstalledUI", false);
+-
+-// 0 = suppress prompting for incompatibilities if there are updates available
+-// to newer versions of installed addons that resolve them.
+-// 1 = suppress prompting for incompatibilities only if there are VersionInfo
+-// updates available to installed addons that resolve them, not newer
+-// versions.
+-pref("app.update.incompatible.mode", 0);
+-
+ // Symmetric (can be overridden by individual extensions) update preferences.
+ // e.g.
+ // extensions.{GUID}.update.enabled
+--- browser/base/content/baseMenuOverlay.xul
++++ browser/base/content/baseMenuOverlay.xul
+@@ -76,7 +76,7 @@
+ label="&helpMenu.label;"
+ accesskey="&helpMenu.accesskey;">
+ #endif
+- <menupopup id="menu_HelpPopup" onpopupshowing="buildHelpMenu();">
++ <menupopup id="menu_HelpPopup">
+ <menuitem oncommand="openHelp('firefox-help', 'chrome://browser/locale/help/help.rdf');"
+ #ifdef XP_MACOSX
+ label="&helpContentsMac.label;"
+@@ -102,10 +102,8 @@
+ accesskey="&updateCmd.accesskey;"
+ label="&updateCmd.label;"
+ class="menuitem-iconic"
+- oncommand="checkForUpdates();"/>
+-#ifndef XP_MACOSX
+- <menuseparator/>
+-#endif
++ oncommand="checkForUpdates();"
++ hidden="true"/>
+ <menuitem id="aboutName"
+ accesskey="&aboutCmd.accesskey;"
+ label="&aboutCmd.label;"
+--- browser/components/preferences/advanced.js
++++ browser/components/preferences/advanced.js
+@@ -252,7 +252,8 @@
+ var enabledPref = document.getElementById("app.update.enabled");
+ var enableAppUpdate = document.getElementById("enableAppUpdate");
+
+- enableAppUpdate.disabled = !aus.canUpdate || enabledPref.locked;
++ enableAppUpdate.disabled = true;
++ enableAppUpdate.hidden = true;
+ },
+
+ /**
|
