Merge jcole@work.mysql.com:/home/bk/mysql

into main.burghcom.com:/usr/home/nusphere/bk/mysql


Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BitKeeper/etc/logging_ok

@@ -19,3 +19,5 @@ sinisa@work.mysql.com
 tim@localhost.polyesthetic.msg
 tim@work.mysql.com
 tonu@work.mysql.com
+jcole@nslinux.bedford.progress.com
+nusphere@main.burghcom.com

Docs/manual.texi

@@ -2609,7 +2609,7 @@ The manufacturer and model of the machine you are working on.
 
 @item
 The operating system name and version. For most operating systems, you can
-get this information by executing the Unix command @code{uname -a}.
+get this information by executing the UNIX command @code{uname -a}.
 
 @item
 Sometimes the amount of memory (real and virtual) is relevant.