database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Fix filename mention in psqlrc.sample file.

Browse Source
This commit is contained in:
Bruce Momjian
2004-04-22 14:33:49 +00:00
parent 19f1649bed
commit 65b020bd61
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/src/sgml/ref/psql-ref.sgml
View File

@ -1,5 +1,5 @@
<!--
$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
-->
@ -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).

4
src/bin/psql/Makefile
View File

@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
# 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
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)

2
src/bin/psql/psql.rc.sample → src/bin/psql/psqlrc.sample
View File

@ -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.

4
src/bin/psql/startup.c
View File

@ -3,7 +3,7 @@
*
* 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"
@ -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