about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-05-22 03:52:53 +0000
committerAlyssa Ross <hi@alyssa.is>2020-05-22 03:52:53 +0000
commit6a934b0ee82d4725f858b40a95dba711722b4abf (patch)
tree881cacfd9959a1d67428a817d608b5d7e34332e0
parent0bf8bc373a2c609768469883fd4e73d52b721754 (diff)
downloadwww-6a934b0ee82d4725f858b40a95dba711722b4abf.tar
www-6a934b0ee82d4725f858b40a95dba711722b4abf.tar.gz
www-6a934b0ee82d4725f858b40a95dba711722b4abf.tar.bz2
www-6a934b0ee82d4725f858b40a95dba711722b4abf.tar.lz
www-6a934b0ee82d4725f858b40a95dba711722b4abf.tar.xz
www-6a934b0ee82d4725f858b40a95dba711722b4abf.tar.zst
www-6a934b0ee82d4725f858b40a95dba711722b4abf.zip
Clarify license
This isn't a change in license, just clarifying how the GFDL applies.
-rw-r--r--contributing.html14
-rw-r--r--design.html14
-rw-r--r--doc/index.html14
-rw-r--r--index.html14
-rw-r--r--motivation.html14
-rw-r--r--participating.html14
-rw-r--r--todo.html14
7 files changed, 56 insertions, 42 deletions
diff --git a/contributing.html b/contributing.html
index d5c6c40..430c52e 100644
--- a/contributing.html
+++ b/contributing.html
@@ -95,9 +95,11 @@ on <a href="participating.html#spectrum-discuss">spectrum-discuss</a>,
 or in real time on <a href="participating.html#irc">IRC</a>.
 
 <p>
-<small>You may distribute this content under the terms of either
-the <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA</a>
-license (version 4.0 or later), or
-the <a href="https://www.gnu.org/licenses/gfdl.html">GNU Free
-Documentation License</a> (version 1.2 or later), at your
-option.</small>
+<small>Permission is granted to copy, distribute and/or modify this
+document under either the terms of the
+<a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative
+Commons Attribution-ShareAlike 4.0 International License</a>, or the
+<a href="https://www.gnu.org/licenses/fdl-1.3.html">GNU Free
+Documentation License, Version 1.3</a> or any later version published
+by the Free Software Foundation; with no Invariant Sections, no
+Front-Cover Texts, and no Back-Cover Texts.</small>
diff --git a/design.html b/design.html
index 4e617c0..234f656 100644
--- a/design.html
+++ b/design.html
@@ -138,9 +138,11 @@ them to force them to use packages built on other such untrustworthy
 hardware.
 
 <p>
-<small>You may distribute this content under the terms of either
-the <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA</a>
-license (version 4.0 or later), or
-the <a href="https://www.gnu.org/licenses/gfdl.html">GNU Free
-Documentation License</a> (version 1.2 or later), at your
-option.</small>
+<small>Permission is granted to copy, distribute and/or modify this
+document under either the terms of the
+<a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative
+Commons Attribution-ShareAlike 4.0 International License</a>, or the
+<a href="https://www.gnu.org/licenses/fdl-1.3.html">GNU Free
+Documentation License, Version 1.3</a> or any later version published
+by the Free Software Foundation; with no Invariant Sections, no
+Front-Cover Texts, and no Back-Cover Texts.</small>
diff --git a/doc/index.html b/doc/index.html
index 812793b..c6acecc 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -26,9 +26,11 @@
 </ul>
 
 <p>
-<small>You may distribute this content under the terms of either
-the <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA</a>
-license (version 4.0 or later), or
-the <a href="https://www.gnu.org/licenses/gfdl.html">GNU Free
-Documentation License</a> (version 1.2 or later), at your
-option.</small>
+<small>Permission is granted to copy, distribute and/or modify this
+document under either the terms of the
+<a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative
+Commons Attribution-ShareAlike 4.0 International License</a>, or the
+<a href="https://www.gnu.org/licenses/fdl-1.3.html">GNU Free
+Documentation License, Version 1.3</a> or any later version published
+by the Free Software Foundation; with no Invariant Sections, no
+Front-Cover Texts, and no Back-Cover Texts.</small>
diff --git a/index.html b/index.html
index d1999e1..e98443b 100644
--- a/index.html
+++ b/index.html
@@ -82,9 +82,11 @@ Commission.
 </nav>
 
 <p>
