[7413] texinfo.texi duplicate index entries

[gavinsmith0123]

Revision: 7413
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7413
Author:   gavin
Date:     2016-09-23 15:27:16 +0000 (Fri, 23 Sep 2016)
Log Message:
-----------
texinfo.texi duplicate index entries

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/texinfo.texi

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-09-23 14:49:56 UTC (rev 7412)
+++ trunk/ChangeLog     2016-09-23 15:27:16 UTC (rev 7413)
@@ -1,5 +1,13 @@
 2016-09-23  Gavin Smith  <address@hidden>
 
+       * doc/texinfo.texi (Customization Variables and Options): Remove 
+       index entries for some customization variables with index 
+       entries duplicated elsewhere.  These variables are 
+       'documentlanguage', 'HEADERS', and 'SHOW_MENU'.
+       (Other Customization Variables): Add index entry for 'HEADERS'.
+
+2016-09-23  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Parser.pm (indices_information): Do not return
        'merged_indices' hash, as this information is not used anywhere.  
        Callers updated.

Modified: trunk/doc/texinfo.texi
===================================================================
--- trunk/doc/texinfo.texi      2016-09-23 14:49:56 UTC (rev 7412)
+++ trunk/doc/texinfo.texi      2016-09-23 15:27:16 UTC (rev 7413)
@@ -16717,7 +16717,6 @@
 @item
 @vindex ENABLE_ENCODING
 @option{--enable-encoding}   @tab @code{ENABLE_ENCODING}
address@hidden documentlanguage
 @item
 @option{--document-language} @tab @code{documentlanguage}
 @item
@@ -16739,8 +16738,6 @@
 @vindex MACRO_EXPAND
 @option{--macro-expand}      @tab @code{MACRO_EXPAND}
 @item
address@hidden HEADERS
address@hidden SHOW_MENU
 @option{--headers}           @tab @code{HEADERS}, @code{SHOW_MENU}
 @item
 @vindex NO_WARN
@@ -17376,6 +17373,7 @@
 when generating address@hidden
 
 @item SHOW_MENU
address@hidden HEADERS
 @opindex --no-headers
 If set, Texinfo menus are output.  By default, it is set unless
 generating Docbook or if @option{--no-headers} is specified.