--- doc/src/sgml/man1/psql.1 +++ doc/src/sgml/man1/psql.1 @@ -68,7 +68,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 @@ -418,7 +418,7 @@ Do not read the start\-up file (neither the system\-wide psqlrc file nor the user\*(Aqs -~/\&.psqlrc +~/\&.desk/psqlrc file)\&. .RE .PP @@ -2342,7 +2342,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 @@ -2444,20 +2444,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\&. @@ -2995,7 +2995,7 @@ \fBPSQLRC\fR .RS 4 Alternative location of the user\*(Aqs -\&.psqlrc +\&.desk/psqlrc file\&. Tilde (~) expansion is performed\&. .RE .PP @@ -3020,7 +3020,7 @@ Section 31.14, \(lqEnvironment Variables\(rq, in the documentation)\&. .SH "FILES" .PP -psqlrc and ~/\&.psqlrc +psqlrc and ~/\&.desk/psqlrc .RS 4 Unless it is passed an \fB\-X\fR @@ -3028,7 +3028,7 @@ \fB\-c\fR option, psql -attempts to read and execute commands from the system\-wide startup file (psqlrc) and then the user\*(Aqs personal startup file (~/\&.psqlrc), after connecting to the database but before accepting normal commands\&. These files can be used to set up the client and/or the server to taste, typically with +attempts to read and execute commands from the system\-wide startup file (psqlrc) and then the user\*(Aqs personal startup file (~/\&.desk/psqlrc), after connecting to the database but before accepting normal commands\&. These files can be used to set up the client and/or the server to taste, typically with \fB\eset\fR and \fBSET\fR @@ -3048,7 +3048,7 @@ environment variable\&. .sp The user\*(Aqs personal startup file is named -\&.psqlrc +\&.desk/psqlrc and is sought in the invoking user\*(Aqs home directory\&. On Windows, which lacks such a concept, the personal startup file is named %APPDATA%\epostgresql\epsqlrc\&.conf\&. The location of the user\*(Aqs startup file can be set explicitly via the \fBPSQLRC\fR @@ -3058,15 +3058,15 @@ psql\-version\-specific by appending a dash and the PostgreSQL major or minor release number to the file name, for example -~/\&.psqlrc\-9\&.2 +~/\&.desk/psqlrc\-9\&.2 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\&.2\&.5\&. The most specific version\-matching file will be read in preference to a non\-version\-specific file\&. .RE .PP -\&.psql_history +\&.desk/psql_history .RS 4 The command\-line history is stored in the file -~/\&.psql_history, or +~/\&.desk/psql_history, or %APPDATA%\epostgresql\epsql_history on Windows\&. .sp