-<small>You may distribute this content under the terms of either
-the <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA</a>
-license (version 4.0 or later), or
-the <a href="https://www.gnu.org/licenses/gfdl.html">GNU Free
-Documentation License</a> (version 1.2 or later), at your
-option.</small>
+<small>Permission is granted to copy, distribute and/or modify this
+document under either the terms of the
+<a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative
+Commons Attribution-ShareAlike 4.0 International License</a>, or the
+<a href="https://www.gnu.org/licenses/fdl-1.3.html">GNU Free
+Documentation License, Version 1.3</a> or any later version published
+by the Free Software Foundation; with no Invariant Sections, no
+Front-Cover Texts, and no Back-Cover Texts.</small>
diff --git a/motivation.html b/motivation.html
index a605baf..af8e045 100644
--- a/motivation.html
+++ b/motivation.html
@@ -120,9 +120,11 @@ major security issue.
 The last release of SubgraphOS was an alpha in 2017.
 
 <p>
-<small>You may distribute this content under the terms of either
-the <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA</a>
-license (version 4.0 or later), or
-the <a href="https://www.gnu.org/licenses/gfdl.html">GNU Free
-Documentation License</a> (version 1.2 or later), at your
-option.</small>
+<small>Permission is granted to copy, distribute and/or modify this
+document under either the terms of the
+<a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative
+Commons Attribution-ShareAlike 4.0 International License</a>, or the
+<a href="https://www.gnu.org/licenses/fdl-1.3.html">GNU Free
+Documentation License, Version 1.3</a> or any later version published
+by the Free Software Foundation; with no Invariant Sections, no
+Front-Cover Texts, and no Back-Cover Texts.</small>
diff --git a/participating.html b/participating.html
index 6fe9a80..18f940b 100644
--- a/participating.html
+++ b/participating.html
@@ -148,9 +148,11 @@ the web</a>, or by sending mail
 to <a href="mailto:devel-subscribe@spectrum-os.org">devel-subscribe@spectrum-os.org</a>.
 
 <p>
-<small>You may distribute this content under the terms of either
-the <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA</a>
-license (version 4.0 or later), or
-the <a href="https://www.gnu.org/licenses/gfdl.html">GNU Free
-Documentation License</a> (version 1.2 or later), at your
-option.</small>
+<small>Permission is granted to copy, distribute and/or modify this
+document under either the terms of the
+<a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative
+Commons Attribution-ShareAlike 4.0 International License</a>, or the
+<a href="https://www.gnu.org/licenses/fdl-1.3.html">GNU Free
+Documentation License, Version 1.3</a> or any later version published
+by the Free Software Foundation; with no Invariant Sections, no
+Front-Cover Texts, and no Back-Cover Texts.</small>
diff --git a/todo.html b/todo.html
index b8c091a..abb9c11 100644
--- a/todo.html
+++ b/todo.html
@@ -62,9 +62,11 @@ might be able to help out.
 </ol>
   
 <p>
-<small>You may distribute this content under the terms of either
-the <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA</a>
-license (version 4.0 or later), or
-the <a href="https://www.gnu.org/licenses/gfdl.html">GNU Free
-Documentation License</a> (version 1.2 or later), at your
-option.</small>
+<small>Permission is granted to copy, distribute and/or modify this
+document under either the terms of the
+<a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative
+Commons Attribution-ShareAlike 4.0 International License</a>, or the
+<a href="https://www.gnu.org/licenses/fdl-1.3.html">GNU Free
+Documentation License, Version 1.3</a> or any later version published
+by the Free Software Foundation; with no Invariant Sections, no
+Front-Cover Texts, and no Back-Cover Texts.</small>