aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--appendixa/glibc-desc.xml46
-rw-r--r--appendixa/glibc-shortdesc.xml32
-rw-r--r--appendixa/glibc.xml1
-rw-r--r--chapter06/glibc.xml4
-rw-r--r--entities/glibc.ent1
5 files changed, 50 insertions, 34 deletions
diff --git a/appendixa/glibc-desc.xml b/appendixa/glibc-desc.xml
index 3597c7622..19425a92f 100644
--- a/appendixa/glibc-desc.xml
+++ b/appendixa/glibc-desc.xml
@@ -2,14 +2,7 @@
<para>Last checked against version &glibc-contversion;.</para>
-<sect3><title>Program Files</title>
-
-<para>catchsegv, gencat, getconf, getent, glibcbug, iconv, iconvconfig,
-ldconfig, ldd, lddlibc4, locale, localedef, mtrace, nscd, nscd_nischeck,
-pcprofiledump, pt_chown, rpcgen, rpcinfo, sln, sprof, tzselect, xtrace,
-zdump and zic</para></sect3>
-
-<sect3><title>Descriptions</title>
+<sect3><title>Program files descriptions</title>
<sect4><title>catchsegv</title>
<para>catchsegv can be used to create a stack trace when a program
@@ -107,38 +100,27 @@ function.</para></sect4>
</sect3>
-<sect3><title>Library Files</title>
-<para>ld.so, libBrokenLocale.[a,so], libBrokenLocale_p.a,
-libSegFault.so, libanl.[a,so], libanl_p.a, libbsd-compat.a, libc.[a,so],
-libc_nonshared.a, libc_p.a, libcrypt.[a,so], libcrypt_p.a, libdl.[a,so],
-libdl_p.a, libg.a, libieee.a, libm.[a,so], libm_p.a, libmcheck.a,
-libmemusage.so, libnsl.a, libnsl_p.a, libnss_compat.so, libnss_dns.so,
-libnss_files.so, libnss_hesiod.so, libnss_nis.so, libnss_nisplus.so,
-libpcprofile.so, libpthread.[a,so], libpthread_p.a, libresolv.[a,so],
-libresolv_p.a, librpcsvc.a, librpcsvc_p.a, librt.[a,so], librt_p.a,
-libthread_db.so, libutil.[a,so] and libutil_p.a</para></sect3>
-
-<sect3><title>Descriptions</title>
+<sect3><title>Library files descriptions</title>
<sect4><title>ld.so</title>
<para>ld.so is the helper program for shared library
executables.</para></sect4>
-<sect4><title>libBrokenLocale, libBrokenLocale_p</title>
+<sect4><title>libBrokenLocale</title>
<para>Used by software, such as Mozilla, to solve broken locales.</para></sect4>
<sect4><title>libSegFault</title>
<para>libSegFault is a segmentation fault signal handler. It tries to catch
segfaults.</para></sect4>
-<sect4><title>libanl, libanl_p</title>
+<sect4><title>libanl</title>
<para>libanl is an asynchronous name lookup library.</para></sect4>
<sect4><title>libbsd-compat</title>
<para>libbsd-compat provides the portability needed in order to run certain
programs in Linux.</para></sect4>
-<sect4><title>libc, libc_nonshared, libc_p</title>
+<sect4><title>libc, libc_nonshared</title>
<para>These files constitute the main C library. The C library is a
collection of commonly used functions in programs.
This way a programmer doesn't need to create his own functions for every
@@ -156,10 +138,10 @@ documentation that comes with the C library describes this in more
detail, as it is too complicated to explain here in one or two
lines.</para></sect4>
-<sect4><title>libcrypt, libcrypt_p</title>
+<sect4><title>libcrypt</title>
<para>libcrypt is the cryptography library.</para></sect4>
-<sect4><title>libdl, libdl_p</title>
+<sect4><title>libdl</title>
<para>libdl is the dynamic linking interface library.</para></sect4>
<sect4><title>libg</title>
@@ -168,7 +150,7 @@ lines.</para></sect4>
<sect4><title>libieee</title>
<para>libieee is the IEEE floating point library.</para></sect4>
-<sect4><title>libm, libm_p</title>
+<sect4><title>libm</title>
<para>libm is the mathematical library.</para></sect4>
<sect4><title>libmcheck</title>
@@ -178,7 +160,7 @@ lines.</para></sect4>
<para>libmemusage is used by memusage to help collect information about the
memory usage of a program.</para></sect4>
-<sect4><title>libnsl, libnsl_p</title>
+<sect4><title>libnsl</title>
<para>libnsl is the network services library.</para></sect4>
<sect4><title>libnss_compat, libnss_dns, libnss_files,
@@ -197,17 +179,17 @@ GNU C library,</para></listitem>
<para>Code used by the kernel to track CPU time spent in functions, source
code lines, and instructions.</para></sect4>
-<sect4><title>libpthread, libpthread_p</title>
+<sect4><title>libpthread</title>
<para>The POSIX threads library.</para></sect4>
-<sect4><title>libresolv, libresolv_p</title>
+<sect4><title>libresolv</title>
<para>Functions in this library provide for creating, sending, and
interpreting packets to the Internet domain name servers.</para></sect4>
-<sect4><title>librpcsvc, librpcsvc_p</title>
+<sect4><title>librpcsvc</title>
<para>Functions in this library provide miscellaneous RPC services.</para></sect4>
-<sect4><title>librt, librt_p</title>
+<sect4><title>librt</title>
<para>Functions in this library provide most of the interfaces specified by
the POSIX.1b Realtime Extension.</para></sect4>
@@ -215,7 +197,7 @@ the POSIX.1b Realtime Extension.</para></sect4>
<para>Functions is this library are useful for building debuggers for
multi-threaded programs.</para></sect4>
-<sect4><title>libutil, libutil_p</title>
+<sect4><title>libutil</title>
<para>Contains code for "standard" functions used in many different Unix
utilities.</para></sect4>
diff --git a/appendixa/glibc-shortdesc.xml b/appendixa/glibc-shortdesc.xml
new file mode 100644
index 000000000..80d5832be
--- /dev/null
+++ b/appendixa/glibc-shortdesc.xml
@@ -0,0 +1,32 @@
+<sect2><title>Contents of Glibc</title>
+
+<para>Last checked against version &glibc-contversion;.</para>
+
+<para>Glibc is the C library that provides the system calls and basic
+functions such as open, malloc, printf, etc. The C library is used by all
+dynamically linked programs.</para>
+
+<para>Glibc installs the following files:</para>
+
+<sect3><title>Program Files</title>
+
+<para>catchsegv, gencat, getconf, getent, glibcbug, iconv, iconvconfig,
+ldconfig, ldd, lddlibc4, locale, localedef, mtrace, nscd, nscd_nischeck,
+pcprofiledump, pt_chown, rpcgen, rpcinfo, sln, sprof, tzselect, xtrace,
+zdump and zic</para>
+
+</sect3>
+
+<sect3><title>Library Files</title>
+<para>ld.so, libBrokenLocale.[a,so], libSegFault.so, libanl.[a,so],
+libbsd-compat.a, libc.[a,so], libc_nonshared.a, libcrypt.[a,so], libdl.[a,so],
+libg.a, libieee.a, libm.[a,so], libmcheck.a, libmemusage.so, libnsl.a,
+libnss_compat.so, libnss_dns.so, libnss_files.so, libnss_hesiod.so,
+libnss_nis.so, libnss_nisplus.so, libpcprofile.so, libpthread.[a,so],
+libresolv.[a,so], librpcsvc.a, librt.[a,so], libthread_db.so and
+libutil.[a,so]</para>
+
+</sect3>
+
+</sect2>
+
diff --git a/appendixa/glibc.xml b/appendixa/glibc.xml
index a57cc3986..2aa3e91c6 100644
--- a/appendixa/glibc.xml
+++ b/appendixa/glibc.xml
@@ -3,6 +3,7 @@
<?dbhtml filename="glibc.html" dir="appendixa"?>
&aa-glibc-down;
+&aa-glibc-shortdesc;
&aa-glibc-desc;
&aa-glibc-dep;
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 6e6240d89..23d103675 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -5,9 +5,9 @@
<screen>Estimated build time: &glibc-time;
Estimated required disk space: &glibc-compsize;</screen>
-&c6-glibc-inst;
-&aa-glibc-desc;
+&aa-glibc-shortdesc;
&aa-glibc-dep;
+&c6-glibc-inst;
</sect1>
diff --git a/entities/glibc.ent b/entities/glibc.ent
index 37e9d7d15..8a4fe9df6 100644
--- a/entities/glibc.ent
+++ b/entities/glibc.ent
@@ -10,6 +10,7 @@
<!ENTITY c6-cf-glibc SYSTEM "../chapter06/config-glibc.xml">
<!ENTITY aa-glibc SYSTEM "../appendixa/glibc.xml">
+<!ENTITY aa-glibc-shortdesc SYSTEM "../appendixa/glibc-shortdesc.xml">
<!ENTITY aa-glibc-desc SYSTEM "../appendixa/glibc-desc.xml">
<!ENTITY aa-glibc-dep SYSTEM "../appendixa/glibc-dep.xml">
<!ENTITY aa-glibc-down SYSTEM "../appendixa/glibc-down.xml">