diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml
index 1c0ab5c645d..4e1fc95daa1 100644
--- a/doc/src/sgml/ecpg.sgml
+++ b/doc/src/sgml/ecpg.sgml
@@ -1,5 +1,5 @@
@@ -1053,14 +1053,16 @@ ECPGdo(__LINE__, NULL, "select res from mytable where index = ? ",
- All SQL statements are performed in one
- transaction unless you issue a commit transaction. To accomplish
- this auto-transaction behavior, the first statement and the first
- statement after a commit or rollback always begins a new transaction. To
- disable this feature, use the command-line
- option.
+ In the default mode, queries are committed only when exec
+ sql commit is issued. Ecpg
+ also supports auto-commit of transactions via the
+ command-line option or via the exec
+ sql set autocommit to on statement. In
+ autocommit mode, each query is automatically
+ committed unless it is inside an explicit transaction block. This
+ mode can be explicitly turned off using exec sql set
+ autocommit to off.
-
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 62f08501fa6..3e9fb16ef3c 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1,5 +1,5 @@
@@ -2109,10 +2109,17 @@ for information on correct values for these environment variables.
libpq is thread-safe as of
PostgreSQL 7.0, so long as no two threads
-attempt to manipulate the same PGconn> object at the same time. In particular,
-you cannot issue concurrent queries from different threads through the same
-connection object. (If you need to run concurrent queries, start up multiple
-connections.)
+attempt to manipulate the same PGconn> object at the same
+time. In particular, you cannot issue concurrent queries from different
+threads through the same connection object. (If you need to run
+concurrent queries, start up multiple connections.)
+
+
+However, libpq clients using the
+crypt encryption method rely on the
+crypt() operating system function, which often is not
+thread-safe. It is better to use MD5 encryption,
+which is guarantted to be thread-safe on all platforms.
diff --git a/doc/src/sgml/ref/ecpg-ref.sgml b/doc/src/sgml/ref/ecpg-ref.sgml
index 30295b6d5b8..1d6019b6284 100644
--- a/doc/src/sgml/ref/ecpg-ref.sgml
+++ b/doc/src/sgml/ref/ecpg-ref.sgml
@@ -1,5 +1,5 @@
@@ -57,7 +57,10 @@ PostgreSQL documentation
-t
- Turn on auto-commit of transactions.
+ Turn on auto-commit of transactions. In this mode, each query is
+ automatically committed unless it is inside an explicit
+ transaction block. In the default mode, queries are committed
+ only when exec sql commit is issued.
@@ -404,32 +407,6 @@ EXEC SQL COMMIT;
missing features.
-
-