[SCM] GNU Mailutils branch, master, updated. release-2.2-700-g87e9c79

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=87e9c7921d151d1b978348f94a1475423bf9dbfe

The branch, master has been updated
       via  87e9c7921d151d1b978348f94a1475423bf9dbfe (commit)
      from  17930dd7cacf60c375408a26154301934a17609e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 87e9c7921d151d1b978348f94a1475423bf9dbfe
Author: Sergey Poznyakoff <address@hidden>
Date:   Sun May 3 22:55:49 2015 +0300

    Fix doc generation.
    
    The Config file applies to all output formats, which is wrong.
    Use a dedicated configuration file for html output formats, and
    default settings for the rest.
    
    * doc/texinfo/Makefile.am (GENDOCS): Add html-specific configuration file.
    * doc/texinfo/Config: Rename to doc/texinfo/html.init (with changes).
    * doc/texinfo/programs.texi: Fix sectioning.

-----------------------------------------------------------------------

Summary of changes:
 doc/texinfo/Makefile.am           |    4 ++--
 doc/texinfo/{Config => html.init} |   15 ++++++++-------
 doc/texinfo/mailutils.texi        |   30 +++++++++++++++---------------
 doc/texinfo/programs.texi         |    4 ++--
 4 files changed, 27 insertions(+), 26 deletions(-)
 rename doc/texinfo/{Config => html.init} (90%)

diff --git a/doc/texinfo/Makefile.am b/doc/texinfo/Makefile.am
index 656c3ac..469b646 100644
--- a/doc/texinfo/Makefile.am
+++ b/doc/texinfo/Makefile.am
@@ -52,7 +52,7 @@ final: imprimatur-final
 #EXTRA_DIST = \
 # gendocs_template
 
-GENDOCS=$(srcdir)/gendocs.sh
+GENDOCS=$(srcdir)/gendocs.sh --no-copy-images --html 
'--init-file=$(abs_srcdir)/html.init'
 TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -E
 
 .PHONY: manual
@@ -60,7 +60,7 @@ manual:
        TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$(TEXINPUTS) \
         MAKEINFO="$(MAKEINFO) $(MAKEINFOFLAGS) $(AM_MAKEINFOFLAGS)" \
         TEXI2DVI="$(TEXI2DVI)" \
-       $(GENDOCS) --no-copy-images $(PACKAGE) '$(PACKAGE_NAME) manual'
+       $(GENDOCS) $(PACKAGE) '$(PACKAGE_NAME) manual'
 
 manual.tar.bz2: manual
        tar cfj manual.tar.bz2 manual
diff --git a/doc/texinfo/Config b/doc/texinfo/html.init
similarity index 90%
rename from doc/texinfo/Config
rename to doc/texinfo/html.init
index 5b5a38b..076879d 100644
--- a/doc/texinfo/Config
+++ b/doc/texinfo/html.init
@@ -1,18 +1,18 @@
 # Texi2any configuration for rush documentation. -*- perl -*-
 # Copyright (C) 2009-2010, 2014, 2015 Sergey Poznyakoff
 #
-# GNU Rush is free software; you can redistribute it and/or modify
+# GNU Mailutils is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
-# GNU Rush is distributed in the hope that it will be useful,
+# GNU Mailutils is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Rush.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 use strict;
 
 my $top_html_dir="";
@@ -79,12 +79,10 @@ set_from_init_file('PROGRAM_NAME_IN_FOOTER',1);
 set_from_init_file('DEFAULT_RULE', '');
 set_from_init_file('BIG_RULE', '');
 
-# Turn off footer buttons in section split
-set_from_init_file('SECTION_FOOTER_BUTTONS', undef);
-#set_from_init_file('SECTION_BUTTONS', undef);
 # Turn off navigation bars at the bottom of each section in chapter split mode
+# or subsection in section split mode.
 set_from_init_file('HEADERS', undef)
-    if (get_conf('SPLIT') and (get_conf('SPLIT') eq 'chapter'));
+    if ((get_conf('SPLIT') eq 'chapter') or (get_conf('SPLIT') eq 'section'));
 # Use navigation icons
 
 set_from_init_file('ICONS', 1);
@@ -153,8 +151,11 @@ my @gray_buttons = (\&gray_document_title, ' ',
                    'FastBack', ' ', 'Up', ' ', 'FastForward', ' ',
                    'Contents', 'Index' );
 
+set_from_init_file('TOP_BUTTONS', undef);
 set_from_init_file('SECTION_BUTTONS', address@hidden);
 set_from_init_file('CHAPTER_BUTTONS', address@hidden);
+set_from_init_file('NODE_FOOTER_BUTTONS', address@hidden);
+set_from_init_file('SECTION_FOOTER_BUTTONS', address@hidden);
 set_from_init_file('MISC_BUTTONS',
                   [\&gray_document_title,
                    'Contents',
diff --git a/doc/texinfo/mailutils.texi b/doc/texinfo/mailutils.texi
index 84632f9..98e0408 100644
--- a/doc/texinfo/mailutils.texi
+++ b/doc/texinfo/mailutils.texi
@@ -530,6 +530,21 @@ if a new format is added at a later date, your program 
will support
 that new format automatically as soon as it is compiled against the
 new library. 
 
address@hidden Programs
address@hidden Mailutils Programs
address@hidden Programs
address@hidden programs.texi
+
address@hidden Libraries
address@hidden Mailutils Libraries
address@hidden Libraries
address@hidden
+
address@hidden Sieve Language
address@hidden Sieve Language
address@hidden Sieve Language
address@hidden sieve.texi
+
 @node Reporting Bugs
 @chapter Reporting Bugs
 
@@ -548,21 +563,6 @@ needed is:
 The archives of bug-mailutils mailing list are available from
 @url{http://mail.gnu.org/@/mailman/@/listinfo/@/bug-mailutils}.
 
address@hidden Programs
address@hidden Mailutils Programs
address@hidden Programs
address@hidden programs.texi
-
address@hidden Libraries
address@hidden Mailutils Libraries
address@hidden Libraries
address@hidden
-
address@hidden Sieve Language
address@hidden Sieve Language
address@hidden Sieve Language
address@hidden sieve.texi
-
 @node News
 @chapter Getting News About GNU Mailutils
 
diff --git a/doc/texinfo/programs.texi b/doc/texinfo/programs.texi
index 1476671..4e82cd5 100644
--- a/doc/texinfo/programs.texi
+++ b/doc/texinfo/programs.texi
@@ -1294,7 +1294,7 @@ tcp-wrappers @{
 @}
 @end example
 
address@hidden Description
address@hidden Description
 The @code{tcp-wrappers} statements provides an alternative way to
 control accesses to the resources served by GNU Mailutils.  This
 statement is enabled if Mailutils is compiled with TCP wrappers
@@ -1937,7 +1937,7 @@ sql @{
   getpwuid @var{query};
 @}
 @end example
address@hidden Description
address@hidden Description
 
 The @code{sql} statement configures access credentials to
 @acronym{SQL} database and the queries for authentication and


hooks/post-receive
-- 
GNU Mailutils