bdr: doc: flatten install chapter a level

diff --git a/doc/bdr.sgml b/doc/bdr.sgml
index ff3ab6b2c9cfb36a06fc1e7a0be4e13423dd1990..fb6387e378b86982a9504252981b2cfa93d42ab5 100644 (file)
--- a/doc/bdr.sgml
+++ b/doc/bdr.sgml
@@ -60,32 +60,7 @@
   </keywordset>
  </bookinfo>
 
- <part id="installation" xreflabel="Installation">
-  <title>Installation</title>
-
-  <partintro>
-   <para>
-    It is possible to install &bdr; or &udr; from binary packages or from
-    source.
-   </para>
-   <para>
-    In general you should choose binary packages if they are available
-    for your platform.
-   </para>
-   <para>
-    Source installs are mainly useful if you want to keep track of the very
-    latest BDR development and contribute to development.  They're also the
-    only option if there are no packages for your operating system yet.
-   </para>
-   <para>
-    Before installing &bdr; make sure you satisfy the <xref linkend="bdr-requirements">.
-   </para>
-  </partintro>
-
-  &install-packages;
-  &install-source;
-
- </part>
+&install;
 
 <part id="quickstart">
   <title>Quick Start</title>

diff --git a/doc/filelist.sgml b/doc/filelist.sgml
index a41790102a28b4b58a603704a6f29cd2537578a9..eb4fc94261a2c7105f96f2cd64a3d67bdf55940e 100644 (file)
--- a/doc/filelist.sgml
+++ b/doc/filelist.sgml
@@ -29,6 +29,7 @@
 <!--
  Include external documentation sections
  -->
+<!ENTITY install SYSTEM "install.sgml">
 <!ENTITY install-packages      SYSTEM "install-packages.sgml">
 <!ENTITY install-source      SYSTEM "install-source.sgml">
 <!ENTITY quickstart-install      SYSTEM "quickstart-install.sgml">

diff --git a/doc/install-packages.sgml b/doc/install-packages.sgml
index 1829b76b969a0c675eedc01084fe40922daaa5a9..c269754c41827e5df23bdd175893b0bc3392ea30 100644 (file)
--- a/doc/install-packages.sgml
+++ b/doc/install-packages.sgml
@@ -1,4 +1,4 @@
-<chapter id="installation-packages" xreflabel="Installing from packages">
+<sect1 id="installation-packages" xreflabel="Installing from packages">
  <title>Installing &bdr; or &udr; from packages</title>
 
  <para>
@@ -24,7 +24,7 @@
  </note>
 
 
- <sect1 id="installation-packages-redhat" xreflabel="Installing from packages on RHEL, Fedora and CentOS">
+ <sect2 id="installation-packages-redhat" xreflabel="Installing from packages on RHEL, Fedora and CentOS">
   <title>RHEL, Fedora and CentOS</title>
 
   <para>
@@ -32,7 +32,7 @@
    Fedora, RHEL, and CentOS.
   </para>
 
-  <sect2>
+  <sect3>
    <title>Install the repository RPMs</title>
 
    <para>
@@ -83,12 +83,12 @@
     <ulink url="https://fedoraproject.org/wiki/EPEL">enable EPEL</ulink>.
    </para>
 
-  </sect2>
+  </sect3>
 
-  <sect2>
+  <sect3>
    <title>Installing PostgreSQL &pgmajorversion; and &bdr; from packages for RHEL, Fedora or CentOS</title>
 
-   <sect3>
+   <sect4>
     <title>Remove the <literal>postgresql94</literal> packages, if installed</title>
 
     <note>
@@ -129,9 +129,9 @@
      will not be used while BDR is installed.
     </para>
 
-   </sect3>
+   </sect4>
 
-   <sect3>
+   <sect4>
     <title>Install the &bdr; packages</title>
 
     <para>
@@ -164,11 +164,11 @@
      <xref linkend="settings"> and <xref linkend="quickstart">.
     </para>
 
