From f4b3c51803cb6e0cb915e9e84129c6d9df3352cb Mon Sep 17 00:00:00 2001
From: Björn Persson <bjorn@rombobjörn.se>
Date: Wed, 9 Oct 2013 17:19:42 +0200
Subject: Moved some paragraphs back.

---
 INSTALL        | 22 +++++++++++-----------
 manual.en.html | 50 +++++++++++++++++++++++++-------------------------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/INSTALL b/INSTALL
index 9353fe4..5a45025 100644
--- a/INSTALL
+++ b/INSTALL
@@ -112,6 +112,15 @@ are relevant during the build:
  logdir
     The top-level directory for log files. Default: <localstatedir>/log
 
+ includedir
+    The top-level directory for source files to be used in the compilation of
+    software using libraries, used only if no directories project is provided.
+    Default: <prefix>/include
+
+ archincludedir
+    Like includedir but for architecture-specific source files, in case this
+    library must install such files. Default: <includedir>
+
  libdir
     The directory for binary libraries to be used by other software, and the
     top-level directory for other architecture-specific files, used for
@@ -123,15 +132,6 @@ are relevant during the build:
     files for this library, used only if no directories project is provided.
     Default: <libdir>
 
- includedir
-    The top-level directory for source files to be used in the compilation of
-    software using libraries, used only if no directories project is provided.
-    Default: <prefix>/include
-
- archincludedir
-    Like includedir but for architecture-specific source files, in case this
-    library must install such files. Default: <libdir>/include
-
  gprdir
     The directory for GNAT project files to be used in the building of software
     using libraries. If you set this to a directory that GPRbuild and Gnatmake
@@ -192,10 +192,10 @@ invoke Gnatprep. You may need to define them if you run Gnatprep manually.
  Statedir
  Cachedir
  Logdir
- Libdir
- Alidir
  Includedir
  Archincludedir
+ Libdir
+ Alidir
  GPRdir
  Localedir
  Mandir
diff --git a/manual.en.html b/manual.en.html
index b27f463..d46954d 100755
--- a/manual.en.html
+++ b/manual.en.html
@@ -280,21 +280,6 @@ to create the subdirectory under <var>stage_cachedir</var>.</p></li>
 install log files but you may want to create a separate subdirectory under
 <var>stage_logdir</var> if your program writes its own log files.</p></li>
 
-<li><p>Binary libraries shall be placed in <var>Comfignat.Stage_Libdir</var>
-by build project files. Usage project files shall get the directory from the
-preprocessor symbol <var>Libdir</var>.</p></li>
-
-<li><p>Ada library information (ALI) files shall be placed under a separate
-subdirectory of <var>Comfignat.Stage_Alidir</var> by build project files. Usage
-project files shall get the directory from the preprocessor symbol
-<var>Alidir</var>.</p></li>
-
-<li><p>Other architecture-specific files shall usually be placed under a
-separate subdirectory of <var>stage_libdir</var>. (It will be the same
-subdirectory that ALI files are placed in when
-<var>alidir</var> = <var>libdir</var>.) Programs shall look for them under
-<var>Comfignat.Libdir</var>.</p></li>
-
 <li><p>Ada specifications, C headers and other source files that are needed for
 compilation of other software that uses your libraries shall be placed under
 <var>Comfignat.Stage_Includedir</var> by build project files, usually under a
@@ -310,6 +295,21 @@ put them under a separate subdirectory of <var>stage_archincludedir</var>.
 Usage project files shall get the directory from the preprocessor symbol
 <var>Archincludedir</var>.</p></li>
 
+<li><p>Binary libraries shall be placed in <var>Comfignat.Stage_Libdir</var>
+by build project files. Usage project files shall get the directory from the
+preprocessor symbol <var>Libdir</var>.</p></li>
+
+<li><p>Ada library information (ALI) files shall be placed under a separate
+subdirectory of <var>Comfignat.Stage_Alidir</var> by build project files. Usage
+project files shall get the directory from the preprocessor symbol
+<var>Alidir</var>.</p></li>
+
+<li><p>Other architecture-specific files shall usually be placed under a
+separate subdirectory of <var>stage_libdir</var>. (It will be the same
+subdirectory that ALI files are placed in when
+<var>alidir</var> = <var>libdir</var>.) Programs shall look for them under
+<var>Comfignat.Libdir</var>.</p></li>
+
 <li><p>Comfignat puts usage project files in <var>stage_gprdir</var>.</p></li>
 
 <li><p>Locale-specific message catalogs shall be placed in the appropriate
@@ -350,6 +350,16 @@ target architecture.</dd>
 <dd>The top-level directory for programs that are intended to be run by other
 programs rather than by users.</dd>
 
+<dt><var>Includedir</var></dt>
+<dd>The top-level directory for (normally architecture-independent) source
+files to be used in the compilation of software using libraries.</dd>
+
+<dt><var>Archincludedir</var></dt>
+<dd>The parent of libraries' separate library-specific directories for
+architecture-specific source files to be used in the compilation of software
+using libraries, for any libraries that absolutely must install such
+files.</dd>
+
 <dt><var>Libdir</var></dt>
 <dd>The directory for binary libraries to be used by other software, and the
 top-level directory for other architecture-specific files.</dd>
@@ -359,16 +369,6 @@ top-level directory for other architecture-specific files.</dd>
 Ada library information files.</dd>
 </dl>
 
-<dt><var>Includedir</var></dt>
-<dd>The top-level directory for architecture-independent source files to be
-used in the compilation of software using libraries.</dd>
-
-<dt><var>Archincludedir</var></dt>
-<dd>The parent of libraries' separate library-specific directories for
-architecture-specific source files to be used in the compilation of software
-using libraries, for any libraries that absolutely must install such
-files.</dd>
-
 <p>Here's an example of what a directories project may look like:</p>
 
 <pre class="example gpr">abstract project System_Directories is
-- 
cgit v1.2.3