diff --git a/appendices/glossary.xml b/appendices/glossary.xml
index 814f9350f8..6d77bd1d89 100644
--- a/appendices/glossary.xml
+++ b/appendices/glossary.xml
@@ -2,13 +2,6 @@
Glossary
-Abbreviations
-
-imon
-Inode Monitor
-
-
-
Acronyms
@@ -16,7 +9,7 @@
Asymmetric Digital Subscriber Line
ATK
-Accessibility Took Kit
+Accessibility Tool Kit
BIND
Berkeley Internet Name Domain
@@ -65,6 +58,9 @@
IDL
Interface Definition Language
+imon
+Inode MONitor
+
ISP
Internet Service Provider
@@ -77,6 +73,9 @@
LZO
Lemple-Ziv-Oberhumer
+NASM
+Netwide ASseMbler
+
ORB
Object Request BrokerCORBA
@@ -93,6 +92,8 @@ otherterm="gCORBA">CORBA
RP
Roaring Penguin
+XMMS
+X MultiMedia System
diff --git a/basicnet/netprogs/cvs.xml b/basicnet/netprogs/cvs.xml
index 7d6e900494..db9dd7503d 100644
--- a/basicnet/netprogs/cvs.xml
+++ b/basicnet/netprogs/cvs.xml
@@ -1,6 +1,6 @@
-
+
-cvs-&cvs-version;
+CVS-&cvs-version;
&cvs-intro;
&cvs-inst;
diff --git a/basicnet/netprogs/cvs/cvs-config.xml b/basicnet/netprogs/cvs/cvs-config.xml
index 067f4c5eb5..0294800343 100644
--- a/basicnet/netprogs/cvs/cvs-config.xml
+++ b/basicnet/netprogs/cvs/cvs-config.xml
@@ -1,5 +1,5 @@
-Configuring cvs
+Configuring CVS
Config files
~/.cvsrc, ~/.cvswrappers
@@ -7,14 +7,16 @@
Configuration Information
-~/.cvsrc is the main cvs configuration file.
-This file is used by users to specify defaults for different cvs commands, for example to
-make all cvs diff commands run with -u, a user would add diff -u to
-their .cvsrc file.
+~/.cvsrc is the main
+CVS configuration file.
+This file is used by users to specify defaults for different cvs
+ commands, for example to make all cvs diff
+commands run with -u, a user would add
+diff -u to their .cvsrc file.
-~/.cvswrappers specifies wrappers to be used in addition to
-those specified in the CVSROOT/cvswrappers file in the
-repository.
+~/.cvswrappers specifies wrappers to be used in
+addition to those specified in the CVSROOT/cvswrappers
+file in the repository.
diff --git a/basicnet/netprogs/cvs/cvs-desc.xml b/basicnet/netprogs/cvs/cvs-desc.xml
index 401d9eecce..f56ffa2115 100644
--- a/basicnet/netprogs/cvs/cvs-desc.xml
+++ b/basicnet/netprogs/cvs/cvs-desc.xml
@@ -1,8 +1,9 @@
Contents
-The cvs package contains cvs, cvsbug and
-rcs2log.
+The CVS package contains
+cvs, cvsbug and rcs2log
+.
diff --git a/basicnet/netprogs/cvs/cvs-inst.xml b/basicnet/netprogs/cvs/cvs-inst.xml
index aaaa80a445..b6abc5860b 100644
--- a/basicnet/netprogs/cvs/cvs-inst.xml
+++ b/basicnet/netprogs/cvs/cvs-inst.xml
@@ -1,5 +1,5 @@
-Installation of cvs
+Installation of CVS
The cvs-&cvs-version;-zlib.patch patch is
used to compile CVS
diff --git a/basicnet/netprogs/cvs/cvs-intro.xml b/basicnet/netprogs/cvs/cvs-intro.xml
index 5c1e1c870c..ecb6c14b8b 100644
--- a/basicnet/netprogs/cvs/cvs-intro.xml
+++ b/basicnet/netprogs/cvs/cvs-intro.xml
@@ -1,9 +1,9 @@
-Introduction to cvs
+Introduction to CVS
-CVS is the concurrent versioning system. This is useful for
-projects on which multiple people are working or where archives of
-previous versions of files need to be kept.
+CVS is the concurrent
+versioning system. This is useful for projects on which multiple people are
+working or where archives of previous versions of files need to be kept.
Package information
diff --git a/general/genlib/libfam/libfam-inst.xml b/general/genlib/libfam/libfam-inst.xml
index 3ce027a988..ebbe638944 100644
--- a/general/genlib/libfam/libfam-inst.xml
+++ b/general/genlib/libfam/libfam-inst.xml
@@ -9,7 +9,7 @@ following commands:
You will get warnings about make install being unable to
merge entries in /etc/rpc. These can be ignored, along
-with any imon or inetd.conf warnings,
+with any IMON or inetd.conf warnings,
as we will be configuring these files after installation.
diff --git a/general/prog/nasm/nasm-desc.xml b/general/prog/nasm/nasm-desc.xml
index da66e709db..8dea31aa70 100644
--- a/general/prog/nasm/nasm-desc.xml
+++ b/general/prog/nasm/nasm-desc.xml
@@ -1,8 +1,8 @@
Contents
-The NASM package contains nasm and
-ndisasm programs.
+The NASM package contains nasm
+ and ndisasm programs.
diff --git a/general/prog/nasm/nasm-inst.xml b/general/prog/nasm/nasm-inst.xml
index a49e214051..ff2c01da7d 100644
--- a/general/prog/nasm/nasm-inst.xml
+++ b/general/prog/nasm/nasm-inst.xml
@@ -1,7 +1,7 @@
-Installation of NASM
+Installation of NASM
-Install NASM by running the
+Install NASM by running the
following commands:
./configure --prefix=/usr &&
diff --git a/general/prog/nasm/nasm-intro.xml b/general/prog/nasm/nasm-intro.xml
index f6c961033e..3059d4a133 100644
--- a/general/prog/nasm/nasm-intro.xml
+++ b/general/prog/nasm/nasm-intro.xml
@@ -1,8 +1,9 @@
-Introduction to NASM
+Introduction to NASM
-NASM (The Netwide Assembler) is an 80x86 assembler designed for
-portability and modularity. It includes a disassembler as well.
+NASM (Netwide Assembler) is
+an 80x86 assembler designed for portability and modularity. It includes a
+disassembler as well.
Package information
diff --git a/multimedia/audioutils/xmms.xml b/multimedia/audioutils/xmms.xml
index e75860be1d..5f281f043d 100644
--- a/multimedia/audioutils/xmms.xml
+++ b/multimedia/audioutils/xmms.xml
@@ -1,6 +1,6 @@
-
+
-xmms-&XMMS-version;
+XMMS-&XMMS-version;
&XMMS-intro;
&XMMS-inst;
diff --git a/multimedia/audioutils/xmms/xmms-config.xml b/multimedia/audioutils/xmms/xmms-config.xml
index b63929af22..f66badb562 100644
--- a/multimedia/audioutils/xmms/xmms-config.xml
+++ b/multimedia/audioutils/xmms/xmms-config.xml
@@ -1,5 +1,5 @@
-Configuring xmms
+Configuring XMMS
Config files
~/.xmms/config
diff --git a/multimedia/audioutils/xmms/xmms-desc.xml b/multimedia/audioutils/xmms/xmms-desc.xml
index d698b3ee21..a4ebba1e75 100644
--- a/multimedia/audioutils/xmms/xmms-desc.xml
+++ b/multimedia/audioutils/xmms/xmms-desc.xml
@@ -1,7 +1,7 @@
Contents
-The xmms package contains xmms, xmms-config, gnomexmss and wmxmms.
+The XMMS package contains xmms, xmms-config, gnomexmss and wmxmms.
@@ -16,7 +16,7 @@ skins.
xmms-config
This script is used by other programs which need to link with xmms to
-retrieve the library and include paths XMMS was compiled with.
+retrieve the library and include paths.
gnomexmms
This is an applet for the GNOME desktop environment that will dock into
diff --git a/multimedia/audioutils/xmms/xmms-inst.xml b/multimedia/audioutils/xmms/xmms-inst.xml
index 68b4b09e48..dcda49b278 100644
--- a/multimedia/audioutils/xmms/xmms-inst.xml
+++ b/multimedia/audioutils/xmms/xmms-inst.xml
@@ -1,7 +1,7 @@
-Installation of XMMS
+Installation of XMMS
-Install XMMS by running the following commands:
+Install XMMS by running the following commands:
./configure --prefix=/usr --enable-one-plugin-dir &&
diff --git a/multimedia/audioutils/xmms/xmms-intro.xml b/multimedia/audioutils/xmms/xmms-intro.xml
index 47137c1876..c038860107 100644
--- a/multimedia/audioutils/xmms/xmms-intro.xml
+++ b/multimedia/audioutils/xmms/xmms-intro.xml
@@ -1,7 +1,7 @@
-Introduction to XMMS
+Introduction to XMMS
-XMMS is an audio player for the
+XMMS is an audio player for the
X Window System.
Package information
@@ -17,7 +17,7 @@ url="&XMMS-download-ftp;"/>
&XMMS-time;
-XMMS dependencies
+XMMS dependencies
Required
a working soundcard, , and