Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 29e5833

Browse files
committed
Change Win32 client configuration files from *.txt to *.conf.
1 parent 2730eb9 commit 29e5833

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

doc/src/sgml/libpq.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.177 2005/01/08 22:13:28 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.178 2005/01/14 00:23:21 momjian Exp $
33
-->
44

55
<chapter id="libpq">
@@ -3883,7 +3883,7 @@ The file <filename>.pgpass</filename> in a user's home directory is a file
38833883
that can contain passwords to be used if the connection requires a
38843884
password (and no password has been specified otherwise).
38853885
On Microsoft Windows the file is named
3886-
<filename>%APPDATA%\postgresql\pgpass.txt</> (where <filename>%APPDATA%</>
3886+
<filename>%APPDATA%\postgresql\pgpass.conf</> (where <filename>%APPDATA%</>
38873887
refers to the Application Data subdirectory in the user's profile).
38883888
</para>
38893889

doc/src/sgml/ref/psql-ref.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.129 2005/01/06 21:20:44 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.130 2005/01/14 00:24:23 momjian Exp $
33
PostgreSQL documentation
44
-->
55

@@ -2525,7 +2525,7 @@ $endif
25252525
<filename>psqlrc</filename> file and the user's
25262526
<filename>~/.psqlrc</filename> file.
25272527
(On Windows, the user's startup file is named
2528-
<filename>%APPDATA%\postgresql\psqlrc.txt</filename>.)
2528+
<filename>%APPDATA%\postgresql\psqlrc.conf</filename>.)
25292529
See <filename><replaceable>PREFIX</>/share/psqlrc.sample</>
25302530
for information on setting up the system-wide file. It could be used
25312531
to set up the client or the server to taste (using the <command>\set

src/bin/psql/startup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (c) 2000-2005, PostgreSQL Global Development Group
55
*
6-
* $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.109 2005/01/06 18:29:09 tgl Exp $
6+
* $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.110 2005/01/14 00:25:17 momjian Exp $
77
*/
88
#include "postgres_fe.h"
99

@@ -48,7 +48,7 @@ PsqlSettings pset;
4848
#define PSQLRC ".psqlrc"
4949
#else
5050
#define SYSPSQLRC "psqlrc"
51-
#define PSQLRC "psqlrc.txt"
51+
#define PSQLRC "psqlrc.conf"
5252
#endif
5353

5454
/*

src/interfaces/libpq/fe-connect.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.300 2005/01/10 00:19:43 tgl Exp $
11+
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.301 2005/01/14 00:25:56 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -69,7 +69,7 @@
6969
#ifndef WIN32
7070
#define PGPASSFILE ".pgpass"
7171
#else
72-
#define PGPASSFILE "pgpass.txt"
72+
#define PGPASSFILE "pgpass.conf"
7373
#endif
7474

7575
/* fall back options if they are not specified by arguments or defined

0 commit comments

Comments
 (0)