summaryrefslogtreecommitdiffstats
path: root/LICENSE.FDL
diff options
context:
space:
mode:
authorLaszlo Papp <lpapp@kde.org>2013-02-14 13:07:46 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-14 14:59:20 +0100
commit2ed0f45fe5fdcc567933697824fb1bd40a2fa353 (patch)
treead0519eb10dd89eaecff23c67f612b54fb1e134e /LICENSE.FDL
parent386a4cb232a1f6dbc6b08d48a7deec62a343ee80 (diff)
Match the documentation license file exactly as requested
Change-Id: I7aa12627e03e08bf12f3ba36e739cf5c17cea925 Reviewed-by: Jason McDonald <macadder1@gmail.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'LICENSE.FDL')
-rw-r--r--LICENSE.FDL18
1 files changed, 9 insertions, 9 deletions
diff --git a/LICENSE.FDL b/LICENSE.FDL
index 086177c0a..938bb8da9 100644
--- a/LICENSE.FDL
+++ b/LICENSE.FDL
@@ -400,19 +400,19 @@ public wiki that anybody can edit is an example of such a server. A
"Massive Multiauthor Collaboration" (or "MMC") contained in the site
means any set of copyrightable works thus published on the MMC site.
-"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0
-license published by Creative Commons Corporation, a not-for-profit
-corporation with a principal place of business in San Francisco,
-California, as well as future copyleft versions of that license
+"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0
+license published by Creative Commons Corporation, a not-for-profit
+corporation with a principal place of business in San Francisco,
+California, as well as future copyleft versions of that license
published by that same organization.
-"Incorporate" means to publish or republish a Document, in whole or in
+"Incorporate" means to publish or republish a Document, in whole or in
part, as part of another Document.
-An MMC is "eligible for relicensing" if it is licensed under this
-License, and if all works that were first published under this License
-somewhere other than this MMC, and subsequently incorporated in whole or
-in part into the MMC, (1) had no cover texts or invariant sections, and
+An MMC is "eligible for relicensing" if it is licensed under this
+License, and if all works that were first published under this License
+somewhere other than this MMC, and subsequently incorporated in whole or
+in part into the MMC, (1) had no cover texts or invariant sections, and
(2) were thus incorporated prior to November 1, 2008.
The operator of an MMC Site may republish an MMC contained in the site