about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--manual/Makefile2
-rw-r--r--manual/threads.texi (renamed from manual/nptl.texi)0
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f389131cab..e50ae01898 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-19  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	* manual/nptl.texi: Renamed to ...
+	* manual/threads.texi: ... this.
+	* manual/Makefile (chapters): Update.
+
 2013-03-18  Roland McGrath  <roland@hack.frob.com>
 
 	[BZ #14812]
diff --git a/manual/Makefile b/manual/Makefile
index 10314a9624..44c0fd4f68 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -42,7 +42,7 @@ chapters = $(addsuffix .texi, \
 		       message search pattern io stdio llio filesys	\
 		       pipe socket terminal syslog math arith time	\
 		       resource setjmp signal startup process job nss	\
-		       users sysinfo conf crypt debug nptl)
+		       users sysinfo conf crypt debug threads)
 add-chapters = $(wildcard $(foreach d, $(add-ons), ../$d/$d.texi))
 appendices = lang.texi header.texi install.texi maint.texi platform.texi \
 	     contrib.texi
diff --git a/manual/nptl.texi b/manual/threads.texi
index 9a1df1a862..9a1df1a862 100644
--- a/manual/nptl.texi
+++ b/manual/threads.texi