Standardize spelling of "nonblocking"

Only adjusted the user-exposed messages and documentation,  not all
source code comments.

diff --git a/doc/src/sgml/indexam.sgml b/doc/src/sgml/indexam.sgml
index e03ebc93680c568c4745707b7c503f84734204cc..e15f60fdece367f042afe85d6c52d89ae12adf08 100644 (file)
--- a/doc/src/sgml/indexam.sgml
+++ b/doc/src/sgml/indexam.sgml
@@ -746,7 +746,7 @@ amrestrpos (IndexScanDesc scan);
   <para>
    When the <structfield>ampredlocks</> flag is not set, any scan using that
    index access method within a serializable transaction will acquire a
-   non-blocking predicate lock on the full index.  This will generate a
+   nonblocking predicate lock on the full index.  This will generate a
    read-write conflict with the insert of any tuple into that index by a
    concurrent serializable transaction.  If certain patterns of read-write
    conflicts are detected among a set of concurrent serializable

diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml
index db820d6f43f278c526c3bd65ae07e56157e66fbb..b2d172f725df72e8010a082607bf46133b2aab2b 100644 (file)
--- a/doc/src/sgml/mvcc.sgml
+++ b/doc/src/sgml/mvcc.sgml
@@ -1366,7 +1366,7 @@ SELECT pg_advisory_lock(q.id) FROM
    <para>
     As mentioned in <xref linkend="xact-serializable">, Serializable
     transactions are just Repeatable Read transactions which add
-    non-blocking monitoring for dangerous patterns of read/write conflicts.
+    nonblocking monitoring for dangerous patterns of read/write conflicts.
     When a pattern is detected which could cause a cycle in the apparent
     order of execution, one of the transactions involved is rolled back to
     break the cycle.

diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index d9dda21d93c3c1128d744d6486d914cf5ef2af21..61dde51f55ca2c4f1b2259192d87a351769c513d 100644 (file)
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -808,7 +808,7 @@ pq_set_nonblocking(bool nonblocking)
        {
                if (!pg_set_noblock(MyProcPort->sock))
                        ereport(COMMERROR,
-                                 (errmsg("could not set socket to non-blocking mode: %m")));
+                                 (errmsg("could not set socket to nonblocking mode: %m")));
        }
        else
        {

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 474e17e9218945ad2b8b5f7e2e20989a5fc679ee..f07ed76881f21d48a7b20731f1546e8a0ba1af8d 100644 (file)
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -6261,7 +6261,7 @@ InitPostmasterDeathWatchHandle(void)
        if (fcntl(postmaster_alive_fds[POSTMASTER_FD_WATCH], F_SETFL, O_NONBLOCK))
                ereport(FATAL,
                                (errcode_for_socket_access(),
-                                errmsg_internal("could not set postmaster death monitoring pipe to non-blocking mode: %m")));
+                                errmsg_internal("could not set postmaster death monitoring pipe to nonblocking mode: %m")));
 #else
 
        /*

diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index 1fff4fe340ccf58de96742c5f58c21c55c2a1270..c8ff40ac5cb8dff02c2136a178d01cd216fde9dc 100644 (file)
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -285,7 +285,7 @@ pg_krb5_sendauth(PGconn *conn)
                char            sebuf[256];
 
                printfPQExpBuffer(&conn->errorMessage,
-               libpq_gettext("could not restore non-blocking mode on socket: %s\n"),
+               libpq_gettext("could not restore nonblocking mode on socket: %s\n"),
                                                  pqStrerror(errno, sebuf, sizeof(sebuf)));
                ret = STATUS_ERROR;
        }

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index eea9c6bdaa3a95096b4ae6cf2e8ef45b2e7ed205..ae9dfaa0adda8d8f239c189d8b48f7356c31af09 100644 (file)
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -1666,7 +1666,7 @@ keep_going:                                               /* We will come back to here until there is
                                        if (!pg_set_noblock(conn->sock))
                                        {
                                                appendPQExpBuffer(&conn->errorMessage,
-                                                                                 libpq_gettext("could not set socket to non-blocking mode: %s\n"),
+                                                                                 libpq_gettext("could not set socket to nonblocking mode: %s\n"),
                                                        SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
                                                pqDropConnection(conn);
                                                conn->addr_cur = addr_cur->ai_next;