--- doc/src/sgml/man1/psql.1 +++ doc/src/sgml/man1/psql.1 @@ -62,7 +62,7 @@ is to execute one command string, \fIcommand\fR, and then exit\&. This is useful in shell scripts\&. Start\-up files (psqlrc and -~/\&.psqlrc) are ignored with this option\&. +~/\&.desk/psqlrc) are ignored with this option\&. .sp \fIcommand\fR must be either a command string that is completely parsable by the server (i\&.e\&., it contains no @@ -336,7 +336,7 @@ Do not read the start\-up file (neither the system\-wide psqlrc file nor the user\*(Aqs -~/\&.psqlrc +~/\&.desk/psqlrc file)\&. .RE .PP @@ -2245,7 +2245,7 @@ PostgreSQL\*(Aqs traditional 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 psqlrc file or your -~/\&.psqlrc +~/\&.desk/psqlrc file\&. .sp .5v .RE @@ -2347,20 +2347,20 @@ \fIHISTFILE\fR .RS 4 The file name that will be used to store the history list\&. The default value is -~/\&.psql_history\&. For example, putting: +~/\&.desk/psql_history\&. For example, putting: .sp .if n \{\ .RS 4 .\} .nf -\eset HISTFILE ~/\&.psql_history\- :DBNAME +\eset HISTFILE ~/\&.desk/psql_history\- :DBNAME .fi .if n \{\ .RE .\} .sp in -~/\&.psqlrc +~/\&.desk/psqlrc will cause psql to maintain a separate history for each database\&. @@ -2885,7 +2885,7 @@ \fBPSQLRC\fR .RS 4 Alternative location of the user\*(Aqs -\&.psqlrc +\&.desk/psqlrc file\&. Tilde (~) expansion is performed\&. .RE .PP @@ -2927,7 +2927,7 @@ attempts to read and execute commands from the system\-wide psqlrc file and the user\*(Aqs -~/\&.psqlrc +~/\&.desk/psqlrc file before starting up\&. (On Windows, the user\*(Aqs startup file is named %APPDATA%\epostgresql\epsqlrc\&.conf\&.) See \fIPREFIX\fR/share/psqlrc\&.sample @@ -2938,7 +2938,7 @@ commands)\&. .sp The location of the user\*(Aqs -~/\&.psqlrc +~/\&.desk/psqlrc file can also be set explicitly via the \fBPSQLRC\fR environment setting\&. @@ -2955,16 +2955,16 @@ Both the system\-wide psqlrc file and the user\*(Aqs -~/\&.psqlrc +~/\&.desk/psqlrc file can be made psql\-version\-specific by appending a dash and the PostgreSQL major or minor psql release number, for example -~/\&.psqlrc\-9\&.2 +~/\&.desk/psqlrc\-9\&.3 or -~/\&.psqlrc\-9\&.2\&.5\&. The most specific version\-matching file will be read in preference to a non\-version\-specific file\&. +~/\&.desk/psqlrc\-9\&.3\&.1\&. The most specific version\-matching file will be read in preference to a non\-version\-specific file\&. .RE .sp .RS 4 @@ -2976,7 +2976,7 @@ .IP \(bu 2.3 .\} The command\-line history is stored in the file -~/\&.psql_history, or +~/\&.desk/psql_history, or %APPDATA%\epostgresql\epsql_history on Windows\&. .sp