summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BitKeeper/etc/logging_ok1
-rw-r--r--Docs/manual.texi4
2 files changed, 3 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 2fe7f501449..4f455e446a8 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -2,3 +2,4 @@ monty@donna.mysql.com
sasha@mysql.sashanet.com
serg@serg.mysql.com
monty@narttu.mysql.fi
+mwagner@work.mysql.com
diff --git a/Docs/manual.texi b/Docs/manual.texi
index ee711dbab3e..898a065545c 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -3021,8 +3021,8 @@ arrangements:
The formal terms of the GPL license can be found at @ref{GPL license}.
Basically, our licensing policy and intepretation of the GPL is as follows:
-Note that older versions of @strong{MySQL} are still using a more strict
-license. See the documentation for that version for more information.
+Note that older versions of @strong{MySQL} are still using a more
+@uref{http://www.mysql.com/support/arrangements/mypl.html, strict license}. See the documentation for that version for more information.
If you need a commercial @strong{MySQL} license, because the GPL license
doesn't suit your application, you can buy one at
@uref{https://order.mysql.com/license.htmy}.