diff --git a/doc/src/sgml/release-10.sgml b/doc/src/sgml/release-10.sgml
index 753cb458789..a32afda0111 100644
--- a/doc/src/sgml/release-10.sgml
+++ b/doc/src/sgml/release-10.sgml
@@ -106,10 +106,12 @@ Branch: REL9_3_STABLE [485857d44] 2018-03-30 18:14:51 -0400
       installations will continue to contain the incorrect markings.
       Practical use of these functions seems to pose little hazard, but in
       case of trouble, it can be fixed by manually updating these
-      functions' <structname>pg_proc</structname> entries.  (Note that that
-      will need to be done in each database of the installation.)  Another
-      option is to <application>pg_upgrade</application> the database to a
-      version containing the corrected initial data.
+      functions' <structname>pg_proc</structname> entries, for example
+      <literal>ALTER FUNCTION pg_catalog.query_to_xml(text, boolean,
+      boolean, text) VOLATILE</literal>.  (Note that that will need to be
+      done in each database of the installation.)  Another option is
+      to <application>pg_upgrade</application> the database to a version
+      containing the corrected initial data.
      </para>
     </listitem>
 
@@ -146,10 +148,12 @@ Branch: REL9_6_STABLE [91d82317d] 2018-03-30 18:14:51 -0400
       incorrect markings.  Practical use of these functions seems to pose
       little hazard unless <varname>force_parallel_mode</varname> is turned
       on.  In case of trouble, it can be fixed by manually updating these
-      functions' <structname>pg_proc</structname> entries.  (Note that that
-      will need to be done in each database of the installation.)  Another
-      option is to <application>pg_upgrade</application> the database to a
-      version containing the corrected initial data.
+      functions' <structname>pg_proc</structname> entries, for example
+      <literal>ALTER FUNCTION pg_catalog.brin_summarize_new_values(regclass)
+      PARALLEL UNSAFE</literal>.  (Note that that will need to be done in
+      each database of the installation.)  Another option is
+      to <application>pg_upgrade</application> the database to a version
+      containing the corrected initial data.
      </para>
     </listitem>
 
diff --git a/doc/src/sgml/release-9.3.sgml b/doc/src/sgml/release-9.3.sgml
index dc2bb078451..be825e7a074 100644
--- a/doc/src/sgml/release-9.3.sgml
+++ b/doc/src/sgml/release-9.3.sgml
@@ -59,10 +59,12 @@
       installations will continue to contain the incorrect markings.
       Practical use of these functions seems to pose little hazard, but in
       case of trouble, it can be fixed by manually updating these
-      functions' <structname>pg_proc</structname> entries.  (Note that that
-      will need to be done in each database of the installation.)  Another
-      option is to <application>pg_upgrade</application> the database to a
-      version containing the corrected initial data.
+      functions' <structname>pg_proc</structname> entries, for example
+      <literal>ALTER FUNCTION pg_catalog.query_to_xml(text, boolean,
+      boolean, text) VOLATILE</literal>.  (Note that that will need to be
+      done in each database of the installation.)  Another option is
+      to <application>pg_upgrade</application> the database to a version
+      containing the corrected initial data.
      </para>
     </listitem>
 
diff --git a/doc/src/sgml/release-9.4.sgml b/doc/src/sgml/release-9.4.sgml
index 48bf28e5bf4..0ea2c2b29d3 100644
--- a/doc/src/sgml/release-9.4.sgml
+++ b/doc/src/sgml/release-9.4.sgml
@@ -59,10 +59,12 @@
       installations will continue to contain the incorrect markings.
       Practical use of these functions seems to pose little hazard, but in
       case of trouble, it can be fixed by manually updating these
-      functions' <structname>pg_proc</structname> entries.  (Note that that
-      will need to be done in each database of the installation.)  Another
-      option is to <application>pg_upgrade</application> the database to a
-      version containing the corrected initial data.
+      functions' <structname>pg_proc</structname> entries, for example
+      <literal>ALTER FUNCTION pg_catalog.query_to_xml(text, boolean,
+      boolean, text) VOLATILE</literal>.  (Note that that will need to be
+      done in each database of the installation.)  Another option is
+      to <application>pg_upgrade</application> the database to a version
+      containing the corrected initial data.
      </para>
     </listitem>
 
