Adding a section to the man page on the non-obvious functioning of

the cutbuffer and the mark.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5244 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 3ac99fb74827b24add526b23a82cb75fedbea10c..cc00845c7fa70e0bac85e6306f29971433428675 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
        * doc/man/nano.1, doc/man/nanorc.5, doc/texinfo/nano.texi: Clarify the
        meaning of --backupdir: it doesn't just specify a directory for saving
        backup files, it mainly causes uniquely numbered backups to be made.
+       * doc/man/nano.1: Add a section on the non-obvious functioning of the
+       cutbuffer and the mark.
 
 2015-06-04  Benno Schulenberg  <bensberg@justemail.net>
        * src/nano.h: Fix compilation with --enable-tiny.

diff --git a/doc/man/nano.1 b/doc/man/nano.1
index 8abb551a140905c2a28d67104cdba9dd2b47b2c5..e601e598aeada4ce348f21030273e7b0c71a101d 100644 (file)
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -20,7 +20,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.TH NANO 1 "version 2.4.0" "March 2015"
+.TH NANO 1 "version 2.4.2" "June 2015"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 
@@ -38,6 +38,27 @@ top of copying Pico's look and feel, \fBnano\fP also implements some
 missing (or disabled by default) features in Pico, such as "search and
 replace" and "go to line and column number".
 
+.SH EDITING
+Entering text and moving around in a file is straightforward: typing the
+letters and using the normal cursor movement keys.  Commands are entered
+by using the Control (^) and the Alt or Meta (M-) keys.
+Typing \fB^K\fR deletes the current line and puts it in the cutbuffer.
+Consecutive \fB^K\fRs will put all deleted lines together in the cutbuffer.
+Any cursor movement or executing any other command will cause the next
+\fB^K\fR to overwrite the cutbuffer.  A \fB^U\fR will paste the current
+contents of the cutbuffer at the current cursor position.
+.PP
+When a more precise piece of text needs to be cut or copied, one can mark
+its start with \fB^6\fR, move the cursor to its end (the marked text will be
+highlighted), and then use \fB^K\fR to cut it, or \fBM-6\fR to copy it to the
+cutbuffer. One can also save the marked text to a file with \fB^O\fR, or
+spell check it with \fB^T\fR.
+.PP
+The two lines at the bottom of the screen show the most important commands;
+the built-in help (\fB^G\fR) lists all the available ones.
+The default key bindings can be changed via the .nanorc file -- see
+.BR nanorc (5).
+
 .SH OPTIONS
 .TP
 .B +\fIline\fP,\fIcolumn\fP