aboutsummaryrefslogtreecommitdiffstats
path: root/pages/options.html
diff options
context:
space:
mode:
authorStephen Blott2015-06-06 20:19:33 +0100
committerStephen Blott2015-06-06 20:19:33 +0100
commit616261ef8364cbd99765d651dfe8acd5ff55b453 (patch)
treec7b75f7aa9a960132ba484935a4c1ed1cfb63a29 /pages/options.html
parentc20e5d44455be8ac885f0d7c42e05ec9857bd203 (diff)
parentcb900a255113b8304d8931f7c6294e20f7f9f36d (diff)
downloadvimium-616261ef8364cbd99765d651dfe8acd5ff55b453.tar.bz2
Merge branch 'rework-completions'
Conflicts: background_scripts/completion.coffee background_scripts/completion_engines.coffee
Diffstat (limited to 'pages/options.html')
-rw-r--r--pages/options.html5
1 files changed, 3 insertions, 2 deletions
diff --git a/pages/options.html b/pages/options.html
index 441bd9da..12a3ad21 100644
--- a/pages/options.html
+++ b/pages/options.html
@@ -43,7 +43,7 @@ unmap j
unmapAll
" this is a comment
# this is also a comment</pre>
- <a href="#" id="showCommands">Show available commands.</a>
+ <a href="#" id="showCommands">Show available commands</a>.
</div>
</div>
<textarea id="keyMappings" type="text"></textarea>
@@ -60,7 +60,8 @@ a: http://a.com/?q=%s
b: http://b.com/?q=%s description
" this is a comment
# this is also a comment</pre>
- %s is replaced with the search terms.
+ %s is replaced with the search terms. <br/>
+ For search completion, see <a href="completion_engines.html" target="_blank">here</a>.
</div>
</div>
<textarea id="searchEngines"></textarea>