From bd7bdf0be2279a1e224a4a1703ca0c313088cdad Mon Sep 17 00:00:00 2001
From: Björn Persson <bjorn@rombobjörn.se>
Date: Mon, 14 Oct 2013 03:29:05 +0200
Subject: Additions to the manual.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

· Explained more about configuration with environment variables.
· Documented show_configuration.
· Added a news section.
---
 manual.en.html | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/manual.en.html b/manual.en.html
index 14184bd..b601f57 100755
--- a/manual.en.html
+++ b/manual.en.html
@@ -470,12 +470,22 @@ configured persistently. Run "<samp>make configure</samp>" with some variables
 set on the command line or in the environment. Those variables will then be
 saved in a file named <var>comfignat_configuration.mk</var>, which will be
 loaded in all subsequent Make invocations. Additional variables can be
-configured incrementally. In subsequent Make invocations environment variables
+configured incrementally. Make variables that can be overridden by environment
+variables can also be configured from the environment, whereas those variables
+that can only be overridden on the command line can only be configured from the
+command line. In subsequent Make invocations environment variables
 override values that were configured from the environment, and variables set on
 the command line override all configured values. The configuration can be
 erased with "<samp>make unconfigure</samp>" or as a part of
 "<samp>make distclean</samp>".</p>
 
+<p>The command "<samp>make show_configuration</samp>" may be used to view the
+current configuration. It outputs the configured variables in Make assignment
+syntax, but easier to read than the actual configuration file. Variables that
+were configured from the command line are shown as ordinary assignments with
+"=", and those that were configured from the environment are shown as
+conditional assignments with "?=".</p>
+
 <p>The variables that can be configured are listed in the variable
 <var>configuration_variables</var>. The variables listed in <var>options</var>
 are included. You can make additional variables configurable by appending their
@@ -518,6 +528,30 @@ be useful to users as-is, but it will be more helpful if you edit it. Put the
 title of your project in the heading, add information about optional features
 and testing, and delete parts that don't apply to your project.</p>
 
+<h2 id="news">News</h2>
+
+<h3 id="news_1.2">Noteworthy changes in version 1.2</h3>
+
+<ul>
+<li><p>The directory variables <var>alidir</var> and <var>archincludedir</var>
+were added.</p></li>
+
+<li><p>The directory variable <var>runtimedir</var> was renamed to
+<var>runstatedir</var> to keep Comfignat compatible with the GNU Coding
+Standards.</p></li>
+
+<li><p>Comfignat.Bindir was made relative to Comfignat.Libexecdir when
+relocatable_package is true.</p></li>
+
+<li><p>Comfignat's behaviour in sub-Makes was fixed so that subprocesses
+working in subdirectories use the right build and staging directories.</p></li>
+
+<li><p>The ability to save environment variables in the persistent
+configuration was added.</p></li>
+
+<li><p>The Make target <var>show_configuration</var> was added.</p></li>
+</ul>
+
 <!--#include virtual="/SSIfragment/giltig.shtml" -->
 
 </body>
-- 
cgit v1.2.3