Index: doc/src/sgml/ref/psql-ref.sgml
===================================================================
RCS file: /cvsroot/pgsql-server/doc/src/sgml/ref/psql-ref.sgml,v
retrieving revision 1.113
diff -c -c -r1.113 psql-ref.sgml
*** doc/src/sgml/ref/psql-ref.sgml	22 Apr 2004 01:53:17 -0000	1.113
--- doc/src/sgml/ref/psql-ref.sgml	22 Apr 2004 14:06:21 -0000
***************
*** 440,446 ****
        <term><option>--no-psqlrc</></term>
        <listitem>
        <para>
!       Do not read the start-up file <filename>/psql.rc</filename> or
        <filename>~/.psqlrc</filename>.
        </para>
        </listitem>
--- 440,446 ----
        <term><option>--no-psqlrc</></term>
        <listitem>
        <para>
!       Do not read the start-up file <filename>/psqlrc</filename> or
        <filename>~/.psqlrc</filename>.
        </para>
        </listitem>
***************
*** 1861,1867 ****
  	 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> file.
  	</para>
  	</note>
--- 1861,1867 ----
  	 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>psqlrc</filename> or your 
           <filename>.psqlrc</filename> file.
  	</para>
  	</note>
***************
*** 2491,2499 ****
      <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>$HOME/.psqlrc</filename> file in the user's home
!      directory.  See <filename><replaceable>PREFIX</>/share/psql.rc.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).
--- 2491,2499 ----
      <para>
       Before starting up, <application>psql</application> attempts to
       read and execute commands from the the system-wide
!      <filename>psqlrc</filename> file and the  
       <filename>$HOME/.psqlrc</filename> file in the user's home
!      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).
Index: src/bin/psql/Makefile
===================================================================
RCS file: /cvsroot/pgsql-server/src/bin/psql/Makefile,v
retrieving revision 1.41
diff -c -c -r1.41 Makefile
*** src/bin/psql/Makefile	22 Apr 2004 01:53:37 -0000	1.41
--- src/bin/psql/Makefile	22 Apr 2004 14:06:44 -0000
***************
*** 50,56 ****
  
  install: all installdirs
  	$(INSTALL_PROGRAM) psql$(X) $(DESTDIR)$(bindir)/psql$(X)
! 	$(INSTALL_DATA) $(srcdir)/psql.rc.sample $(DESTDIR)$(datadir)/psql.rc.sample
  
  installdirs:
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
--- 50,56 ----
  
  install: all installdirs
  	$(INSTALL_PROGRAM) psql$(X) $(DESTDIR)$(bindir)/psql$(X)
! 	$(INSTALL_DATA) $(srcdir)/psqlrc.sample $(DESTDIR)$(datadir)/psqlrc.sample
  
  installdirs:
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
Index: src/bin/psql/startup.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/bin/psql/startup.c,v
retrieving revision 1.89
diff -c -c -r1.89 startup.c
*** src/bin/psql/startup.c	22 Apr 2004 01:53:37 -0000	1.89
--- src/bin/psql/startup.c	22 Apr 2004 14:06:44 -0000
***************
*** 45,51 ****
  PsqlSettings pset;
  
  #define PSQLRC 		".psqlrc"
! #define SYSPSQLRC	"psql.rc"
  
  /*
   * Structures to pass information between the option parsing routine
--- 45,51 ----
  PsqlSettings pset;
  
  #define PSQLRC 		".psqlrc"
! #define SYSPSQLRC	"psqlrc"
  
  /*
   * Structures to pass information between the option parsing routine