--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-10  Hui Zhu  <teawater@gmail.com>
+
+	* gdb.texinfo (can-use-displaced-stepping) Describe the auto mode
+	setting, and make it the default.
+
 2008-10-06  Doug Evans  <dje@google.com>
 
 	* gdb.texinfo (set debug dwarf2-die): Document it.
--- a/gdb.texinfo
+++ b/gdb.texinfo
@@ -23935,16 +23935,25 @@ Shared library events.
 
 @kindex maint set can-use-displaced-stepping
 @kindex maint show can-use-displaced-stepping
-@cindex displaced stepping support
-@cindex out-of-line single-stepping
-@item maint set can-use-displaced-stepping
-@itemx maint show can-use-displaced-stepping
-Control whether or not @value{GDBN} will do @dfn{displaced stepping}
-if the target supports it.  The default is on.  Displaced stepping is
-a way to single-step over breakpoints without removing them from the
-inferior, by executing an out-of-line copy of the instruction that was
-originally at the breakpoint location.  It is also known as
-out-of-line single-stepping.
+@table @code
+@item maint set can-use-displaced-stepping on
+If the target supports it.  Gdb behaves are single-step over
+breakpoints without removing them from the inferior, by executing
+an out-of-line copy of the instruction that was originally at the
+breakpoint location.  It is also known as out-of-line single-stepping.
+
+@item maint set can-use-displaced-stepping off
+Gdb behaves are single-step over breakpoints with removing them from
+the inferior.
+
+@cindex non-stop mode, and @code{breakpoint always-inserted}
+@item maint set can-use-displaced-stepping auto
+This is the default mode.  If @value{GDBN} is controlling the inferior
+in non-stop mode (@pxref{Non-Stop Mode}), gdb behaves as if
+@code{can-use-displaced-stepping} mode is on.  If @value{GDBN} is
+controlling the inferior in all-stop mode, @value{GDBN} behaves as if
+@code{can-use-displaced-stepping} mode is off.
+@end table
 
 @kindex maint check-symtabs
 @item maint check-symtabs