diff --git a/appendices/glossary.xml b/appendices/glossary.xml
index d1dd2e1829..79c0a88a54 100644
--- a/appendices/glossary.xml
+++ b/appendices/glossary.xml
@@ -26,6 +26,12 @@
CORBA
Common Object Request Broker Architecture
+CSS
+Cascading Style Sheets
+
+CUPS
+Common UNIX Printing System
+
CVS
Concurrent Versions System
@@ -35,6 +41,8 @@
DNS
Domain Name Service
+DVI
+DeVice Independent
FAM
File Alteration Monitor
@@ -60,12 +68,18 @@
GUI
Graphical User Interface
+HTML
+HyperText Markup Language
+
HTTP
HyperText Transfer Protocol
IDL
Interface Definition Language
+IMAP
+Internet Message Access Protocol
+
IMON
Inode MONitor
@@ -91,12 +105,21 @@
LZO
Lemple-Ziv-Oberhumer
+MPEG
+Moving Picture Experts Group
+
MTA
Mail Transport Agent
+MUA
+Mail User Agent
+
NASM
Netwide ASseMbler
+NNTP
+Network News Transfer Protocol
+
NFS
Network File System
@@ -107,6 +130,15 @@ otherterm="gCORBA">CORBA
PAM
Pluggable authentication Modules
+PDF
+Portable Document Format
+
+POP
+Post Office Protocol
+
+PPD
+PostScript Printer Description
+
PPP
Point to Point Protocol
@@ -122,12 +154,21 @@ otherterm="gCORBA">CORBA
RPC
Remote Procedure Call
+SGML
+Standard Generalized Markup Language
+
+SMTP
+Simple Mail Transfer Protocol
+
SSL
Secure Sockets Layer
TCP
Transmission Control Protocol
+UDF
+Universal Disk Format
+
UDP
User Datagram Protocol
@@ -137,6 +178,15 @@ otherterm="gCORBA">CORBA
WWW
World Wide Web
+XML
+eXtensible Markup Language
+
+XSL
+eXtensible Style Language
+
+XSLT
+eXtensible Style Language Transformation
+
XMMS
X MultiMedia System
diff --git a/basicnet/mailnews/fetchmail.xml b/basicnet/mailnews/fetchmail.xml
index 7b60d9f00b..e5f46df805 100644
--- a/basicnet/mailnews/fetchmail.xml
+++ b/basicnet/mailnews/fetchmail.xml
@@ -1,6 +1,6 @@
-
+
-fetchmail-&fetchmail-version;
+Fetchmail-&fetchmail-version;
&fetchmail-intro;
&fetchmail-inst;
diff --git a/basicnet/mailnews/fetchmail/fetchmail-config.xml b/basicnet/mailnews/fetchmail/fetchmail-config.xml
index 28fbc81752..a75f6b41d0 100644
--- a/basicnet/mailnews/fetchmail/fetchmail-config.xml
+++ b/basicnet/mailnews/fetchmail/fetchmail-config.xml
@@ -1,5 +1,5 @@
-Configuring fetchmail
+Configuring Fetchmail
Config files
~/.fetchmailrc
diff --git a/basicnet/mailnews/fetchmail/fetchmail-desc.xml b/basicnet/mailnews/fetchmail/fetchmail-desc.xml
index 2d74d4ace9..18582fd064 100644
--- a/basicnet/mailnews/fetchmail/fetchmail-desc.xml
+++ b/basicnet/mailnews/fetchmail/fetchmail-desc.xml
@@ -1,7 +1,7 @@
Contents
-The fetchmail package contains
+The Fetchmail package contains
fetchmail and fetchmailconf.
diff --git a/basicnet/mailnews/fetchmail/fetchmail-exp.xml b/basicnet/mailnews/fetchmail/fetchmail-exp.xml
index 2f1e2ab0a8..eb62696043 100644
--- a/basicnet/mailnews/fetchmail/fetchmail-exp.xml
+++ b/basicnet/mailnews/fetchmail/fetchmail-exp.xml
@@ -3,11 +3,11 @@
--with-ssl : This enables
SSL if found, so that you can handle connections to
-secure POP3 and IMAP servers.
+secure POP3 and IMAP servers.
--enable-fallback=procmail : This tells
-fetchmail to hand incoming mail to
-procmail for delivery if your port 25 mail server is
+Fetchmail to hand incoming mail to
+Procmail for delivery if your port 25 mail server is
not present or not responding.
diff --git a/basicnet/mailnews/fetchmail/fetchmail-inst.xml b/basicnet/mailnews/fetchmail/fetchmail-inst.xml
index efe1ce7fd6..d884c60ddd 100644
--- a/basicnet/mailnews/fetchmail/fetchmail-inst.xml
+++ b/basicnet/mailnews/fetchmail/fetchmail-inst.xml
@@ -1,7 +1,7 @@
-Installation of fetchmail
+Installation of Fetchmail
-Install fetchmail by running the following commands:
+Install Fetchmail by running the following commands:
./configure --prefix=/usr --with-ssl --enable-fallback=procmail &&
make &&
diff --git a/basicnet/mailnews/fetchmail/fetchmail-intro.xml b/basicnet/mailnews/fetchmail/fetchmail-intro.xml
index 9142e0d9c4..3e03f98ae5 100644
--- a/basicnet/mailnews/fetchmail/fetchmail-intro.xml
+++ b/basicnet/mailnews/fetchmail/fetchmail-intro.xml
@@ -1,7 +1,7 @@
-Introduction to fetchmail
+Introduction to Fetchmail
-The fetchmail package contains the
+The Fetchmail package contains the
fetchmail program. "It
retrieves mail from remote mail servers and forwards it to your local
(client) machine's delivery system, so it can then be read by
@@ -20,7 +20,7 @@ url="&fetchmail-download-ftp;"/>
&fetchmail-time;
-fetchmail dependencies
+Fetchmail dependencies
Required
and a local MDA ()
diff --git a/basicnet/mailnews/procmail.xml b/basicnet/mailnews/procmail.xml
index 4b643d31f0..0a7281c378 100644
--- a/basicnet/mailnews/procmail.xml
+++ b/basicnet/mailnews/procmail.xml
@@ -1,6 +1,6 @@
-
+
-procmail-&procmail-version;
+Procmail-&procmail-version;
&procmail-intro;
&procmail-inst;
diff --git a/basicnet/mailnews/procmail/procmail-config.xml b/basicnet/mailnews/procmail/procmail-config.xml
index 5632d4ec4d..fcbc9a4be3 100644
--- a/basicnet/mailnews/procmail/procmail-config.xml
+++ b/basicnet/mailnews/procmail/procmail-config.xml
@@ -1,5 +1,5 @@
-Configuring procmail
+Configuring Procmail
Config files
/etc/procmailrc,
diff --git a/basicnet/mailnews/procmail/procmail-desc.xml b/basicnet/mailnews/procmail/procmail-desc.xml
index b9cc5d2792..938e4eeba1 100644
--- a/basicnet/mailnews/procmail/procmail-desc.xml
+++ b/basicnet/mailnews/procmail/procmail-desc.xml
@@ -1,7 +1,7 @@
Contents
-The procmail package contains procmail, formail, lockfile and mailstat.
+The Procmail package contains procmail, formail, lockfile and mailstat.
@@ -21,7 +21,7 @@ use interactively or in a script.
mailstat
mailstat prints a summary report of mail that has been
-filtered by procmail since the last time
+filtered by procmail since the last time
mailstat was ran.
diff --git a/basicnet/mailnews/procmail/procmail-inst.xml b/basicnet/mailnews/procmail/procmail-inst.xml
index 7a42d089c7..ed5186628b 100644
--- a/basicnet/mailnews/procmail/procmail-inst.xml
+++ b/basicnet/mailnews/procmail/procmail-inst.xml
@@ -1,7 +1,7 @@
-Installation of procmail
+Installation of Procmail
-Install procmail by running the following commands:
+Install Procmail by running the following commands:
make BASENAME=/usr install &&
make install-suid
diff --git a/basicnet/mailnews/procmail/procmail-intro.xml b/basicnet/mailnews/procmail/procmail-intro.xml
index c1934ddd19..786299bf42 100644
--- a/basicnet/mailnews/procmail/procmail-intro.xml
+++ b/basicnet/mailnews/procmail/procmail-intro.xml
@@ -1,7 +1,7 @@
-Introduction to procmail
+Introduction to Procmail
-The procmail package contains an autonomous mail processor. This
+The Procmail package contains an autonomous mail processor. This
is useful for filtering and sorting incoming mail.
Package information
diff --git a/server/other/openssh.xml b/server/other/openssh.xml
index 2f5a0c570c..dfaf7066bc 100644
--- a/server/other/openssh.xml
+++ b/server/other/openssh.xml
@@ -1,4 +1,4 @@
-
+
OpenSSH-&openssh-version;
diff --git a/server/other/openssh/openssh-config.xml b/server/other/openssh/openssh-config.xml
index 58fe113161..afdb114d0e 100644
--- a/server/other/openssh/openssh-config.xml
+++ b/server/other/openssh/openssh-config.xml
@@ -1,5 +1,5 @@
-Configuring OpenSSH
+Configuring OpenSSH
Config files
@@ -7,18 +7,21 @@
/etc/ssh/sshd_config
There are no required changes in either of these files. However
you may wish to view them to make changes for appropriate security to
-your system. Configuration information can be found in the man pages for sshd, ssh and ssh-agent
+your system. Configuration information can be found in the man pages for
+sshd, ssh and ssh-agent
+
sshd init.d script
-Note that you only want to start the sshd server if you want to be
-able to ssh into your machine. The ssh client
-doesn't need this script to be used. Having said that, if you want to
-run the ssh daemon, the sshd init.d script can be created using the following
+Note that you only want to start the sshd server if
+you want to be able to ssh into your
+machine. The ssh client doesn't need this script to be
+used. Having said that, if you want to run the ssh daemon,
+the sshd init.d script can be created using the following
commands:
-cat > /etc/rc.d/init.d/sshd << "EOF"
+cat > /etc/rc.d/init.d/sshd << "EOF"
#!/bin/sh
# Begin $rc_base/init.d/sshd
@@ -62,10 +65,11 @@ esac
# End $rc_base/init.d/sshd
EOF
-chmod 755 /etc/rc.d/init.d/sshd
+chmod 755 /etc/rc.d/init.d/sshd
Create the symbolic links to this file in the relevant rc.d directories with the following commands:
+class="directory">rc.d directories with the following
+commands:
cd /etc/rc.d/init.d &&
ln -sf ../init.d/sshd ../rc0.d/K30sshd &&
ln -sf ../init.d/sshd ../rc1.d/K30sshd &&
@@ -73,7 +77,7 @@ ln -sf ../init.d/sshd ../rc2.d/K30sshd &&
ln -sf ../init.d/sshd ../rc3.d/S30sshd &&
ln -sf ../init.d/sshd ../rc4.d/S30sshd &&
ln -sf ../init.d/sshd ../rc5.d/S30sshd &&
-ln -sf ../init.d/sshd ../rc6.d/K30sshd
+ln -sf ../init.d/sshd ../rc6.d/K30sshd
diff --git a/server/other/openssh/openssh-desc.xml b/server/other/openssh/openssh-desc.xml
index 93144100a0..01f7d9e34d 100644
--- a/server/other/openssh/openssh-desc.xml
+++ b/server/other/openssh/openssh-desc.xml
@@ -1,7 +1,7 @@
Contents
-The OpenSSH package contains ssh,
+The OpenSSH package contains ssh,
sshd, ssh-agent,
ssh-add, sftp,
scp, ssh-keygen,
@@ -22,10 +22,11 @@
An authentication agent that can store private keys.
ssh-add
-Tool which adds keys to the ssh-agent.
+Tool which adds keys to the ssh-agent.
sftp
-FTP-like program that works over SSH1 and SSH2 protocol.
+FTP-like program that works over
+SSH1 and SSH2 protocol.
scp
File copy program that acts like rcp.
@@ -34,7 +35,7 @@
Key generation tool.
sftp-server
-SFTP server subsystem.
+SFTP server subsystem.
ssh-keyscan
Utility for gathering public host keys from a number of hosts.
diff --git a/server/other/openssh/openssh-exp.xml b/server/other/openssh/openssh-exp.xml
index 446468d354..40ed14f95a 100644
--- a/server/other/openssh/openssh-exp.xml
+++ b/server/other/openssh/openssh-exp.xml
@@ -6,17 +6,18 @@ configuration files from going to /usr/etc.
--with-md5-passwords : This is required
if you made the changes recommended by the shadowpasswd_plus lfs hint on
-your ssh server when you installed the Shadow Password Suite or if you
-access a ssh server that authenticates by user passwords encrypted with
-md5.
+your SSH server when you installed the Shadow Password
+Suite or if you access a SSH server that authenticates by
+user passwords encrypted with md5.
--libexecdir=/usr/sbin :
-OpenSSH puts
-programs called by programs in /usr/libexec. sftp-server is a sshd
-utility and ssh-askpass is a ssh-add utility that is installed as a
-link to X11-ssh-askpass. Both of these should go in /usr/sbin not /usr/libexec.
+OpenSSH puts
+programs called by programs in /usr/libexec
+. sftp-server is a sshd
+utility and ssh-askpass is a ssh-add
+utility that is installed as a link to X11-ssh-askpass.
+Both of these should go in /usr/sbin
+not /usr/libexec.
diff --git a/server/other/openssh/openssh-inst.xml b/server/other/openssh/openssh-inst.xml
index ad5f2ea3d9..fdfd6a21b0 100644
--- a/server/other/openssh/openssh-inst.xml
+++ b/server/other/openssh/openssh-inst.xml
@@ -1,7 +1,8 @@
-Installation of OpenSSH
+Installation of OpenSSH
-OpenSSH runs as two processes when connecting to other
+OpenSSH runs as two
+processes when connecting to other
computers. The first process is a priviledged process and controls the
issuance of privileges as necessary. The second process communicates
with the network. Additional installation steps are necessary to set up
@@ -13,7 +14,8 @@ chown root:sys /var/empty &&
groupadd sshd &&
useradd -c 'sshd privsep' -d /var/empty -g sshd -s /bin/false sshd
-Install OpenSSH by running the following commands:
+Install OpenSSH by running
+the following commands:
./configure --prefix=/usr --sysconfdir=/etc/ssh \
--libexecdir=/usr/sbin --with-md5-passwords &&
diff --git a/server/other/openssh/openssh-intro.xml b/server/other/openssh/openssh-intro.xml
index 1015e246c9..f40b6b22d6 100644
--- a/server/other/openssh/openssh-intro.xml
+++ b/server/other/openssh/openssh-intro.xml
@@ -1,9 +1,9 @@
-Introduction to OpenSSH
+Introduction to OpenSSH
-The OpenSSH package contains ssh clients and the sshd daemon.
-This is
-useful for encrypting all traffic over a network.
+The OpenSSH package
+contains ssh clients and the sshd daemon.
+This is useful for encrypting all traffic over a network.
Package information
@@ -14,7 +14,7 @@ useful for encrypting all traffic over a network.
Estimated build time: &openssh-time;
-OpenSSH dependencies
+OpenSSH dependencies
Required
Optional