--- 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. @@ -496,7 +496,7 @@ Do not read the start-up file (neither the system-wide psqlrc file nor the user's - ~/.psqlrc file). + ~/.desk/psqlrc file). @@ -2768,7 +2768,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. @@ -2894,11 +2894,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. @@ -3504,7 +3504,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. @@ -3545,13 +3545,13 @@ - psqlrc and ~/.psqlrc + psqlrc and ~/.desk/psqlrc Unless it is passed an or option, psql attempts to read and execute commands from the system-wide startup file (psqlrc) and then - the user's personal startup file (~/.psqlrc), after + the user's 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 \set and SET @@ -3568,7 +3568,7 @@ environment variable. - The user's personal startup file is named .psqlrc + The user's personal startup file is named .desk/psqlrc and is sought in the invoking user's home directory. On Windows, which lacks such a concept, the personal startup file is named %APPDATA%\postgresql\psqlrc.conf. @@ -3580,8 +3580,8 @@ can be made psql-version-specific by appending a dash and the PostgreSQL major or minor release number to the file name, - 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. @@ -3589,11 +3589,11 @@ - .psql_history + .desk/psql_history The command-line history is stored in the file - ~/.psql_history, or + ~/.desk/psql_history, or %APPDATA%\postgresql\psql_history on Windows.