diff options
Diffstat (limited to 'doc/src/sgml/config.sgml')
| -rw-r--r-- | doc/src/sgml/config.sgml | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index b158e6de8aa..5e0043ee7cb 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.303 2010/08/03 19:02:21 tgl Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.304 2010/08/17 04:37:20 petere Exp $ --> <chapter Id="runtime-config"> <title>Server Configuration</title> @@ -243,7 +243,7 @@ SET ENABLE_SEQSCAN TO OFF; <listitem> <para> Specifies the configuration file for - <xref linkend="auth-username-maps"> username mapping + <xref linkend="auth-username-maps"> user name mapping (customarily called <filename>pg_ident.conf</>). This parameter can only be set at server start. </para> @@ -1495,7 +1495,7 @@ SET ENABLE_SEQSCAN TO OFF; one transaction is determined by the setting in effect when it commits. It is therefore possible, and useful, to have some transactions commit synchronously and others asynchronously. - For example, to make a single multi-statement transaction commit + For example, to make a single multistatement transaction commit asynchronously when the default is the opposite, issue <command>SET LOCAL synchronous_commit TO OFF</> within the transaction. </para> @@ -3407,9 +3407,8 @@ local0.* /var/log/postgresql fields to displayed messages. <literal>TERSE</> excludes the logging of <literal>DETAIL</>, <literal>HINT</>, <literal>QUERY</>, and <literal>CONTEXT</> error information. - <literal>VERBOSE</> output includes the <link - linkend="errcodes-appendix">SQLSTATE</> error - code and the source code file name, function name, + <literal>VERBOSE</> output includes the <symbol>SQLSTATE</> error + code (see also <xref linkend="errcodes-appendix">) and the source code file name, function name, and line number that generated the error. Only superusers can change this setting. </para> @@ -5492,7 +5491,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir' the server. The default value of <literal>NAMEDATALEN</> is 64; therefore the default <varname>max_identifier_length</varname> is 63 bytes, which - can be less than 63 characters when using multi-byte encodings. + can be less than 63 characters when using multibyte encodings. </para> </listitem> </varlistentry> @@ -5803,7 +5802,7 @@ plruby.use_strict = true # generates error: unknown class name If on, emit information about lock usage. Information dumped includes the type of lock operation, the type of lock and the unique identifier of the object being locked or unlocked. Also included - are bitmasks for the lock types already granted on this object as + are bit masks for the lock types already granted on this object as well as for the lock types awaited on this object. For each lock type a count of the number of granted locks and waiting locks is also dumped as well as the totals. An example of the log file output @@ -5823,7 +5822,7 @@ LOG: CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1) wait(0) type(INVALID) </screen> Details of the structure being dumped may be found in - src/include/storage/lock.h + <filename>src/include/storage/lock.h</filename>. </para> <para> This parameter is only available if the <symbol>LOCK_DEBUG</symbol> @@ -5917,7 +5916,7 @@ LOG: CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1) <listitem> <para> If set, dumps information about all current locks when a - DeadLockTimeout occurs. + deadlock timeout occurs. </para> <para> This parameter is only available if the <symbol>LOCK_DEBUG</symbol> @@ -5935,7 +5934,7 @@ LOG: CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1) <listitem> <para> If set, logs system resource usage statistics (memory and CPU) on - various btree operations. + various B-tree operations. </para> <para> This parameter is only available if the <symbol>BTREE_BUILD_STATS</symbol> @@ -5981,7 +5980,7 @@ LOG: CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1) to the log. The default is <literal>WARNING</>. Note that <literal>LOG</> has a different rank here than in <varname>client_min_messages</>. - Parameter should be set in the postgresql.conf only. + Parameter should be set in <filename>postgresql.conf</filename> only. </para> </listitem> </varlistentry> |