Updated bookmarks section of manual.

[elpher.git] / elpher.texi

diff --git a/elpher.texi b/elpher.texi
index b95f148..d9a835b 100644 (file)
--- a/elpher.texi
+++ b/elpher.texi
@@ -237,12 +237,6 @@ Move to the previous link or menu item in the file.
 Jump directly to a link within a file by specifying its display string
 or link text.  (Unlike the previous two commands, this immediately opens
 the selected link.
-
-@keycmd{@key{M}, elpher-jump-to-number}
-Jump directly to a link within a file by specifying the number of the
-link, where the first link on the page is link number 1.
-(These indices can be shown next to the links by setting the customization
-option elpher-number-links to non-nil.)
 @end table
 
 
@@ -386,14 +380,13 @@ Elpher actually maintains two histories, and there are two different
 commands to access them:
 
 @table @asis
-@keycmd{@key{s}, elpher-history}
+@keycmd{@key{s}, elpher-show-history}
 This shows the history of the current buffer. This shows all the links
 you would visit if you were to use @key{u} again and again.
 
-@keycmd{@key{S}, elpher-history-all}
+@keycmd{@key{S}, elpher-show-visited-pages}
 This shows the entire Elpher browsing history. It includes all the
-pages you visited using other Elpher buffers, and it includes buffers
-you later killed.
+pages you visited in your current Emacs session.
 
 @end table
 
@@ -405,29 +398,35 @@ emacs, The Emacs Editor}. The following commands are perhaps the most
 useful ones:
 
 @table @asis
-@keycmd{@key{a}, elpher-set-bookmark-no-overwrite}
+@keycmd{@key{a}, elpher-bookmark-link}
 Add a bookmark for the link at point.  The minibuffer will prompt for
 a name for the bookmark, which defaults to the display string.
 
-@keycmd{@key{A}, bookmark-set-no-overwrite}
+@keycmd{@key{A}, elpher-bookmark-current}
 Add a bookmark for the current page.  The minibuffer will prompt for
 a name for the bookmark, defaulting to the display string associated
 with the link that was followed to reach the current page.
 
-@keycmd{@key{B}, bookmark-bmenu-list}
+@keycmd{@key{B}, elpher-open-bookmarks}
 Open a page displaying all current bookmarks. This is where you can
 delete and search bookmarks, for example.
-
 @end table
 
-If all your bookmarks disappeared in an upgrade from 2.10 to 2.11, you
-can import your old Elpher bookmarks into your Emacs bookmarks using
+On opening the bookmarks page, elpher will offer to import any legacy
+(2.x) bookmarks files into the new system. Once the import is complete,
+the original bookmarks file will have ``-legacy'' appended to it, so
+so that elpher knows not to import it again.
+
+If you have any other legacy bookmark files (besides the one in the
+original location, or specified in the @code{elpher-bookmarks-file}
+customization variable, which should be automatically detected), you can
+can import these using
 
 @example
 @kbd{M-x elpher-bookmark-import @key{RET}}
 @end example
 
-Once this is done, you can delete the file with the Elpher bookmarks.
+Once this is done, you may delete these legacy bookmarks files.
 
 @node Gopher character encodings, Encrypted gopher connections, Bookmarks, Top
 @chapter Gopher character encodings
@@ -440,8 +439,8 @@ characters.  To do this properly requires knowledge of the encoding
 system used by whoever authored the document.
 
 Unfortunately gopher lacks a systematic way of acquiring this necessary
-information. Thus, the details of the coding system must be either inferred from the binary data,
-or must be specified by the user.
+information. Thus, the details of the coding system must be either
+inferred from the binary data, or must be specified by the user.
 
 By default, Elpher applies Emacs' built-in character encoding detection
 system to the full (undecoded) response data and uses this to attempt to