diff --git a/doc/src/sgml/fdwhandler.sgml b/doc/src/sgml/fdwhandler.sgml
index 98882ddab86..9f9274ce55f 100644
--- a/doc/src/sgml/fdwhandler.sgml
+++ b/doc/src/sgml/fdwhandler.sgml
@@ -460,7 +460,7 @@ AddForeignUpdateTargets(PlannerInfo *root,
      for a whole-row <structname>Var</structname> marked with
      <structfield>vartype</structfield> = <type>RECORD</type>,
      and <literal>wholerow<replaceable>N</replaceable></literal>
-     for a whole-row <structname>Var</structname> with 
+     for a whole-row <structname>Var</structname> with
      <structfield>vartype</structfield> equal to the table's declared rowtype.
      Re-use these names when you can (the planner will combine duplicate
      requests for identical junk columns).  If you need another kind of
@@ -1616,7 +1616,7 @@ ForeignAsyncRequest(AsyncRequest *areq);
 void
 ForeignAsyncConfigureWait(AsyncRequest *areq);
 </programlisting>
-     Configure a file descriptor event for which the 
+     Configure a file descriptor event for which the
      <structname>ForeignScan</structname> node wishes to wait.
      This function will only be called when the
      <structname>ForeignScan</structname> node has the
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index 66ad4ba9380..50d9fa20215 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -982,7 +982,7 @@ build-postgresql:
          <filename>configure</filename> will check for the required
          header files and libraries to make sure that your
          <productname>OpenSSL</productname> installation is sufficient
-         before proceeding. 
+         before proceeding.
         </para>
        </listitem>
       </varlistentry>
diff --git a/doc/src/sgml/logical-replication.sgml b/doc/src/sgml/logical-replication.sgml
index 73789526518..88646bc859d 100644
--- a/doc/src/sgml/logical-replication.sgml
+++ b/doc/src/sgml/logical-replication.sgml
@@ -305,7 +305,7 @@
        using <command>ALTER SUBSCRIPTION</command> before attempting to drop
        the subscription.  If the remote database instance no longer exists, no
        further action is then necessary.  If, however, the remote database
-       instance is just unreachable, the replication slot (and any still 
+       instance is just unreachable, the replication slot (and any still
        remaining table synchronization slots) should then be
        dropped manually; otherwise it/they would continue to reserve WAL and might
        eventually cause the disk to fill up.  Such cases should be carefully
diff --git a/doc/src/sgml/logicaldecoding.sgml b/doc/src/sgml/logicaldecoding.sgml
index f61bcfcf3c9..a7ec5c35776 100644
--- a/doc/src/sgml/logicaldecoding.sgml
+++ b/doc/src/sgml/logicaldecoding.sgml
@@ -477,7 +477,7 @@ typedef void (*LogicalOutputPluginInit) (struct OutputPluginCallbacks *cb);
     <para>
     An output plugin may also define functions to support two-phase commits,
     which allows actions to be decoded on the <command>PREPARE TRANSACTION</command>.
-    The <function>begin_prepare_cb</function>, <function>prepare_cb</function>, 
+    The <function>begin_prepare_cb</function>, <function>prepare_cb</function>,
     <function>stream_prepare_cb</function>,
     <function>commit_prepared_cb</function> and <function>rollback_prepared_cb</function>
     callbacks are required, while <function>filter_prepare_cb</function> is optional.
@@ -1202,7 +1202,7 @@ stream_commit_cb(...);  &lt;-- commit of the streamed transaction
     To support the streaming of two-phase commands, an output plugin needs to
     provide additional callbacks. There are multiple two-phase commit callbacks
     that are required, (<function>begin_prepare_cb</function>,
-    <function>prepare_cb</function>, <function>commit_prepared_cb</function>, 
+    <function>prepare_cb</function>, <function>commit_prepared_cb</function>,
     <function>rollback_prepared_cb</function> and
     <function>stream_prepare_cb</function>) and an optional callback
     (<function>filter_prepare_cb</function>).
diff --git a/doc/src/sgml/ref/pgupgrade.sgml b/doc/src/sgml/ref/pgupgrade.sgml
index 92e1d09a55c..4737d97d202 100644
--- a/doc/src/sgml/ref/pgupgrade.sgml
+++ b/doc/src/sgml/ref/pgupgrade.sgml
@@ -375,7 +375,7 @@ NET STOP postgresql-&majorversion;
      <quote>Latest checkpoint location</quote> values match in all clusters.
      (There will be a mismatch if old standby servers were shut down
      before the old primary or if the old standby servers are still running.)
-     Also, make sure <varname>wal_level</varname> is not set to 
+     Also, make sure <varname>wal_level</varname> is not set to
      <literal>minimal</literal> in the <filename>postgresql.conf</filename> file on the
      new primary cluster.
     </para>
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index bd4f26e6cc8..3b9ec5e0a39 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1937,7 +1937,7 @@ testdb=&gt;
         The status of each kind of extended statistics is shown in a column
         named after its statistic kind (e.g. Ndistinct).
         "defined" means that it was requested when creating the statistics,
-        and NULL means it wasn't requested. 
+        and NULL means it wasn't requested.
         You can use pg_stats_ext if you'd like to know whether <link linkend="sql-analyze">
         <command>ANALYZE</command></link> was run and statistics are available to the
         planner.
diff --git a/doc/src/sgml/ref/reindex.sgml b/doc/src/sgml/ref/reindex.sgml
index 5875ecb93f7..53c362dcd3e 100644
--- a/doc/src/sgml/ref/reindex.sgml
+++ b/doc/src/sgml/ref/reindex.sgml
@@ -224,7 +224,7 @@ REINDEX [ ( <replaceable class="parameter">option</replaceable> [, ...] ) ] { IN
     <term><replaceable class="parameter">new_tablespace</replaceable></term>
     <listitem>
      <para>
-      The tablespace where indexes will be rebuilt. 
+      The tablespace where indexes will be rebuilt.
      </para>
     </listitem>
    </varlistentry>
diff --git a/doc/src/sgml/ref/vacuum.sgml b/doc/src/sgml/ref/vacuum.sgml
index 6a0028a5142..5f67c9d18b7 100644
--- a/doc/src/sgml/ref/vacuum.sgml
+++ b/doc/src/sgml/ref/vacuum.sgml
@@ -398,7 +398,7 @@ VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ ANALYZE ] [ <replaceable class="paramet
     <literal>FULL</literal> option will report its progress in the
     <structname>pg_stat_progress_vacuum</structname> view. Backends running
     <command>VACUUM FULL</command> will instead report their progress in the
-    <structname>pg_stat_progress_cluster</structname> view. See 
+    <structname>pg_stat_progress_cluster</structname> view. See
     <xref linkend="vacuum-progress-reporting"/> and
     <xref linkend="cluster-progress-reporting"/> for details.
    </para>
diff --git a/doc/src/sgml/wal.sgml b/doc/src/sgml/wal.sgml
index 36e00c92c26..9606c617d41 100644
--- a/doc/src/sgml/wal.sgml
+++ b/doc/src/sgml/wal.sgml
@@ -270,7 +270,7 @@
 
    <para>
     The <link linkend="app-pgchecksums"><application>pg_checksums</application></link>
-    application can be used to enable or disable data checksums, as well as 
+    application can be used to enable or disable data checksums, as well as
     verify checksums, on an offline cluster.
    </para>
 
@@ -783,7 +783,7 @@
    <function>issue_xlog_fsync</function> syncs WAL data to disk are counted as
    <literal>wal_write_time</literal> and <literal>wal_sync_time</literal> in
    <xref linkend="pg-stat-wal-view"/>, respectively.
-   <function>XLogWrite</function> is normally called by 
+   <function>XLogWrite</function> is normally called by
    <function>XLogInsertRecord</function> (when there is no space for the new
    record in WAL buffers), <function>XLogFlush</function> and the WAL writer,
    to write WAL buffers to disk and call <function>issue_xlog_fsync</function>.