Re: nptl.texi

[Siddhesh Poyarekar <siddhesh at redhat dot com>]

On Fri, Mar 15, 2013 at 09:23:20AM -0700, Roland McGrath wrote:
> The "nptl" name is an implementation detail.
> The manual and its file names are about interfaces.
> "threads.texi" is the obvious file name to use.

OK, here's the patch to rename the file.  OK to commit?

Siddhesh

	* manual/nptl.texi: Rename to manual/threads.texi.
	* manual/threads.texi: Rename from manual/nptl.texi.
	* manual/Makefile (chapters): Adjust for the rename.


diff --git a/manual/Makefile b/manual/Makefile
index 10314a9..44c0fd4 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/nptl.texi
deleted file mode 100644
index 9a1df1a..0000000
--- a/manual/nptl.texi
+++ /dev/null
@@ -1,44 +0,0 @@
-@node POSIX Threads
-@c @node POSIX Threads, , Cryptographic Functions, Top
-@chapter POSIX Threads
-@c %MENU% POSIX Threads
-@cindex pthreads
-
-This chapter describes the @glibcadj{} POSIX Thread implementation.
-
-@menu
-* Thread-specific Data::          Support for creating and
-				  managing thread-specific data
-@end menu
-
-@node Thread-specific Data
-@section Thread-specific Data
-
-The @glibcadj{} implements functions to allow users to create and manage
-data specific to a thread.  Such data may be destroyed at thread exit,
-if a destructor is provided.  The following functions are defined:
-
-@table @code
-
-@item int pthread_key_create (pthread_key_t *@var{key}, void (*@var{destructor})(void*))
-Create a thread-specific data key for the calling thread, referenced by
-@var{key}.
-
-Objects declared with the C++11 @code{thread_local} keyword are destroyed
-before thread-specific data, so they should not be used in thread-specific
-data destructors or even as members of the thread-specific data, since the
-latter is passed as an argument to the destructor function.
-
-@item int pthread_key_delete (pthread_key_t @var{key})
-Destroy the thread-specific data @var{key} in the calling thread.  The
-destructor for the thread-specific data is not called during destruction, nor
-is it called during thread exit.
-
-@item void *pthread_getspecific (pthread_key_t @var{key})
-Return the thread-specific data associated with @var{key} in the calling
-thread.
-
-@item int pthread_setspecific (pthread_key_t @var{key}, const void *@var{value})
-Associate the thread-specific @var{value} with @var{key} in the calling thread.
-
-@end table
diff --git a/manual/threads.texi b/manual/threads.texi
new file mode 100644
index 0000000..9a1df1a
--- /dev/null
+++ b/manual/threads.texi
@@ -0,0 +1,44 @@
+@node POSIX Threads
+@c @node POSIX Threads, , Cryptographic Functions, Top
+@chapter POSIX Threads
+@c %MENU% POSIX Threads
+@cindex pthreads
+
+This chapter describes the @glibcadj{} POSIX Thread implementation.
+
+@menu
+* Thread-specific Data::          Support for creating and
+				  managing thread-specific data
+@end menu
+
+@node Thread-specific Data
+@section Thread-specific Data
+
+The @glibcadj{} implements functions to allow users to create and manage
+data specific to a thread.  Such data may be destroyed at thread exit,
+if a destructor is provided.  The following functions are defined:
+
+@table @code
+
+@item int pthread_key_create (pthread_key_t *@var{key}, void (*@var{destructor})(void*))
+Create a thread-specific data key for the calling thread, referenced by
+@var{key}.
+
+Objects declared with the C++11 @code{thread_local} keyword are destroyed
+before thread-specific data, so they should not be used in thread-specific
+data destructors or even as members of the thread-specific data, since the
+latter is passed as an argument to the destructor function.
+
+@item int pthread_key_delete (pthread_key_t @var{key})
+Destroy the thread-specific data @var{key} in the calling thread.  The
+destructor for the thread-specific data is not called during destruction, nor
+is it called during thread exit.
+
+@item void *pthread_getspecific (pthread_key_t @var{key})
+Return the thread-specific data associated with @var{key} in the calling
+thread.
+
+@item int pthread_setspecific (pthread_key_t @var{key}, const void *@var{value})
+Associate the thread-specific @var{value} with @var{key} in the calling thread.
+
+@end table