diff --git a/ChangeLog b/ChangeLog index 10e5bd39..0ccaebe2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ the meaning of 'all' to "all menus where the function exists". * src/rcfile.c (is_universal): New function, returning TRUE for the functions that are present in most menus but only listed in MMAIN. + * doc/man/nanorc.5, doc/texinfo/nano.texi: Update the docs for this. 2014-06-25 Benno Schulenberg * src/browser.c (do_browser): Allow 'firstfile' and 'lastfile' to be diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5 index 87b7ea86..1681a73d 100644 --- a/doc/man/nanorc.5 +++ b/doc/man/nanorc.5 @@ -322,7 +322,8 @@ Key bindings may be reassigned via the following commands: .TP .BI bind " key function menu" Rebinds the key \fIkey\fP to a new function named \fIfunction\fP in the -context of menu \fImenu\fP (or in all menus by using \fBall\fP). +context of menu \fImenu\fP (or in all menus where the function exists +by using \fBall\fP). .TP .BI unbind " key menu" Unbinds the key \fIkey\fP from the menu named \fImenu\fP (or from all @@ -655,9 +656,9 @@ The 'search for a file' menu in the file browser. The 'go to directory' menu in the file browser. .TP .B all -A special name that encompasses all menus. For rebinding keys, it really -means all menus (which may have unobvious effects, so use it carefully); -for unbinding keys, it just means all the menus where the key exists. +A special name that encompasses all menus. +For \fBbind\fR it means all menus where the specified \fIfunction\fR exists; +for \fBunbind\fR it means all menus where the specified \fIkey\fR exists. .SH FILES .TP diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi index b79098a2..6dedd472 100644 --- a/doc/texinfo/nano.texi +++ b/doc/texinfo/nano.texi @@ -843,7 +843,7 @@ nanorc file: @item bind key function menu Rebinds @code{key} to @code{function} in the context of @code{menu} -(or in all menus by using @code{all}). +(or in all menus where the function exists by using @code{all}). @item unbind key menu Unbinds @code{key} from @code{menu} @@ -1183,9 +1183,9 @@ The 'search for a file' menu in the file browser. The 'go to directory' menu in the file browser. @item all -A special name that encompasses all menus. For rebinding keys, it really -means all menus (which may have unobvious effects, so use it carefully); -for unbinding keys, it just means all the menus where the key exists. +A special name that encompasses all menus. For @code{bind} it means +all menus where the specified @code{function} exists; for @code{unbind} +it means all menus where the specified @code{key} exists. @end table