diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml
new file mode 100644
index 90725d9..7a4c2be
*** a/doc/src/sgml/ref/pg_ctl-ref.sgml
--- b/doc/src/sgml/ref/pg_ctl-ref.sgml
*************** PostgreSQL documentation
*** 261,267 ****
        <term><option>--pgdata <replaceable class="parameter">datadir</replaceable></option></term>
        <listitem>
         <para>
!         Specifies the file system location of the database files.  If
          this is omitted, the environment variable
          <envar>PGDATA</envar> is used.
         </para>
--- 261,267 ----
        <term><option>--pgdata <replaceable class="parameter">datadir</replaceable></option></term>
        <listitem>
         <para>
!         Specifies the file system location of the database configuration files.  If
          this is omitted, the environment variable
          <envar>PGDATA</envar> is used.
         </para>
diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml
new file mode 100644
index a1f36e1..41745fb
*** a/doc/src/sgml/ref/postgres-ref.sgml
--- b/doc/src/sgml/ref/postgres-ref.sgml
*************** PostgreSQL documentation
*** 179,186 ****
        <term><option>-D <replaceable class="parameter">datadir</replaceable></option></term>
        <listitem>
         <para>
!         Specifies the file system location of the data directory or
!         configuration file(s).  See
          <xref linkend="runtime-config-file-locations"> for details.
         </para>
        </listitem>
--- 179,186 ----
        <term><option>-D <replaceable class="parameter">datadir</replaceable></option></term>
        <listitem>
         <para>
!         Specifies the file system location of the database
!         configuration files.  See
          <xref linkend="runtime-config-file-locations"> for details.
         </para>
        </listitem>
diff --git a/doc/src/sgml/storage.sgml b/doc/src/sgml/storage.sgml
new file mode 100644
index bd2dca3..e0a93c1
*** a/doc/src/sgml/storage.sgml
--- b/doc/src/sgml/storage.sgml
*************** directories.
*** 19,25 ****
  </para>
  
  <para>
! All the data needed for a database cluster is stored within the cluster's data
  directory, commonly referred to as <varname>PGDATA</> (after the name of the
  environment variable that can be used to define it).  A common location for
  <varname>PGDATA</> is <filename>/var/lib/pgsql/data</>.  Multiple clusters,
--- 19,26 ----
  </para>
  
  <para>
! Traditionally, the configuration and data files used by a database
! cluster are stored together within the cluster's data
  directory, commonly referred to as <varname>PGDATA</> (after the name of the
  environment variable that can be used to define it).  A common location for
  <varname>PGDATA</> is <filename>/var/lib/pgsql/data</>.  Multiple clusters,
*************** these required items, the cluster config
*** 33,39 ****
  <filename>postgresql.conf</filename>, <filename>pg_hba.conf</filename>, and
  <filename>pg_ident.conf</filename> are traditionally stored in
  <varname>PGDATA</> (although in <productname>PostgreSQL</productname> 8.0 and
! later, it is possible to keep them elsewhere).
  </para>
  
  <table tocentry="1" id="pgdata-contents-table">
--- 34,40 ----
  <filename>postgresql.conf</filename>, <filename>pg_hba.conf</filename>, and
  <filename>pg_ident.conf</filename> are traditionally stored in
  <varname>PGDATA</> (although in <productname>PostgreSQL</productname> 8.0 and
! later, it is possible to place them elsewhere).
  </para>
  
  <table tocentry="1" id="pgdata-contents-table">