2004-07-28 Andrew Cagney <cagney@gnu.org>

	* cli/cli-decode.c (add_setshow_zinteger_cmd)
	(add_setshow_cmd, add_setshow_auto_boolean_cmd)
	(add_setshow_boolean_cmd, add_setshow_cmd_full): Add help_doc and
	print parameters.  Make string parameters constant.
	* command.h: Update.  Update copyright.
	* remote.c (add_packet_config_cmd, _initialize_remote): Ditto.
	* observer.c (_initialize_observer): Ditto.
	* frame.c (_initialize_frame): Ditto.
	* complaints.c (_initialize_complaints): Ditto.
	* maint.c (_initialize_maint_cmds): Ditto.
	* target.c (initialize_targets): Ditto.
	* cli/cli-logging.c (_initialize_cli_logging): Ditto.
	* infcall.c (_initialize_infcall): Ditto.
	* arm-tdep.c (_initialize_arm_tdep): Ditto.
	* m32r-rom.c (_initialize_m32r_rom): Ditto.
	* remote-rdi.c (_initialize_remote_rdi): Ditto.
	* d10v-tdep.c (_initialize_d10v_tdep): Ditto.
	* mips-tdep.c (_initialize_mips_tdep): Ditto.

17 files changed, 220 insertions, 164 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cd92e08..96865459 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,26 @@
 2004-07-28  Andrew Cagney  <cagney@gnu.org>
 
+	* cli/cli-decode.c (add_setshow_zinteger_cmd)
+	(add_setshow_cmd, add_setshow_auto_boolean_cmd)
+	(add_setshow_boolean_cmd, add_setshow_cmd_full): Add help_doc and
+	print parameters.  Make string parameters constant.
+	* command.h: Update.  Update copyright.
+	* remote.c (add_packet_config_cmd, _initialize_remote): Ditto.
+	* observer.c (_initialize_observer): Ditto.
+	* frame.c (_initialize_frame): Ditto.
+	* complaints.c (_initialize_complaints): Ditto.
+	* maint.c (_initialize_maint_cmds): Ditto.
+	* target.c (initialize_targets): Ditto.
+	* cli/cli-logging.c (_initialize_cli_logging): Ditto.
+	* infcall.c (_initialize_infcall): Ditto.
+	* arm-tdep.c (_initialize_arm_tdep): Ditto.
+	* m32r-rom.c (_initialize_m32r_rom): Ditto.
+	* remote-rdi.c (_initialize_remote_rdi): Ditto.
+	* d10v-tdep.c (_initialize_d10v_tdep): Ditto.
+	* mips-tdep.c (_initialize_mips_tdep): Ditto.
+
+2004-07-28  Andrew Cagney  <cagney@gnu.org>
+
 	* gdbtypes.c (lookup_primitive_typename): Delete function.
 	* gdbtypes.h (lookup_primitive_typename): Delete declaration.
 	* ada-lex.l: Use language_lookup_primitive_type_by_name.
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index b44768c..a86e09a 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -2942,19 +2942,22 @@ _initialize_arm_tdep (void)
   deprecated_add_show_from_set (new_set, &showarmcmdlist);
 
   add_setshow_cmd_full ("apcs32", no_class,
-			var_boolean, (char *) &arm_apcs_32,
-			"Set usage of ARM 32-bit mode.",
-			"Show usage of ARM 32-bit mode.",
+			var_boolean, (char *) &arm_apcs_32, "\
+Set usage of ARM 32-bit mode.", "\
+Show usage of ARM 32-bit mode.", "\
+Determine the usage of ARM 32-bit mode.", "\
+Usage of ARM 32-bit mode is %s.",
 			NULL, NULL,
 			&setlist, &showlist, &new_set, &new_show);
   deprecate_cmd (new_set, "set arm apcs32");
   deprecate_cmd (new_show, "show arm apcs32");
 
-  add_setshow_boolean_cmd ("apcs32", no_class, &arm_apcs_32,
-			   "Set usage of ARM 32-bit mode.  "
-			   "When off, a 26-bit PC will be used.",
-			   "Show usage of ARM 32-bit mode.  "
-			   "When off, a 26-bit PC will be used.",
+  add_setshow_boolean_cmd ("apcs32", no_class, &arm_apcs_32, "\
+Set usage of ARM 32-bit mode.", "\
+Show usage of ARM 32-bit mode.", "\
+When off, a 26-bit PC will be used.\n\
+When off, a 26-bit PC will be used.", "\
+Usage of ARM 32-bit mode is %s.",
 			   NULL, NULL,
 			   &setarmcmdlist, &showarmcmdlist);
 
@@ -2978,11 +2981,11 @@ _initialize_arm_tdep (void)
 		 "set arm disassembly");
 
   /* Debugging flag.  */