diff --git a/doc/src/sgml/release-9.5.sgml b/doc/src/sgml/release-9.5.sgml
index 9054d444931..bc7f0a3b30d 100644
--- a/doc/src/sgml/release-9.5.sgml
+++ b/doc/src/sgml/release-9.5.sgml
@@ -59,10 +59,12 @@
       installations will continue to contain the incorrect markings.
       Practical use of these functions seems to pose little hazard, but in
       case of trouble, it can be fixed by manually updating these
-      functions' <structname>pg_proc</structname> entries.  (Note that that
-      will need to be done in each database of the installation.)  Another
-      option is to <application>pg_upgrade</application> the database to a
-      version containing the corrected initial data.
+      functions' <structname>pg_proc</structname> entries, for example
+      <literal>ALTER FUNCTION pg_catalog.query_to_xml(text, boolean,
+      boolean, text) VOLATILE</literal>.  (Note that that will need to be
+      done in each database of the installation.)  Another option is
+      to <application>pg_upgrade</application> the database to a version
+      containing the corrected initial data.
      </para>
     </listitem>
 
diff --git a/doc/src/sgml/release-9.6.sgml b/doc/src/sgml/release-9.6.sgml
index 98bf664f215..d3b35d61e7b 100644
--- a/doc/src/sgml/release-9.6.sgml
+++ b/doc/src/sgml/release-9.6.sgml
@@ -91,10 +91,12 @@
       installations will continue to contain the incorrect markings.
       Practical use of these functions seems to pose little hazard, but in
       case of trouble, it can be fixed by manually updating these
-      functions' <structname>pg_proc</structname> entries.  (Note that that
-      will need to be done in each database of the installation.)  Another
-      option is to <application>pg_upgrade</application> the database to a
-      version containing the corrected initial data.
+      functions' <structname>pg_proc</structname> entries, for example
+      <literal>ALTER FUNCTION pg_catalog.query_to_xml(text, boolean,
+      boolean, text) VOLATILE</literal>.  (Note that that will need to be
+      done in each database of the installation.)  Another option is
+      to <application>pg_upgrade</application> the database to a version
+      containing the corrected initial data.
      </para>
     </listitem>
 
@@ -107,15 +109,12 @@
      <para>
       The functions
       <function>brin_summarize_new_values</function>,
-      <function>brin_summarize_range</function>,
-      <function>brin_desummarize_range</function>,
       <function>gin_clean_pending_list</function>,
       <function>cursor_to_xml</function>,
       <function>cursor_to_xmlschema</function>,
       <function>ts_rewrite</function>,
-      <function>ts_stat</function>,
-      <function>binary_upgrade_create_empty_extension</function>, and
-      <function>pg_import_system_collations</function>
+      <function>ts_stat</function>, and
+      <function>binary_upgrade_create_empty_extension</function>
       should be marked parallel-unsafe; some because they perform database
       modifications directly, and others because they execute user-supplied
       queries that might do so.  They were marked parallel-restricted
@@ -125,10 +124,12 @@
       incorrect markings.  Practical use of these functions seems to pose
       little hazard unless <varname>force_parallel_mode</varname> is turned
       on.  In case of trouble, it can be fixed by manually updating these
-      functions' <structname>pg_proc</structname> entries.  (Note that that
-      will need to be done in each database of the installation.)  Another
-      option is to <application>pg_upgrade</application> the database to a
-      version containing the corrected initial data.
+      functions' <structname>pg_proc</structname> entries, for example
+      <literal>ALTER FUNCTION pg_catalog.brin_summarize_new_values(regclass)
+      PARALLEL UNSAFE</literal>.  (Note that that will need to be done in
+      each database of the installation.)  Another option is
+      to <application>pg_upgrade</application> the database to a version
+      containing the corrected initial data.
      </para>
     </listitem>