Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit65b020b

Browse files
committed
Fix filename mention in psqlrc.sample file.
1 parent19f1649 commit65b020b

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

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

Lines changed: 5 additions & 5 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.113 2004/04/2201:53:17 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.114 2004/04/2214:33:38 momjian Exp $
33
PostgreSQL documentation
44
-->
55

@@ -440,7 +440,7 @@ PostgreSQL documentation
440440
<term><option>--no-psqlrc</></term>
441441
<listitem>
442442
<para>
443-
Do not read the start-up file <filename>/psql.rc</filename> or
443+
Do not read the start-up file <filename>/psqlrc</filename> or
444444
<filename>~/.psqlrc</filename>.
445445
</para>
446446
</listitem>
@@ -1861,7 +1861,7 @@ bar
18611861
The autocommit-on mode is <productname>PostgreSQL</>'s traditional
18621862
behavior, but autocommit-off is closer to the SQL spec. If you
18631863
prefer autocommit-off, you may wish to set it in the system-wide
1864-
<filename>psql.rc</filename> or your
1864+
<filename>psqlrc</filename> or your
18651865
<filename>.psqlrc</filename> file.
18661866
</para>
18671867
</note>
@@ -2491,9 +2491,9 @@ $endif
24912491
<para>
24922492
Before starting up, <application>psql</application> attempts to
24932493
read and execute commands from the the system-wide
2494-
<filename>psql.rc</filename> file and the
2494+
<filename>psqlrc</filename> file and the
24952495
<filename>$HOME/.psqlrc</filename> file in the user's home
2496-
directory. See <filename><replaceable>PREFIX</>/share/psql.rc.sample</>
2496+
directory. See <filename><replaceable>PREFIX</>/share/psqlrc.sample</>
24972497
for information on setting up the system-wide file. It could be used
24982498
to set up the client or the server to taste (using the <command>\set
24992499
</command> and <command>SET</command> commands).

‎src/bin/psql/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.41 2004/04/2201:53:37 momjian Exp $
8+
# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.42 2004/04/2214:33:45 momjian Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -50,7 +50,7 @@ distprep: $(srcdir)/sql_help.h $(srcdir)/psqlscan.c
5050

5151
install: all installdirs
5252
$(INSTALL_PROGRAM) psql$(X)$(DESTDIR)$(bindir)/psql$(X)
53-
$(INSTALL_DATA)$(srcdir)/psql.rc.sample$(DESTDIR)$(datadir)/psql.rc.sample
53+
$(INSTALL_DATA)$(srcdir)/psqlrc.sample$(DESTDIR)$(datadir)/psqlrc.sample
5454

5555
installdirs:
5656
$(mkinstalldirs)$(DESTDIR)$(bindir)

‎src/bin/psql/psql.rc.samplerenamed to‎src/bin/psql/psqlrc.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
-- This file is read before the .psqlrc file in the user's home directory.
55
--
66
-- Copy this to your sysconf directory (typically /usr/local/pgsql/etc) and
7-
-- rename itpsql.rc.
7+
-- rename itpsqlrc.

‎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-2003, PostgreSQL Global Development Group
55
*
6-
* $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.89 2004/04/2201:53:37 momjian Exp $
6+
* $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.90 2004/04/2214:33:49 momjian Exp $
77
*/
88
#include"postgres_fe.h"
99

@@ -45,7 +45,7 @@ intoptreset;
4545
PsqlSettingspset;
4646

4747
#definePSQLRC ".psqlrc"
48-
#defineSYSPSQLRC"psql.rc"
48+
#defineSYSPSQLRC"psqlrc"
4949

5050
/*
5151
* Structures to pass information between the option parsing routine

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp