Merge remote branch 'origin/master' into edge

Author: automatic-merge

README.md

@@ -50,6 +50,10 @@ The GtkAda Reference Manual can be found:
 
   - HTML version: in `gtkada_rm/gtkada_rm/index.html`
 
+Documentation is available on-line
+  - [GtkAda User's Guide](http://docs.adacore.com/live/wave/gtkada/html/gtkada_ug/index.html)
+  - [GtkAda Reference Manual](http://docs.adacore.com/live/wave/gtkada/html/gtkada_rm/index.html)
+
 Patches
 -------
 

src/gtkada-intl.gpb

@@ -7,7 +7,7 @@
 -- This library is free software; you can redistribute it and/or     --
 -- modify it under the terms of the GNU General Public               --
 -- License as published by the Free Software Foundation; either      --
--- version 2 of the License, or (at your option) any later version.  --
+-- version 3 of the License, or (at your option) any later version.  --
 --                                                                   --
 -- This library is distributed in the hope that it will be useful,   --
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of    --

src/misc.c

@@ -8,7 +8,7 @@
 -- This library is free software; you can redistribute it and/or     --
 -- modify it under the terms of the GNU General Public               --
 -- License as published by the Free Software Foundation; either      --
--- version 2 of the License, or (at your option) any later version.  --
+-- version 3 of the License, or (at your option) any later version.  --
 --                                                                   --
 -- This library is distributed in the hope that it will be useful,   --
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of    --

src/misc_osx.h

@@ -7,7 +7,7 @@
 -- This library is free software; you can redistribute it and/or     --
 -- modify it under the terms of the GNU General Public               --
 -- License as published by the Free Software Foundation; either      --
--- version 2 of the License, or (at your option) any later version.  --
+-- version 3 of the License, or (at your option) any later version.  --
 --                                                                   --
 -- This library is distributed in the hope that it will be useful,   --
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of    --

src/misc_osx.m

@@ -8,7 +8,7 @@
 -- This library is free software; you can redistribute it and/or     --
 -- modify it under the terms of the GNU General Public               --
 -- License as published by the Free Software Foundation; either      --
--- version 2 of the License, or (at your option) any later version.  --
+-- version 3 of the License, or (at your option) any later version.  --
 --                                                                   --
 -- This library is distributed in the hope that it will be useful,   --
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of    --

testgtk/create_about.adb

@@ -91,7 +91,7 @@ package body Create_About is
          "This library is free software; you can redistribute it and/or"
          & " modify it under the terms of the GNU General Public"
          & " License as published by the Free Software Foundation; either"
-         & " version 2 of the License, or (at your option) any later version."
+         & " version 3 of the License, or (at your option) any later version."
          & ASCII.LF
          & "This library is distributed in the hope that it will be useful,"
          & " but WITHOUT ANY WARRANTY; without even the implied warranty of"