1 files changed, 53 insertions, 7 deletions
diff --git a/upstream/debian-unstable/man1/nano.1 b/upstream/debian-unstable/man1/nano.1
index 1eb19c5f..8ca854a5 100644
--- a/upstream/debian-unstable/man1/nano.1
+++ b/upstream/debian-unstable/man1/nano.1
@@ -1,4 +1,4 @@
-.\" Copyright (C) 1999-2011, 2013-2023 Free Software Foundation, Inc.
+.\" Copyright (C) 1999-2011, 2013-2024 Free Software Foundation, Inc.
 .\"
 .\" This document is dual-licensed.  You may distribute and/or modify it
 .\" under the terms of either of the following licenses:
@@ -16,19 +16,40 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <https://www.gnu.org/licenses/>.
 .\"
-.TH NANO 1 "version 7.2" "January 2023"
+.TH NANO 1 "version 8.0" "May 2024"
 
 .SH NAME
-nano \- Nano's ANOther editor, inspired by Pico
+nano \- Nano's ANOther text editor, inspired by Pico
 
 .SH SYNOPSIS
 .B nano
 .RI [ options "] [[\fB+" line [\fB, column "]] " file ]...
 .sp
-.BR nano " [" \fIoptions "] [[" + [ crCR ]( / | ? ) \fIstring "] " \fIfile ]...
+.B nano
+.RI [ options "] [" file [\fB: line [\fB: column "]]]..."
+.sp
+.BR nano " [" \fIoptions "] [[" + [ crCR ]{ / | ? } \fIstring "] " \fIfile ]...
+
+.SH NOTICE
+Since version 8.0, to be newcomer friendly, \fB^F\fR starts a forward search,
+\fB^B\fR starts a backward search, \fBM\-F\fR searches the next occurrence
+forward, and \fBM\-B\fR searches the next occurrence backward.  If you want
+those keystrokes to do what they did before version 8.0, add the following
+lines at the end of your \fInanorc\fR file:
+.sp
+.RS 4
+.B bind ^F forward main
+.br
+.B bind ^B back main
+.br
+.B bind M\-F formatter main
+.br
+.B bind M\-B linter main
+.RE
+.sp
 
 .SH DESCRIPTION
-\fBnano\fP is a small and friendly editor.  It copies the look and feel
+\fBnano\fP is a small and friendly text editor.  It copies the look and feel
 of Pico, but is free software, and implements several features that Pico
 lacks, such as: opening multiple files, scrolling per line, undo/redo,
 syntax coloring, line numbering, and soft-wrapping overlong lines.
@@ -36,7 +57,11 @@ syntax coloring, line numbering, and soft-wrapping overlong lines.
 When giving a filename on the command line, the cursor can be put on a
 specific line by adding the line number with a plus sign (\fB+\fR) before
 the filename, and even in a specific column by adding it with a comma.
-(Negative numbers count from the end of the file or line.)
+Negative numbers count from the end of the file or line.
+The line and column numbers may also be specified by gluing them with colons
+after the filename.  (When a filename contains a colon followed by digits,
+escape the colon by preceding it with a triple backslash.)
+.sp
 The cursor can be put on the first or last occurrence of a specific string
 by specifying that string after \fB+/\fR or \fB+?\fR before the filename.
 The string can be made case sensitive and/or caused to be interpreted as a
@@ -112,6 +137,7 @@ nanorc file.  See \fBnanorc\fR(5).
 .BR \-E ", " \-\-tabstospaces
 Convert each typed tab to spaces -- to the number of spaces
 that a tab at that position would take up.
+(Note: pasted tabs are not converted.)
 .TP
 .BR \-F ", " \-\-multibuffer
 Read a file into a new buffer by default.
@@ -282,6 +308,7 @@ similar to a chroot.
 .BR \-p ", " \-\-preserve
 Preserve the XON and XOFF sequences (\fB^Q\fR and \fB^S\fR) so they
 will be caught by the terminal.
+Note that option \fB\-/\fR (\fB\-\-modernbindings\fR) overrides this.
 .TP
 .BR \-q ", " \-\-indicator
 Display a "scrollbar" on the righthand side of the edit window.
@@ -338,7 +365,7 @@ filename in the center of the title bar.
 .BR \-_ ", " \-\-minibar
 Suppress the title bar and instead show information about
 the current buffer at the bottom of the screen, in the space
-for the status bar.  In this "minibar" the filename is shown
+for the status bar.  In this "mini bar" the filename is shown
 on the left, followed by an asterisk if the buffer has been modified.
 On the right are displayed the current line and column number, the
 code of the character under the cursor (in Unicode format: U+xxxx),
@@ -359,6 +386,19 @@ The status bar appears only when there is a significant message,
 and disappears after 1.5 seconds or upon the next keystroke.
 With \fBM\-Z\fR the title bar plus status bar can be toggled.
 With \fBM\-X\fR the help lines.
+.TP
+.BR \-/ ", " \-\-modernbindings
+Use key bindings similar to the ones that most modern programs use:
+\fB^X\fR cuts, \fB^C\fR copies, \fB^V\fR pastes,
+\fB^Z\fR undoes, \fB^Y\fR redoes,
+\fB^F\fR searches forward, \fB^G\fR searches next,
+\fB^S\fR saves, \fB^O\fR opens a file, \fB^Q\fR quits,
+and (when the terminal permits) \fB^H\fR shows help.
+Furthermore, \fB^A\fR sets the mark,
+\fB^R\fR makes replacements, \fB^D\fR searches previous,
+\fB^P\fR shows the position, \fB^T\fR goes to a line,
+\fB^W\fR writes out a file, and \fB^E\fR executes a command.
+Note that this overrides option \fB\-p\fR (\fB\-\-preserve\fR).
 
 .SH TOGGLES
 Several of the above options can be switched on and off also while
@@ -391,6 +431,9 @@ Suspension is enabled by default, reachable via \fB^T^Z\fR.
 (If you want a plain \fB^Z\fR to suspend nano, add
 \fBbind ^Z suspend main\fR to your nanorc.)
 .sp
+When you want to copy marked text from \fBnano\fR to the system's clipboard,
+see one of the examples in the \fBnanorc\fR(5) man page.
+.sp
 If no alternative spell checker command is specified on the command
 line nor in one of the \fInanorc\fP files, \fBnano\fP will check the
 \fBSPELL\fP environment variable for one.
@@ -404,6 +447,9 @@ that name already exists in the current directory, it will add ".save"
 plus a number (e.g.\& ".save.1") to the current filename in order to make
 it unique.  In multibuffer mode, \fBnano\fP will write all the open
 buffers to their respective emergency files.
+.sp
+If you have any question about how to use \fBnano\fR in some specific
+situation, you can ask on \fIhelp-nano@gnu.org\fR.
 
 .SH BUGS
 The recording and playback of keyboard macros works correctly only on a