diff options
| author | Stephen Blott | 2015-06-06 20:19:33 +0100 | 
|---|---|---|
| committer | Stephen Blott | 2015-06-06 20:19:33 +0100 | 
| commit | 616261ef8364cbd99765d651dfe8acd5ff55b453 (patch) | |
| tree | c7b75f7aa9a960132ba484935a4c1ed1cfb63a29 /pages/options.html | |
| parent | c20e5d44455be8ac885f0d7c42e05ec9857bd203 (diff) | |
| parent | cb900a255113b8304d8931f7c6294e20f7f9f36d (diff) | |
| download | vimium-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.html | 5 | 
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>  | 
