diff --git a/vimperator/locale/en-US/asciidoc.conf b/vimperator/locale/en-US/asciidoc.conf index 8656b2dc..4bcc4288 100644 --- a/vimperator/locale/en-US/asciidoc.conf +++ b/vimperator/locale/en-US/asciidoc.conf @@ -28,7 +28,7 @@ HEADER=
[count] \[!\]=[!] -# [macros] +[macros] # section:Introduction[tag1,tag2] (?su)(?.+?)\|(?!\+)=section # help:helptext[href] @@ -56,6 +56,7 @@ HEADER=
|| ________________________________________________________________________________ Decrements the last number in URL by 1, or by [count] if given. Negative -numbers are not supported, as this not generally useful, so the number cannot +numbers are not supported, as this is not generally useful, so the number cannot be decremented past 0. ________________________________________________________________________________ @@ -160,22 +160,22 @@ ________________________________________________________________________________ section:Navigating[navigating] |H| || |CTRL-O| |:ba| |:back| -||:[count]ba[ck] {url}|| + +||:[count]ba[ck] [url]|| + ||:ba[ck]!|| + ||CTRL-o|| ________________________________________________________________________________ -Go [count] pages back in the browser history. If {url} is specified go back to +Go [count] pages back in the browser history. If [url] is specified go back to the first matching URL. The special version [c]:back![c] goes to the beginning of the browser history. ________________________________________________________________________________ |L| || |CTRL-i| |:fo| |:fw| |:forward| -||:[count]fo[rward] {url}|| + +||:[count]fo[rward] [url]|| + ||:fo[rward]!|| + ||CTRL-i|| ________________________________________________________________________________ -Go [count] pages forward in the browser history. If {url} is specified go +Go [count] pages forward in the browser history. If [url] is specified go forward to the first matching URL. The special version [c]:forward![c] goes to the end of the browser history. ________________________________________________________________________________ @@ -311,7 +311,7 @@ ________________________________________________________________________________ ||:xa[ll]|| ________________________________________________________________________________ Save the session and quit. Quit Vimperator, no matter how many tabs/windows -are open. The session is stored. [c]:wq[c] is different as in Vim, as it +are open. The session is stored. [c]:wq[c] is different from Vim, as it closes the window instead of just one tab by popular demand. Complain on the mailing list, if you want to change that. ________________________________________________________________________________ diff --git a/vimperator/locale/en-US/buffer.txt b/vimperator/locale/en-US/buffer.txt index 86c3c259..91022f27 100644 --- a/vimperator/locale/en-US/buffer.txt +++ b/vimperator/locale/en-US/buffer.txt @@ -243,28 +243,28 @@ between 0 and 1, not as a percentage. |+| |zi| + ||[count]zi|| ________________________________________________________________________________ -Enlarge text zoom of current web page. Mnemonic: zoom in +Enlarge text zoom of current web page. Mnemonic: zoom in. ________________________________________________________________________________ |zm| + ||[count]zm|| ________________________________________________________________________________ -Enlarge text zoom of current web page by a larger amount. Mnemonic: zoom more +Enlarge text zoom of current web page by a larger amount. Mnemonic: zoom more. ________________________________________________________________________________ |-| |zo| + ||[count]zo|| ________________________________________________________________________________ -Reduce text zoom of current web page. Mnemonic: zoom out +Reduce text zoom of current web page. Mnemonic: zoom out. ________________________________________________________________________________ |zr| + ||[count]zr|| ________________________________________________________________________________ -Reduce text zoom of current web page by a larger amount. Mnemonic: zoom reduce +Reduce text zoom of current web page by a larger amount. Mnemonic: zoom reduce. ________________________________________________________________________________ @@ -279,28 +279,28 @@ ________________________________________________________________________________ |zI| + ||[count]zI|| ________________________________________________________________________________ -Enlarge full zoom of current web page. Mnemonic: zoom in +Enlarge full zoom of current web page. Mnemonic: zoom in. ________________________________________________________________________________ |zM| + ||[count]zM|| ________________________________________________________________________________ -Enlarge full zoom of current web page by a larger amount. Mnemonic: zoom more +Enlarge full zoom of current web page by a larger amount. Mnemonic: zoom more. ________________________________________________________________________________ |zO| + ||[count]zO|| ________________________________________________________________________________ -Reduce full zoom of current web page. Mnemonic: zoom out +Reduce full zoom of current web page. Mnemonic: zoom out. ________________________________________________________________________________ |zR| + ||[count]zR|| ________________________________________________________________________________ -Reduce full zoom of current web page by a larger amount. Mnemonic: zoom reduce +Reduce full zoom of current web page by a larger amount. Mnemonic: zoom reduce. ________________________________________________________________________________ diff --git a/vimperator/locale/en-US/developer.txt b/vimperator/locale/en-US/developer.txt index 13757c3d..91c6210b 100644 --- a/vimperator/locale/en-US/developer.txt +++ b/vimperator/locale/en-US/developer.txt @@ -4,8 +4,8 @@ section:Writing{nbsp}documentation[writing-docs,documentation] For every new feature, writing documentation is _mandatory_ for the patch to be accepted. The docs are written in -http://www.methods.co.nz/asciidoc/index.html[asciidoc] version 8.x or -newer. The are placed in the _src/locale/en-US/_ directory and compiled with +http://www.methods.co.nz/asciidoc/index.html[asciidoc] version 8.2.x. +They are placed in the _src/locale/en-US/_ directory and compiled with _make doc_. Please refer to the http://www.methods.co.nz/asciidoc/userguide.html[asciidoc documentation] above for details. Usually you can just write text as is, and mostly it will be diff --git a/vimperator/locale/en-US/gui.txt b/vimperator/locale/en-US/gui.txt index 0b1f5102..4da826c5 100644 --- a/vimperator/locale/en-US/gui.txt +++ b/vimperator/locale/en-US/gui.txt @@ -3,7 +3,7 @@ HEADER |gui| + Although Vimperator offers the most frequently used Firefox functionality via -Ex and normal-mode commands there may be times when directly accessing the GUI +Ex and Normal mode commands there may be times when directly accessing the GUI is required. There are commands for accessing the menu system, standard dialogs and the sidebar. diff --git a/vimperator/locale/en-US/map.txt b/vimperator/locale/en-US/map.txt index 5dcd49ae..36a8c37b 100644 --- a/vimperator/locale/en-US/map.txt +++ b/vimperator/locale/en-US/map.txt @@ -12,7 +12,7 @@ which are translated to a string of characters. Example: will echo the current date to the command line when [m][m] is pressed. -There are separate key mapping tables for each of the Normal, Insert, +There are separate key mapping tables for each of the Normal, Insert, and Command-line modes. |:map-special-chars| + @@ -29,7 +29,7 @@ ________________________________________________________________________________ |||| ________________________________________________________________________________ Expand to a line terminator in a key mapping. An Ex command in the {rhs} of a -mapping requires a a line terminator after it so that it is executed when the +mapping requires a line terminator after it so that it is executed when the mapping is expanded. [m][m] should be used for this purpose. ________________________________________________________________________________ @@ -57,7 +57,7 @@ ________________________________________________________________________________ Map the key sequence {lhs} to {rhs}. The {rhs} is remapped, allowing for nested and recursive mappings. -Warning: Mappings are NOT saved during sessions, make sure you put them in your +Warning: Mappings are NOT saved between sessions, make sure you put them in your vimperatorrc file! ________________________________________________________________________________ @@ -70,7 +70,7 @@ ________________________________________________________________________________ Map the key sequence {lhs} to {rhs} (in Command-line mode). The {rhs} is remapped, allowing for nested and recursive mappings. -Warning: Mappings are NOT saved during sessions, make sure you put them in your +Warning: Mappings are NOT saved between sessions, make sure you put them in your vimperatorrc file! ________________________________________________________________________________ @@ -80,10 +80,10 @@ ________________________________________________________________________________ ||:imap {lhs}|| + ||:imap|| ________________________________________________________________________________ -Map the key sequence {lhs} to {rhs} (in insert mode). The {rhs} is remapped, +Map the key sequence {lhs} to {rhs} (in Insert mode). The {rhs} is remapped, allowing for nested and recursive mappings. -Warning: Mappings are NOT saved during sessions, make sure you put them in your +Warning: Mappings are NOT saved between sessions, make sure you put them in your vimperatorrc file! ________________________________________________________________________________ @@ -107,7 +107,7 @@ ________________________________________________________________________________ |:imapc| |:imapclear| + ||:imapc[lear]|| ________________________________________________________________________________ -Remove all mappings (in insert mode). All user-defined mappings which were set +Remove all mappings (in Insert mode). All user-defined mappings which were set by [c]:imap[c] or [c]:inoremap[c] are cleared. ________________________________________________________________________________ @@ -136,7 +136,7 @@ ________________________________________________________________________________ ||:ino[remap] {lhs}|| + ||:ino[remap]|| ________________________________________________________________________________ -Map the key sequence {lhs} to {rhs} (in insert mode). No remapping of the +Map the key sequence {lhs} to {rhs} (in Insert mode). No remapping of the {rhs} is performed. ________________________________________________________________________________ @@ -167,7 +167,7 @@ ________________________________________________________________________________ |:iunm| |:iunmap| + ||:iunm[ap] {lhs}|| ________________________________________________________________________________ -Remove the mapping of {lhs} (in insert mode). +Remove the mapping of {lhs} (in Insert mode). ________________________________________________________________________________ section:Abbreviations[abbreviations] @@ -178,8 +178,8 @@ words. An abbreviation can be one of three types that are defined by the types of constituent characters. Whitespace and quotes are non-keyword types, and all other characters are keyword types. -1. A "full-id" abbreviation consists entirely of characters that are not -keyword characters (e.g., "teh", "msoft"). +1. A "full-id" abbreviation consists entirely of keyword characters +(e.g., "teh", "msoft"). 2. An "end-id" abbreviation ends in keyword character but otherwise contains all non-keyword characters (e.g., "'i"). @@ -304,7 +304,7 @@ The valid values are: *-nargs=1* One argument is allowed *-nargs=** Zero or more arguments are allowed *-nargs=?* Zero or one argument is allowed -*-nargs=+* One or more argument is allowd +*-nargs=+* One or more arguments are allowed -------------------------------------------------------------------------------- |E180| |E181| |:command-complete| + @@ -365,7 +365,7 @@ available for expansion as in the argument. |:command-bang| + Special cases -By default a user command does not have a special version. i.e. a version +By default a user command does not have a special version, i.e. a version executed with the ! modifier. Providing the -bang attribute will enable this and will be available in the argument. @@ -379,7 +379,7 @@ is then executed as an Ex command. The valid escape sequences are: `----------`-------------------------------------------------------------------- ** The command arguments exactly as supplied -** Any supplied count E.g. 5 +** Any supplied count, e.g. 5 ** ! if the command was executed with the ! modifier ** A literal '<' character to allow for a literal copy of one of the escape sequences. E.g. args> will expand to a literal -------------------------------------------------------------------------------- diff --git a/vimperator/locale/en-US/marks.txt b/vimperator/locale/en-US/marks.txt index 61ee2049..837268be 100644 --- a/vimperator/locale/en-US/marks.txt +++ b/vimperator/locale/en-US/marks.txt @@ -6,7 +6,7 @@ Vimperator supports a number of different marks: - Bookmarks which allow you to mark a web page as one of your favorites for easy access. -- QuickMarks allow you to define up to 62 (a-zA-Z0-9) web sites (or group of +- QuickMarks allow you to define up to 62 (a-zA-Z0-9) web sites (or groups of web sites) which you visit most often. - Local marks to store the position within a web page. - History is also a special type of marks, as Vimperator automatically @@ -40,7 +40,7 @@ ____________________________________________________________________________ ||A|| ________________________________________________________________________________ Toggle bookmarked state of current URL. Add/remove a bookmark for the current -location, depending if it already is bookmarked or not. In contrast to the +location, depending on if it is already bookmarked or not. In contrast to the [c]:bmark[c] command, the bookmark is just _starred_ which means it is placed in the _Unfiled Bookmarks Folder_ instead of the bookmarks menu. ________________________________________________________________________________ @@ -242,7 +242,7 @@ ________________________________________________________________________________ |:marks| + ||:marks [a][arg][a]|| ________________________________________________________________________________ -Show all location marks of current web page. If [a][arg][a] is specified then +Show all location marks of the current web page. If [a][arg][a] is specified then limit the list to those marks mentioned. ________________________________________________________________________________ diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt index 35b9ae6b..92c5abae 100644 --- a/vimperator/locale/en-US/options.txt +++ b/vimperator/locale/en-US/options.txt @@ -22,7 +22,7 @@ ____ ||:se[t] all|| ____ -Show all options. Show all options. +Show all options. ____ |E518| |E519| @@ -125,7 +125,7 @@ ____ ||:setl[ocal] {option}-={value}|| + ____ -The same as [c]:set[c] command, but it operates for current tab options +The same as [c]:set[c] command, but operates on current tab options only. See [c]:set[c] for details. ____ @@ -144,7 +144,7 @@ ____ ||:setg[lobal] {option}-={value}|| + ____ -The same as [c]:set[c] command, but it operates on global options only. +The same as [c]:set[c] command, but operates on global options only. See [c]:set[c] for details. ____ @@ -377,7 +377,7 @@ Change the behaviour of [m][m] in hint mode. Possible values: *0* Follow the first hint as soon as typed text uniquely identifies it. Follow the selected hint on [m][m]. *1* Follow the selected hint on [m][m]. -*2* Follow the selected hint on [m][m] only it's been [m][m]-selected. +*2* Follow the selected hint on [m][m] only if it's been [m][m]-selected. --------------------------------------------------------------------- ____ @@ -651,7 +651,7 @@ ____ |\'ssli'| |\'showstatuslinks'| ||'showstatuslinks' 'ssli'|| number (default: 1) ____ -Show the destination of the link under the cursor in the status bar +Show the destination of the link under the cursor in the status bar. Also links which are focused by keyboard commands like [m][m] are shown. Possible values: .---`-------------------------------------- @@ -689,7 +689,7 @@ ____ ||'suggestengines' || stringlist (default: "google") ____ Set the search engines which can be used for completion suggestions. -Add "S" to the 'complete' option if you want use this feature. +Add "S" to the 'complete' option if you want to use this feature. Warning: This feature could make tab-completion slower because it needs to wait for changes, so use it only if you have a fast internet connection. @@ -744,8 +744,7 @@ ____ ||'visualbell' 'vb'|| boolean (default: off) ____ Use visual bell instead of beeping on errors. The visual bell style is -controlled by [c]:hi Bell[c]. If no bell is desired use [c]:set t_vb=[c] -together with this option. +controlled by [c]:hi Bell[c]. ____ @@ -776,7 +775,7 @@ ____ |\'wim'| |\'wildmode'| ||'wildmode' 'wim'|| stringlist (default: "list:full") ____ -Define how command-line completion works. +Defines how command-line completion works. It is a comma-separated list of parts, where each part specifies what to do for each consecutive use of the completion key. The first part specifies the behavior for the first use of the completion key, @@ -788,7 +787,7 @@ These are the possible values for each part: "full" Complete the next full match. After the last, the original string is used. "longest" Complete till the longest common string. "list" When more than one match, list all matches. -"list:full" When more than one match, list all matches and complete first match. +"list:full" When more than one match, list all matches and complete the first match. "list:longest" When more than one match, list all matches and complete till the longest common string. \ When there is only a single match, it is fully completed regardless of the case. ----------------------------------------- diff --git a/vimperator/locale/en-US/pattern.txt b/vimperator/locale/en-US/pattern.txt index 33e6ac17..6462a897 100644 --- a/vimperator/locale/en-US/pattern.txt +++ b/vimperator/locale/en-US/pattern.txt @@ -8,7 +8,7 @@ commands as Firefox does not provide native regexp support. It is unlikely that this will ever be available. |/| + -||/\\{pattern\\}[/]|| + +||/{pattern}[/]|| + ________________________________________________________________________________ Search forward for the first occurrence of {pattern}. diff --git a/vimperator/locale/en-US/repeat.txt b/vimperator/locale/en-US/repeat.txt index 43d39f41..2817c980 100644 --- a/vimperator/locale/en-US/repeat.txt +++ b/vimperator/locale/en-US/repeat.txt @@ -7,7 +7,7 @@ Vimperator can repeat a number of commands and record macros. section:Macros[macros,complex-repeat] |q| -||q {0-9a-zA-Z}|| + +||q{0-9a-zA-Z}|| + ____________________________________________________________________________ Record a key sequence into a macro. Available macros are {0-9a-zA-Z} (uppercase to append). @@ -49,7 +49,7 @@ ____________________________________________________________________________ |.| -||[count].| +||[count].|| ____________________________________________________________________________ Repeat the last keyboard mapping [count] times. Note that, unlike in Vim, this does not apply solely to editing commands, mainly because Vimperator doesn't @@ -104,7 +104,7 @@ ________________________________________________________________________________ |:ru| |:runtime| -||:runt[ime][!]| {file} ...|| + +||:runt[ime][!] {file} ...|| + ________________________________________________________________________________ Source the specified file from each directory in 'runtimepath'. Example: + [c]:runtime plugin/foobar.vimp[c] + diff --git a/vimperator/locale/en-US/styling.txt b/vimperator/locale/en-US/styling.txt index 2577c65e..a4ba91a2 100644 --- a/vimperator/locale/en-US/styling.txt +++ b/vimperator/locale/en-US/styling.txt @@ -18,7 +18,7 @@ sourced. ________________________________________________________________________________ |:hi| |:highlight| + -||:hi[ghlight] [-append] {group}[{selector}] [{css}]|| + +||:hi[ghlight][!] [-append] {group}[{selector}] [{css}]|| + ________________________________________________________________________________ Highlight {group} with {css}. Normally, {css} is checked for valid syntax before it's applied. Once you're certain it's @@ -86,7 +86,7 @@ Valid groups are: ------------------------------------------------------- Every invocation completely replaces the styling of any previous invocation, -unless [-append] (short option: -a) is provided, in which case, {css} is +unless *-append* (short option: *-a*) is provided, in which case {css} is appended to its current value. If {css} is not provided, any styles matching {group} are listed. ________________________________________________________________________________ @@ -103,12 +103,12 @@ ________________________________________________________________________________ ||:sty[le][!] [-name={name}] [-append] {filter} [{css}]|| + ________________________________________________________________________________ Add CSS styles to the browser or to web pages. {filter} is a comma -separated list of URLs to match. URLs ending with [c]*[c] are matched as -prefixes, URLs not containing any [c]:[c] or [c]/[c] characters are +separated list of URLs to match. URLs ending with *\** are matched as +prefixes, URLs not containing any *:* or */* characters are matched as domains. If {name} (short option: [c]-n[c]) is provided, any existing style with the same name is overridden, and the style may later -be deleted using {name}. If -append (short option: [c]-a[c]) is provided -along with [c]-name[c], {css} and {filter} are appended to its current +be deleted using {name}. If *-append* (short option: *-a*) is provided +along with *-name*, {css} and {filter} are appended to its current value. If {css} isn't provided, matching styles are listed. @@ -123,9 +123,9 @@ style for [c]www.google.com,mozilla.org[c], will result in a style for [c]www.google.com[c]. The available options are: * [c]-name[c]: The name provided to [c]:style[c] (short option: - [c]-n[c]) + *-n*) * [c]-index[c]: For unnamed styles, the index listed by [c]:style[c] - (short option: [c]-i[c]) + (short option: *-i*) ________________________________________________________________________________ // vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/tabs.txt b/vimperator/locale/en-US/tabs.txt index 3305e05d..9ccded72 100644 --- a/vimperator/locale/en-US/tabs.txt +++ b/vimperator/locale/en-US/tabs.txt @@ -101,7 +101,7 @@ buffer, it is selected. With [!] the next buffer matching the argument is selected, even if it cannot be identified uniquely. Use [m]b[m] as a shortcut to open this prompt. -If argument is [a]#[a], the alternate buffer will be selected (see [m][m]). +If argument is [a]\#[a], the alternate buffer will be selected (see [m][m]). If no argument is given the current buffer remains current. ________________________________________________________________________________ @@ -153,7 +153,7 @@ ________________________________________________________________________________ ||:[count]bn[ext] [count]|| + ________________________________________________________________________________ Switch to the next or [count]th tab. Cycles to the first tab when the last is -selected and {count} is not specified. +selected and [count] is not specified. ________________________________________________________________________________ @@ -203,8 +203,8 @@ ________________________________________________________________________________ ||:[count]u[ndo] [a][url][a]|| + ||[count]u|| ________________________________________________________________________________ -Undo closing of a tab. If a count is given, don't close the last but the -[count]th last tab. With [a][url][a] restores the tab matching the URL. +Undo closing of a tab. If a count is given, don't undo the last but the +[count]th last closed tab. With [a][url][a] restores the tab matching the URL. ________________________________________________________________________________ diff --git a/vimperator/locale/en-US/tutorial.txt b/vimperator/locale/en-US/tutorial.txt index a3cf8005..f7766ec8 100644 --- a/vimperator/locale/en-US/tutorial.txt +++ b/vimperator/locale/en-US/tutorial.txt @@ -15,7 +15,7 @@ bare-looking window. The menubar, navigation bar, and bookmark bars are hidden. In case you missed the notice in the help:Introduction[intro.html], you can regain these by issuing the command - :set go+=mTb + :set go+=mTB where [m][m] represents pressing the or key. If you're a veteran Vim user, this may look familiar. It should. @@ -39,7 +39,7 @@ The other core mode of Vimperator, command-line mode, can be entered from normal mode by typing a \':' (colon). You will frequently see Vimperator commands start with a \':', indicating that what follows is a command. -To return to normal mode command-line mode, type [m][m]. Pressing +To return to normal mode from command-line mode, type [m][m]. Pressing [m][m] will also return you to normal mode from most other modes in Vimperator. @@ -73,7 +73,7 @@ The efficiency of Vimperator, as with the legendary editor it was inspired by, relies on the user being able to keep his fingers on the keyboard where they can do the most good. While there are some areas where the mouse is clearly superior at, such as GUI design or some games, Vimperator acts on the -assumption that the web browser doesn't have to be one of those. +assumption that a web browser doesn't have to be one of those. Here are some areas where the mouse is typically considered indisposable, and how Vimperator challenges this preconception. @@ -116,7 +116,7 @@ Vimmers. To open a web page in a new tab, use the [c]:tabopen {url}[c]. To open a URL in the current tab, use [c]:open[c]. The normal mode mappings [m]t[m] and [m]o[m], -respectively, map to these commands, so the following pairs sequences are +respectively, map to these commands, so the following pairs of sequences are equivalent: :open my.webmail.com diff --git a/vimperator/locale/en-US/various.txt b/vimperator/locale/en-US/various.txt index e8533445..34168638 100644 --- a/vimperator/locale/en-US/various.txt +++ b/vimperator/locale/en-US/various.txt @@ -21,7 +21,7 @@ ________________________________________________________________________________ Execute Normal mode commands {commands}. This makes it possible to execute Normal mode commands typed on the command line. {commands} is executed like it is typed. If the [!] is given, mappings will not be used. {commands} should be -a complete command. {commands} cannot start with a space. Put a 1 (one) before +a complete command. {commands} cannot start with a space. Put 1 space before it, 1 space is one space. ________________________________________________________________________________