summaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/ref/psql-ref.sgml19
1 files changed, 12 insertions, 7 deletions
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 99c0dbd95e8..9779789bef2 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.112 2004/04/21 00:34:18 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.113 2004/04/22 01:53:17 momjian Exp $
PostgreSQL documentation
-->
@@ -440,7 +440,8 @@ PostgreSQL documentation
<term><option>--no-psqlrc</></term>
<listitem>
<para>
- Do not read the start-up file <filename>~/.psqlrc</filename>.
+ Do not read the start-up file <filename>/psql.rc</filename> or
+ <filename>~/.psqlrc</filename>.
</para>
</listitem>
</varlistentry>
@@ -1859,8 +1860,9 @@ bar
<para>
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
- your <filename>.psqlrc</filename> file.
+ prefer autocommit-off, you may wish to set it in the system-wide
+ <filename>psql.rc</filename> or your
+ <filename>.psqlrc</filename> file.
</para>
</note>
</listitem>
@@ -2488,9 +2490,12 @@ $endif
<listitem>
<para>
Before starting up, <application>psql</application> attempts to
- read and execute commands from the file
- <filename>$HOME/.psqlrc</filename>. It could be used to set up
- the client or the server to taste (using the <command>\set
+ read and execute commands from the the system-wide
+ <filename>psql.rc</filename> file and the
+ <filename>$HOME/.psqlrc</filename> file in the user's home
+ directory. See <filename><replaceable>PREFIX</>/share/psql.rc.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).
</para>
</listitem>