diff options
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/sgml/ref/psql-ref.sgml | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index d8bd2e964af..f65b9d4767b 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -161,8 +161,7 @@ EOF Echo the actual queries generated by <command>\d</command> and other backslash commands. You can use this to study <application>psql</application>'s internal operations. This is equivalent to - setting the variable <varname>ECHO_HIDDEN</varname> from within - <application>psql</application>. + setting the variable <varname>ECHO_HIDDEN</varname> to <literal>on</>. </para> </listitem> </varlistentry> @@ -321,8 +320,8 @@ EOF quietly. By default, it prints welcome messages and various informational output. If this option is used, none of this happens. This is useful with the <option>-c</option> option. - Within <application>psql</application> you can also set the - <varname>QUIET</varname> variable to achieve the same effect. + This is equivalent to setting the variable <varname>QUIET</varname> + to <literal>on</>. </para> </listitem> </varlistentry> @@ -2824,8 +2823,9 @@ bar <term><varname>ECHO_HIDDEN</varname></term> <listitem> <para> - When this variable is set and a backslash command queries the - database, the query is first shown. This way you can study the + When this variable is set to <literal>on</> and a backslash command + queries the database, the query is first shown. + This feature helps you to study <productname>PostgreSQL</productname> internals and provide similar functionality in your own programs. (To select this behavior on program start-up, use the switch <option>-E</option>.) If you set @@ -2985,16 +2985,16 @@ bar </term> <listitem> <para> - When <literal>on</>, if a statement in a transaction block + When set to <literal>on</>, if a statement in a transaction block generates an error, the error is ignored and the transaction - continues. When <literal>interactive</>, such errors are only + continues. When set to <literal>interactive</>, such errors are only ignored in interactive sessions, and not when reading script - files. When <literal>off</> (the default), a statement in a + files. When unset or set to <literal>off</>, a statement in a transaction block that generates an error aborts the entire - transaction. The on_error_rollback-on mode works by issuing an + transaction. The error rollback mode works by issuing an implicit <command>SAVEPOINT</> for you, just before each command - that is in a transaction block, and rolls back to the savepoint - on error. + that is in a transaction block, and then rolling back to the + savepoint if the command fails. </para> </listitem> </varlistentry> @@ -3004,7 +3004,8 @@ bar <listitem> <para> By default, command processing continues after an error. When this - variable is set, it will instead stop immediately. In interactive mode, + variable is set to <literal>on</>, processing will instead stop + immediately. In interactive mode, <application>psql</application> will return to the command prompt; otherwise, <application>psql</application> will exit, returning error code 3 to distinguish this case from fatal error @@ -3046,8 +3047,8 @@ bar <term><varname>QUIET</varname></term> <listitem> <para> - This variable is equivalent to the command line option - <option>-q</option>. It is probably not too useful in + Setting this variable to <literal>on</> is equivalent to the command + line option <option>-q</option>. It is probably not too useful in interactive mode. </para> </listitem> @@ -3057,8 +3058,8 @@ bar <term><varname>SINGLELINE</varname></term> <listitem> <para> - This variable is equivalent to the command line option - <option>-S</option>. + Setting this variable to <literal>on</> is equivalent to the command + line option <option>-S</option>. </para> </listitem> </varlistentry> @@ -3067,8 +3068,8 @@ bar <term><varname>SINGLESTEP</varname></term> <listitem> <para> - This variable is equivalent to the command line option - <option>-s</option>. + Setting this variable to <literal>on</> is equivalent to the command + line option <option>-s</option>. </para> </listitem> </varlistentry> |