From d698f06f63ab06fc2cb46c75111148088647650e Mon Sep 17 00:00:00 2001
From: Karl Chen <quarl@quarl.org>
Date: Thu, 28 Aug 2003 06:56:53 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=2203
---
 doc/install_python_mysqldb.txt | 12 ++++++++++--
 doc/software.php               | 11 +++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/doc/install_python_mysqldb.txt b/doc/install_python_mysqldb.txt
index 07b1492a65..50f8f93571 100644
--- a/doc/install_python_mysqldb.txt
+++ b/doc/install_python_mysqldb.txt
@@ -1,10 +1,15 @@
 ;; $Id$
 
-To run the test scripts in test/ you need a Python extension module called
-"MySQLdb".  You can get the source here:
+Various BOINC tools depend on a Python extension module called "MySQLdb".  You
+can get the source here:
 
 http://sourceforge.net/projects/mysql-python
 
+WARNING: currently (2003/08/28) BOINC requires version 0.9.2 of
+Python-MySQLdb, however this could be backported to 0.9.1 in the future as
+many Linux distributions seem to have 0.9.1.
+
+
 INSTALLATION INSTRUCTIONS
 =========================
 
@@ -32,6 +37,9 @@ Debian Linux: shared module
 
 Red Hat Linux: shared module
 ----------------------------
+    WARNING: The RPM on SourceForge is currently (2003/08/28) for Python 1.5
+    and will likely not work for your system; instead see below.
+
     1. Download MySQL-python
        $ wget http://easynews.dl.sourceforge.net/sourceforge/mysql-python/MySQL-python-0.9.2-1.i386.rpm
 
diff --git a/doc/software.php b/doc/software.php
index 684a854c47..85d0c620e1 100644
--- a/doc/software.php
+++ b/doc/software.php
@@ -17,20 +17,23 @@ Required to run automated tests, create a project and other various tools:
 <ul>
   <li><b>Python</b> 2.2+
     <ul>
-      <li>Python module <a href=z><b>MySQLdb</b></a> (<a href=z>installation instructions</a>)
-      <li>Python module <a href=z><b>xmlzzzz</b></a>
+      <li>Python module <a
+          href=http://sourceforge.net/projects/mysql-python><b>MySQLdb</b></a>
+          0.9.2 (0.9.1 currently won't work; see <a href=install_python_mysqldb.txt>installation instructions</a>)
+      <li>Python module <a href=http://pyxml.sourceforge.net/><b>xml</b></a> (part of most distributions)
     </ul>
 </ul>
 
 Required on the <b>database</b> server:
 <ul>
-  <li><b>MySQL</b> 3.25+ or 4.0+: other SQL server can be ported.
+  <li><b>MySQL server</b> 3.25+ or 4.0+: other SQL server can be ported.
 </ul>
 
 Required on the <b>master/scheduler</b> server(s):
 <ul>
   <li><b>Apache</b> or other webserver
   <li><b>PHP</b> 4.0
+  <li><b>MySQL client</b>
 </ul>
 
 Optional, required only if you change <code>*/Makefile.am</code>:
@@ -43,7 +46,7 @@ Optional, required only if you change <code>*/Makefile.am</code>:
 <small>
   On Debian Linux you can install all of the above software using
   <blockquote>
-    <code>apt-get install g++ python python-mysqldb python-xml mysql apache php automake autoconf</code>
+    <code>apt-get install g++ python python-mysqldb python-xml mysql-server mysql-client apache php automake autoconf</code>
   </blockquote>
 </small>