1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-22 20:35:48 +01:00

Unify "command-line" (adjective) and "command line" (substantive) usage.

This commit is contained in:
Štěpán Němec
2010-10-12 12:15:26 +02:00
parent 00b95bacab
commit 2a73dd35e2
8 changed files with 32 additions and 31 deletions

View File

@@ -45,7 +45,7 @@
</description> </description>
</item> </item>
<h2 tag="cmdline-editing">Command-line editing</h2> <h2 tag="cmdline-editing">Command line editing</h2>
<item> <item>
<tags><![CDATA[c_<C-c>]]></tags> <tags><![CDATA[c_<C-c>]]></tags>
@@ -69,7 +69,7 @@
<spec>&lt;Up></spec> <spec>&lt;Up></spec>
<description> <description>
<p> <p>
Recall from command history the previous command-line Recall from command history the previous command line
which begins with the current input value. which begins with the current input value.
</p> </p>
</description> </description>
@@ -81,7 +81,7 @@
<spec>&lt;Down></spec> <spec>&lt;Down></spec>
<description> <description>
<p> <p>
Recall from command history the next command-line Recall from command history the next command line
which begins with the current input value. which begins with the current input value.
</p> </p>
</description> </description>
@@ -215,7 +215,7 @@
</description> </description>
</item> </item>
<h3 tag="cmdline-arguments">Ex command-line arguments</h3> <h3 tag="cmdline-arguments">Ex command line arguments</h3>
<p> <p>
Most Ex commands accept a number of options and arguments. Arguments and Most Ex commands accept a number of options and arguments. Arguments and

View File

@@ -73,7 +73,7 @@
<dt>Items</dt><dd/> <dt>Items</dt><dd/>
<dt>item</dt> <dd>A help entry (HelpItem)</dd> <dt>item</dt> <dd>A help entry (HelpItem)</dd>
<dt>&tab;tags</dt> <dd>See the 'Tagging' section (HelpTags)</dd> <dt>&tab;tags</dt> <dd>See the 'Tagging' section (HelpTags)</dd>
<dt>&tab;spec</dt> <dd>The specification for this item, such as an example command-line. (HelpSpec)</dd> <dt>&tab;spec</dt> <dd>The specification for this item, such as an example command line. (HelpSpec)</dd>
<dt>&tab;strut</dt> <dd>A horizontal formatting strut which ensures that all previous &lt;tags> and &lt;spec> elements appear above the ones that follow.</dd> <dt>&tab;strut</dt> <dd>A horizontal formatting strut which ensures that all previous &lt;tags> and &lt;spec> elements appear above the ones that follow.</dd>
<dt>&tab;type</dt> <dd>For options, the type of the option. <dt>&tab;type</dt> <dd>For options, the type of the option.
<em>number</em>, <em>boolean</em>, <em>string</em>, <em>stringlist</em>, or <em>charlist</em>. <em>number</em>, <em>boolean</em>, <em>string</em>, <em>stringlist</em>, or <em>charlist</em>.

View File

@@ -15,11 +15,11 @@
Much of the power of &dactyl.appName; lies in its scriptable expression Much of the power of &dactyl.appName; lies in its scriptable expression
evaluation. &dactyl.appName; understands two kinds of expressions: Ex evaluation. &dactyl.appName; understands two kinds of expressions: Ex
commands, and JavaScript. Ex commands are simple, easy to type, and commands, and JavaScript. Ex commands are simple, easy to type, and
readily accessible from the <t>command-line</t>. They form a core part of readily accessible from the <link topic="command-line">command line</link>.
the user interface. JavaScript, on the other hand, is much less They form a core part of the user interface. JavaScript, on the other hand,
straightforward, but allows for any number of complex actions to be is much less straightforward, but allows for any number of complex actions
executed, with full access to all of the internals of &dactyl.appName; and to be executed, with full access to all of the internals of &dactyl.appName;
&dactyl.host;. Both expression evaluation methods support sophisticated and &dactyl.host;. Both expression evaluation methods support sophisticated
expression completion, including option lists and descriptions thereof, expression completion, including option lists and descriptions thereof,
along with paren matching and syntax error highlighting. along with paren matching and syntax error highlighting.
</p> </p>
@@ -33,7 +33,7 @@
string, in which case it is shown in the statusline, or any string, in which case it is shown in the statusline, or any
arbitrary JavaScript expression. If the expression results in arbitrary JavaScript expression. If the expression results in
anything other than a string, it is pretty-printed in a multiline anything other than a string, it is pretty-printed in a multiline
frame just above the command-line. The output depends on the type frame just above the command line. The output depends on the type
of object. Functions display their source, DOM nodes display the of object. Functions display their source, DOM nodes display the
pretty-printed XML of the top-level node, XML literals are pretty-printed XML of the top-level node, XML literals are
rendered as page content, and all other objects display their rendered as page content, and all other objects display their

