Fix filename mention in psqlrc.sample file.

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 9779789bef24a7ff7a0f057110c0d8d11070b581..6ae2ba854e58029152f4c3d9bf9a8ee2cc20da44 100644 (file)
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.113 2004/04/22 01:53:17 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.114 2004/04/22 14:33:38 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -440,7 +440,7 @@ PostgreSQL documentation
       <term><option>--no-psqlrc</></term>
       <listitem>
       <para>
-      Do not read the start-up file <filename>/psql.rc</filename> or
+      Do not read the start-up file <filename>/psqlrc</filename> or
       <filename>~/.psqlrc</filename>.
       </para>
       </listitem>
@@ -1861,7 +1861,7 @@ bar
         The autocommit-on mode is <productname>PostgreSQL</>'s traditional
         behavior, but autocommit-off is closer to the SQL spec.  If you
         prefer autocommit-off, you may wish to set it in the system-wide
-         <filename>psql.rc</filename> or your 
+         <filename>psqlrc</filename> or your 
          <filename>.psqlrc</filename> file.
        </para>
        </note>
@@ -2491,9 +2491,9 @@ $endif
     <para>
      Before starting up, <application>psql</application> attempts to
      read and execute commands from the the system-wide
-     <filename>psql.rc</filename> file and the  
+     <filename>psqlrc</filename> file and the  
      <filename>$HOME/.psqlrc</filename> file in the user's home
-     directory.  See <filename><replaceable>PREFIX</>/share/psql.rc.sample</> 
+     directory.  See <filename><replaceable>PREFIX</>/share/psqlrc.sample</> 
      for information on setting up the system-wide file.  It could be used 
      to set up the client or the server to taste (using the <command>\set
      </command> and <command>SET</command> commands).

diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
index a29f18e88e60f98eb70203c4010f43f7eec4c69a..a3de06182a9597b96d29b4a82c2b126cfa05739a 100644 (file)
--- a/src/bin/psql/Makefile
+++ b/src/bin/psql/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.41 2004/04/22 01:53:37 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.42 2004/04/22 14:33:45 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -50,7 +50,7 @@ distprep: $(srcdir)/sql_help.h $(srcdir)/psqlscan.c
 
 install: all installdirs
        $(INSTALL_PROGRAM) psql$(X) $(DESTDIR)$(bindir)/psql$(X)
-       $(INSTALL_DATA) $(srcdir)/psql.rc.sample $(DESTDIR)$(datadir)/psql.rc.sample
+       $(INSTALL_DATA) $(srcdir)/psqlrc.sample $(DESTDIR)$(datadir)/psqlrc.sample
 
 installdirs:
        $(mkinstalldirs) $(DESTDIR)$(bindir)

diff --git a/src/bin/psql/psql.rc.sample b/src/bin/psql/psqlrc.sample
similarity index 89%
rename from src/bin/psql/psql.rc.sample
rename to src/bin/psql/psqlrc.sample
index ff23bfa52823a2be039c85b287d58c50ef7ed682..6054fabb380e5e2b0bb86206318331e1fd54ebfc 100644 (file)
--- a/src/bin/psql/psql.rc.sample
+++ b/src/bin/psql/psqlrc.sample
@@ -4,4 +4,4 @@
 --  This file is read before the .psqlrc file in the user's home directory.
 --
 --  Copy this to your sysconf directory (typically /usr/local/pgsql/etc) and
---  rename it psql.rc.
+--  rename it psqlrc.

diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index aeb7c13fbdaaa69fb491c9336780f4256c0e5ebe..eb241c119e68768bca715a20a9787567bfa01675 100644 (file)
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2003, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.89 2004/04/22 01:53:37 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.90 2004/04/22 14:33:49 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -45,7 +45,7 @@ int                   optreset;
 PsqlSettings pset;
 
 #define PSQLRC                 ".psqlrc"
-#define SYSPSQLRC      "psql.rc"
+#define SYSPSQLRC      "psqlrc"
 
 /*
  * Structures to pass information between the option parsing routine