diff --git a/common/content/dactyl.js b/common/content/dactyl.js index e5e25dea..9294572e 100644 --- a/common/content/dactyl.js +++ b/common/content/dactyl.js @@ -1813,7 +1813,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), { }); commands.add(["loadplugins", "lpl"], - "Load all plugins immediately", + "Load all or matching plugins", function (args) { dactyl.loadPlugins(args.length ? args : null, args.bang); }, diff --git a/common/locale/en-US/map.xml b/common/locale/en-US/map.xml index c43250b9..d1f91a9b 100644 --- a/common/locale/en-US/map.xml +++ b/common/locale/en-US/map.xml @@ -639,7 +639,7 @@

completions is a two-dimensional array of the form: - [[arg1, description1], [arg2, description2], …] + [[val1, description1], [val2, description2], …]

@@ -650,11 +650,11 @@

Example: :command foo -nargs=? -complete custom, - \ function (context) context.completions = [["arg1", "description1"], ["arg2", "description2"]] + \ function (context) context.completions = [["val1", "description1"], ["val2", "description2"]] \ :echo Useless + <q-args> :command foo -nargs=? - \ -complete custom,[["arg1", "description1"], ["arg2, "description2"]] + \ -complete custom,[["val1", "description1"], ["val2", "description2"]] \ :echo Same as above but simpler + <q-args>

diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml index 73217611..175c90af 100644 --- a/common/locale/en-US/options.xml +++ b/common/locale/en-US/options.xml @@ -984,7 +984,6 @@ - 'nolpl' 'noloadplugins' 'lpl' 'loadplugins' 'loadplugins' 'lpl' &option.loadplugins.type; diff --git a/common/modules/io.jsm b/common/modules/io.jsm index 57b94538..ac5b07b9 100644 --- a/common/modules/io.jsm +++ b/common/modules/io.jsm @@ -794,7 +794,7 @@ unlet s:cpo_save { argCount: "0" }); commands.add(["so[urce]"], - "Read Ex commands from a file", + "Read Ex commands, JavaScript or CSS from a file", function (args) { if (args.length > 1) dactyl.echoerr(_("io.oneFileAllowed")); diff --git a/pentadactyl/NEWS b/pentadactyl/NEWS index 481c7ba5..a42eb160 100644 --- a/pentadactyl/NEWS +++ b/pentadactyl/NEWS @@ -185,6 +185,7 @@ - Added 'banghist' option. [b1] - Added 'downloadsort' option. [b7] - Replaced 'focuscontent' with 'strictfocus'. [b1] + - Made 'strictfocus' a [sitemap]. [b7] - 'complete' now defaults to "slf" but file completion only triggers when the URL begins as above. [b1] - Added 's' flag to 'pageinfo' and changed default value. [b7]