View File

@@ -40,7 +40,7 @@
<p> <p>
causes “<ex>:echo Date()<k name="CR"/></ex>” to be typed out causes “<ex>:echo Date()<k name="CR"/></ex>” to be typed out
whenever <k name="F2"/> is pressed, thus echoing the full date whenever <k name="F2"/> is pressed, thus echoing the full date
to the command-line. to the command line.
</p> </p>
<p tag=":map-modes"> <p tag=":map-modes">
@@ -117,7 +117,7 @@
<dt>-javascript</dt> <dd>Execute <a>rhs</a> as JavaScript rather than keys (short names <em>-js</em>, <em>-j</em>)</dd> <dt>-javascript</dt> <dd>Execute <a>rhs</a> as JavaScript rather than keys (short names <em>-js</em>, <em>-j</em>)</dd>
<dt>-modes</dt> <dd>Create this mapping in the given modes (short names <em>-mode</em>, <em>-m</em>)</dd> <dt>-modes</dt> <dd>Create this mapping in the given modes (short names <em>-mode</em>, <em>-m</em>)</dd>
<dt>-nopersist</dt> <dd>Do not save this mapping to an auto-generated rc file (short name <em>-n</em>)</dd> <dt>-nopersist</dt> <dd>Do not save this mapping to an auto-generated rc file (short name <em>-n</em>)</dd>
<dt>-silent</dt> <dd>Do not echo any generated keys to the command-line (short name <em>-s</em>, also <em>&lt;silent></em> for Vim compatibility)</dd> <dt>-silent</dt> <dd>Do not echo any generated keys to the command line (short name <em>-s</em>, also <em>&lt;silent></em> for Vim compatibility)</dd>
</dl> </dl>
<item> <item>
@@ -520,7 +520,7 @@
<p> <p>
Defining new commands is perhaps the most straightforward way of Defining new commands is perhaps the most straightforward way of
repeating commonly used actions. User-defined commands may be repeating commonly used actions. User-defined commands may be
entered from the command-line or scripts exactly like standard entered from the command line or scripts exactly like standard
commands, and may similarly accept arguments, options, counts, commands, and may similarly accept arguments, options, counts,
and <oa>!</oa>s, as well as provide command-line completion. and <oa>!</oa>s, as well as provide command-line completion.
These commands may be defined as either ordinary, These commands may be defined as either ordinary,

View File

@@ -76,7 +76,7 @@
<dt>g</dt> <dd>back to the start</dd> <dt>g</dt> <dd>back to the start</dd>
<dt/><dd/> <dt/><dd/>
<dt>q, <k name="Esc"/> or CTRL-C</dt> <dd>stop the listing</dd> <dt>q, <k name="Esc"/> or CTRL-C</dt> <dd>stop the listing</dd>
<dt>:</dt> <dd>stop the listing and enter a command-line</dd> <dt>:</dt> <dd>stop the listing and enter a command line</dd>
<dt>;</dt> <dd>start an <t>extended-hints</t> command</dd> <dt>;</dt> <dd>start an <t>extended-hints</t> command</dd>
<dt><k name="C-Y"/></dt> <dd>yank (copy) a modeless selection to the clipboard</dd> <dt><k name="C-Y"/></dt> <dd>yank (copy) a modeless selection to the clipboard</dd>
</dl> </dl>

View File

