[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses agpl-3.0.txt
From: |
Karl Berry |
Subject: |
www/licenses agpl-3.0.txt |
Date: |
Tue, 22 Jan 2008 19:36:31 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: Karl Berry <karl> 08/01/22 19:36:31
Modified files:
licenses : agpl-3.0.txt
Log message:
refilled version of agpl to minimize differences with gpl; from Jay
Lepreau, licensing #347600
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/agpl-3.0.txt?cvsroot=www&r1=1.1&r2=1.2
Patches:
Index: agpl-3.0.txt
===================================================================
RCS file: /web/www/www/licenses/agpl-3.0.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- agpl-3.0.txt 19 Nov 2007 16:06:13 -0000 1.1
+++ agpl-3.0.txt 22 Jan 2008 19:36:14 -0000 1.2
@@ -7,15 +7,15 @@
Preamble
- The GNU Affero General Public License is a free, copyleft license
-for software and other kinds of works, specifically designed to ensure
+ The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
cooperation with the community in the case of network server software.
- The licenses for most software and other practical works are
-designed to take away your freedom to share and change the works. By
-contrast, our General Public Licenses are intended to guarantee your
-freedom to share and change all versions of a program--to make sure it
-remains free software for all its users.
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
@@ -60,11 +60,10 @@
0. Definitions.
- "This License" refers to version 3 of the GNU Affero General Public
-License.
+ "This License" refers to version 3 of the GNU Affero General Public License.
- "Copyright" also means copyright-like laws that apply to other kinds
-of works, such as semiconductor masks.
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
@@ -377,12 +376,12 @@
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further restriction,
-you may remove that term. If a license document contains a further
-restriction but permits relicensing or conveying under this License, you
-may add to a covered work material governed by the terms of that license
-document, provided that the further restriction does not survive such
-relicensing or conveying.
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
@@ -551,34 +550,34 @@
of the GNU General Public License that is incorporated pursuant to the
following paragraph.
- Notwithstanding any other provision of this License, you have permission
-to link or combine any covered work with a work licensed under version 3
-of the GNU General Public License into a single combined work, and to
-convey the resulting work. The terms of this License will continue to
-apply to the part which is the covered work, but the work with which it is
-combined will remain governed by version 3 of the GNU General Public
-License.
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may differ
-in detail to address new problems or concerns.
+the GNU Affero General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU Affero
-General Public License "or any later version" applies to it, you have
-the option of following the terms and conditions either of that
-numbered version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number
-of the GNU Affero General Public License, you may choose any version
-ever published by the Free Software Foundation.
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that
-proxy's public statement of acceptance of a version permanently
-authorizes you to choose that version for the Program.
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
@@ -634,9 +633,9 @@
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses agpl-3.0.txt,
Karl Berry <=