Skip to content

Commit 42b1670

Browse files
author
Mark Wielaard
committed
Update COPYING and COPYING.DOCS with new FSF address.
Copied latest GPLv2 and GFDLv1.2 files from gnulib. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15621
1 parent 235c116 commit 42b1670

File tree

2 files changed

+18
-20
lines changed

2 files changed

+18
-20
lines changed

COPYING

+15-16
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
GNU GENERAL PUBLIC LICENSE
2-
Version 2, June 1991
1+
GNU GENERAL PUBLIC LICENSE
2+
Version 2, June 1991
33

4-
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
5-
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
4+
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
5+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
66
Everyone is permitted to copy and distribute verbatim copies
77
of this license document, but changing it is not allowed.
88

9-
Preamble
9+
Preamble
1010

1111
The licenses for most software are designed to take away your
1212
freedom to share and change it. By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
1515
General Public License applies to most of the Free Software
1616
Foundation's software and to any other program whose authors commit to
1717
using it. (Some other Free Software Foundation software is covered by
18-
the GNU Library General Public License instead.) You can apply it to
18+
the GNU Lesser General Public License instead.) You can apply it to
1919
your programs, too.
2020

2121
When we speak of free software, we are referring to freedom, not
@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
5656
The precise terms and conditions for copying, distribution and
5757
modification follow.
5858

59-
GNU GENERAL PUBLIC LICENSE
59+
GNU GENERAL PUBLIC LICENSE
6060
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
6161

6262
0. This License applies to any program or other work which contains
@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
255255
of preserving the free status of all derivatives of our free software and
256256
of promoting the sharing and reuse of software generally.
257257

258-
NO WARRANTY
258+
NO WARRANTY
259259

260260
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
261261
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
277277
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
278278
POSSIBILITY OF SUCH DAMAGES.
279279

280-
END OF TERMS AND CONDITIONS
280+
END OF TERMS AND CONDITIONS
281281

282-
How to Apply These Terms to Your New Programs
282+
How to Apply These Terms to Your New Programs
283283

284284
If you develop a new program, and you want it to be of the greatest
285285
possible use to the public, the best way to achieve this is to make it
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
303303
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
304304
GNU General Public License for more details.
305305

306-
You should have received a copy of the GNU General Public License
307-
along with this program; if not, write to the Free Software
308-
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
309-
306+
You should have received a copy of the GNU General Public License along
307+
with this program; if not, write to the Free Software Foundation, Inc.,
308+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
310309

311310
Also add information on how to contact you by electronic and paper mail.
312311

313312
If the program is interactive, make it output a short notice like this
314313
when it starts in an interactive mode:
315314

316-
Gnomovision version 69, Copyright (C) year name of author
315+
Gnomovision version 69, Copyright (C) year name of author
317316
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
318317
This is free software, and you are welcome to redistribute it
319318
under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names:
336335
This General Public License does not permit incorporating your program into
337336
proprietary programs. If your program is a subroutine library, you may
338337
consider it more useful to permit linking proprietary applications with the
339-
library. If this is what you want to do, use the GNU Library General
338+
library. If this is what you want to do, use the GNU Lesser General
340339
Public License instead of this License.

COPYING.DOCS

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
GNU Free Documentation License
2-
Version 1.2, November 2002
1+
GNU Free Documentation License
2+
Version 1.2, November 2002
33

44

55
Copyright (C) 2000,2001,2002 Free Software Foundation, Inc.
6-
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
6+
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
77
Everyone is permitted to copy and distribute verbatim copies
88
of this license document, but changing it is not allowed.
99

@@ -395,4 +395,3 @@ If your document contains nontrivial examples of program code, we
395395
recommend releasing these examples in parallel under your choice of
396396
free software license, such as the GNU General Public License,
397397
to permit their use in free software.
398-

0 commit comments

Comments
 (0)