@@ -367,12 +367,13 @@
Enables automatic completion for completion groups matching the Enables automatic completion for completion groups matching the
given regular expressions. When automatic completion is enabled, given regular expressions. When automatic completion is enabled,
the completion list is automatically opened when the the completion list is automatically opened when the
<t>command-line</t> is focused. Thereafter, any key press <link topic="command-line">command line</link> is focused.
triggers a completion update for the matching groups (hereafter Thereafter, any key press triggers a completion update for the
contexts). Non-matching contexts will only be updated when the matching groups (hereafter contexts). Non-matching contexts will
<k name="Tab" mode="c"/> key is pressed. This option is useful for only be updated when the <k name="Tab" mode="c"/> key is pressed.
disabling auto-completion for computationally intensive contexts This option is useful for disabling auto-completion for
that don't perform well when your system is under load. computationally intensive contexts that don't perform well when
your system is under load.
</p> </p>
<example> <example>
@@ -632,12 +633,12 @@
<dl dt="width: 6em;"> <dl dt="width: 6em;">
<dt>B</dt> <dd>Bookmark bar</dd> <dt>B</dt> <dd>Bookmark bar</dd>
<dt>C</dt> <dd>Always show the command-line outside of the status line</dd> <dt>C</dt> <dd>Always show the command line outside of the status line</dd>
<dt>M</dt> <dd>Always show messages outside of the status line</dd> <dt>M</dt> <dd>Always show messages outside of the status line</dd>
<dt>N</dt> <dd>Tab number over image</dd> <dt>N</dt> <dd>Tab number over image</dd>
<dt>T</dt> <dd>Toolbar</dd> <dt>T</dt> <dd>Toolbar</dd>
<dt>b</dt> <dd>Bottom scrollbar</dd> <dt>b</dt> <dd>Bottom scrollbar</dd>
<dt>c</dt> <dd>Always show the command-line, even when empty</dd> <dt>c</dt> <dd>Always show the command line, even when empty</dd>
<dt>l</dt> <dd>Left scrollbar (<em>l</em> and <em>r</em> are mutually exclusive)</dd> <dt>l</dt> <dd>Left scrollbar (<em>l</em> and <em>r</em> are mutually exclusive)</dd>
<dt>m</dt> <dd>Menu bar</dd> <dt>m</dt> <dd>Menu bar</dd>
<dt>n</dt> <dd>Tab number</dd> <dt>n</dt> <dd>Tab number</dd>
@@ -1261,8 +1262,8 @@
<dl dt="width: 6em;"> <dl dt="width: 6em;">
<dt>0</dt> <dd>Don't show link destination</dd> <dt>0</dt> <dd>Don't show link destination</dd>
<dt>1</dt> <dd>Show the link's destination in the <t>status-line</t></dd> <dt>1</dt> <dd>Show the link's destination in the <link topic="status-line">status line</link></dd>
<dt>2</dt> <dd>Show the link's destination in the <t>command-line</t></dd> <dt>2</dt> <dd>Show the link's destination in the <link topic="command-line">command line</link></dd>
</dl> </dl>
</description> </description>
</item> </item>

View File

@@ -162,11 +162,11 @@
<p> <p>
Ex command files are executed as if each line were entered into Ex command files are executed as if each line were entered into
the <t>command-line</t> individually. Additionally, certain the <link topic="command-line">command line</link> individually.
commands support the same here document syntax supported by most Additionally, certain commands support the same here document
Unix shells and by the <t>command-line</t>. So, to execute a syntax supported by most Unix shells and by the <link topic="command-line">command line</link>.
JavaScript statement which does not comfortably fit on a single So, to execute a JavaScript statement which does not comfortably fit
line, you can use, on a single line, you can use
</p> </p>
<code><ex>:js</ex> &lt;&lt;<em>EOF</em> <code><ex>:js</ex> &lt;&lt;<em>EOF</em>

View File

@@ -94,7 +94,7 @@
<dt>Null</dt> <dd>A JavaScript Null object</dd> <dt>Null</dt> <dd>A JavaScript Null object</dd>
<dt>Number</dt> <dd>A JavaScript Number object</dd> <dt>Number</dt> <dd>A JavaScript Number object</dd>
<dt>Object</dt> <dd>A JavaScript Object</dd> <dt>Object</dt> <dd>A JavaScript Object</dd>
<dt>Preview</dt> <dd>The completion preview displayed in the <t>command-line</t></dd> <dt>Preview</dt> <dd>The completion preview displayed in the <link topic="command-line">command line</link></dd>
<dt>Question</dt> <dd>A prompt for a decision</dd> <dt>Question</dt> <dd>A prompt for a decision</dd>
<dt>Search</dt> <dd>Highlighted search results in a web page</dd> <dt>Search</dt> <dd>Highlighted search results in a web page</dd>
<dt>StatusLine</dt> <dd>The status bar</dd> <dt>StatusLine</dt> <dd>The status bar</dd>