diff options
| -rw-r--r-- | common/locale/en-US/eval.xml | 2 | ||||
| -rw-r--r-- | common/locale/en-US/map.xml | 23 | ||||
| -rw-r--r-- | common/locale/en-US/options.xml | 2 | ||||
| -rw-r--r-- | common/locale/en-US/repeat.xml | 2 | ||||
| -rw-r--r-- | common/locale/en-US/styling.xml | 13 | ||||
| -rw-r--r-- | common/locale/en-US/various.xml | 2 | ||||
| -rw-r--r-- | common/modules/base.jsm | 15 | ||||
| -rw-r--r-- | pentadactyl/NEWS | 4 | ||||
| -rw-r--r-- | pentadactyl/locale/en-US/autocommands.xml | 4 |
9 files changed, 32 insertions, 35 deletions
diff --git a/common/locale/en-US/eval.xml b/common/locale/en-US/eval.xml index 507ee5a7..40b059bc 100644 --- a/common/locale/en-US/eval.xml +++ b/common/locale/en-US/eval.xml @@ -43,7 +43,7 @@ string representation and all of their enumerable properties. </p> - <p>See also <ex>:javascript</ex></p> + <p>See also <ex>:javascript</ex>.</p> </description> </item> diff --git a/common/locale/en-US/map.xml b/common/locale/en-US/map.xml index b1e82c44..222a8115 100644 --- a/common/locale/en-US/map.xml +++ b/common/locale/en-US/map.xml @@ -625,35 +625,30 @@ describing the command's arguments. It should set the context's <tt>completions</tt> property to the list of completion results. Other influential properties include <tt>title</tt>, <tt>sort</tt>, - <tt>anthored</tt>, and <tt>filters</tt>, which are documented in the + <tt>anchored</tt>, and <tt>filters</tt>, which are documented in the <link topic="resource://dactyl/completion.jsm" line="17" dactyl:command="buffer.viewSource">source code</link>. </p> <p> - <em>start</em> is the index into the word being completed at which the returned values - should be applied and <em>completions</em> is a two-dimensional array of the form: + <em>completions</em> is a two-dimensional array of the form: <tt>[[arg1, description1], [arg2, description2], …]</tt> </p> <p> - Otherwise <a>thing</a> should be an array of the same form as the - <tt>completions</tt> property of the context object. + Otherwise <a>thing</a> should evaluate to an array of the same form + as the <tt>completions</tt> property of the context object. </p> <p> Example: - <code><ex>:command foo -nargs=<str>?</str> - \ -complete custom,<str delim="'"> - \ function (context) context.completions = [["arg1", "description1"], ["arg2", "description2"]]</str> - \ <ex>:echo</ex> <str>Useless </str> + <em><q-args></em></ex> + <code><ex>:command foo -nargs=<str>?</str> -complete custom, + \ <str delim="'">function (context) context.completions = [["arg1", "description1"], ["arg2", "description2"]]</str> + \ <ex>:echo</ex> <str>Useless </str> + <em><q-args></em></ex> <ex>:command foo -nargs=<str>?</str> - \ -complete custom,<str delim="'">[ - \ ["arg1", "description1"], - \ ["arg2, "description2"] - \ ]</str> - \ <ex>:echo</ex> <str>Same as above but simpler </str> + <em><q-args></em></ex></code> + \ -complete custom,<str delim="'">[["arg1", "description1"], ["arg2, "description2"]]</str> + \ <ex>:echo</ex> <str>Same as above but simpler </str> + <em><q-args></em></ex></code> </p> <h3 tag="E177 E178 :command-count">Count handling</h3> diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml index 4f6db975..1d3f9bb7 100644 --- a/common/locale/en-US/options.xml +++ b/common/locale/en-US/options.xml @@ -1568,7 +1568,7 @@ load. </p> - <p>See also <ex>:contexts</ex></p> + <p>See also <ex>:contexts</ex>.</p> </description> </item> diff --git a/common/locale/en-US/repeat.xml b/common/locale/en-US/repeat.xml index 831b9b1c..753bc48f 100644 --- a/common/locale/en-US/repeat.xml +++ b/common/locale/en-US/repeat.xml @@ -156,7 +156,7 @@ extensions, with all hyphens stripped and any letter following a hyphen capitalized. So, the file <em>~/.&dactyl.name;/plugins/foo-bar.js</em> may be accessed as - <em>plugins.fooBar</em>. See also <t>writing-plugins</t> + <em>plugins.fooBar</em>. See also <t>writing-plugins</t>. </p> <h3 tag=":source-ex">Ex commands</h3> diff --git a/common/locale/en-US/styling.xml b/common/locale/en-US/styling.xml index cbbd0068..efa47be0 100644 --- a/common/locale/en-US/styling.xml +++ b/common/locale/en-US/styling.xml @@ -125,7 +125,7 @@ <p> Every invocation completely replaces the styling of any previous - invocation, unless <em>-append</em> (short option: <em>-a</em>) is + invocation, unless <em>-append</em> (short name <em>-a</em>) is provided, in which case <a>css</a> is appended to its current value. If <a>css</a> is not provided, any styles beginning with <a>group</a> are listed. @@ -159,7 +159,7 @@ <dl> <dt>-append</dt> <dd>If provided along with <em>-name</em>, <oa>css</oa> and - <a>filter</a> are appended to its current value. (short name: <em>-a</em>)</dd> + <a>filter</a> are appended to its current value. (short name <em>-a</em>)</dd> <dt>-agent</dt> <dd>If provided, the style is installed as an Agent sheet, which @@ -167,8 +167,9 @@ elements. (short name <em>-A</em>)</dd> <dt>-name=<a>name</a></dt> - <dd>If provided, any existing style with the same name is overridden, and the style may later be deleted using <a>name</a>. - (short name <em>-n</em>)</dd> + <dd>If provided, any existing style with the same name is + overridden, and the style may later be deleted using + <a>name</a>. (short name <em>-n</em>)</dd> </dl> @@ -191,9 +192,9 @@ <p>The available options are:</p> <dl> - <dt>-name</dt> <dd>The name provided to <ex>:style</ex> (short option: <em>-n</em>)</dd> + <dt>-name</dt> <dd>The name provided to <ex>:style</ex> (short name <em>-n</em>)</dd> <dt>-index</dt> <dd>For unnamed styles, the index listed by <ex>:style</ex> - (short option: <em>-i</em>)</dd> + (short name <em>-i</em>)</dd> </dl> </description> </item> diff --git a/common/locale/en-US/various.xml b/common/locale/en-US/various.xml index f170e8bb..c66f85d6 100644 --- a/common/locale/en-US/various.xml +++ b/common/locale/en-US/various.xml @@ -38,7 +38,7 @@ <p>Fake key events.</p> <dl> - <dt>-mode</dt> <dd>The mode in which to feed the keys (short name: <em>-m</em>)</dd> + <dt>-mode</dt> <dd>The mode in which to feed the keys (short name <em>-m</em>)</dd> </dl> </description> </item> diff --git a/common/modules/base.jsm b/common/modules/base.jsm index 13c13471..ef3f4928 100644 --- a/common/modules/base.jsm +++ b/common/modules/base.jsm @@ -399,15 +399,16 @@ function isSubclass(targ, src) { } /** - * Returns true if object is an instance or interfaces. If interfaces is an array, - * returns true if object is an instance of any element of interfaces. If interfaces is - * the object form of a primitive type, returns true if object is a - * non-boxed version of the type, i.e., if (typeof object == "string"), - * isinstance(object, String) is true. Finally, if interfaces is a string, - * returns true if ({}.toString.call(object) == "[object <interfaces>]"). + * Returns true if *object* is an instance of *interfaces*. If *interfaces* is + * an array, returns true if *object* is an instance of any element of + * *interfaces*. If *interfaces* is the object form of a primitive type, + * returns true if *object* is a non-boxed version of the type, i.e., if + * (typeof object == "string"), isinstance(object, String) is true. Finally, if + * *interfaces* is a string, returns true if ({}.toString.call(object) == + * "[object <interfaces>]"). * * @param {object} object The object to check. - * @param {constructor|[constructor|string]} interfaces The types to check object against. + * @param {constructor|[constructor|string]} interfaces The types to check *object* against. * @returns {boolean} */ var isinstance_types = { diff --git a/pentadactyl/NEWS b/pentadactyl/NEWS index da191ad6..780d9fb4 100644 --- a/pentadactyl/NEWS +++ b/pentadactyl/NEWS @@ -63,7 +63,7 @@ :listoptions and :listcommands, providing more powerful and consistent interactive help facility (improvements include listing keys for modes other than Normal, filtering the output - and linking to source locations). + and linking to source code locations). - :downloads now opens a download list in the multi-line output buffer. - Added :cookies command. @@ -120,7 +120,7 @@ no longer be split at quoted commas and the option name, operators, and = sign may no longer be quoted. This will break certain automatically-generated configuration files. - See :help stringlist + See :help stringlist. * Option changes: - Added "bookmarks", "diverted", and "links" to 'activate' option. diff --git a/pentadactyl/locale/en-US/autocommands.xml b/pentadactyl/locale/en-US/autocommands.xml index 50852cc2..3726d8b5 100644 --- a/pentadactyl/locale/en-US/autocommands.xml +++ b/pentadactyl/locale/en-US/autocommands.xml @@ -7,7 +7,7 @@ xmlns="&xmlns.dactyl;" xmlns:html="&xmlns.html;"> -<dl tag="autocommand-list" tag="autocommand-list" replace="autocommand-list"> +<dl tag="autocommand-list" replace="autocommand-list"> <dt>BookmarkAdd</dt> <dd>Triggered after a page is bookmarked</dd> <dt>BookmarkChange</dt> <dd>Triggered after a page's bookmark is changed</dd> <dt>BookmarkRemove</dt> <dd>Triggered after a page's bookmark is removed</dd> @@ -26,7 +26,7 @@ <dt>Leave</dt> <dd>Triggered before exiting &dactyl.host;</dd> </dl> -<dl tag="autocommand-args" tag="autocommand-args"replace="autocommand-args"> +<dl tag="autocommand-args" replace="autocommand-args"> <dt><bookmark></dt> <dd>The JavaScript bookmark object. Only for <em>Bookmark*</em>.</dd> <dt><changed></dt> <dd>The name of the property that has changed. Only for <em>BookmarkChange</em>.</dd> <dt><doc></dt> <dd>The document for which the event occurred. Only for <em>DOMLoad</em>, <em>PageLoad</em> and <em>PageLoadPre</em>.</dd> |