Merge lp:~michaelh1/gdb-linaro/lp939150 into lp:gdb-linaro/7.4

[Michael Hope]

Backport the GDB index documentation split to fix filename collisions on the Windows binary builds.

  2012-07-04 Michael Hope <email address hidden>

        Backport from mainline:

        gdb/doc/
        2012-07-03 Eli Zaretskii <email address hidden>

        * gdb.texinfo: Separate the index into 2 indices, cp and fn, to
        avoid file-name clashes between Index.html and index.html on
        case-insensitive filesystems. See the discussion starting in
        http://sourceware.org/ml/gdb-patches/2012-06/msg00457.html for the
        details of the problem.
        (Top): Update the master menu for the above.
        (Concept Index, Command and Variable Index): New nodes, instead of
        the old "Index" node that was deleted. All cross-references
        updated.

[Ulrich Weigand (uweigand)]

This is OK.

review: Approve

[Michael Hope (michaelh1)]

cbuild has taken a snapshot of this branch at r37134 and queued it for build.

The diff against the ancestor r37133 is available at:
 http://builds.linaro.org/toolchain/snapshots/gdb-linaro-7.4+bzr37134~michaelh1~lp939150.diff

and will be built on the following builders:
 a9-builder i686 x86_64

You can track the build queue at:
 http://ex.seabright.co.nz/helpers/scheduler

cbuild-snapshot: gdb-linaro-7.4+bzr37134~michaelh1~lp939150
cbuild-ancestor: lp:gdb-linaro+bzr37133
cbuild-state: check

=== modified file 'ChangeLog.linaro'
--- ChangeLog.linaro	2012-06-14 04:06:33 +0000
+++ ChangeLog.linaro	2012-07-04 01:02:19 +0000
@@ -1,3 +1,20 @@
[phone]  Michael Hope  <[e-mail]>
+
+	Backport from mainline:
+
+	gdb/doc/
+	2012-07-03  Eli Zaretskii  <[e-mail]>
+
+	* gdb.texinfo: Separate the index into 2 indices, cp and fn, to
+	avoid file-name clashes between Index.html and index.html on
+	case-insensitive filesystems.  See the discussion starting in
+	http://sourceware.org/ml/gdb-patches/2012-06/msg00457.html for the
+	details of the problem.
+	(Top): Update the master menu for the above.
+	(Concept Index, Command and Variable Index): New nodes, instead of
+	the old "Index" node that was deleted.  All cross-references
+	updated.
+
 2012-06-14  Thiago Jung Bauermann  <[e-mail]>
 
 	gdb/

=== modified file 'gdb/doc/gdb.texinfo'
--- gdb/doc/gdb.texinfo	2012-02-03 20:13:45 +0000
+++ gdb/doc/gdb.texinfo	2012-07-04 01:02:19 +0000
@@ -18,13 +18,17 @@
 @end iftex
 
 @finalout
-@syncodeindex ky cp
-@syncodeindex tp cp
+@c To avoid file-name clashes between index.html and Index.html, when
+@c the manual is produced on a Posix host and then moved to a
+@c case-insensitive filesystem (e.g., MS-Windows), we separate the
+@c indices into two: Concept Index and all the rest.
+@syncodeindex ky fn
+@syncodeindex tp fn
 
 @c readline appendices use @vindex, @findex and @ftable,
 @c annotate.texi and gdbmi use @findex.
-@syncodeindex vr cp
-@syncodeindex fn cp
+@syncodeindex vr fn
+@syncodeindex fn fn
 
 @c !!set GDB manual's edition---not the same as GDB version!
 @c This is updated by GNU Press.
@@ -180,7 +184,9 @@
 * Copying::			GNU General Public License says
                                 how you can copy and share GDB
 * GNU Free Documentation License::  The license for this documentation
-* Index::                       Index
+* Concept Index::               Index of @value{GDBN} concepts
+* Command and Variable Index::  Index of @value{GDBN} commands, variables,
+                                  functions, and Python data types
 @end menu
 
 @end ifnottex
@@ -1742,8 +1748,9 @@
 and @code{show} to inquire about the state of your program, or the state
 of @value{GDBN} itself.  Each command supports many topics of inquiry; this
 manual introduces each of them in the appropriate context.  The listings
-under @code{info} and under @code{show} in the Index point to
-all the sub-commands.  @xref{Index}.
+under @code{info} and under @code{show} in the Command, Variable, and
+Function Index point to all the sub-commands.  @xref{Command and Variable
+Index}.
 
 @c @group
 @table @code
@@ -38728,11 +38735,16 @@
 @appendix GNU Free Documentation License
 @include fdl.texi
 
-@node Index
-@unnumbered Index
+@node Concept Index
+@unnumbered Concept Index
 
 @printindex cp
 
+@node Command and Variable Index
+@unnumbered Command, Variable, and Function Index
+
+@printindex fn
+
 @tex
 % I think something like @colophon should be in texinfo.  In the
 % meantime: