Wordpress 3.3-scripts2

[autoinstalls/wordpress.git] / license.txt

diff --git a/license.txt b/license.txt
index b5fcfa6e7a5343eec02d2d25805773efbdf65121..431a146a67bc59b67b65cd66439bf48923b0ee49 100644 (file)
--- a/license.txt
+++ b/license.txt
@@ -1,8 +1,48 @@
+WordPress - Web publishing software\r
+\r
+Copyright 2011 by the contributors\r
+\r
+This program is free software; you can redistribute it and/or modify\r
+it under the terms of the GNU General Public License as published by\r
+the Free Software Foundation; either version 2 of the License, or\r
+(at your option) any later version.\r
+\r
+This program is distributed in the hope that it will be useful,\r
+but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+GNU General Public License for more details.\r
+\r
+You should have received a copy of the GNU General Public License\r
+along with this program; if not, write to the Free Software\r
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\r
+\r
+This program incorporates work covered by the following copyright and\r
+permission notices:\r
+\r
+  b2 is (c) 2001, 2002 Michel Valdrighi - m@tidakada.com -\r
+  http://tidakada.com\r
+\r
+  Wherever third party code has been used, credit has been given in the code's\r
+  comments.\r
+\r
+  b2 is released under the GPL\r
+\r
+and\r
+\r
+  WordPress - Web publishing software\r
+\r
+  Copyright 2003-2010 by the contributors\r
+\r
+  WordPress is released under the GPL\r
+\r
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
+\r

                    GNU GENERAL PUBLIC LICENSE\r
                       Version 2, June 1991\r
 \r
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.\r
                    GNU GENERAL PUBLIC LICENSE\r
                       Version 2, June 1991\r
 \r
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.\r

-                          675 Mass Ave, Cambridge, MA 02139, USA\r
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA\r
+\r

  Everyone is permitted to copy and distribute verbatim copies\r
  of this license document, but changing it is not allowed.\r
 \r
  Everyone is permitted to copy and distribute verbatim copies\r
  of this license document, but changing it is not allowed.\r
 \r


@@ -278,3 +318,10 @@ POSSIBILITY OF SUCH DAMAGES.
 \r
                     END OF TERMS AND CONDITIONS\r
 \r
 \r
                     END OF TERMS AND CONDITIONS\r
 \r

+\r
+WRITTEN OFFER\r
+\r
+The source code for any program binaries or compressed scripts that are\r
+included with WordPress can be freely obtained at the following URL:\r
+\r
+       http://wordpress.org/download/source/\r