Author: pfrields
Update of /cvs/docs/jargon-buster
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31933
Modified Files:
jargon-buster-en.xml
Log Message:
More editing, got to the G's now :-)
Index: jargon-buster-en.xml
===================================================================
RCS file: /cvs/docs/jargon-buster/jargon-buster-en.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jargon-buster-en.xml 26 Aug 2005 17:11:57 -0000 1.4
+++ jargon-buster-en.xml 27 Aug 2005 01:47:39 -0000 1.5
@@ -401,10 +401,11 @@
<glossdef>
<para>
The <command>ethtool</command> utility is a Linux network
- driver diagnostic and tuning tool for Linux 2.4 or later
- kernels. The <command>ethtool</command> utility obtains
- information and diagnostics related to media, link status,
- driver version, bus location, and more.
+ driver diagnostic and tuning tool for a Linux 2.4 or later
+ <xref linkend="gl-jb-kernel"/>. The
+ <command>ethtool</command> utility obtains information and
+ diagnostics related to media, link status, driver version,
+ bus location, and more.
</para>
</glossdef>
</glossentry>
@@ -541,34 +542,51 @@
information about <systemitem>glibc</systemitem>.
</para>
</glossdef>
- </glossentry><!-- end PWF -->
+ </glossentry>
<glossentry id="gl-jb-gnome">
<glossterm>GNOME</glossterm>
<glossdef>
<para>
- The GNOME Project is an effort to create a complete, free
- and easy-to-use desktop environment for users, as well as a
- powerful application development framework for software
- developers. Refer to <ulink url="http://www.gnome.org">Home
- page </ulink>
+ <acronym>GNOME</acronym> is the short name for the GNOME
+ Desktop, a product of the GNOME Project. GNOME is a
+ complete, free and easy-to-use desktop environment for
+ users. It is also a powerful application development
+ framework for software developers. GNOME provides a
+ complete set of human interface guidelines, which means that
+ GNOME strives to have a consistent look and feel for all its
+ applications. Read more about GNOME at <ulink
+
url="http://www.gnome.org/"/>.
</para>
</glossdef>
</glossentry>
- <glossentry>
- <glossterm>GPG</glossterm>
+ <glossentry id="gl-jb-gnu">
+ <glossterm>GNU</glossterm>
+ <glossdef>
+ <para>
+ <acronym>GNU</acronym> is an acronym that stands for "GNU's
+ Not UNIX," and is pronounced "guh-NOO." GNU was originally
+ intended to be a complete UNIX-like operating system. It
+ has become a broader term describing free software licensed
+ under the <xref linkend="gl-jb-gpl"/>. Because the <xref
+ linkend="gl-jb-kernel"/> and much of the other software in a
+ Linux system are licensed under the <xref
+ linkend="gl-jb-gpl"/>, many people call that system
+ GNU/Linux.
+ </para>
+ </glossdef>
+ </glossentry>
+ <glossentry id="gl-jb-gnupg">
+ <glossterm>GnuPG (GPG)</glossterm>
<glossdef>
<para>
- GnuPG is a complete and free replacement for PGP. Because it
- does not use the patented IDEA algorithm, it can be used
- without any restrictions. GnuPG is a RFC2440 (OpenPGP)
- compliant application. Refer to
- <ulink
-
url="http://gnupg.org/">gnupg.org</ulink>. You may
- also see RPM-GPG-KEY referenced, which relates to the keys
- used for checking packages. E.g. see
- <ulink
-
url="http://rpmfind.net/linux/rawhide/1.0/i386/">rpmfind
- </ulink>
+ GnuPG, the GNU Privacy Guard, is a complete and free
+ replacement for PGP, Pretty Good Privacy. GnuPG software
+ allows you to digitally sign or encrypt data using public
+ key encryption methods. GnuPG is OpenPGP compliant, so data
+ signed or encrypted by GnuPG can be exchanged with almost
+ any computer user. Refer to <ulink
+
url="http://www.gnupg.org/"/> for more information about
+ GPG.
</para>
</glossdef>
</glossentry>
@@ -576,20 +594,35 @@
<glossterm>GPL</glossterm>
<glossdef>
<para>
- Gnu General Public Licence. Refer to
- <ulink
url="http://www.fsf.org/licenses/licenses.html">fsf.org</...
+ The GNU General Public Licence, or <acronym>GPL</acronym>,
+ is a software license designed to preserve users' rights to
+ share and modify software. The GPL does this by restricting
+ anyone from denying you those rights. Use of software is
+ usually subject to the terms under which it is licensed.
+ Many software licenses restrict you from copying, sharing,
+ or even examining the software they cover. The terms of the
+ GPL, however, allow you very broad rights to share, modify,
+ and redistribute software. In return the GPL requires you
+ to give others those rights if you share the results. The
+ GPL encourages software programmers to learn and contribute
+ to each other's work. Refer to <ulink
+
url="http://www.fsf.org/licenses/licenses/gpl.html"/> for
+ more information about the GPL. For a <xref
+ linkend="gl-jb-faq"/> about the GPL, refer to <ulink
+
url="http://www.fsf.org/licensing/licenses/gpl-faq.html"/>.
</para>
</glossdef>
- </glossentry>
- <glossentry>
+ </glossentry><!-- end PWF -->
+ <glossentry id="gl-jb-grub">
<glossterm>GRUB</glossterm>
<glossdef>
<para>
- GNU GRand Unified Boot loader or GRUB is a program which
- enables the user to select which installed operating system
- or kernel to load at system boot time. It also allows the
- user to pass arguments to the kernel. Refer to
- <ulink
url="http://www.redhat.com/docs/manuals/linux/RHL-9-Manual/ref-guide...
+ The GNU GRand Unified Boot Loader, or
+ <acronym>GRUB</acronym> is a program which enables the user
+ to select which installed operating system or kernel to load
+ at system boot time. It also allows the user to pass
+ arguments to the kernel. Refer to <ulink
+
url="http://www.redhat.com/docs/manuals/linux/RHL-9-Manual/ref-guide...
</para>
</glossdef>
</glossentry>
@@ -654,7 +687,7 @@
</para>
</glossdef>
</glossentry>
- <glossentry>
+ <glossentry id="gl-jb-kernel">
<glossterm>kernel</glossterm>
<glossdef>
<para>