Change the license.

This commit is contained in:
Toshio Sekiya 2023-04-15 10:24:30 +09:00
parent ed565bcbe1
commit b54944675d
6 changed files with 78 additions and 25 deletions

View file

@ -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

View file

@ -156,11 +156,12 @@ Gtk 4 tutorial with HTML or PDF format</h4>
There is a document (“<a href="Readme_for_developers.html">How to build
GTK 4 Tutorial</a>”) for further information.</p>
<h4 id="license">License</h4>
<p>The license of this repository is GPL and written in <a
href="sec1.html">Section1</a>.</p>
<p>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.</p>
<p>The license of this repository is written in <a
href="sec1.html">Section1</a>. In short,</p>
<ul>
<li>GFDL1.3 for documents</li>
<li>GPL3 for programs</li>
</ul>
<h2 id="table-of-contents">Table of contents</h2>
<ol type="1">
<li><a href="sec1.html">Prerequisite and License</a></li>

View file

@ -139,19 +139,39 @@ rbenv.</li>
standard library of Ruby.</li>
</ul>
<h2 id="license">License</h2>
<p>Copyright (C) 2020-2022 ToshioCP (Toshio Sekiya)</p>
<p>Copyright (C) 2020-2020,2023 ToshioCP (Toshio Sekiya)</p>
<p>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.</p>
in the following description.</p>
<p>GTK4-tutorial is free; you can redistribute it and/or modify it under
terms of the following licenses.</p>
<ul>
<li>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 <code>rake pdf</code>, it is also
included the documents.</li>
<li>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.</li>
</ul>
<p>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 <a
href="https://www.gnu.org/licenses/gpl-3.0.html">GNU General Public
License</a> for more details.</p>
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU License
web pages for more details.</p>
<ul>
<li><a href="https://www.gnu.org/licenses/fdl-1.3.html">GNU Free
Documentation License</a></li>
<li><a href="https://www.gnu.org/licenses/gpl-3.0.html">GNU General
Public License</a></li>
</ul>
<p>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.</p>
</div>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script>
</body>

View file

@ -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)

View file

@ -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

View file

@ -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.