2da3f9dc24645c6ece32631dd7313cf7cd26991c
ccpowell
  Tue Jul 9 11:30:20 2019 -0700
Switching MySQL mentions with MariaDB in mysql.html, refs #23597

diff --git src/hg/htdocs/goldenPath/help/mysql.html src/hg/htdocs/goldenPath/help/mysql.html
index 28ce449..0672cf1 100755
--- src/hg/htdocs/goldenPath/help/mysql.html
+++ src/hg/htdocs/goldenPath/help/mysql.html
@@ -1,32 +1,37 @@
 <!DOCTYPE html>
 <!--#set var="TITLE" value="Genome Browser MySql Downloads" -->
 <!--#set var="ROOT" value="../.." -->
 
 <!-- Relative paths to support mirror sites with non-standard GB docs install -->
 <!--#include virtual="$ROOT/inc/gbPageStart.html" -->
 
 <h1>Downloading Data using MySQL</h1>
 
 <p>
+The UCSC Genome Browser uses MariaDB as our backend database server. MariaDB is a community-developed,
+commercially supported fork of the MySQL relational database management system, intended to remain
+free and open-source software under the GNU General Public License.
+</P>
+<p>
 We have two  MariaDB databases for public access:
 <ul>
   <li><strong>genome-mysql.soe.ucsc.edu</strong> (located on the US west coast)</li>
   <li><strong>genome-euro-mysql.soe.ucsc.edu</strong> (located in Europe)</li>
 </ul></p>
 <p>
-These servers allow MariaDB access to the same set of data currently available on our public
+These servers allow MySQL access to the same set of data currently available on our public
 Genome Browser site. The data are synchronized weekly with the main databases on our public site.
 During synchronization, the MariaDB server can be intermittently out of sync with the main website for
 a short period of time. The weekly synchronization takes place on Monday mornings from 4:00 am to
 9:00 am Pacific Time (GMT -7:00 in summer, GMT -8:00 in winter).</p>
 	
 <h2>Connecting</h2> 
 <p>
 You must have MySQL client libraries installed on your computer. We recommend using the most current
 version of the <a href="http://dev.mysql.com/downloads/mysql/5.0.html" target="_blank">v5.0 MySQL 
 clients</a>.</p>
 <p>
 You can connect to the US MariaDB server using the command:</p>
 <pre><code>mysql --user=genome --host=genome-mysql.soe.ucsc.edu -A -P 3306</code></pre> 
 <p>Or the European MariaDB server with this command:</p>
 <pre><code>mysql --user=genome --host=genome-euro-mysql.soe.ucsc.edu -A -P 3306</code></pre>
@@ -59,31 +64,31 @@
 specifications to your $HOME/.hg.conf file (remember to chmod your .hg.conf file to 600 
 permissions) if you would like to access the US public MariaDB server:</p>
 <pre><code>#US MariaDB server
 db.host=genome-mysql.soe.ucsc.edu
 db.user=genomep
 db.password=password
 central.db=hgcentral
 central.host=genome-mysql.soe.ucsc.edu
 central.user=genomep
 central.password=password
 gbdbLoc1=http://hgdownload.soe.ucsc.edu/gbdb/
 forceTwoBit=on
 </code></pre>
 <p>
 Or these lines if you'd like to access the European MariaDB server:</p>
-<pre><code>#European MySQL server
+<pre><code>#European MariaDB server
 db.host=genome-euro-mysql.soe.ucsc.edu
 db.user=genomep
 db.password=password
 central.db=hgcentral
 central.host=genome-euro-mysql.soe.ucsc.edu
 central.user=genomep
 central.password=password
 gbdbLoc1=http://hgdownload.soe.ucsc.edu/gbdb/
 forceTwoBit=on
 </code></pre>
 
 <p>
 The <code>db.*</code> and <code>central.*</code> settings tell our utilities how to connect to the public MariaDB server.
 The <code>gbdbLoc1</code> setting tells our utilities where to find data files.
 The <code>forceTwoBit</code> setting is necessary for utilities that retrieve genomic sequence.