more help converted to the new help format

content/completion.js

@@ -313,11 +313,10 @@ vimperator.Completion = function () //{{{
             return [0, buildLongestCommonSubstring(helpArray, filter)];
         },
 
-        // TODO: add cache?
         Help: function (filter)
         {
             var res = [];
-            var files = ["intro.html", "options.html", "motion.html", "starting.html"];
+            var files = ["intro.html", "options.html", "motion.html", "starting.html", "browsing.html", "various.html"];
             for (var file in files)
             {
                 try

locale/en-US/asciidoc.conf

@@ -22,6 +22,12 @@ email=stubenschrott@gmx.net
 [replacements]
 LOGO=<center>image:chrome://vimperator/content/logo_white.png[Vimperator]</center>
 HEADER=<span style="float: right; padding-top: 10px;"><form action="https://www.paypal.com/cgi-bin/webscr" method="post"><fieldset class="paypal"> <input type="hidden" name="cmd" value="_s-xclick"/> <input type="image" src="https://www.paypal.com/en_US/i/btn/x-click-but21.gif" name="submit" alt="Make payments with PayPal - it\'s fast, free and secure!"/> <img alt="" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1"/> <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----"/> </fieldset></form></span>image:chrome://vimperator/content/logo_white.png[Vimperator]
+\[count\]=<span class="argument">&#91;count&#93;</span>
+\[arg\]=<span class="argument">&#91;arg&#93;</span>
+\[arg1\]=<span class="argument">&#91;arg1&#93;</span>
+\[arg2\]=<span class="argument">&#91;arg2&#93;</span>
+\[url\]=<span class="argument">&#91;url&#93;</span>
+\[!\]=<span class="argument">&#91;!&#93;</span>
 
 # [macros]
 # section:Introduction[tag1,tag2]

locale/en-US/browsing.txt

@@ -0,0 +1,97 @@
+HEADER
+
+|surfing| |browsing| +
+
+Vimperator overrides nearly all Firefox keys in order to make browing more
+pleasent for vim users. In the rare occurences where you want to pass a
+keystroke to the web page or to Firefox to retain its original meaning you
+have 2 possibilities:
+
+|pass-through| |<C-q>| |CTRL-Q| +
+||CTRL-Q||
+________________________________________________________________________________
+Disable all Vimperator keys except <Esc> and pass them to the next event handler.
+This is especially useful, if JavaScript controlled forms like the RichEdit
+form fields of GMail don't work anymore. To exit this mode, press <Esc>. If
+you also need to pass <Esc> in this mode to the web page, prepend it with
+help:CTRL-V[browsing.html,CTRL-V].
+________________________________________________________________________________
+
+|send-key| |<C-v>| |CTRL-V| +
+||CTRL-V||
+________________________________________________________________________________
+If you only need to pass a single key to a JavaScript form field or another
+extension prefix the key with <C-v>.
+Also works to unshadow Firefox shortcuts like <C-o> which are otherwise hidden
+in Vimperator.  When Vimperator mode is temporarily disabled with <C-q>, <C-v>
+will pass the next key to Vimperator instead of the web page.
+________________________________________________________________________________
+
+
+section:Opening{nbsp}web{nbsp}pages[opening]
+
+|o| |:o| |:open|
+||:o[pen] [arg1], [arg2], ...|| +
+||o||
+________________________________________________________________________________
+Open one or more URLs in the current tab.
+Multiple URLs can be separated with ", ".
+Note that the space after the comma is required.
+Each token is analyzed and in this order:
+
+1. Opened as a local file if it is an existing relative or absolute filename.
+   - [c]:open /etc/fstab[c] shows the file system table.
+   - [c]:open ../other/foo.html[c] in your home directory opens
+	 [a]/home/other/foo.html[a]
+2. Opened with the specified search engine if the token looks like a search
+   string and the first word is the name of a search engine ([c]:open wikipedia
+   linus torvalds[c] opens the wikipedia entry for linus torvalds). The short
+   name of a search engine is automatically guessed from its name. If you want
+   to set a custom name, you can change it with [c]:dialog searchengines[c].
+3. Opened with the default search engine or keyword (specified with the
+   'defsearch' option) if the first word is no search engine ([c]:open linus
+   torvalds[c] opens a Google search for linux torvalds).
+4. Passed directly to Firefox in all other cases ([c]:open www.osnews.com,
+   www.slashdot.org[c] opens OSNews in the current, and Slashdot in a new
+   background tab).
+
+You can use :open -tags linux torvalds<Tab> to complete bookmarks with tag "linux" and which contain "torvalds". Note that -tags support is only available for tab completion, not for the actual command.
+The items which are completed on <Tab> are specified in the 'complete' option.
+Without argument, reloads the current page.
+Without argument but with !, reloads the current page skipping the cache.
+________________________________________________________________________________
+
+
+|t| |:t| |:tabopen|
+||:tabopen [arg1], [arg2], ...|| +
+||t||
+________________________________________________________________________________
+Just like help::open[browsing.html,:open], but opens the resulting web page(s)
+in a new tab. When used with [a]![a], the 'tabopen' value of the 'activate' option is negated.
+________________________________________________________________________________
+
+
+
+|w| |:w| |:winopen|
+||:winopen [arg1], [arg2], ...|| +
+________________________________________________________________________________
+Just like help::open[browsing.html,:open], but opens the resulting web page(s)
+in a new window.
+________________________________________________________________________________
+
+
+section:Navigating[navigating]
+
+|H| |<C-o>| |CTRL-O| |:ba| |:back|
+||:[count]ba[ck][!] [url]|| +
+________________________________________________________________________________
+Go [count] pages back in the browser history.
+The special version [c]:back![c] goes to the beginning of the browser history.
+________________________________________________________________________________
+
+|L| |<C-i>| |CTRL-i| |:fo| |:fw| |:forward|
+||:[count]fo[rward] [!] [url]|| +
+________________________________________________________________________________
+Go [count] pages back in the browser history.
+The special version [c]:forward![c] goes to the end of the browser history.
+________________________________________________________________________________

locale/en-US/intro.txt

@@ -46,7 +46,9 @@ it, recommend it and like it :)
 section:Help{nbsp}topics[overview]
 
 - help:Initialization[starting.html]: How vimperator starts up, where it reads the config file...
-- help:Options[options.html]: A description of all options
+- help:Browsing[browsing.html]: Explains most mappings and commands needed for
+  a browsing session.
+- help:Options[options.html]: A description of all options.
 
 section:Features[features]
 

locale/en-US/options.txt

@@ -27,7 +27,7 @@ Number option: show value. +
 String option: show value.
 ____
 
-||:se[t] no{option}|| Toggle option: Reset, switch it off.
+||:se[t] no{option} +++<br/>+++ :se[t] {option}!|| Toggle option: Reset, switch it off.
 
 // :se[t] {option}!   or
 ||:se[t] inv{option}|| Toggle option: Invert value.
@@ -81,7 +81,7 @@ exactly as they appear in the option.  Remove flags
 one by one to avoid problems.
 ____
 
-
+''''
 
 section:List{nbsp}of{nbsp}options[list-options]
 

locale/en-US/starting.txt

@@ -0,0 +1,26 @@
+HEADER
+
+Vimperator does not yet read any command line options. When it does, they will
+be documented here.
+
+section:Initialization[initialization, startup]
+
+At startup Vimperator sources a user RC file, containing Ex commands, and any
+JavaScript files found in the plugin directory. The RC file may be named
+[a].vimperatorrc_[a] or [a]\_vimperatorrc[a]. The search order is:
+
+* Unix and Mac: [a]\~/.vimperatorrc[a] then [a]\~/_vimperatorrc[a]
+* Windows - [a]\~/_vimperatorrc[a] then [a]\~/.vimperatorrc[a]
+
+The plugin directory is named:
+
+* Unix and Mac - [a]\~/.vimperator/plugin[a]
+* Windows - [a]\~/vimperator/plugin[a]
+
+The user's '$HOME'(~) directory is determined as follows:
+
+* Unix and Mac - _$HOME_ is used.
+* Windows - if _$HOME_ is set then this is used, otherwise _$USERPROFILE_ or finally
+_$HOMEDRIVE$HOMEPATH_.
+
+_$VIMPERATOR_HOME_ can be used to override the calculated _$HOME_ directory.

locale/en-US/various.txt

@@ -0,0 +1,11 @@
+HEADER
+
+section:Various{nbsp}Commands[various]
+
+|<C-l>| |CTRL-L| |:redr| |:redraw| +
+||:redr[aw]||
+____
+Redraws the screen. Useful to update the screen halfway executing a script or function.
+____
+
+

locale/en-US/xhtml11.css

@@ -51,7 +51,7 @@ body h1 {
 }
 
 body h2 {
-  margin-top: 30px;
+  margin-top: 50px;
   line-height: 1.3;
   border-bottom: 1px solid silver;
 }
@@ -286,13 +286,13 @@ span.tag {
     float: right;
 }
 span.section {
-    padding-top: 22px !important; /* NOTE: needs change when you change <h2>'s margin */
+    padding-top: 35px !important; /* NOTE: needs change when you change <h2>'s margin */
 }
 
 div.key {
     color: rgb(255, 0, 255); /* magenta */
     min-width: 120px; /* with 20px padding actually 140px */
-	padding-bottom: 1em;
+	/*padding-bottom: 5px;*/
 	padding-right: 20px;
     float: left;
 }
@@ -321,5 +321,5 @@ fieldset.paypal {
 }
 .quoteblock {
 	margin-left: 140px;
-	margin-bottom: 30px;
+	margin-bottom: 20px;
 }