From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 7 Sep 2012 00:06:07 +0000 (+0000)
Subject: Fix pointers between nodes in manual (bug 10038).
X-Git-Tag: glibc-2.17~571
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c23fed5d5e4c4f78e0b3a4742a22e7dc8a28d6b;p=thirdparty%2Fglibc.git

Fix pointers between nodes in manual (bug 10038).
---

diff --git a/ChangeLog b/ChangeLog
index f8ccb686b0b..ff693a82939 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-06  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #10038]
+	* manual/memory.texi (Memory): Make order of menu items match
+	order of sections.
+
 2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* elf/dl-tls.c (DL_INITIAL_DTV): Removed.
diff --git a/NEWS b/NEWS
index c3a3b2858ce..eb9e55da920 100644
--- a/NEWS
+++ b/NEWS
@@ -9,11 +9,11 @@ Version 2.17
 
 * The following bugs are resolved with this release:
 
-  1349, 3479, 5400, 6778, 6808, 9685, 9914, 11607, 13412, 13717, 13696,
-  13939, 13966, 14042, 14090, 14166, 14150, 14151, 14154, 14157, 14166,
-  14173, 14195, 14237, 14252, 14283, 14298, 14303, 14307, 14328, 14331,
-  14336, 14337, 14347, 14349, 14459, 14476, 14505, 14510, 14516, 14519,
-  14532, 14538, 14544, 14545.
+  1349, 3479, 5400, 6778, 6808, 9685, 9914, 10038, 11607, 13412, 13717,
+  13696, 13939, 13966, 14042, 14090, 14166, 14150, 14151, 14154, 14157,
+  14166, 14173, 14195, 14237, 14252, 14283, 14298, 14303, 14307, 14328,
+  14331, 14336, 14337, 14347, 14349, 14459, 14476, 14505, 14510, 14516,
+  14519, 14532, 14538, 14544, 14545.
 
 * Support for STT_GNU_IFUNC symbols added for s390 and s390x.
   Optimized versions of memcpy, memset, and memcmp added for System z10 and
diff --git a/manual/memory.texi b/manual/memory.texi
index 35fed23c7fa..fba3a2cffe6 100644
--- a/manual/memory.texi
+++ b/manual/memory.texi
@@ -16,8 +16,8 @@ and allocation of real memory.
 @menu
 * Memory Concepts::             An introduction to concepts and terminology.
 * Memory Allocation::           Allocating storage for your program data
-* Locking Pages::               Preventing page faults
 * Resizing the Data Segment::   @code{brk}, @code{sbrk}
+* Locking Pages::               Preventing page faults
 @end menu
 
 Memory mapped I/O is not discussed in this chapter.  @xref{Memory-mapped I/O}.