diff --git a/README.md b/README.md index f2a6ca7..6ae0bfb 100644 --- a/README.md +++ b/README.md @@ -53,10 +53,11 @@ There is a document \("[How to build GTK 4 Tutorial](gfm/Readme_for_developers.m #### License -The license of this repository is GPL and written in [Section1](gfm/sec1.md). +The license of this repository is written in [Section1](gfm/sec1.md). +In short, -But new licenses, one of which is GFDL1.3 for documents and the other is GPL3 for programs, are under consideration. -The decision will be made on 15/April/2023. +- GFDL1.3 for documents +- GPL3 for programs ## Table of contents diff --git a/docs/index.html b/docs/index.html index a72878e..0a4d893 100644 --- a/docs/index.html +++ b/docs/index.html @@ -156,11 +156,12 @@ Gtk 4 tutorial with HTML or PDF format There is a document (“How to build GTK 4 Tutorial”) for further information.

License

-

The license of this repository is GPL and written in Section1.

-

But new licenses, one of which is GFDL1.3 for documents and the other -is GPL3 for programs, are under consideration. The decision will be made -on 15/April/2023.

+

The license of this repository is written in Section1. In short,

+

Table of contents

  1. Prerequisite and License
    2. diff --git a/docs/sec1.html b/docs/sec1.html index d2ced93..9f058a6 100644 --- a/docs/sec1.html +++ b/docs/sec1.html @@ -139,19 +139,39 @@ rbenv. standard library of Ruby.

    License

    -

    Copyright (C) 2020-2022 ToshioCP (Toshio Sekiya)

    +

    Copyright (C) 2020-2020,2023 ToshioCP (Toshio Sekiya)

    GTK4-tutorial repository contains tutorial documents and programs such as converters, generators and controllers. All of them make up the ‘GTK4-tutorial’ package. This package is simply called ‘GTK4-tutorial’ -in the following description. ‘GTK4-tutorial’ is free; 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 3 of the License or, at your option, any later version.

    +in the following description.

    +

    GTK4-tutorial is free; you can redistribute it and/or modify it under +terms of the following licenses.

    +

    ‘GTK4-tutorial’ is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public -License for more details.

    +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU License +web pages for more details.

    + +

    The licenses above is effective since 15/April/2023. Before that, GPL +covered all the contents of the GTK4-tutorial. But GFDL1.3 is more +appropriate for documents so the license was changed. The license above +is the only effective license since 15/April/2023.

    diff --git a/gfm/sec1.md b/gfm/sec1.md index ed96294..e6a4577 100644 --- a/gfm/sec1.md +++ b/gfm/sec1.md @@ -36,14 +36,29 @@ You don't need to install it separately because it is a standard library of Ruby ## License -Copyright (C) 2020-2022 ToshioCP (Toshio Sekiya) +Copyright (C) 2020-2020,2023 ToshioCP (Toshio Sekiya) GTK4-tutorial repository contains tutorial documents and programs such as converters, generators and controllers. All of them make up the 'GTK4-tutorial' package. This package is simply called 'GTK4-tutorial' in the following description. -'GTK4-tutorial' is free; 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 3 of the License or, at your option, any later version. + +GTK4-tutorial is free; you can redistribute it and/or modify it under terms of the following licenses. + +- The license of documents in GTK4-tutorial is the GNU Free Documentation License as published by the Free Software Foundation; either version 1.3 of the License or, at your opinion, any later version. +The documents are Markdown, HTML and image files. +If you generate a PDF file by running `rake pdf`, it is also included the documents. +- The license of programs in GTK4-tutorial is the GNU General Public License as published by the Free Software Foundation; either version 3 of the License or, at your option, any later version. +The programs are written in C, Ruby and other languages. 'GTK4-tutorial' is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the [GNU General Public License](https://www.gnu.org/licenses/gpl-3.0.html) for more details. +See the GNU License web pages for more details. + +- [GNU Free Documentation License](https://www.gnu.org/licenses/fdl-1.3.html) +- [GNU General Public License](https://www.gnu.org/licenses/gpl-3.0.html) + +The licenses above is effective since 15/April/2023. +Before that, GPL covered all the contents of the GTK4-tutorial. +But GFDL1.3 is more appropriate for documents so the license was changed. +The license above is the only effective license since 15/April/2023. Up: [README.md](../README.md), Next: [Section 2](sec2.md) diff --git a/src/abstract.src.md b/src/abstract.src.md index b39d806..e68a62f 100644 --- a/src/abstract.src.md +++ b/src/abstract.src.md @@ -55,7 +55,8 @@ An appendix "How to build GTK 4 Tutorial" describes how to make them. #### License -The license of this repository is GPL and written in [Section1](sec1.src.md). +The license of this repository is written in [Section1](sec1.src.md). +In short, -But new licenses, one of which is GFDL1.3 for documents and the other is GPL3 for programs, are under consideration. -The decision will be made on 15/April/2023. +- GFDL1.3 for documents +- GPL3 for programs diff --git a/src/sec1.src.md b/src/sec1.src.md index ac53979..e7ad335 100644 --- a/src/sec1.src.md +++ b/src/sec1.src.md @@ -34,12 +34,27 @@ You don't need to install it separately because it is a standard library of Ruby ## License -Copyright (C) 2020-2022 ToshioCP (Toshio Sekiya) +Copyright (C) 2020-2020,2023 ToshioCP (Toshio Sekiya) GTK4-tutorial repository contains tutorial documents and programs such as converters, generators and controllers. All of them make up the 'GTK4-tutorial' package. This package is simply called 'GTK4-tutorial' in the following description. -'GTK4-tutorial' is free; 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 3 of the License or, at your option, any later version. + +GTK4-tutorial is free; you can redistribute it and/or modify it under terms of the following licenses. + +- The license of documents in GTK4-tutorial is the GNU Free Documentation License as published by the Free Software Foundation; either version 1.3 of the License or, at your opinion, any later version. +The documents are Markdown, HTML and image files. +If you generate a PDF file by running `rake pdf`, it is also included the documents. +- The license of programs in GTK4-tutorial is the GNU General Public License as published by the Free Software Foundation; either version 3 of the License or, at your option, any later version. +The programs are written in C, Ruby and other languages. 'GTK4-tutorial' is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the [GNU General Public License](https://www.gnu.org/licenses/gpl-3.0.html) for more details. +See the GNU License web pages for more details. + +- [GNU Free Documentation License](https://www.gnu.org/licenses/fdl-1.3.html) +- [GNU General Public License](https://www.gnu.org/licenses/gpl-3.0.html) + +The licenses above is effective since 15/April/2023. +Before that, GPL covered all the contents of the GTK4-tutorial. +But GFDL1.3 is more appropriate for documents so the license was changed. +The license above is the only effective license since 15/April/2023.