From a3de4d77804a846dc6194f213b3f7f971406c113 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Mon, 4 Aug 2008 01:03:01 +0000 Subject: [PATCH] move :buffer help to tabs.txt --- locale/en-US/autocommands.txt | 1 - locale/en-US/browsing.txt | 2 -- locale/en-US/buffer.txt | 1 - locale/en-US/developer.txt | 1 - locale/en-US/intro.txt | 2 +- locale/en-US/marks.txt | 3 --- locale/en-US/options.txt | 1 - locale/en-US/tabs.txt | 19 ++++++++++++++++--- locale/en-US/tutorial.txt | 12 ------------ locale/en-US/various.txt | 18 ------------------ 10 files changed, 17 insertions(+), 43 deletions(-) diff --git a/locale/en-US/autocommands.txt b/locale/en-US/autocommands.txt index 6903c590..a528a327 100644 --- a/locale/en-US/autocommands.txt +++ b/locale/en-US/autocommands.txt @@ -5,7 +5,6 @@ HEADER Autocommands are a way to automatically execute code when certain events happen. - |:au| |:autocmd| + ||:au[tocmd]|| Execute commands automatically on events. ________________________________________________________________________________ diff --git a/locale/en-US/browsing.txt b/locale/en-US/browsing.txt index 447d72e8..966efda8 100644 --- a/locale/en-US/browsing.txt +++ b/locale/en-US/browsing.txt @@ -27,7 +27,6 @@ in Vimperator. When Vimperator mode is temporarily disabled with , will pass the next key to Vimperator instead of the web page. ________________________________________________________________________________ - section:Opening{nbsp}web{nbsp}pages[opening] |o| |:o| |:open| @@ -86,7 +85,6 @@ Just like help::open[browsing.html,:open], but opens the resulting web page(s) in a new window. ________________________________________________________________________________ - section:Navigating[navigating] |H| || |CTRL-O| |:ba| |:back| diff --git a/locale/en-US/buffer.txt b/locale/en-US/buffer.txt index e42747b8..8c5f91e3 100644 --- a/locale/en-US/buffer.txt +++ b/locale/en-US/buffer.txt @@ -144,7 +144,6 @@ or documentation. Change 'previouspattern' to modify its behavior. It follows relations between files too. ________________________________________________________________________________ - section:Zooming[zooming] |+| |zi| diff --git a/locale/en-US/developer.txt b/locale/en-US/developer.txt index 39b88dc4..23afd07a 100644 --- a/locale/en-US/developer.txt +++ b/locale/en-US/developer.txt @@ -73,7 +73,6 @@ on the mailing list or on #vimperator. Usually help should be grouped together in logically connected subject areas like help:opening{nbsp}web{nbsp}pages[browsing.html#opening]. - section:Generating{nbsp}Documentation[generating-docs] You can also autogenerate most of the asciidoc help after you have written a diff --git a/locale/en-US/intro.txt b/locale/en-US/intro.txt index 312b8b9e..80c6210e 100644 --- a/locale/en-US/intro.txt +++ b/locale/en-US/intro.txt @@ -52,7 +52,7 @@ section:Help{nbsp}topics[overview] - help:Buffer{nbsp}commands[buffer.html]: Operations on the current document like scrolling or copying text. - help:Tabs[tabs.html]: Manage your tabbed browsing session. -- help:Hints[hints.html]: Select hyperlinks. +- help:Hints[hints.html]: Select hyperlinks. - help:Key{nbsp}Mapping{nbsp}and{nbsp}Abbreviations[map.html]: Define new key mappings. - help:Expression{nbsp}Evaluation[eval.html]: Execute JavaScript. - help:Options[options.html]: A description of all options. diff --git a/locale/en-US/marks.txt b/locale/en-US/marks.txt index 99153911..c00b7216 100644 --- a/locale/en-US/marks.txt +++ b/locale/en-US/marks.txt @@ -83,7 +83,6 @@ The following options WILL be interpreted in the future: * [!] a special version to delete ALL bookmarks ________________________________________________________________________________ - section:History[history] TO BE WRITTEN... @@ -145,7 +144,6 @@ The special version [c]:history![c] works the same as [c]:history[c] except it opens all the found items in new tabs. ________________________________________________________________________________ - section:QuickMarks[quickmarks] INTRO TO BE WRITTEN... @@ -209,7 +207,6 @@ ________________________________________________________________________________ Show all QuickMarks. If [arg] is specified then limit the list to those QuickMarks mentioned. ________________________________________________________________________________ - section:Local{nbsp}Marks[localmarks] Local marks are used to ... diff --git a/locale/en-US/options.txt b/locale/en-US/options.txt index 18aeea0f..df93e552 100644 --- a/locale/en-US/options.txt +++ b/locale/en-US/options.txt @@ -111,7 +111,6 @@ Change any Firefox {preference} (those in the about:config window). You can also reset/delete those preferences with [c]:set! {preference}&[c]. ________________________________________________________________________________ - section:List{nbsp}of{nbsp}options[list-options] |\'act'| |\'activate'| diff --git a/locale/en-US/tabs.txt b/locale/en-US/tabs.txt index d2b2e03a..1f9e0cc7 100644 --- a/locale/en-US/tabs.txt +++ b/locale/en-US/tabs.txt @@ -3,7 +3,6 @@ HEADER |tabs| + Tabs are used to be able to view many web pages at the same time... - section:Listing{nbsp}tabs[listing-tabs] |B| + @@ -86,6 +85,21 @@ provides a quick method of toggling between two tabs. ________________________________________________________________________________ +|:b| |:buffer| +||:b[uffer][!] {url|index}|| + +________________________________________________________________________________ +Go to buffer from buffer list. Argument can be either the buffer index or the +full URL. + +If argument is neither a full URL nor an index but uniquely identifies a +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 #, the alternate buffer will be selected (see [m][m]). +________________________________________________________________________________ + + |:bl| |:blast| |:tabl| |:tablast| ||:tabl[ast]|| + ||:bl[ast]|| @@ -139,10 +153,9 @@ ________________________________________________________________________________ ||:tabfir[st]|| + ||:br[ewind]|| + ||:bf[irst]|| +________________________________________________________________________________ Switch to the first tab. ________________________________________________________________________________ -________________________________________________________________________________ - section:Closing{nbsp}tabs[closing-tabs] diff --git a/locale/en-US/tutorial.txt b/locale/en-US/tutorial.txt index 63cb0787..cbe34add 100644 --- a/locale/en-US/tutorial.txt +++ b/locale/en-US/tutorial.txt @@ -7,7 +7,6 @@ LOGO Vimperator.* ++++++ - section:Quick-Start{nbsp}Tutorial[tutorial] If you've started using Vimperator from scratch (i.e., without any @@ -63,12 +62,9 @@ and you can find out about the [m]gt[m] and [m]gT[m] mapping with [c]:help gt[c] [c]:help gT[c] - Finally, in addition to the help system itself, [c]:exusage[c] and [c]:viusage[c] are useful quick-reference commands. - - section:Mouseless[living_mouseless] *-- or how I learned to stop worrying and love the 80+ buttons I already have.* @@ -82,7 +78,6 @@ assumption that the 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. - section:Scrolling[keyboard_scrolling] Scrolling the browser window is done with simple keystrokes: @@ -99,7 +94,6 @@ Scrolling the browser window is done with simple keystrokes: Your standard buttons ([m][m]/[m][m]/[m][m]/[m][m]) will also work as expected. - section:History{nbsp}and{nbsp}Tabs[history_navigation,tab_navigation] History navigation (e.g., ``Back'', ``Forward'') are done similarly to @@ -131,7 +125,6 @@ following pairs sequences are equivalent: :tabopen vimperator.mozdev.org tvimperator.mozdev.org - section:Some{nbsp}hints{nbsp}about{nbsp}surfing...[hints.html] So now you can navigate around in Vimperator. But wait... how do you *open* a @@ -163,7 +156,6 @@ uniquely identified soon, and Vimperator will open it. Once you're done, remember to use [m][m] (``History Back'') or [m]d[m] (``Delete Buffer'') to return here, depending on which key you used to activate QuickHint mode. - section:Common{nbsp}Issues[common_issues] Say you get half-way done typing in a new URL, only to remember that you've @@ -177,7 +169,6 @@ following: gT - section:Saving{nbsp}for{nbsp}Posterity{nbsp}-{nbsp}vimperatorrc[vimperatorrc] Once you get Vimperator set up with your desired options, maps, and @@ -192,7 +183,6 @@ This will create the file *$HOME/.vimperatorrc* containing your settings. It is a simple text file, just like a vimrc file and can be easily edited to suit your preferences. - section:Find{nbsp}the{nbsp}Exit{nbsp}Nearest{nbsp}You[quitting_without_menus] Vimperator supports all of Vim's classic methods of exiting. @@ -203,8 +193,6 @@ Vimperator supports all of Vim's classic methods of exiting. * [m]ZZ[m] -- normal mode mapping equivalent to [c]:xall[c] * [m]ZQ[m] -- normal mode mapping equivalent to [c]:qall[c] - - section:Where{nbsp}did{nbsp}Firefox{nbsp}go?[whither_firefox] You might feel pretty disoriented now. Don't worry. This is still Firefox diff --git a/locale/en-US/various.txt b/locale/en-US/various.txt index d577d058..ab602100 100644 --- a/locale/en-US/various.txt +++ b/locale/en-US/various.txt @@ -20,7 +20,6 @@ typed. If the [!] is given, mappings will not be used. before it, 1 space is one space. ________________________________________________________________________________ - section:Online{nbsp}Help[online-help] || |:help| |:h| |help| @@ -52,10 +51,8 @@ Douglas Adams, the only person who knew what this question really was about is now dead, unfortunately. So now you might wonder what the meaning of death is... - section:Uncategorized{nbsp}Help[uncategorized] - || || + |||| ________________________________________________________________________________ @@ -343,21 +340,6 @@ Play a system beep. ________________________________________________________________________________ -|:b| |:buffer| -||:b[uffer][!] {url|index}|| + -________________________________________________________________________________ -Go to buffer from buffer list. Argument can be either the buffer index or the -full URL. - -If argument is neither a full URL nor an index but uniquely identifies a -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 #, the alternate buffer will be selected (see [m][m]). -________________________________________________________________________________ - - |:dia| |:dialog| ||:dia[log] [firefox-dialog]|| + ________________________________________________________________________________