--- doc/src/sgml/ref/psql-ref.sgml +++ doc/src/sgml/ref/psql-ref.sgml @@ -80,7 +80,7 @@ Specifies that psql is to execute one command string, command, and then exit. This is useful in shell scripts. Start-up files - (psqlrc and ~/.psqlrc) are + (psqlrc and ~/.desk/psqlrc) are ignored with this option. command must be either @@ -482,7 +482,7 @@ Do not read the start-up file (neither the system-wide psqlrc file nor the user's - ~/.psqlrc file). + ~/.desk/psqlrc file). @@ -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 psqlrc file or your - ~/.psqlrc file. + ~/.desk/psqlrc file. @@ -2869,11 +2869,11 @@ The file name that will be used to store the history list. The default - value is ~/.psql_history. For example, putting: + value is ~/.desk/psql_history. For example, putting: -\set HISTFILE ~/.psql_history- :DBNAME +\set HISTFILE ~/.desk/psql_history- :DBNAME - in ~/.psqlrc will cause + in ~/.desk/psqlrc will cause psql to maintain a separate history for each database. @@ -3477,7 +3477,7 @@ - Alternative location of the user's .psqlrc file. Tilde (~) expansion is performed. + Alternative location of the user's .desk/psqlrc file. Tilde (~) expansion is performed. @@ -3524,7 +3524,7 @@ psql attempts to read and execute commands from the system-wide psqlrc file and the user's - ~/.psqlrc file before starting up. + ~/.desk/psqlrc file before starting up. (On Windows, the user's startup file is named %APPDATA%\postgresql\psqlrc.conf.) See PREFIX/share/psqlrc.sample @@ -3533,7 +3533,7 @@ and SET commands). - The location of the user's ~/.psqlrc file can + The location of the user's ~/.desk/psqlrc file can also be set explicitly via the PSQLRC environment setting. @@ -3542,11 +3542,11 @@ Both the system-wide psqlrc file and the user's - ~/.psqlrc file can be made psql-version-specific + ~/.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 or - ~/.psqlrc-9.2.5. The most specific + for example ~/.desk/psqlrc-9.2 or + ~/.desk/psqlrc-9.2.5. The most specific version-matching file will be read in preference to a non-version-specific file. @@ -3555,7 +3555,7 @@ The command-line history is stored in the file - ~/.psql_history, or + ~/.desk/psql_history, or %APPDATA%\postgresql\psql_history on Windows.