diff --git a/lib/modules/Sql.pmod/pgsql.pike b/lib/modules/Sql.pmod/pgsql.pike
index 537e2b32a10bb4b892ca17db3550e1c317624a70..a31c91179be4846ad85560c0df3b9c0a2e01712d 100644
--- a/lib/modules/Sql.pmod/pgsql.pike
+++ b/lib/modules/Sql.pmod/pgsql.pike
@@ -15,7 +15,7 @@
 //! @ul
 //! @item
 //!  PostgreSQL network protocol version 3, authentication methods
-//!   currently supported are: cleartext and MD5 (recommended).
+//!   currently supported are: cleartext, md5 and scram (recommended).
 //! @item
 //!  Streaming queries which do not buffer the whole resultset in memory.
 //! @item
@@ -312,8 +312,7 @@ protected void create(void|string host, void|string database,
 //!   @[reload()], @[resync()]
 //!
 //! @note
-//! This function is PostgreSQL-specific, and thus it is not available
-//! through the generic SQL-interface.
+//! This function is PostgreSQL-specific.
 /*semi*/final void cancelquery() {
   PD("CancelRequest\n");
   .pgsql_util.conxion lcon = .pgsql_util.conxion(this, 0, 2);
@@ -387,8 +386,7 @@ protected void create(void|string host, void|string database,
 //!   @url{http://www.postgresql.org/search/?u=%2Fdocs%2Fcurrent%2F&q=client+connection+search_path@}
 //!
 //! @note
-//! This function is PostgreSQL-specific, and thus it is not available
-//! through the generic SQL-interface.
+//! This function is PostgreSQL-specific.
 /*semi*/final mapping(string:string) getruntimeparameters() {
   waitauthready();
   return _runtimeparameter+([]);
@@ -429,8 +427,7 @@ protected void create(void|string host, void|string database,
 //! @endmapping
 //!
 //! @note
-//! This function is PostgreSQL-specific, and thus it is not available
-//! through the generic SQL-interface.
+//! This function is PostgreSQL-specific.
 /*semi*/final mapping(string:mixed) getstatistics() {
   mapping(string:mixed) stats=([
     "warnings_dropped":warningsdropcount,
@@ -455,8 +452,7 @@ protected void create(void|string host, void|string database,
 //! The previous cachedepth.
 //!
 //! @note
-//! This function is PostgreSQL-specific, and thus it is not available
-//! through the generic SQL-interface.
+//! This function is PostgreSQL-specific.
 /*semi*/final int setcachedepth(void|int newdepth) {
   int olddepth=cachedepth;
   if(!undefinedp(newdepth) && newdepth>=0)
@@ -471,8 +467,7 @@ protected void create(void|string host, void|string database,
 //! The previous timeout.
 //!
 //! @note
-//! This function is PostgreSQL-specific, and thus it is not available
-//! through the generic SQL-interface.
+//! This function is PostgreSQL-specific.
 /*semi*/final int settimeout(void|int newtimeout) {
   int oldtimeout=timeout;
   if(!undefinedp(newtimeout) && newtimeout>0)
@@ -487,8 +482,7 @@ protected void create(void|string host, void|string database,
 //!  The previous portalbuffersize.
 //!
 //! @note
-//! This function is PostgreSQL-specific, and thus it is not available
-//! through the generic SQL-interface.
+//! This function is PostgreSQL-specific.
 /*semi*/final int setportalbuffersize(void|int newportalbuffersize) {
   int oldportalbuffersize=portalbuffersize;
   if(!undefinedp(newportalbuffersize) && newportalbuffersize>0)
@@ -503,8 +497,7 @@ protected void create(void|string host, void|string database,
 //!  The previous fetchlimit.
 //!
 //! @note
-//! This function is PostgreSQL-specific, and thus it is not available
-//! through the generic SQL-interface.
+//! This function is PostgreSQL-specific.
 /*semi*/final int setfetchlimit(void|int newfetchlimit) {
   int oldfetchlimit=_fetchlimit;
   if(!undefinedp(newfetchlimit) && newfetchlimit>=0)
@@ -1328,8 +1321,7 @@ private void procmessage() {
 //! terminated instantly.
 //!
 //! @note
-//! This function is PostgreSQL-specific, and thus it is not available
-//! through the generic SQL-interface.
+//! This function is PostgreSQL-specific.
 /*semi*/final void close() {
   throwdelayederror(this);
   Thread.MutexKey lock;
@@ -1423,8 +1415,7 @@ private void sendsync() {
 //!   @[cancelquery()], @[reload()]
 //!
 //! @note
-//! This function is PostgreSQL-specific, and thus it is not available
-//! through the generic SQL-interface.
+//! This function is PostgreSQL-specific.
 /*semi*/final void resync() {
   mixed err;
   if(is_open()) {
@@ -1490,8 +1481,7 @@ private void sendsync() {
 //!    Extra arguments to pass to @ref{notify_cb@}.
 //!
 //! @note
-//! This function is PostgreSQL-specific, and thus it is not available
-//! through the generic SQL-interface.
+//! This function is PostgreSQL-specific.
 /*semi*/final void set_notify_callback(string condition,
  void|function(int,string,string,mixed ...:void) notify_cb,void|int selfnotify,
   mixed ... args) {
@@ -1545,8 +1535,7 @@ private void runcallback(int pid,string condition,string extrainfo) {
 //!   @[big_query()], @[quote()]
 //!
 //! @note
-//! This function is PostgreSQL-specific, and thus it is not available
-//! through the generic SQL-interface.
+//! This function is PostgreSQL-specific.
 /*semi*/final string quotebinary(string s) {
   return replace(s, ({ "'", "\\", "\0" }), ({ "''", "\\\\", "\\000" }) );
 }
@@ -1777,8 +1766,7 @@ private string trbackendst(int c) {
 //! @endstring
 //!
 //! @note
-//! This function is PostgreSQL-specific, and thus it is not available
-//! through the generic SQL-interface.
+//! This function is PostgreSQL-specific.
 final string status_commit() {
   return trbackendst(backendstatus);
 }
diff --git a/lib/modules/Sql.pmod/pgsql_util.pmod b/lib/modules/Sql.pmod/pgsql_util.pmod
index 958b38c1a3abba518515c346acef675af636f5e9..029862c0b0e46cde5f4c4e700f3b3cba7858a113 100644
--- a/lib/modules/Sql.pmod/pgsql_util.pmod
+++ b/lib/modules/Sql.pmod/pgsql_util.pmod
@@ -699,8 +699,7 @@ class sql_result {
   //!  @[affected_rows()]
   //!
   //! @note
-  //! This function is PostgreSQL-specific, and thus it is not available
-  //! through the generic SQL-interface.
+  //! This function is PostgreSQL-specific.
   /*semi*/final string status_command_complete() {
     return statuscmdcomplete;
   }
@@ -711,8 +710,7 @@ class sql_result {
   //!  @[status_command_complete()]
   //!
   //! @note
-  //! This function is PostgreSQL-specific, and thus it is not available
-  //! through the generic SQL-interface.
+  //! This function is PostgreSQL-specific.
   /*semi*/final int affected_rows() {
     int rows;
     if(statuscmdcomplete)