diff --git a/doc/nano.texi b/doc/nano.texi
index f37d791f..88e5e086 100644
--- a/doc/nano.texi
+++ b/doc/nano.texi
@@ -806,7 +806,8 @@ come before the closing set, and the two sets must be in the same order.
 The default value is @t{"(<[@{)>]@}"}.
 
 @item set morespace
-Use the blank line below the title bar as extra editing space.
+Deprecated option since it has become the default setting.
+When needed, use @code{unset emptyline} instead.
 
 @item set mouse
 Enable mouse support, so that mouse clicks can be used to place the
@@ -822,15 +823,16 @@ Don't convert files from DOS/Mac format.
 Don't display the help lists at the bottom of the screen.
 
 @item set nonewlines
-When a file does not end with a newline, don't automatically add one.
+Deprecated option since it has become the default setting.
+When needed, use @code{unset finalnewline} instead.
 
 @item set nopauses
 Don't pause between warnings at startup.  This means that only
 the last one will be visible (when there are multiple ones).
 
 @item set nowrap
-Do not automatically hard-wrap the current line when it becomes overlong.
-This is the default.
+Deprecated option since it has become the default setting.
+When needed, use @code{unset breaklonglines} instead.
 
 @item set numbercolor @var{fgcolor},@var{bgcolor}
 Use this color combination for line numbers.
@@ -898,7 +900,8 @@ already at that position, it will jump to the true beginning of the
 line.
 
 @item set smooth
-Use smooth scrolling by default.
+Deprecated option since it has become the default setting.
+When needed, use @code{unset jumpyscrolling} instead.
 
 @item set softwrap
 Enable soft line wrapping for easier viewing of very long lines.
diff --git a/doc/nanorc.5 b/doc/nanorc.5
index 50008dcc..2abee644 100644
--- a/doc/nanorc.5
+++ b/doc/nanorc.5
@@ -152,7 +152,8 @@ come before the closing set, and the two sets must be in the same order.
 The default value is "\fB(<[{)>]}\fP".
 .TP
 .B set morespace
-Use the blank line below the title bar as extra editing space.
+Deprecated option since it has become the default setting.
+When needed, use \fBunset emptyline\fR instead.
 .TP
 .B set mouse
 Enable mouse support, if available for your system.  When enabled, mouse
@@ -171,15 +172,16 @@ Don't convert files from DOS/Mac format.
 Don't display the two help lines at the bottom of the screen.
 .TP
 .B set nonewlines
-When a file does not end with a newline, don't automatically add one.
+Deprecated option since it has become the default setting.
+When needed, use \fBunset finalnewline\fR instead.
 .TP
 .B set nopauses
 Don't pause between warnings at startup.  This means that only
 the last one will be visible (when there are multiple ones).
 .TP
 .B set nowrap
-Do not automatically hard-wrap the current line when it becomes overlong.
-This is the default.
+Deprecated option since it has become the default setting.
+When needed, use \fBunset breaklonglines\fR instead.
 .TP
 .B set numbercolor \fIfgcolor\fR,\fIbgcolor\fR
 Specify the color combination to use for line numbers.
@@ -245,7 +247,8 @@ already at that position, it will jump to the true beginning of the
 line.
 .TP
 .B set smooth
-Use smooth scrolling by default.
+Deprecated option since it has become the default setting.
+When needed, use \fBunset jumpyscrolling\fR instead.
 .TP
 .B set softwrap
 Enable soft line wrapping for easier viewing of very long lines.
diff --git a/doc/sample.nanorc.in b/doc/sample.nanorc.in
index 3d0b45f4..83aa6e78 100644
--- a/doc/sample.nanorc.in
+++ b/doc/sample.nanorc.in
@@ -83,9 +83,6 @@
 ## come before the latter set, and both must be in the same order.
 # set matchbrackets "(<[{)>]}"
 
-## Use the blank line below the title bar as extra editing space.
-# set morespace
-
 ## Enable mouse support, if available for your system.  When enabled,
 ## mouse clicks can be used to place the cursor, set the mark (with a
 ## double click), and execute shortcuts.  The mouse will work in the X
@@ -102,16 +99,10 @@
 ## Don't display the helpful shortcut lists at the bottom of the screen.
 # set nohelp
 
-## Don't automatically add a newline when a file does not end with one.
-# set nonewlines
-
 ## Don't pause between warnings at startup.  Which means that only the
 ## last one will be readable (when there are multiple ones).
 # set nopauses
 
-## Do not automatically hard-wrap text.
-# set nowrap
-
 ## Set operating directory.  nano will not read or write files outside
 ## this directory and its subdirectories.  Also, the current directory
 ## is changed to here, so any files are inserted from this dir.  A blank
@@ -159,9 +150,6 @@
 ## beginning of the line.
 # set smarthome
 
-## Use line-by-line scrolling instead of chunk-by-chunk.
-# set smooth
-
 ## Enable soft line wrapping (AKA full-line display).
 # set softwrap