diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index cc18b0bbf0..5bdb8650cc 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -8415,10 +8415,12 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
       <listitem>
        <para>
         This parameter is normally on. When set to <literal>off</literal>, it
-        disables validation of the function body string during <xref
-        linkend="sql-createfunction"/>.  Disabling validation avoids side
-        effects of the validation process and avoids false positives due
-        to problems such as forward references.  Set this parameter
+        disables validation of the routine body string during <xref
+        linkend="sql-createfunction"/> and <xref
+        linkend="sql-createprocedure"/>.  Disabling validation avoids side
+        effects of the validation process, in particular preventing false
+        positives due to problems such as forward references.
+        Set this parameter
         to <literal>off</literal> before loading functions on behalf of other
         users; <application>pg_dump</application> does so automatically.
        </para>
@@ -9954,7 +9956,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
         When set to <literal>on</literal>, which is the default,
         <productname>PostgreSQL</productname> will automatically remove
         temporary files after a backend crash. If disabled, the files will be
-        retained and may be used for debugging, for example. Repeated crashes 
+        retained and may be used for debugging, for example. Repeated crashes
         may however result in accumulation of useless files.
        </para>
       </listitem>
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index ca378bd6af..d0a51b507d 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -1759,7 +1759,7 @@ static struct config_bool ConfigureNamesBool[] =
 	},
 	{
 		{"check_function_bodies", PGC_USERSET, CLIENT_CONN_STATEMENT,
-			gettext_noop("Check function bodies during CREATE FUNCTION."),
+			gettext_noop("Check routine bodies during CREATE FUNCTION and CREATE PROCEDURE."),
 			NULL
 		},
 		&check_function_bodies,