summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2004-04-22 14:33:49 +0000
committerBruce Momjian2004-04-22 14:33:49 +0000
commit1b298f2472efe13a1cc1d3152afd92b4d6661023 (patch)
tree033a2f26338dade5c8479740d2b95c465c370c67
parentef440831dac91f2769dcacc81e267e2584b85f1f (diff)
Fix filename mention in psqlrc.sample file.
-rw-r--r--doc/src/sgml/ref/psql-ref.sgml8
-rw-r--r--src/bin/psql/Makefile2
-rw-r--r--src/bin/psql/psqlrc.sample (renamed from src/bin/psql/psql.rc.sample)2
-rw-r--r--src/bin/psql/startup.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index b943d294f0..d84077c486 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -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 b33a50be7a..56bb07b4a1 100644
--- a/src/bin/psql/Makefile
+++ b/src/bin/psql/Makefile
@@ -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
index ff23bfa528..6054fabb38 100644
--- 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 25788bbfaa..4976488f86 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -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