Index: doc/src/sgml/libpq.sgml
===================================================================
RCS file: /cvsroot/pgsql/doc/src/sgml/libpq.sgml,v
retrieving revision 1.177
diff -c -c -r1.177 libpq.sgml
*** doc/src/sgml/libpq.sgml	8 Jan 2005 22:13:28 -0000	1.177
--- doc/src/sgml/libpq.sgml	13 Jan 2005 15:47:39 -0000
***************
*** 3883,3889 ****
  that can contain passwords to be used if the connection requires a
  password (and no password has been specified otherwise).
  On Microsoft Windows the file is named
! <filename>%APPDATA%\postgresql\pgpass.txt</> (where <filename>%APPDATA%</>
  refers to the Application Data subdirectory in the user's profile).
  </para>
  
--- 3883,3889 ----
  that can contain passwords to be used if the connection requires a
  password (and no password has been specified otherwise).
  On Microsoft Windows the file is named
! <filename>%APPDATA%\postgresql\pgpass.conf</> (where <filename>%APPDATA%</>
  refers to the Application Data subdirectory in the user's profile).
  </para>
  
Index: doc/src/sgml/ref/psql-ref.sgml
===================================================================
RCS file: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v
retrieving revision 1.129
diff -c -c -r1.129 psql-ref.sgml
*** doc/src/sgml/ref/psql-ref.sgml	6 Jan 2005 21:20:44 -0000	1.129
--- doc/src/sgml/ref/psql-ref.sgml	13 Jan 2005 15:47:45 -0000
***************
*** 2525,2531 ****
       <filename>psqlrc</filename> file and the user's
       <filename>~/.psqlrc</filename> file.
       (On Windows, the user's startup file is named
!      <filename>%APPDATA%\postgresql\psqlrc.txt</filename>.)
       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
--- 2525,2531 ----
       <filename>psqlrc</filename> file and the user's
       <filename>~/.psqlrc</filename> file.
       (On Windows, the user's startup file is named
!      <filename>%APPDATA%\postgresql\psqlrc.conf</filename>.)
       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
Index: src/bin/psql/startup.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/startup.c,v
retrieving revision 1.109
diff -c -c -r1.109 startup.c
*** src/bin/psql/startup.c	6 Jan 2005 18:29:09 -0000	1.109
--- src/bin/psql/startup.c	13 Jan 2005 15:47:51 -0000
***************
*** 48,54 ****
  #define PSQLRC		".psqlrc"
  #else
  #define SYSPSQLRC	"psqlrc"
! #define PSQLRC		"psqlrc.txt"
  #endif
  
  /*
--- 48,54 ----
  #define PSQLRC		".psqlrc"
  #else
  #define SYSPSQLRC	"psqlrc"
! #define PSQLRC		"psqlrc.conf"
  #endif
  
  /*
Index: src/interfaces/libpq/fe-connect.c
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v
retrieving revision 1.300
diff -c -c -r1.300 fe-connect.c
*** src/interfaces/libpq/fe-connect.c	10 Jan 2005 00:19:43 -0000	1.300
--- src/interfaces/libpq/fe-connect.c	13 Jan 2005 15:47:57 -0000
***************
*** 69,75 ****
  #ifndef WIN32
  #define PGPASSFILE ".pgpass"
  #else
! #define PGPASSFILE "pgpass.txt"
  #endif
  
  /* fall back options if they are not specified by arguments or defined
--- 69,75 ----
  #ifndef WIN32
  #define PGPASSFILE ".pgpass"
  #else
! #define PGPASSFILE "pgpass.conf"
  #endif
  
  /* fall back options if they are not specified by arguments or defined