Skip to content
Snippets Groups Projects
Commit 65b020bd authored by Bruce Momjian's avatar Bruce Momjian
Browse files

Fix filename mention in psqlrc.sample file.

parent 19f1649b
No related branches found
No related tags found
No related merge requests found
<!-- <!--
$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 PostgreSQL documentation
--> -->
...@@ -440,7 +440,7 @@ PostgreSQL documentation ...@@ -440,7 +440,7 @@ PostgreSQL documentation
<term><option>--no-psqlrc</></term> <term><option>--no-psqlrc</></term>
<listitem> <listitem>
<para> <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>. <filename>~/.psqlrc</filename>.
</para> </para>
</listitem> </listitem>
...@@ -1861,7 +1861,7 @@ bar ...@@ -1861,7 +1861,7 @@ bar
The autocommit-on mode is <productname>PostgreSQL</>'s traditional The autocommit-on mode is <productname>PostgreSQL</>'s traditional
behavior, but autocommit-off is closer to the SQL spec. If you 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 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. <filename>.psqlrc</filename> file.
</para> </para>
</note> </note>
...@@ -2491,9 +2491,9 @@ $endif ...@@ -2491,9 +2491,9 @@ $endif
<para> <para>
Before starting up, <application>psql</application> attempts to Before starting up, <application>psql</application> attempts to
read and execute commands from the the system-wide 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 <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 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 to set up the client or the server to taste (using the <command>\set
</command> and <command>SET</command> commands). </command> and <command>SET</command> commands).
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California # 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 ...@@ -50,7 +50,7 @@ distprep: $(srcdir)/sql_help.h $(srcdir)/psqlscan.c
install: all installdirs install: all installdirs
$(INSTALL_PROGRAM) psql$(X) $(DESTDIR)$(bindir)/psql$(X) $(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: installdirs:
$(mkinstalldirs) $(DESTDIR)$(bindir) $(mkinstalldirs) $(DESTDIR)$(bindir)
......
...@@ -4,4 +4,4 @@ ...@@ -4,4 +4,4 @@
-- This file is read before the .psqlrc file in the user's home directory. -- 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 -- Copy this to your sysconf directory (typically /usr/local/pgsql/etc) and
-- rename it psql.rc. -- rename it psqlrc.
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2003, PostgreSQL Global Development Group * 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" #include "postgres_fe.h"
...@@ -45,7 +45,7 @@ int optreset; ...@@ -45,7 +45,7 @@ int optreset;
PsqlSettings pset; PsqlSettings pset;
#define PSQLRC ".psqlrc" #define PSQLRC ".psqlrc"
#define SYSPSQLRC "psql.rc" #define SYSPSQLRC "psqlrc"
/* /*
* Structures to pass information between the option parsing routine * Structures to pass information between the option parsing routine
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment