Index: server/databases/postgresql.xml
===================================================================
--- server/databases/postgresql.xml	(revision d86ea4be21e0208b536666ceeeb7286ebaa4d2c5)
+++ server/databases/postgresql.xml	(revision a38fe9f2088f50d209ffe9fcc7853038917229bf)
@@ -105,5 +105,64 @@
     <title>Installation of PostgreSQL</title>
 
+    <para>
+      For enhanced security, it is better to have a dedicated group and user
+      for running the PostgreSQL server. First, issue as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>groupadd -g 41 postgres &amp;&amp;
+useradd -c "PostgreSQL Server" -g postgres -d /srv/pgsql/data \
+        -u 41 postgres</userinput></screen>
+
     <note>
+      <para>
+        There are several configuration items that add additional
+        functionality with optional packages to
+        <application>PostgreSQL</application>.  Use <command>./configure
+        --help</command> to see a list.
+      </para>
+    </note>
+
+    <para>
+      Install <application>PostgreSQL</application> with the
+      following commands:
+    </para>
+
+<screen><userinput>sed -i '/DEFAULT_PGSOCKET_DIR/s@/tmp@/run/postgresql@' src/include/pg_config_manual.h &amp;&amp;
+
+./configure --prefix=/usr          \
+            --enable-thread-safety \
+            --docdir=/usr/share/doc/postgresql-&postgresql-version; &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      There are a number of programs in the
+      <filename class="directory">contrib/</filename> directory. If you are
+      going to run this installation as a server and wish to build some of
+      them, enter <command>make -C contrib</command> or <command>make -C
+      contrib/<replaceable>&lt;SUBDIR-NAME&gt;</replaceable></command> for
+      each subdirectory.
+    </para>
+
+    <para>
+      Tests must be run as an unprivileged user because they need to start a
+      temporary server and this is prevented as the root user. For the same
+      reason, you need to stop all PostgreSQL servers if any are running. If a
+      previous version of PostgreSQL is installed, it may be necessary to use
+      <command>--disable-rpath</command> with <command>configure</command> to
+      avoid failures, but <emphasis>installing the binaries created using this
+      switch is not recommended</emphasis>. To test the results, issue:
+      <command>make check</command>.
+    </para>
+
+    <note>
+      <para>Hold off from continuing in case you are building 
+      <application>PostgreSQL</application> to upgrade an existing
+      installation. In case the major version of the new build is 
+      different to the existing one, its quite likely that the
+      new software cannot act on the existing data files. In this case,
+      the server will not start and the old binaries has been overwritten
+      so you got stuck with an unusable database.</para>
+
       <para>
         Before upgrading an existing installation of PostgreSQL check
@@ -114,65 +173,5 @@
         <ulink url="https://www.postgresql.org/docs/current/upgrading.html"/>.
       </para>
-    </note>
-
-    <para>
-      For enhanced security, it is better to have a dedicated group and user
-      for running the PostgreSQL server. First, issue as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 41 postgres &amp;&amp;
-useradd -c "PostgreSQL Server" -g postgres -d /srv/pgsql/data \
-        -u 41 postgres</userinput></screen>
-
-    <note>
-      <para>
-        There are several configuration items that add additional
-        functionality with optional packages to
-        <application>PostgreSQL</application>.  Use <command>./configure
-        --help</command> to see a list.
-      </para>
-    </note>
-
-    <para>
-      Install <application>PostgreSQL</application> with the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i '/DEFAULT_PGSOCKET_DIR/s@/tmp@/run/postgresql@' src/include/pg_config_manual.h &amp;&amp;
-
-./configure --prefix=/usr          \
-            --enable-thread-safety \
-            --docdir=/usr/share/doc/postgresql-&postgresql-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      There are a number of programs in the
-      <filename class="directory">contrib/</filename> directory. If you are
-      going to run this installation as a server and wish to build some of
-      them, enter <command>make -C contrib</command> or <command>make -C
-      contrib/<replaceable>&lt;SUBDIR-NAME&gt;</replaceable></command> for
-      each subdirectory.
-    </para>
-
-    <para>
-      Tests must be run as an unprivileged user because they need to start a
-      temporary server and this is prevented as the root user. For the same
-      reason, you need to stop all PostgreSQL servers if any are running. If a
-      previous version of PostgreSQL is installed, it may be necessary to use
-      <command>--disable-rpath</command> with <command>configure</command> to
-      avoid failures, but <emphasis>installing the binaries created using this
-      switch is not recommended</emphasis>. To test the results, issue:
-      <command>make check</command>.
-    </para>
-
-    <note>
-      <para>Hold off from continuing in case you are building 
-      <application>PostgreSQL</application> to upgrade an existing
-      installation. In case the major version of the new build is 
-      different to the existing one, its quite likely that the
-      new software cannot act on the existing data files. In this case,
-      the server will not start and the old binaries has been overwritten
-      so you got stuck with an unusable database.</para>
+
       <para>At this moment, you have both, the old and the new binaries
       on disk. They can be used to perform an upgrade of your existing