-  add_setshow_boolean_cmd ("arm", class_maintenance, &arm_debug,
-			   "Set ARM debugging.  "
-			   "When on, arm-specific debugging is enabled.",
-			   "Show ARM debugging.  "
-			   "When on, arm-specific debugging is enabled.",
+  add_setshow_boolean_cmd ("arm", class_maintenance, &arm_debug, "\
+Set ARM debugging.", "\
+Show ARM debugging.", "\
+When on, arm-specific debugging is enabled.", "\
+ARM debugging is %s.",
 			   NULL, NULL,
 			   &setdebuglist, &showdebuglist);
 }
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index eeb4544..9858176 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -8086,16 +8086,13 @@ pending breakpoint behavior",
 		  0/*allow-unknown*/, &showlist);
 
   add_setshow_auto_boolean_cmd ("pending", no_class, &pending_break_support, "\
-Set debugger's behavior regarding pending breakpoints.\n\
+Set debugger's behavior regarding pending breakpoints.", "\
+Show debugger's behavior regarding pending breakpoints.", "\
 If on, an unrecognized breakpoint location will cause gdb to create a\n\
 pending breakpoint.  If off, an unrecognized breakpoint location results in\n\
 an error.  If auto, an unrecognized breakpoint location results in a\n\
-user-query to see if a pending breakpoint should be created.","\
-Show debugger's behavior regarding pending breakpoints.\n\
-If on, an unrecognized breakpoint location will cause gdb to create a\n\
-pending breakpoint.  If off, an unrecognized breakpoint location results in\n\
-an error.  If auto, an unrecognized breakpoint location results in a\n\
-user-query to see if a pending breakpoint should be created.",
+user-query to see if a pending breakpoint should be created.", "\
+Debugger's behavior regarding pending breakpoints is %s.",
 				NULL, NULL,
 				&breakpoint_set_cmdlist,
 				&breakpoint_show_cmdlist);
diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index fb755a6..d6f54a6 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -1,6 +1,6 @@
 /* Handle lists of commands, their decoding and documentation, for GDB.
 
-   Copyright 1986, 1989, 1990, 1991, 1998, 2000, 2001, 2002 Free
+   Copyright 1986, 1989, 1990, 1991, 1998, 2000, 2001, 2002, 2004 Free
    Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -320,16 +320,19 @@ add_set_or_show_cmd (char *name,
    CLASS is as in add_cmd.  VAR_TYPE is the kind of thing we are
    setting.  VAR is address of the variable being controlled by this
    command.  SET_FUNC and SHOW_FUNC are the callback functions (if
-   non-NULL).  SET_DOC and SHOW_DOC are the documentation strings.
-   SET_RESULT and SHOW_RESULT, if not NULL, are set to the resulting
-   command structures.  */
+   non-NULL).  SET_DOC, SHOW_DOC and HELP_DOC are the documentation
+   strings.  PRINT the format string to print the value.  SET_RESULT
+   and SHOW_RESULT, if not NULL, are set to the resulting command
+   structures.  */
 
 void
 add_setshow_cmd_full (char *name,
 		      enum command_class class,
 		      var_types var_type, void *var,
-		      char *set_doc, char *show_doc,
-		      cmd_sfunc_ftype *set_func, cmd_sfunc_ftype *show_func,
+		      const char *set_doc, const char *show_doc,
+		      const char *help_doc, const char *print,
+		      cmd_sfunc_ftype *set_func,
+		      cmd_sfunc_ftype *show_func,
 		      struct cmd_list_element **set_list,
 		      struct cmd_list_element **show_list,
 		      struct cmd_list_element **set_result,
@@ -337,12 +340,14 @@ add_setshow_cmd_full (char *name,
 {
   struct cmd_list_element *set;
   struct cmd_list_element *show;
+  char *full_set_doc = xstrprintf ("%s\n%s", set_doc, help_doc);
+  char *full_show_doc = xstrprintf ("%s\n%s", show_doc, help_doc);
   set = add_set_or_show_cmd (name, set_cmd, class, var_type, var,
-			     set_doc, set_list);
+			     full_set_doc, set_list);
   if (set_func != NULL)
     set_cmd_sfunc (set, set_func);
   show = add_set_or_show_cmd (name, show_cmd, class, var_type, var,
-			      show_doc, show_list);
+			      full_show_doc, show_list);
   if (show_func != NULL)
     set_cmd_sfunc (show, show_func);
 
@@ -362,12 +367,14 @@ void
 add_setshow_cmd (char *name,
 		 enum command_class class,
 		 var_types var_type, void *var,
-		 char *set_doc, char *show_doc,
+		 const char *set_doc, const char *show_doc,
+		 const char *help_doc, const char *print,
 		 cmd_sfunc_ftype *set_func, cmd_sfunc_ftype *show_func,
 		 struct cmd_list_element **set_list,
 		 struct cmd_list_element **show_list)
 {
-  add_setshow_cmd_full (name, class, var_type, var, set_doc, show_doc,
+  add_setshow_cmd_full (name, class, var_type, var,
+			set_doc, show_doc, help_doc, print,
 			set_func, show_func, set_list, show_list,
 			NULL, NULL);
 }
@@ -414,7 +421,8 @@ void
 add_setshow_auto_boolean_cmd (char *name,
 			      enum command_class class,
 			      enum auto_boolean *var,
-			      char *set_doc, char *show_doc,
+			      const char *set_doc, const char *show_doc,
+			      const char *help_doc, const char *print,
 			      cmd_sfunc_ftype *set_func,
 			      cmd_sfunc_ftype *show_func,
 			      struct cmd_list_element **set_list,
@@ -423,7 +431,8 @@ add_setshow_auto_boolean_cmd (char *name,
   static const char *auto_boolean_enums[] = { "on", "off", "auto", NULL };
   struct cmd_list_element *c;
   add_setshow_cmd_full (name, class, var_auto_boolean, var,
-			set_doc, show_doc, set_func, show_func,
+			set_doc, show_doc, help_doc, print,
+			set_func, show_func,
 			set_list, show_list,
 			&c, NULL);
   c->enums = auto_boolean_enums;
@@ -434,9 +443,9 @@ add_setshow_auto_boolean_cmd (char *name,
    add_cmd.  VAR is address of the variable which will contain the
    value.  SET_DOC and SHOW_DOC are the documentation strings.  */
 void
-add_setshow_boolean_cmd (char *name,
-			 enum command_class class,
-			 int *var, char *set_doc, char *show_doc,
+add_setshow_boolean_cmd (char *name, enum command_class class, int *var,
+			 const char *set_doc, const char *show_doc,
+			 const char *help_doc, const char *print,
 			 cmd_sfunc_ftype *set_func,
 			 cmd_sfunc_ftype *show_func,
 			 struct cmd_list_element **set_list,
@@ -445,7 +454,7 @@ add_setshow_boolean_cmd (char *name,
   static const char *boolean_enums[] = { "on", "off", NULL };
   struct cmd_list_element *c;
   add_setshow_cmd_full (name, class, var_boolean, var,
-			set_doc, show_doc,
+			set_doc, show_doc, help_doc, print,
 			set_func, show_func,
 			set_list, show_list,
 			&c, NULL);
@@ -457,16 +466,17 @@ add_setshow_boolean_cmd (char *name,
    add_cmd.  VAR is address of the variable which will contain the
    value.  SET_DOC and SHOW_DOC are the documentation strings.  */
 void
-add_setshow_uinteger_cmd (char *name,
-			  enum command_class class,
-			  unsigned int *var, char *set_doc, char *show_doc,
+add_setshow_uinteger_cmd (char *name, enum command_class class,
+			  unsigned int *var,
+			  const char *set_doc, const char *show_doc,
+			  const char *help_doc, const char *print,
 			  cmd_sfunc_ftype *set_func,
 			  cmd_sfunc_ftype *show_func,
 			  struct cmd_list_element **set_list,
 			  struct cmd_list_element **show_list)
 {
   add_setshow_cmd_full (name, class, var_uinteger, var,
-			set_doc, show_doc,
+			set_doc, show_doc, help_doc, print,
 			set_func, show_func,
 			set_list, show_list,
 			NULL, NULL);
@@ -477,16 +487,17 @@ add_setshow_uinteger_cmd (char *name,
    add_cmd.  VAR is address of the variable which will contain the
    value.  SET_DOC and SHOW_DOC are the documentation strings.  */
 void
-add_setshow_zinteger_cmd (char *name,
-			  enum command_class class,
-			  int *var, char *set_doc, char *show_doc,
+add_setshow_zinteger_cmd (char *name, enum command_class class,
+			  int *var,
+			  const char *set_doc, const char *show_doc,
+			  const char *help_doc, const char *print,
 			  cmd_sfunc_ftype *set_func,
 			  cmd_sfunc_ftype *show_func,
 			  struct cmd_list_element **set_list,
 			  struct cmd_list_element **show_list)
 {
   add_setshow_cmd_full (name, class, var_zinteger, var,
-			set_doc, show_doc,
+			set_doc, show_doc, help_doc, print,
 			set_func, show_func,
 			set_list, show_list,
 			NULL, NULL);
diff --git a/gdb/cli/cli-logging.c b/gdb/cli/cli-logging.c
index db34b0d..ec362e3 100644
--- a/gdb/cli/cli-logging.c
+++ b/gdb/cli/cli-logging.c
@@ -1,7 +1,6 @@
 /* Command-line output logging for GDB, the GNU debugger.
 
-   Copyright 2003
-   Free Software Foundation, Inc.
+   Copyright 2003, 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -175,26 +174,24 @@ _initialize_cli_logging (void)
   add_prefix_cmd ("logging", class_support, show_logging_command,
 		  "Show logging options", &show_logging_cmdlist,
 		  "show logging ", 0, &showlist);
-  add_setshow_boolean_cmd ("overwrite", class_support, &logging_overwrite,
-			   "Set whether logging overwrites or appends "
-			   "to the log file.\n",
-			   "Show whether logging overwrites or appends "
-			   "to the log file.\n",
+  add_setshow_boolean_cmd ("overwrite", class_support, &logging_overwrite, "\
+Set whether logging overwrites or appends to the log file.", "\
+Show whether logging overwrites or appends to the log file.", "\
+If set, logging overrides the log file.", "\
+Whether logging overwrites or appends to the log file is %s.",
 			   NULL, NULL, &set_logging_cmdlist, &show_logging_cmdlist);
-  add_setshow_boolean_cmd ("redirect", class_support, &logging_redirect,
-			   "Set the logging output mode.\n"
-			   "If redirect is off, output will go to both the "
-			   "screen and the log file.\n"
-			   "If redirect is on, output will go only to the log "
-			   "file.",
-			   "Show the logging output mode.\n"
-			   "If redirect is off, output will go to both the "
-			   "screen and the log file.\n"
-			   "If redirect is on, output will go only to the log "
-			   "file.",
+  add_setshow_boolean_cmd ("redirect", class_support, &logging_redirect, "\
+Set the logging output mode.", "\
+Show the logging output mode.", "\
+If redirect is off, output will go to both the screen and the log file.\n\
+If redirect is on, output will go only to the log file.", "\
+The logging output mode is %s.",
 			   NULL, NULL, &set_logging_cmdlist, &show_logging_cmdlist);
-  add_setshow_cmd ("file", class_support, var_filename, &logging_filename,
-		   "Set the current logfile.", "Show the current logfile.",
+  add_setshow_cmd ("file", class_support, var_filename, &logging_filename, "\
+Set the current logfile.", "\
+Show the current logfile.", "\
+The logfile is used when directing GDB's output.", "\
+The current logfile is %s.",
 		   NULL, NULL, &set_logging_cmdlist, &show_logging_cmdlist);
   add_cmd ("on", class_support, set_logging_on,
 	   "Enable logging.", &set_logging_cmdlist);
diff --git a/gdb/command.h b/gdb/command.h
index e2a44b2..348adab 100644
--- a/gdb/command.h
+++ b/gdb/command.h
@@ -1,7 +1,7 @@
 /* Header file for command-reading library command.c.
 
    Copyright 1986, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1999,
-   2000, 2002 Free Software Foundation, Inc.
+   2000, 2002, 2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -214,7 +214,8 @@ extern void help_cmd_list (struct cmd_list_element *, enum command_class,
 extern void add_setshow_cmd (char *name,
 			     enum command_class class,
 			     var_types var_type, void *var,
-			     char *set_doc, char *show_doc,
+			     const char *set_doc, const char *show_doc,
+			     const char *help_doc, const char *print,
 			     cmd_sfunc_ftype *set_func,
 			     cmd_sfunc_ftype *show_func,
 			     struct cmd_list_element **set_list,
@@ -223,7 +224,8 @@ extern void add_setshow_cmd (char *name,
 extern void add_setshow_cmd_full (char *name,
 				  enum command_class class,
 				  var_types var_type, void *var,
-				  char *set_doc, char *show_doc,
+				  const char *set_doc, const char *show_doc,
+				  const char *help_doc, const char *print,
 				  cmd_sfunc_ftype *set_func,
 				  cmd_sfunc_ftype *show_func,
 				  struct cmd_list_element **set_list,
@@ -247,7 +249,10 @@ extern struct cmd_list_element *add_set_enum_cmd (char *name,
 extern void add_setshow_auto_boolean_cmd (char *name,
 					  enum command_class class,
 					  enum auto_boolean *var,
-					  char *set_doc, char *show_doc,
+					  const char *set_doc,
+					  const char *show_doc,
+					  const char *help_doc,
+					  const char *print,
 					  cmd_sfunc_ftype *set_func,
 					  cmd_sfunc_ftype *show_func,
 					  struct cmd_list_element **set_list,
@@ -256,8 +261,8 @@ extern void add_setshow_auto_boolean_cmd (char *name,
 extern void add_setshow_boolean_cmd (char *name,
 				     enum command_class class,
 				     int *var,
-				     char *set_doc,
-				     char *show_doc,
+				     const char *set_doc, const char *show_doc,
+				     const char *help_doc, const char *print,
 				     cmd_sfunc_ftype *set_func,
 				     cmd_sfunc_ftype *show_func,
 				     struct cmd_list_element **set_list,
@@ -266,8 +271,10 @@ extern void add_setshow_boolean_cmd (char *name,
 extern void add_setshow_uinteger_cmd (char *name,
 				      enum command_class class,
 				      unsigned int *var,
-				      char *set_doc,
-				      char *show_doc,
+				      const char *set_doc,
+				      const char *show_doc,
+				      const char *help_doc,
+				      const char *print,
 				      cmd_sfunc_ftype *set_func,
 				      cmd_sfunc_ftype *show_func,
 				      struct cmd_list_element **set_list,
@@ -276,8 +283,10 @@ extern void add_setshow_uinteger_cmd (char *name,
 extern void add_setshow_zinteger_cmd (char *name,
 				      enum command_class class,
 				      int *var,
-				      char *set_doc,
-				      char *show_doc,
+				      const char *set_doc,
+				      const char *show_doc,
+				      const char *help_doc,
+				      const char *print,
 				      cmd_sfunc_ftype *set_func,
 				      cmd_sfunc_ftype *show_func,
 				      struct cmd_list_element **set_list,
diff --git a/gdb/complaints.c b/gdb/complaints.c
index bd869f0..4c9ea14 100644
--- a/gdb/complaints.c
+++ b/gdb/complaints.c
@@ -1,7 +1,7 @@
 /* Support for complaint handling during symbol reading in GDB.
 
-   Copyright 1990, 1991, 1992, 1993, 1995, 1998, 1999, 2000, 2002 Free
-   Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1995, 1998, 1999, 2000, 2002,
+   2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -312,9 +312,11 @@ void
 _initialize_complaints (void)
 {
   add_setshow_cmd ("complaints", class_support, var_zinteger,
-		   &stop_whining,
-		   "Set max number of complaints about incorrect symbols.",
-		   "Show max number of complaints about incorrect symbols.",
+		   &stop_whining, "\
+Set max number of complaints about incorrect symbols.", "\
+Show max number of complaints about incorrect symbols.", "\
+Set to zero to disable incorrect symbol complaints.", "\
+Max number of complaints about incorrect symbols is %s.",
 		   NULL, NULL,
 		   &setlist, &showlist);
 
diff --git a/gdb/d10v-tdep.c b/gdb/d10v-tdep.c
index 7029c40..caee590 100644
--- a/gdb/d10v-tdep.c
+++ b/gdb/d10v-tdep.c
@@ -1563,13 +1563,17 @@ as reported by info trace (NOT addresses!).");
   add_info ("itrace", trace_info,
 	    "Display info about the trace data buffer.");
 
-  add_setshow_boolean_cmd ("itracedisplay", no_class, &trace_display,
-			   "Set automatic display of trace.\n",
-			   "Show automatic display of trace.\n",
+  add_setshow_boolean_cmd ("itracedisplay", no_class, &trace_display, "\
+Set automatic display of trace.", "\
+Show automatic display of trace.", "\
+Controls the display of d10v specific instruction trace information.", "\
+Automatic display of trace is %s.",
 			   NULL, NULL, &setlist, &showlist);
   add_setshow_boolean_cmd ("itracesource", no_class,
-			   &default_trace_show_source,
-			   "Set display of source code with trace.\n",
-			   "Show display of source code with trace.\n",
+			   &default_trace_show_source, "\
+Set display of source code with trace.", "\
+Show display of source code with trace.", "\
+When on source code is included in the d10v instruction trace display.", "\
+Display of source code with trace is %s.",
 			   NULL, NULL, &setlist, &showlist);
 }
diff --git a/gdb/frame.c b/gdb/frame.c
index bfc5ae8..11c24f3 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -2233,23 +2233,22 @@ Show backtrace variables such as the backtrace limit",
 
   add_setshow_boolean_cmd ("past-main", class_obscure,
 			   &backtrace_past_main, "\
-Set whether backtraces should continue past \"main\".\n\
+Set whether backtraces should continue past \"main\".", "\
+Show whether backtraces should continue past \"main\".", "\
 Normally the caller of \"main\" is not of interest, so GDB will terminate\n\
 the backtrace at \"main\".  Set this variable if you need to see the rest\n\
 of the stack trace.", "\
-Show whether backtraces should continue past \"main\".\n\
-Normally the caller of \"main\" is not of interest, so GDB will terminate\n\
-the backtrace at \"main\".  Set this variable if you need to see the rest\n\
-of the stack trace.",
+Whether backtraces should continue past \"main\" is %s.",
 			   NULL, NULL, &set_backtrace_cmdlist,
 			   &show_backtrace_cmdlist);
 
   add_setshow_uinteger_cmd ("limit", class_obscure,
 			    &backtrace_limit, "\
-Set an upper bound on the number of backtrace levels.\n\
+Set an upper bound on the number of backtrace levels.", "\
+Show the upper bound on the number of backtrace levels.", "\
 No more than the specified number of frames can be displayed or examined.\n\
 Zero is unlimited.", "\
-Show the upper bound on the number of backtrace levels.",
+An upper bound on the number of backtrace levels is %s.",
 			    NULL, NULL, &set_backtrace_cmdlist,
 			    &show_backtrace_cmdlist);
 
diff --git a/gdb/infcall.c b/gdb/infcall.c
index 9e3e479..a2add7c 100644
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -962,7 +962,8 @@ _initialize_infcall (void)
 {
   add_setshow_boolean_cmd ("coerce-float-to-double", class_obscure,
 			   &coerce_float_to_double_p, "\
-Set coercion of floats to doubles when calling functions\n\
+Set coercion of floats to doubles when calling functions.", "\
+Show coercion of floats to doubles when calling functions", "\
 Variables of type float should generally be converted to doubles before\n\
 calling an unprototyped function, and left alone when calling a prototyped\n\
 function.  However, some older debug info formats do not provide enough\n\
@@ -970,27 +971,17 @@ information to determine that a function is prototyped.  If this flag is\n\
 set, GDB will perform the conversion for a function it considers\n\
 unprototyped.\n\
 The default is to perform the conversion.\n", "\
-Show coercion of floats to doubles when calling functions\n\
-Variables of type float should generally be converted to doubles before\n\
-calling an unprototyped function, and left alone when calling a prototyped\n\
-function.  However, some older debug info formats do not provide enough\n\
-information to determine that a function is prototyped.  If this flag is\n\
-set, GDB will perform the conversion for a function it considers\n\
-unprototyped.\n\
-The default is to perform the conversion.\n",
+Coercion of floats to doubles when calling functions is %s.",
 			   NULL, NULL, &setlist, &showlist);
 
   add_setshow_boolean_cmd ("unwindonsignal", no_class,
 			   &unwind_on_signal_p, "\
-Set unwinding of stack if a signal is received while in a call dummy.\n\
+Set unwinding of stack if a signal is received while in a call dummy.", "\
+Show unwinding of stack if a signal is received while in a call dummy.", "\
 The unwindonsignal lets the user determine what gdb should do if a signal\n\
 is received while in a function called from gdb (call dummy).  If set, gdb\n\
 unwinds the stack and restore the context to what as it was before the call.\n\
 The default is to stop in the frame where the signal was received.", "\
-Show unwinding of stack if a signal is received while in a call dummy.\n\
-The unwindonsignal lets the user determine what gdb should do if a signal\n\
-is received while in a function called from gdb (call dummy).  If set, gdb\n\
-unwinds the stack and restore the context to what as it was before the call.\n\
-The default is to stop in the frame where the signal was received.",
+Unwinding of stack if a signal is received while in a call dummy is %s.",
 			   NULL, NULL, &setlist, &showlist);
 }
diff --git a/gdb/m32r-rom.c b/gdb/m32r-rom.c
index c963b2c..c60f021 100644
--- a/gdb/m32r-rom.c
+++ b/gdb/m32r-rom.c
@@ -1,7 +1,8 @@
 /* Remote debugging interface to m32r and mon2000 ROM monitors for GDB, 
    the GNU debugger.
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001
-   Free Software Foundation, Inc.
+
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2004 Free Software
+   Foundation, Inc.
 
    Adapted by Michael Snyder of Cygnus Support.
 
@@ -558,21 +559,27 @@ Specify the serial device it is connected to (e.g. /dev/ttya).";
   add_target (&mon2000_ops);
 
   add_setshow_cmd ("download-path", class_obscure,
-		   var_string, &download_path,
-		   "Set the default path for downloadable SREC files.",
-		   "Show the default path for downloadable SREC files.",
+		   var_string, &download_path, "\
+Set the default path for downloadable SREC files.", "\
+Show the default path for downloadable SREC files.", "\
+Determines the default path for downloadable SREC files.", "\
+The default path for downloadable SREC files is %s.",
 		   NULL, NULL, &setlist, &showlist);
 
   add_setshow_cmd ("board-address", class_obscure,
-		   var_string, &board_addr,
-		   "Set IP address for M32R-EVA target board.",
-		   "Show IP address for M32R-EVA target board.",
+		   var_string, &board_addr, "\
+Set IP address for M32R-EVA target board.", "\
+Show IP address for M32R-EVA target board.", "\
+Determine the IP address for M32R-EVA target board.", "\
+IP address for M32R-EVA target board is %s",
 		   NULL, NULL, &setlist, &showlist);
 
   add_setshow_cmd ("server-address", class_obscure,
-		   var_string, &server_addr,
-		   "Set IP address for download server (GDB's host computer).",
-		   "Show IP address for download server (GDB's host computer).",
+		   var_string, &server_addr, "\
+Set IP address for download server (GDB's host computer).", "\
+Show IP address for download server (GDB's host computer).", "\
+Determine the IP address for download server (GDB's host computer).", "\
+IP address for download server (GDB's host computer) is %s.",
 		   NULL, NULL, &setlist, &showlist);
 
   add_com ("upload", class_obscure, m32r_upload_command,
diff --git a/gdb/maint.c b/gdb/maint.c
index 6522456..638c1f8 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -860,10 +860,11 @@ of time passes without a response from the target, an error occurs.",
 
 
   add_setshow_boolean_cmd ("profile", class_maintenance,
-			   &maintenance_profile_p,
-			   "Set internal profiling.\n"
-			   "When enabled GDB is profiled.",
-			   "Show internal profiling.\n",
+			   &maintenance_profile_p, "\
+Set internal profiling.", "\
+Show internal profiling.", "\
+When enabled GDB is profiled.", "\
+Internal profiling is %s.",
 			   maintenance_set_profile_cmd, NULL,
 			   &maintenance_set_cmdlist,
 			   &maintenance_show_cmdlist);
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 8ed63d6..14697d4 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -6186,24 +6186,24 @@ search.  The only need to set it is when debugging a stripped executable.", &set
   /* Allow the user to control whether the upper bits of 64-bit
      addresses should be zeroed.  */
   add_setshow_auto_boolean_cmd ("mask-address", no_class, &mask_address_var, "\
-Set zeroing of upper 32 bits of 64-bit addresses.\n\
+Set zeroing of upper 32 bits of 64-bit addresses.", "\
+Show zeroing of upper 32 bits of 64-bit addresses.", "\
 Use \"on\" to enable the masking, \"off\" to disable it and \"auto\" to \n\
 allow GDB to determine the correct value.\n", "\
-Show zeroing of upper 32 bits of 64-bit addresses.",
+Zerroing of upper 32 bits of 64-bit address is %s.",
 				NULL, show_mask_address, &setmipscmdlist, &showmipscmdlist);
 
   /* Allow the user to control the size of 32 bit registers within the
      raw remote packet.  */
   add_setshow_cmd ("remote-mips64-transfers-32bit-regs", class_obscure,
 		   var_boolean, &mips64_transfers_32bit_regs_p, "\
-Set compatibility with 64-bit MIPS targets that transfer 32-bit quantities.\n\
+Set compatibility with 64-bit MIPS target that transfers 32-bit quantities.", "\
+Show compatibility with 64-bit MIPS target that transfers 32-bit quantities.", "\
 Use \"on\" to enable backward compatibility with older MIPS 64 GDB+target\n\
 that would transfer 32 bits for some registers (e.g. SR, FSR) and\n\
 64 bits for others.  Use \"off\" to disable compatibility mode", "\
-Show compatibility with 64-bit MIPS targets that transfer 32-bit quantities.\n\
-Use \"on\" to enable backward compatibility with older MIPS 64 GDB+target\n\
-that would transfer 32 bits for some registers (e.g. SR, FSR) and\n\
-64 bits for others.  Use \"off\" to disable compatibility mode", set_mips64_transfers_32bit_regs, NULL, &setlist, &showlist);
+Compatibility with 64-bit MIPS target that transfers 32-bit quantities is %s.",
+ set_mips64_transfers_32bit_regs, NULL, &setlist, &showlist);
 
   /* Debug this files internals. */
   deprecated_add_show_from_set
diff --git a/gdb/observer.c b/gdb/observer.c
index 6bdcdf5..48514b8 100644
--- a/gdb/observer.c
+++ b/gdb/observer.c
@@ -1,5 +1,6 @@
 /* GDB Notifications to Observers.
-   Copyright 2003 Free Software Foundation, Inc.
+
+   Copyright 2003, 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -199,10 +200,10 @@ void
 _initialize_observer (void)
 {
   add_setshow_zinteger_cmd ("observer", class_maintenance, &observer_debug, "\
-Set observer debugging.\n\
-When non-zero, observer debugging is enabled.",  "\
-Show observer debugging.\n\
-When non-zero, observer debugging is enabled.",
+Set observer debugging.", "\
+Show observer debugging.", "\
+When non-zero, observer debugging is enabled.", "\
+Observer debugging is %s.",
 			    NULL, NULL,
 			    &setdebuglist, &showdebuglist);
 }
diff --git a/gdb/remote-rdi.c b/gdb/remote-rdi.c
index f9e1a80..50d1fbf 100644
--- a/gdb/remote-rdi.c
+++ b/gdb/remote-rdi.c
@@ -1,6 +1,6 @@
 /* GDB interface to ARM RDI library.
 
-   Copyright 1997, 1998, 1999, 2000, 2001, 2002 Free Software
+   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2004 Free Software
    Foundation, Inc.
 
    This file is part of GDB.
@@ -995,24 +995,24 @@ _initialize_remote_rdi (void)
 	   "Withough an argument, it will display current state.\n",
 	   &maintenancelist);
 
-  add_setshow_boolean_cmd
-    ("rdiromatzero", no_class, &rom_at_zero,
-     "Set target has ROM at addr 0.\n"
-     "A true value disables vector catching, false enables vector catching.\n"
-     "This is evaluated at the time the 'target rdi' command is executed\n",
-     "Show if target has ROM at addr 0.\n",
-     NULL, NULL,
-     &setlist, &showlist);
-
-  add_setshow_boolean_cmd
-    ("rdiheartbeat", no_class, &rdi_heartbeat,
-     "Set enable for ADP heartbeat packets.\n"
-     "I don't know why you would want this. If you enable them,\n"
-     "it will confuse ARM and EPI JTAG interface boxes as well\n"
-     "as the Angel Monitor.\n",
-     "Show enable for ADP heartbeat packets.\n",
-     NULL, NULL,
-     &setlist, &showlist);
+  add_setshow_boolean_cmd ("rdiromatzero", no_class, &rom_at_zero, "\
+Set target has ROM at addr 0.", "\
+Show if target has ROM at addr 0.", "\
+A true value disables vector catching, false enables vector catching.\n\
+This is evaluated at the time the 'target rdi' command is executed.", "\
+Target has ROM at addr 0 is %s.",
+			   NULL, NULL,
+			   &setlist, &showlist);
+
+  add_setshow_boolean_cmd ("rdiheartbeat", no_class, &rdi_heartbeat, "\
+Set enable for ADP heartbeat packets.", "\
+Show enable for ADP heartbeat packets.", "\
+I don't know why you would want this. If you enable them,\n\
+it will confuse ARM and EPI JTAG interface boxes as well\n\
+as the Angel Monitor.", "\
+Enable for ADP heartbeat packets is %s.",
+			   NULL, NULL,
+			   &setlist, &showlist);
 }
 
 /* A little dummy to make linking with the library succeed. */
diff --git a/gdb/remote.c b/gdb/remote.c
index ad85c07..cee4cc3 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -646,6 +646,8 @@ add_packet_config_cmd (struct packet_config *config,
   struct cmd_list_element *show_cmd;
   char *set_doc;
   char *show_doc;
+  char *help_doc;
+  char *print;
   char *cmd_name;
   config->name = name;
   config->title = title;
@@ -655,10 +657,13 @@ add_packet_config_cmd (struct packet_config *config,
 			name, title);
   show_doc = xstrprintf ("Show current use of remote protocol `%s' (%s) packet",
 			 name, title);
+  print = xstrprintf ("Current use of remote protocol `%s' (%s) is %%s",
+		      name, title);
   /* set/show TITLE-packet {auto,on,off} */
   cmd_name = xstrprintf ("%s-packet", title);
   add_setshow_auto_boolean_cmd (cmd_name, class_obscure,
 				&config->detect, set_doc, show_doc,
+				"", print,
 				set_func, show_func,
 				set_remote_list, show_remote_list);
   /* set/show remote NAME-packet {auto,on,off} -- legacy */
@@ -5423,9 +5428,11 @@ response packet.  GDB supplies the initial `$' character, and the\n\
 terminating `#' character and checksum.",
 	   &maintenancelist);
 
-  add_setshow_boolean_cmd ("remotebreak", no_class, &remote_break,
-			   "Set whether to send break if interrupted.\n",
-			   "Show whether to send break if interrupted.\n",
+  add_setshow_boolean_cmd ("remotebreak", no_class, &remote_break, "\
+Set whether to send break if interrupted.", "\
+Show whether to send break if interrupted.", "\
+If set, a break, instead of a cntrl-c, is sent to the remote target.", "\
+Whether to send break if interrupted is %s.",
 			   NULL, NULL,
 			   &setlist, &showlist);
 
@@ -5464,15 +5471,17 @@ terminating `#' character and checksum.",
 
   add_setshow_cmd ("hardware-watchpoint-limit", no_class,
 		   var_zinteger, &remote_hw_watchpoint_limit, "\
-Set the maximum number of target hardware watchpoints.\n\
+Set the maximum number of target hardware watchpoints.", "\
+Show the maximum number of target hardware watchpoints.", "\
 Specify a negative limit for unlimited.", "\
-Show the maximum number of target hardware watchpoints.\n",
+The maximum number of target hardware watchpoints is %s.",
 		   NULL, NULL, &remote_set_cmdlist, &remote_show_cmdlist);
   add_setshow_cmd ("hardware-breakpoint-limit", no_class,
 		   var_zinteger, &remote_hw_breakpoint_limit, "\
-Set the maximum number of target hardware breakpoints.\n\
+Set the maximum number of target hardware breakpoints.", "\
+Show the maximum number of target hardware breakpoints.", "\
 Specify a negative limit for unlimited.", "\
-Show the maximum number of target hardware breakpoints.\n",
+The maximum number of target hardware breakpoints is %s.",
 		   NULL, NULL, &remote_set_cmdlist, &remote_show_cmdlist);
 
   deprecated_add_show_from_set
@@ -5565,8 +5574,11 @@ in a memory packet.\n",
   /* Keep the old ``set remote Z-packet ...'' working. */
   add_setshow_auto_boolean_cmd ("Z-packet", class_obscure,
 				&remote_Z_packet_detect, "\
-Set use of remote protocol `Z' packets",
-				"Show use of remote protocol `Z' packets ",
+Set use of remote protocol `Z' packets", "\
+Show use of remote protocol `Z' packets ", "\
+When set, GDB will attempt to use the remote breakpoint and watchpoint\n\
+packets.", "\
+Use of remote protocol `Z' packets is %s",
 				set_remote_protocol_Z_packet_cmd,
 				show_remote_protocol_Z_packet_cmd,
 				&remote_set_cmdlist, &remote_show_cmdlist);
diff --git a/gdb/target.c b/gdb/target.c
index 7078760..cfbbd17 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -2430,11 +2430,12 @@ command.", &setdebuglist),
 
   add_setshow_boolean_cmd ("trust-readonly-sections", class_support, 
 			   &trust_readonly, "\
-Set mode for reading from readonly sections.\n\
+Set mode for reading from readonly sections.", "\
+Show mode for reading from readonly sections.", "\
 When this mode is on, memory reads from readonly sections (such as .text)\n\
 will be read from the object file instead of from the target.  This will\n\
 result in significant performance improvement for remote targets.", "\
-Show mode for reading from readonly sections.\n",
+Mode for reading from readonly sections is %s.",
 			   NULL, NULL,
 			   &setlist, &showlist);