Changeset 17301

Timestamp:

01/14/2011 07:26:43 PM (14 years ago)

Author:

markjaquith

Message:

WordPress contains libraries only available under the GPL v2 or later. No one cares about the GPL v1 anymore. We are now specifically saying that WordPress is available under the GPL version 2 or (at your option) any later version. This was discussed with the entire core team.

Location:

trunk

Files:

• readme.html (modified) (1 diff)
• wp-includes/version.php (modified) (1 diff)

trunk/readme.html

@@ -103 +103 @@
 
 <h1>License</h1>
-<p>WordPress is released under the <abbr title="GNU Public License">GPL</abbr> (see <a href="license.txt">license.txt</a>).</p>
+<p>WordPress is free software, and is released under the terms of the <abbr title="GNU Public License">GPL</abbr> version 2 or (at your option) any later version. See <a href="license.txt">license.txt</a>.</p>
 
 

trunk/wp-includes/version.php

@@ -1 +1 @@
 <?php
-/**
- * This holds the version number in a separate file so we can bump it without cluttering the SVN
- */
+/*
+WordPress - Web publishing software
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+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
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
 
 /**