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

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

Merge jcole@work.mysql.com:/home/bk/mysql
into main.burghcom.com:/usr/home/nusphere/bk/mysql
7a62cdfb · nusphere@main.burghcom.com · f3ca19b7 · 2f160fd9 · 7a62cdfb · 7a62cdfb
Commit 7a62cdfb authored Sep 22, 2000 by nusphere@main.burghcom.com
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

BitKeeper/etc/logging_ok BitKeeper/etc/logging_ok +2 -0

Docs/manual.texi Docs/manual.texi +1 -1

No files found.
--- a/BitKeeper/etc/logging_ok
+++ b/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
--- a/Docs/manual.texi
+++ b/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.