--- doc/src/sgml/ref/psql-ref.sgml +++ doc/src/sgml/ref/psql-ref.sgml @@ -80,7 +80,7 @@ Specifies that <application>psql</application> is to execute one command string, <replaceable class="parameter">command</replaceable>, and then exit. This is useful in shell scripts. Start-up files - (<filename>psqlrc</filename> and <filename>~/.psqlrc</filename>) are + (<filename>psqlrc</filename> and <filename>~/.desk/psqlrc</filename>) are ignored with this option. </para> <para><replaceable class="parameter">command</replaceable> must be either @@ -482,7 +482,7 @@ <para> Do not read the start-up file (neither the system-wide <filename>psqlrc</filename> file nor the user's - <filename>~/.psqlrc</filename> file). + <filename>~/.desk/psqlrc</filename> file). </para> </listitem> </varlistentry> @@ -2743,7 +2743,7 @@ behavior, but autocommit-off is closer to the SQL spec. If you prefer autocommit-off, you might wish to set it in the system-wide <filename>psqlrc</filename> file or your - <filename>~/.psqlrc</filename> file. + <filename>~/.desk/psqlrc</filename> file. </para> </note> </listitem> @@ -2869,11 +2869,11 @@ <listitem> <para> The file name that will be used to store the history list. The default - value is <filename>~/.psql_history</filename>. For example, putting: + value is <filename>~/.desk/psql_history</filename>. For example, putting: <programlisting> -\set HISTFILE ~/.psql_history- :DBNAME +\set HISTFILE ~/.desk/psql_history- :DBNAME </programlisting> - in <filename>~/.psqlrc</filename> will cause + in <filename>~/.desk/psqlrc</filename> will cause <application>psql</application> to maintain a separate history for each database. </para> @@ -3477,7 +3477,7 @@ <listitem> <para> - Alternative location of the user's <filename>.psqlrc</filename> file. Tilde (<literal>~</literal>) expansion is performed. + Alternative location of the user's <filename>.desk/psqlrc</filename> file. Tilde (<literal>~</literal>) expansion is performed. </para> </listitem> </varlistentry> @@ -3524,7 +3524,7 @@ <application>psql</application> attempts to read and execute commands from the system-wide <filename>psqlrc</filename> file and the user's - <filename>~/.psqlrc</filename> file before starting up. + <filename>~/.desk/psqlrc</filename> file before starting up. (On Windows, the user's startup file is named <filename>%APPDATA%\postgresql\psqlrc.conf</filename>.) See <filename><replaceable>PREFIX</>/share/psqlrc.sample</> @@ -3533,7 +3533,7 @@ </command> and <command>SET</command> commands). </para> <para> - The location of the user's <filename>~/.psqlrc</filename> file can + The location of the user's <filename>~/.desk/psqlrc</filename> file can also be set explicitly via the <envar>PSQLRC</envar> environment setting. </para> @@ -3542,11 +3542,11 @@ <listitem> <para> Both the system-wide <filename>psqlrc</filename> file and the user's - <filename>~/.psqlrc</filename> file can be made <application>psql</application>-version-specific + <filename>~/.desk/psqlrc</filename> file can be made <application>psql</application>-version-specific by appending a dash and the <productname>PostgreSQL</productname> major or minor <application>psql</application> release number, - for example <filename>~/.psqlrc-9.2</filename> or - <filename>~/.psqlrc-9.2.5</filename>. The most specific + for example <filename>~/.desk/psqlrc-9.2</filename> or + <filename>~/.desk/psqlrc-9.2.5</filename>. The most specific version-matching file will be read in preference to a non-version-specific file. </para> @@ -3555,7 +3555,7 @@ <listitem> <para> The command-line history is stored in the file - <filename>~/.psql_history</filename>, or + <filename>~/.desk/psql_history</filename>, or <filename>%APPDATA%\postgresql\psql_history</filename> on Windows. </para> <para>