initlocation is history. (It's still mentioned in manage-ag.sgml,

but I'll leave that file alone so as not to mess up the doc patch
I trust Gavin is working on.)

4 files changed, 4 insertions, 96 deletions

diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml
index 352a21c292d..f21410e7c13 100644
--- a/doc/src/sgml/ref/allfiles.sgml
+++ b/doc/src/sgml/ref/allfiles.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/allfiles.sgml,v 1.57 2004/06/18 06:13:05 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/allfiles.sgml,v 1.58 2004/06/18 21:24:01 tgl Exp $
 PostgreSQL documentation
 Complete list of usable sgml source files in this directory.
 -->
@@ -111,7 +111,6 @@ Complete list of usable sgml source files in this directory.
 <!entity dropuser           system "dropuser.sgml">
 <!entity ecpgRef            system "ecpg-ref.sgml">
 <!entity initdb             system "initdb.sgml">
-<!entity initlocation       system "initlocation.sgml">
 <!entity ipcclean           system "ipcclean.sgml">
 <!entity pgConfig           system "pg_config-ref.sgml">
 <!entity pgControldata      system "pg_controldata.sgml">
diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml
index a6b2c8d383c..1d04a61abf6 100644
--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/createdb.sgml,v 1.38 2004/03/23 02:47:35 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/createdb.sgml,v 1.39 2004/06/18 21:24:02 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -90,8 +90,7 @@ PostgreSQL documentation
       <term><option>--location <replaceable class="parameter">location</replaceable></></term>
       <listitem>
        <para>
-	Specifies the alternative location for the database.  See also <xref
-	linkend="app-initlocation">.
+	Specifies the alternative location for the database.
        </para>
       </listitem>
      </varlistentry>
diff --git a/doc/src/sgml/ref/initlocation.sgml b/doc/src/sgml/ref/initlocation.sgml
deleted file mode 100644
index 1ddda484f33..00000000000
--- a/doc/src/sgml/ref/initlocation.sgml
+++ /dev/null
@@ -1,89 +0,0 @@
-<!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/initlocation.sgml,v 1.22 2003/11/29 19:51:39 pgsql Exp $
-PostgreSQL documentation
--->
-
-<refentry id="APP-INITLOCATION">
- <refmeta>
-  <refentrytitle id="APP-INITLOCATION-TITLE"><application>initlocation</application></refentrytitle>
-  <manvolnum>1</manvolnum>
-  <refmiscinfo>Application</refmiscinfo>
- </refmeta>
-
- <refnamediv>
-  <refname>initlocation</refname>
-  <refpurpose>create a secondary <productname>PostgreSQL</productname> database storage area</refpurpose>
- </refnamediv>
-
- <indexterm zone="app-initlocation">
-  <primary>initlocation</primary>
- </indexterm>
-
- <refsynopsisdiv>
-  <cmdsynopsis>
-   <command>initlocation</command>
-   <arg choice="plain"><replaceable>directory</replaceable></arg>
-  </cmdsynopsis>
- </refsynopsisdiv>
-
- <refsect1 id="R1-APP-INITLOCATION-1">
-  <title>Description</title>
-  <para>
-   <application>initlocation</application> 
-   creates a new <productname>PostgreSQL</productname> secondary database storage area.
-   See the discussion under <xref linkend="SQL-CREATEDATABASE" endterm="SQL-CREATEDATABASE-title">
-   about how to manage and use secondary storage areas. If the argument does not contain
-   a slash and is not valid as a path, it is assumed to be an environment variable,
-   which is referenced. See the examples at the end.
-  </para>
-  <para>
-   In order to use this command you must be logged in (using <command>su</command>, for example)
-   as the database superuser.
-  </para>
- </refsect1>
-
- <refsect1 id="R1-APP-INITLOCATION-2">
-  <title>Examples</title>
-
-   <para>
-    To create a database in an alternate location, using an
-    environment variable:
-<screen>
-<prompt>$ </prompt><userinput>export PGDATA2=/opt/postgres/data</userinput>
-</screen>
-    Stop and start <command>postmaster</> so it sees the <envar>PGDATA2</envar>
-    environment variable.  The system must be configured so the
-    <command>postmaster</> sees <envar>PGDATA2</envar> every time it starts.  Finally:
-<screen>
-<prompt>$</prompt> <userinput>initlocation PGDATA2</userinput>
-<prompt>$</prompt> <userinput>createdb -D PGDATA2 testdb</userinput>
-</screen>
-   </para>
-
-   <para>
-    Alternatively, if you allow absolute paths you could write:
-<screen>
-<prompt>$</prompt> <userinput>initlocation /opt/postgres/data</userinput>
-<prompt>$</prompt> <userinput>createdb -D /opt/postgres/data/testdb testdb</userinput>
-</screen>
-   </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:nil
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"../reference.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:"/usr/lib/sgml/catalog"
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/src/sgml/reference.sgml b/doc/src/sgml/reference.sgml
index 100c69bde93..b5d42361ce7 100644
--- a/doc/src/sgml/reference.sgml
+++ b/doc/src/sgml/reference.sgml
@@ -1,5 +1,5 @@
 <!-- reference.sgml
-$PostgreSQL: pgsql/doc/src/sgml/reference.sgml,v 1.48 2004/06/18 06:13:02 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/reference.sgml,v 1.49 2004/06/18 21:24:04 tgl Exp $
 
 PostgreSQL Reference Manual
 -->
@@ -180,7 +180,6 @@ PostgreSQL Reference Manual
   </partintro>
 
    &initdb;
-   &initlocation;
    &ipcclean;
    &pgControldata;
    &pgCtl;