Fix for bug 271473: decouples the app update service, plugin finder service, and extension/theme directory (umo) from each other by moving them to different domain names (aus.mozilla.org, pfs.mozilla.org, and addons.mozilla.org, respectively, but that last URL will redirect to addons.update.mozilla.org temporarily so we don't break Firefox 1.0 users) so that we can isolate them from each other for better reliability and capacity control. r=ben

browser/app/profile/firefox.js

@@ -121,7 +121,7 @@ pref("update.showSlidingNotification", true);   // Windows-only slide-up taskbar
 // 2 = high   (new version of Firefox/Security patch)
 pref("update.severity", 0); 
 
-pref("xpinstall.whitelist.add", "update.mozilla.org");
+pref("xpinstall.whitelist.add", "update.mozilla.org,addons.mozilla.org");
 
 pref("keyword.enabled", true);
 pref("keyword.URL", "http://www.google.com/search?btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8&q=");

browser/components/help/locale/en-US/customization.xhtml

@@ -125,7 +125,11 @@ Contributors:
 <h3 id="getting_installing_themes">Getting and Installing Themes</h3>
 
 <p>You can download and install many themes from <a
+<<<<<<< customization.xhtml
+  href="http://addons.mozilla.org/themes/" target="_blank">Mozilla Update</a>.
+=======
   href="https://update.mozilla.org/themes/" target="_blank">Mozilla Update</a>.
+>>>>>>> 1.10
   Internet searches will find many other themes as well.</p>
 
 <p>Usually when you click on a link to install a theme, &brandShortName;
@@ -173,7 +177,7 @@ Contributors:
 
 <p>Installing an extension involves a very similar process to installing
   themes. Extensions can be found at <a target="blank"
-  href="https://update.mozilla.org/extensions/">Mozilla Update</a>.</p>
+  href="https://addons.mozilla.org/extensions/">Mozilla Update</a>.</p>
 
 <p>There should be an install link for each extension on that extension's
   page. As long as JavaScript is not disabled in your browser, clicking this