Merge.

common/content/liberator.js

@@ -613,8 +613,8 @@ const Liberator = Module("liberator", {
      * @returns {string}
      */
     help: function (topic, unchunked) {
-        if (!topic && !unchunked) {
-            let helpFile = options["helpfile"];
+        if (!topic) {
+            let helpFile = unchunked ? "all" : options["helpfile"];
             if (helpFile in services.get("liberator:").FILE_MAP)
                 liberator.open("liberator://help/" + helpFile, { from: "help" });
             else
@@ -1691,10 +1691,9 @@ const Liberator = Module("liberator", {
         completion.help = function help(context, unchunked) {
             context.title = ["Help"];
             context.anchored = false;
-            context.key = unchunked;
             context.completions = services.get("liberator:").HELP_TAGS;
             if (unchunked)
-                context.keys = { text: "text", description: function () "all" };
+                context.keys = { text: 0, description: function () "all" };
         };
 
         completion.menuItem = function menuItem(context) {

vimperator/Makefile

@@ -1,6 +1,6 @@
 #### configuration
 
-VERSION       = 1.0pre
+VERSION       = 2.3a1pre
 NAME          = vimperator
 
 include ../common/Makefile

vimperator/NEWS

@@ -1,11 +1,12 @@
 2009-XX-XX:
+    * version 2.3a1pre
     * add basic plugin authorship documentation
     * plugins may now provide full-fleged ':help' documentation
     * asciidoc is no longer required to build Vimperator
     * the help system is newly modularized
 
-2009-XX-XX:
-    * version 2.2a1pre
+2009-10-28:
+    * version 2.2
     * IMPORTANT: Vimperator's licence has changed from the MPL/GPL/LGPL
       tri-license to the MIT license.
     * IMPORTANT: Map.flags has been replaced with individual properties.