-   </sect3>
+   </sect4>
 
-  </sect2>
+  </sect3>
 
-  <sect2>
+  <sect3>
    <title>Installing &udr; from packages for RHEL, Fedora or CentOS</title>
 
    <para>
@@ -181,7 +181,7 @@
     </programlisting>
    </para>
 
-  </sect2>
+  </sect3>
 
- </sect1>
-</chapter>
+ </sect2>
+</sect1>

diff --git a/doc/install-source.sgml b/doc/install-source.sgml
index 7c98cf1f4b423a79b7f757528b30040e8bad7e2a..58e6b0704ba41eb65a2fe1db8e2ff47ea41a70e1 100644 (file)
--- a/doc/install-source.sgml
+++ b/doc/install-source.sgml
@@ -1,7 +1,7 @@
-<chapter id="installation-source" xreflabel="Installing from source code">
+<sect1 id="installation-source" xreflabel="Installing from source code">
  <title>Installing &bdr; or &udr; from source</title>
 
- <sect1 id="installation-source-prereqs">
+ <sect2 id="installation-source-prereqs">
   <title>Prerequisites for installing from source</title>
   <para>
    To install either &bdr; or &udr; the prerequisites for compiling
@@ -47,16 +47,16 @@
 
    </itemizedlist>
   </para>
- </sect1>
+ </sect2>
 
- <sect1 id="installation-get-source">
+ <sect2 id="installation-get-source">
   <title>Getting &bdr; source code</title>
 
   <para>
    There are two ways to get the &bdr; source code: with git, or by downloading tarballs of released versions.
   </para>
 
-  <sect2>
+  <sect3>
    <title>Using <application>git</application> to get the &bdr; sources</title>
 
    <para>
@@ -103,9 +103,9 @@
     <ulink url="http://git-scm.org/">git-scm.org</ulink>.
    </para>
 
-  </sect2>
+  </sect3>
 
-  <sect2>
+  <sect3>
    <title>Downloading release source tarballs</title>
 
    <para>
@@ -135,11 +135,11 @@
     clone.
    </para>
 
-  </sect2>
+  </sect3>
 
- </sect1>
+ </sect2>
 
- <sect1 id="installation-bdr-source">
+ <sect2 id="installation-bdr-source">
   <title>Installation of &bdr; from source</title>
   <para>
    Installing &bdr; from source consists out of two steps: First
@@ -169,9 +169,9 @@
     make -j4 -s all
    </programlisting>
   </para>
- </sect1>
+ </sect2>
 
- <sect1 id="installation-udr-source">
+ <sect2 id="installation-udr-source">
   <title>Installation of &udr; from source</title>
   <para>
    Installing &udr; is simpler than installing &bdr;. It compiles
@@ -225,6 +225,6 @@
     PATH=/usr/pgsql-9.4/bin:$PATH ./configure
    </programlisting>
   </para>
- </sect1>
+ </sect2>
 
-</chapter>
+</sect1>

diff --git a/doc/install.sgml b/doc/install.sgml
new file mode 100644 (file)
index 0000000..deb98c3
--- /dev/null
+++ b/doc/install.sgml
@@ -0,0 +1,24 @@
+<chapter id="installation" xreflabel="Installation">
+ <title>Installation</title>
+
+ <para>
+  It is possible to install &bdr; or &udr; from binary packages or from
+  source.
+ </para>
+ <para>
+  In general you should choose binary packages if they are available
+  for your platform.
+ </para>
+ <para>
+  Source installs are mainly useful if you want to keep track of the very
+  latest BDR development and contribute to development.  They're also the
+  only option if there are no packages for your operating system yet.
+ </para>
+ <para>
+  Before installing &bdr; make sure you satisfy the <xref linkend="bdr-requirements">.
+ </para>
+
+ &install-packages;
+ &install-source;
+
+</chapter>