diff --git a/ChangeLog b/ChangeLog
index ed45ffab10b13e28e4668b01cdc0184dec468eeb..bdc85d08b4ffaa3c4405f3d12101a549372f5258 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18 Benno Schulenberg <bensberg@justemail.net>
+ * src/global.c, src/nano.c, doc/man/nanorc.5, doc/texinfo/nano.texi:
+ Make the descriptions of the multibuffer feature more accurate.
+
2015-04-18 Mark Oteiza <mvoteiza@udel.edu>
* doc/syntax/{python,ruby,sh,tex}.nanorc: Add a linter definition.
* doc/syntax/elisp.nanorc: New file; syntax highlighting for Elisp.
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index a02415f07edf51ea72b0fd0896020a56672011c8..60465d7fe7c075b3e7b4190ae51b0e935ce576eb 100644
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -132,7 +132,7 @@ System, and on the console when gpm is running. Text can still be
selected through dragging by holding down the Shift key.
.TP
.B set multibuffer
-Allow inserting files into their own buffers.
+When reading in a file with ^R, insert it into a new buffer by default.
.TP
.B set noconvert
Don't convert files from DOS/Mac format.
@@ -379,8 +379,8 @@ Exits from the program (or from the help viewer or the file browser).
Writes the current buffer to disk.
.TP
.B insert
-Inserts a file into the current buffer (or into a new buffer when multibuffer
-is enabled).
+Inserts a file into the current buffer (at the current cursor position),
+or into a new buffer when option \fBmultibuffer\fR is set.
.TP
.B whereis
Searches for text in the current buffer -- or for filenames matching
@@ -492,10 +492,10 @@ Moves the cursor to the bracket (brace, parenthesis, etc.) that matches
(pairs) with the one under the cursor.
.TP
.B prevbuf
-Switches to editing/viewing the previous buffer when using multibuffer mode.
+Switches to editing/viewing the previous buffer when multiple buffers are open.
.TP
.B nextbuf
-Switches to editing/viewing the next buffer when using multibuffer mode.
+Switches to editing/viewing the next buffer when multiple buffers are open.
.TP
.B verbatim
Inserts the next character verbatim into the file.
@@ -619,7 +619,8 @@ Toggles whether typed tabs will be converted to spaces.
Toggles whether a backup will be made of the file to be edited.
.TP
.B multibuffer
-Toggles the use of multiple file buffers (if support for them has been compiled in).
+Toggles whether a file is inserted into the current buffer
+or read into a new buffer.
.TP
.B mouse
Toggles mouse support.
diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index d48aeeb5d020a008fb0541cb5da83d53dc4e52a8..dd1fa84d9038bda499e0734be9df4a01421e409b 100644
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -157,7 +157,7 @@ Convert typed tabs to spaces.
@item -F
@itemx --multibuffer
-Enable multiple file buffers (if support for them has been compiled in).
+Read a file into a new buffer by default.
@item -G
@itemx --locking
@@ -688,7 +688,7 @@ Enable mouse support, so that mouse clicks can be used to place the
cursor, set the mark (with a double click), or execute shortcuts.
@item set multibuffer
-Allow inserting files into their own buffers.
+When reading in a file with ^R, insert it into a new buffer by default.
@item set noconvert
Don't convert files from DOS/Mac format.
@@ -949,8 +949,8 @@ Exits from the program (or from the help viewer or the file browser).
Writes the current buffer to disk.
@item insert
-Inserts a file into the current buffer (or into a new buffer when multibuffer
-is enabled).
+Inserts a file into the current buffer (at the current cursor position),
+or into a new buffer when option @code{multibuffer} is set.
@item whereis
Searches for text in the current buffer -- or for filenames matching
@@ -1059,10 +1059,10 @@ Moves the cursor to the bracket (brace, parenthesis, etc.) that matches
(pairs) with the one under the cursor.
@item prevbuf
-Switches to editing/viewing the previous buffer when using multibuffer mode.
+Switches to editing/viewing the previous buffer when multiple buffers are open.
@item nextbuf
-Switches to editing/viewing the next buffer when using multibuffer mode.
+Switches to editing/viewing the next buffer when multiple buffers are open.
@item verbatim
Inserts the next character verbatim into the file.
@@ -1186,7 +1186,8 @@ Toggles whether typed tabs will be converted to spaces.
Toggles whether a backup will be made of the file to be edited.
@item multibuffer
-Toggles the use of multiple file buffers (if available).
+Toggles whether a file is inserted into the current buffer
+or read into a new buffer.
@item mouse
Toggles mouse support.
@@ -1378,7 +1379,7 @@ command-line option, which enables the mouse functionality.
@item --disable-multibuffer
Disable support for opening multiple files at a time and switching
between them on the fly. This also eliminates the -F command-line
-option, which switches the use of multiple file buffers on.
+option, which causes a file to be read into a separate buffer by default.
@item --disable-nanorc
Disable support for reading the nanorc files at startup. With such
diff --git a/src/global.c b/src/global.c
index 5cacb71b00ca805098c350cc92df4ddb20384b56..2d22e462b13bbcd029bb24de0c29c46de144b8a7 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1271,7 +1271,7 @@ const char *flagtostr(int flag)
case BACKUP_FILE:
return N_("Backup files");
case MULTIBUFFER:
- return N_("Multiple file buffers");
+ return N_("Reading file into separate buffer");
case USE_MOUSE:
return N_("Mouse support");
case NO_CONVERT:
diff --git a/src/nano.c b/src/nano.c
index cc69195d8a51ac6adcf1760dafcdeca494421307..c2cc3d5f0f38a6ee6d75644ef490b1fa5c974d63 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -858,7 +858,8 @@ void usage(void)
N_("Convert typed tabs to spaces"));
#endif
#ifndef DISABLE_MULTIBUFFER
- print_opt("-F", "--multibuffer", N_("Enable multiple file buffers"));
+ print_opt("-F", "--multibuffer",
+ N_("Read a file into a new buffer by default"));
#endif
#ifndef NANO_TINY
print_opt("-G", "--locking",