| Index: lib/ui.js | 
| =================================================================== | 
| --- a/lib/ui.js | 
| +++ b/lib/ui.js | 
| @@ -629,8 +629,7 @@ | 
| */ | 
| loadDocLink: function(/**String*/ linkID, /**Window*/ window) | 
| { | 
| - let {Prefs} = require("prefs"); | 
| - let link = Prefs.documentation_link.replace(/%LINK%/g, linkID).replace(/%LANG%/g, Utils.appLocale); | 
| + let link = Utils.getDocLink(linkID); | 
| this.loadInBrowser(link, window); | 
| }, | 
| @@ -751,14 +750,14 @@ | 
| let {addTab} = require("appSupport"); | 
| if (addTab) | 
| { | 
| - addTab(window, "chrome://adblockplus/content/ui/firstRun.xhtml"); | 
| + addTab(window, "chrome://adblockplus/content/ui/firstRun.html"); | 
| } | 
| else | 
| { | 
| let dialogSource = '\ | 
| <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>\ | 
| <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="document.title=content.document.title" buttons="accept" width="500" height="600">\ | 
| - <iframe type="content-primary" flex="1" src="chrome://adblockplus/content/ui/firstRun.xhtml"/>\ | 
| + <iframe type="content-primary" flex="1" src="chrome://adblockplus/content/ui/firstRun.html"/>\ | 
| </dialog>'; | 
| Services.ww.openWindow(window, | 
| "data:application/vnd.mozilla.xul+xml," + encodeURIComponent(dialogSource), |