From 73a8aa0a74a3c214c94e244b863e50a27a540b3e Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Mon, 16 Jun 2014 15:02:58 +0000 Subject: [PATCH] Updating the docs for the changed location of nano's search history. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4972 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 2 ++ doc/man/nano.1 | 2 +- doc/man/nanorc.5 | 2 +- doc/texinfo/nano.texi | 7 ++++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 055d3d16..f494b048 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ * src/nano.c (do_mouse): Put a common statement outside of then/else. * src/Makefile.am: Remove -I m4; it is needed only at the top level. * Makefile.am: Trim the contents of EXTRA_DIST to what is required. + * doc/man/nano.1, doc/man/nanorc.5, doc/texinfo/nano.texi: Update + the docs for the changed location of nano's search history. 2014-06-14 Mark Majeres * src/nano.h, src/text.c (undo_cut, update_undo): When undoing a diff --git a/doc/man/nano.1 b/doc/man/nano.1 index 48be089d..51d44758 100644 --- a/doc/man/nano.1 +++ b/doc/man/nano.1 @@ -74,7 +74,7 @@ Enable multiple file buffers, if available. Enable vim-style file locking when editing files. .TP .B \-H (\-\-historylog) -Log search and replace strings to \fI~/.nano_history\fP, so they can be +Log search and replace strings to \fI~/.nano/search_history\fP, so they can be retrieved in later sessions, if \fInanorc\fP support is available. .TP .B \-I (\-\-ignorercfiles) diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5 index 78880249..9ed3ee97 100644 --- a/doc/man/nanorc.5 +++ b/doc/man/nanorc.5 @@ -100,7 +100,7 @@ in the two help lines at the bottom of the screen. See \fBset titlecolor\fR for more details. .TP .B set/unset historylog -Enable the use of \fB~/.nano_history\fP for saving and reading +Enable the use of \fB~/.nano/search_history\fP for saving and reading search/replace strings. .TP .B set keycolor \fIfgcolor\fR,\fIbgcolor\fR diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi index a494a8b3..b688142f 100644 --- a/doc/texinfo/nano.texi +++ b/doc/texinfo/nano.texi @@ -154,7 +154,7 @@ Enable multiple file buffers, if available. Enable vim-style file locking when editing files. @item -H, --historylog -Log search and replace strings to ~/.nano_history, so they can be +Log search and replace strings to ~/.nano/search_history, so they can be retrieved in later sessions, if nanorc support is available. @item -I, --ignorercfiles @@ -521,7 +521,7 @@ toggles the -$ (@code{--softwrap}) command line option. The nanorc files contain the default settings for @code{nano}. They should be in Unix format, not in DOS or Mac format. During startup, -@code{nano} will first read the system-wide settings, from /etc/nanorc, +@code{nano} will first read the system-wide settings, from SYSCONFDIR/nanorc, and then the user-specific settings, from ~/.nanorc. A nanorc file accepts a series of "set" and "unset" commands, which can @@ -606,7 +606,8 @@ in the two help lines at the bottom of the screen. See "set titlecolor" for more details. @item set/unset historylog -Enable ~/.nano_history for saving and reading search/replace strings. +Enable the use of ~/.nano/search_history for saving and reading +search/replace strings. @item set keycolor fgcolor,bgcolor Specify the color combination to use for the shortcut key combos