(sql-mysql): Doc change by RMS.

(sql-db2): Doc change.
(sql-help): Doc change by Christian Egli <christian.egli@stest.ch>.
(sql-mysql): Doc change by Christian Egli <christian.egli@stest.ch>.

diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 13f9e9eebbf4446198cd0aaaf9ee1035e4acfe43..b3a520627771bdc829b7dd04e7631ffabf1e59a2 100644 (file)
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -4,7 +4,7 @@
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Alex Schroeder <alex@gnu.org>
-;; Version: 1.6.2
+;; Version: 1.6.3
 ;; Keywords: comm languages processes
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?SqlMode
 
@@ -796,10 +796,10 @@ usually named `*SQL*'.  The name of the major mode is SQLi.
 Use the following commands to start a specific SQL interpreter:
 
     PostGres: \\[sql-postgres]
+    MySQL: \\[sql-mysql]
 
 Other non-free SQL implementations are also supported:
 
-    MySQL: \\[sql-mysql]
     Solid: \\[sql-solid]
     Oracle: \\[sql-oracle]
     Informix: \\[sql-informix]
@@ -1447,8 +1447,7 @@ The default comes from `process-coding-system-alist' and
 (defun sql-mysql ()
   "Run mysql by TcX as an inferior process.
 
-Note that the widespread idea that mysql is free software is inaccurate;
-its license is too restrictive.  We urge you to use PostGres instead.
+Mysql versions 3.23 and up are free software.
 
 If buffer `*SQL*' exists but no process is running, make a new process.
 If buffer exists and a process is running, just switch to buffer