diff --git a/doc/src/sgml/file-fdw.sgml b/doc/src/sgml/file-fdw.sgml
index 955a13ab7d9..d80142b4fdf 100644
--- a/doc/src/sgml/file-fdw.sgml
+++ b/doc/src/sgml/file-fdw.sgml
@@ -188,7 +188,7 @@
  <para>
   Changing table-level options requires being a superuser or having the privileges
   of the default role <literal>pg_read_server_files</literal> (to use a filename) or
-  the default role <literal>pg_execute_server_programs</literal> (to use a program),
+  the default role <literal>pg_execute_server_program</literal> (to use a program),
   for security reasons: only certain users should be able to control which file is
   read or which program is run.  In principle regular users could be allowed to
   change the other options, but that's not supported at present.
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 75e5fde799d..88af09213f0 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -16304,7 +16304,7 @@ SET search_path TO <replaceable>schema</replaceable> <optional>, <replaceable>sc
     optional parameter. The return value is <literal>NULL</literal> when the
     log format requested is not a configured
     <xref linkend="guc-log-destination"/>.  The
-    <function>pg_current_logfiles</function> reflects the contents of the
+    <function>pg_current_logfile</function> reflects the contents of the
     <filename>current_logfiles</filename> file.
    </para>
 
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 39ac26cbe22..0f3475730ce 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -6175,7 +6175,7 @@ char *PQencryptPasswordConn(PGconn *conn, const char *passwd, const char *user,
 char *PQencryptPassword(const char *passwd, const char *user);
 </synopsis>
       <function>PQencryptPassword</function> is an older, deprecated version of
-      <function>PQencryptPasswodConn</function>. The difference is that
+      <function>PQencryptPasswordConn</function>. The difference is that
       <function>PQencryptPassword</function> does not
       require a connection object, and <literal>md5</literal> is always used as the
       encryption algorithm.
diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index 93c0861942f..13d15c27dc3 100644
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -1292,7 +1292,7 @@ CREATE DATABASE foo WITH TEMPLATE template0;
   <para>
    When dumping logical replication subscriptions,
    <application>pg_dump</application> will generate <command>CREATE
-   SUBSCRIPTION</command> commands that use the <literal>NOCONNECT</literal>
+   SUBSCRIPTION</command> commands that use the <literal>connect = false</literal>
    option, so that restoring the subscription does not make remote connections
    for creating a replication slot or for initial table copy.  That way, the
    dump can be restored without requiring network access to the remote
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index 15852fe24ff..b8bad60a305 100644
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -3800,7 +3800,7 @@ pgstat_get_wait_io(WaitEventIO w)
 			event_name = "LockFileCreateSync";
 			break;
 		case WAIT_EVENT_LOCK_FILE_CREATE_WRITE:
-			event_name = "LockFileCreateWRITE";
+			event_name = "LockFileCreateWrite";
 			break;
 		case WAIT_EVENT_LOCK_FILE_RECHECKDATADIR_READ:
 			event_name = "LockFileReCheckDataDirRead";