From f3894eb13646dc415905a3350e96577d84c824ac Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Tue, 22 Feb 2011 02:03:53 -0500
Subject: [PATCH] Remove all references to the "word" unchunked.

---
 common/content/dactyl.js        | 31 +++++++++++++++----------------
 common/locale/en-US/various.xml |  2 +-
 pentadactyl/NEWS                |  2 +-
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 11b9e6a1..5e488a8a 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -556,14 +556,13 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
      * Returns the URL of the specified help *topic* if it exists.
      *
      * @param {string} topic The help topic to look up.
-     * @param {boolean} unchunked Whether to search the unchunked help page.
+     * @param {boolean} consolidated Whether to search the consolidated help page.
      * @returns {string}
      */
-    findHelp: function (topic, unchunked) {
-        if (!unchunked && topic in services["dactyl:"].FILE_MAP)
+    findHelp: function (topic, consolidated) {
+        if (!consolidated && topic in services["dactyl:"].FILE_MAP)
             return topic;
-        unchunked = !!unchunked;
-        let items = completion._runCompleter("help", topic, null, unchunked).items;
+        let items = completion._runCompleter("help", topic, null, !!consolidated).items;
         let partialMatch = null;
 
         function format(item) item.description + "#" + encodeURIComponent(item.text);
@@ -1030,12 +1029,12 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
      * Opens the help page containing the specified *topic* if it exists.
      *
      * @param {string} topic The help topic to open.
-     * @param {boolean} unchunked Whether to use the unchunked help page.
+     * @param {boolean} consolidated Whether to use the consolidated help page.
      */
-    help: function (topic, unchunked) {
+    help: function (topic, consolidated) {
         dactyl.initHelp();
         if (!topic) {
-            let helpFile = unchunked ? "all" : options["helpfile"];
+            let helpFile = consolidated ? "all" : options["helpfile"];
 
             if (helpFile in services["dactyl:"].FILE_MAP)
                 dactyl.open("dactyl://help/" + helpFile, { from: "help" });
@@ -1044,7 +1043,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
             return;
         }
 
-        let page = this.findHelp(topic, unchunked);
+        let page = this.findHelp(topic, consolidated);
         dactyl.assert(page != null, "E149: Sorry, no help for " + topic);
 
         dactyl.open("dactyl://help/" + page, { from: "help" });
@@ -1682,7 +1681,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
             function () { dactyl.help(); });
 
         mappings.add(modes.all, ["<A-F1>"],
-            "Open the single unchunked help page",
+            "Open the single, consolidated help page",
             function () { ex.helpall(); });
 
         if (dactyl.has("session"))
@@ -1759,20 +1758,20 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
                 description: "Open the introductory help page"
             }, {
                 name: "helpa[ll]",
-                description: "Open the single unchunked help page"
+                description: "Open the single consolidated help page"
             }
         ].forEach(function (command) {
-            let unchunked = command.name == "helpa[ll]";
+            let consolidated = command.name == "helpa[ll]";
 
             commands.add([command.name],
                 command.description,
                 function (args) {
                     dactyl.assert(!args.bang, "E478: Don't panic!");
-                    dactyl.help(args.literalArg, unchunked);
+                    dactyl.help(args.literalArg, consolidated);
                 }, {
                     argCount: "?",
                     bang: true,
-                    completer: function (context) completion.help(context, unchunked),
+                    completer: function (context) completion.help(context, consolidated),
                     literal: 0
                 });
         });
@@ -2025,12 +2024,12 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
             context.completions = [[k, v[0], v[2]] for ([k, v] in Iterator(config.dialogs))];
         };
 
-        completion.help = function help(context, unchunked) {
+        completion.help = function help(context, consolidated) {
             dactyl.initHelp();
             context.title = ["Help"];
             context.anchored = false;
             context.completions = services["dactyl:"].HELP_TAGS;
-            if (unchunked)
+            if (consolidated)
                 context.keys = { text: 0, description: function () "all" };
         };
 
diff --git a/common/locale/en-US/various.xml b/common/locale/en-US/various.xml
index b68b72b6..ac5ee93f 100644
--- a/common/locale/en-US/various.xml
+++ b/common/locale/en-US/various.xml
@@ -185,7 +185,7 @@
     <spec>&lt;A-F1></spec>
     <description>
         <p>
-            Open all help pages coalesced into a single page and scroll to
+            Open all help pages consolidated into a single page and scroll to
             <oa>subject</oa> if given.
         </p>
 
diff --git a/pentadactyl/NEWS b/pentadactyl/NEWS
index 5e039a46..8853a4a4 100644
--- a/pentadactyl/NEWS
+++ b/pentadactyl/NEWS
@@ -198,7 +198,7 @@
       - Add basic plugin authorship documentation. [b1]
       - The help system is newly modularized and features significant
         updates, rewrites, and formatting improvements. [b1]
-      - Added <A-F1> to open the single unchunked help page. [b5]
+      - Added <A-F1> to open the single, consolidated help page. [b5]
     • Removed :beep. [b2]
     • Removed :edit, :tabedit, and :winedit aliases. [b2]
     • Removed :play. [b2]