diff options
| author | unknown <nusphere@main.burghcom.com> | 2000-09-22 15:11:22 -0400 |
|---|---|---|
| committer | unknown <nusphere@main.burghcom.com> | 2000-09-22 15:11:22 -0400 |
| commit | acadb7c901bb50da2b01e9cd7329595a41d6e88e (patch) | |
| tree | 934dd02bd7ae5bf9dd05622a2073715f9f52d518 | |
| parent | 5b5d69ffbb12dd1a233027710f7b4e46080793a2 (diff) | |
| parent | 5cde8f058e0f80542e1ab1d7832caf8ca9f123c8 (diff) | |
| download | mariadb-git-acadb7c901bb50da2b01e9cd7329595a41d6e88e.tar.gz | |
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
| -rw-r--r-- | BitKeeper/etc/logging_ok | 2 | ||||
| -rw-r--r-- | Docs/manual.texi | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index dd9420c40f7..4c82a23befa 100644 --- 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 diff --git a/Docs/manual.texi b/Docs/manual.texi index 542c9464ab2..ba218cddd4f 100644 --- 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. |