Index: src/bin/psql/help.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/help.c,v
retrieving revision 1.125
diff -c -c -r1.125 help.c
*** src/bin/psql/help.c	4 Apr 2008 17:42:43 -0000	1.125
--- src/bin/psql/help.c	4 Apr 2008 17:57:18 -0000
***************
*** 188,194 ****
  			ON(pset.timing));
  	fprintf(output, _("  \\unset NAME    unset (delete) internal variable\n"));
  	fprintf(output, _("  \\! [COMMAND]   execute command in shell or start interactive shell\n"));
- 	fprintf(output, _("  \\?             display this help output\n"));
  	fprintf(output, "\n");
  
  	fprintf(output, _("Query Buffer\n"));
--- 188,193 ----
Index: src/bin/psql/mainloop.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/mainloop.c,v
retrieving revision 1.88
diff -c -c -r1.88 mainloop.c
*** src/bin/psql/mainloop.c	4 Apr 2008 17:42:43 -0000	1.88
--- src/bin/psql/mainloop.c	4 Apr 2008 17:57:18 -0000
***************
*** 11,17 ****
  
  #include "command.h"
  #include "common.h"
- #include "help.h"
  #include "input.h"
  #include "settings.h"
  
--- 11,16 ----
***************
*** 172,184 ****
  			continue;
  		}
  
! 		/* A request for help? Be friendly and show them the slash way of doing things */
  		if (pset.cur_cmd_interactive && query_buf->len == 0 &&
  			pg_strncasecmp(line, "help", 4) == 0 &&
  			(line[4] == '\0' || line[4] == ';' || isspace(line[4])))
  		{
  			free(line);
! 			slashUsage(pset.popt.topt.pager);
  			continue;
  		}
  
--- 171,186 ----
  			continue;
  		}
  
! 		/* A request for help? Be friendly and give them some guidance */
  		if (pset.cur_cmd_interactive && query_buf->len == 0 &&
  			pg_strncasecmp(line, "help", 4) == 0 &&
  			(line[4] == '\0' || line[4] == ';' || isspace(line[4])))
  		{
  			free(line);
! 			puts("You are using psql, the command-line interface to PostgreSQL.");
! 			puts("Enter SQL commands, or type \\? for a list of backslash options.");
! 			puts("Use \\h for SQL command help.");
! 			puts("Use \\q to quit.");
  			continue;
  		}