diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index f5bfe59..5e0a088 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -15699,7 +15699,10 @@ SET search_path TO <replaceable>schema</> <optional>, <replaceable>schema</>, ..
     or <systemitem>stderr</> as the value of the optional parameter. The
     return value is <literal>NULL</literal> when the log format requested
     is not a configured <xref linkend="guc-log-destination">.
-   </para>
+    <function>pg_current_logfiles</function> reflects the content of the
+    <xref linkend="storage-pgdata-current-logfiles"> file.  All caveats
+    regards <filename>current_logfiles</filename> content are applicable
+    to <function>pg_current_logfiles</function>' return value.</para>
 
    <indexterm>
     <primary>pg_my_temp_schema</primary>
diff --git a/doc/src/sgml/storage.sgml b/doc/src/sgml/storage.sgml
index 3b8f5fd..928133c 100644
--- a/doc/src/sgml/storage.sgml
+++ b/doc/src/sgml/storage.sgml
@@ -81,10 +81,37 @@ Item
   <filename>current_logfiles</filename>.</para>
 
   <note>
-    <para>Non-<productname>PostgreSQL</productname> log sources, such as 3rd
-    party libraries, which deliver error messages directly to stderr are
-    always logged by <productname>PostgreSQL</productname> to stderr.  Stderr
-    is also the destination for any incomplete log messages produced by
+    <indexterm>
+      <primary><application>pg_ctl</application></primary>
+      <secondary>and <filename>current_logfiles</filename></secondary>
+    </indexterm>
+    <indexterm>
+      <primary><filename>stderr</filename></primary>
+      <secondary>and <filename>current_logfiles</filename></secondary>
+    </indexterm>
+    <indexterm>
+      <primary>log_destination configuration parameter</primary>
+      <secondary>and <filename>current_logfiles</filename></secondary>
+    </indexterm>
+
+    <para>Although logs directed to <filename>stderr</filename> may be written
+    to the filesystem, when the writing of <filename>stderr</filename> is
+    managed outside of the <productname>PostgreSQL</productname> database
+    server the location of such files in the filesystem is not reflected in
+    the content of <filename>current_logfiles</filename>.  One such case is
+    when the <application>pg_ctl</application> command is used to start
+    the <command>postgres</command> database server, capture
+    the <filename>stderr</filename> output of the server, and direct it to a
+    file.</para>
+
+    <para>There are other notable situations related
+    to <filename>stderr</filename> logging.
+    Non-<productname>PostgreSQL</productname> log sources, such as 3rd party
+    libraries, which deliver error messages directly
+    to <filename>stderr</filename> are always logged
+    by <productname>PostgreSQL</productname>
+    to <filename>stderr</filename>.  <Filename>Stderr</Filename> is also the
+    destination for any incomplete log messages produced by
     <productname>PostgreSQL</productname>.  When
     <systemitem>stderr</systemitem> is not in
     <xref linkend="guc-log-destination">,