diff --git a/doc/src/sgml/contrib-spi.sgml b/doc/src/sgml/contrib-spi.sgml
index 3287c18d27d..a88d99d517c 100644
--- a/doc/src/sgml/contrib-spi.sgml
+++ b/doc/src/sgml/contrib-spi.sgml
@@ -10,7 +10,9 @@
 
  <para>
   The <application>spi</> module provides several workable examples
-  of using SPI and triggers.  While these functions are of some value in
+  of using the <link linkend="spi">Server Programming Interface</link>
+  (<acronym>SPI</acronym>) and triggers.  While these functions are of
+  some value in
   their own right, they are even more useful as examples to modify for
   your own purposes.  The functions are general enough to be used
   with any table, but you have to specify table and field names (as described
diff --git a/doc/src/sgml/spi.sgml b/doc/src/sgml/spi.sgml
index c099fcfad3a..66ab8fbe3d0 100644
--- a/doc/src/sgml/spi.sgml
+++ b/doc/src/sgml/spi.sgml
@@ -42,8 +42,7 @@
   have documented error-return conventions.  Those conventions only apply
   for errors detected within the SPI functions themselves, however.)
   It is possible to recover control after an error by establishing your own
-  subtransaction surrounding SPI calls that might fail.  This is not currently
-  documented because the mechanisms required are still in flux.
+  subtransaction surrounding SPI calls that might fail.
  </para>
 
  <para>