Changeset 1907

Timestamp:

03/22/2011 11:40:47 AM (14 months ago)

Author:

Xiping.Wang

Message:

[trunk]Upgrade wordpress to version 3.1

Location:

trunk/blogs

Files:

• license.txt (modified) (2 diffs)
• readme.html (modified) (4 diffs)

trunk/blogs/license.txt

@@ -3 +3 @@
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc. 
-              51 Franklin St, Fifth Floor, Boston, MA 02110, USA
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 
  Everyone is permitted to copy and distribute verbatim copies
@@ -280 +280 @@
                      END OF TERMS AND CONDITIONS
 
+
+WRITTEN OFFER
+
+The source code for any program binaries or compressed scripts that are
+included with WordPress can be freely obtained at the following URL:
+
+        http://wordpress.org/download/source/

trunk/blogs/readme.html

@@ -9 +9 @@
 <h1 id="logo">
         <a href="http://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" width="250" height="68" /></a>
-        <br /> Version 3.0.5
+        <br /> Version 3.1
 </h1>
 <p style="text-align: center">Semantic Personal Publishing Platform</p>
@@ -32 +32 @@
 </ol>
 
-<h1>Upgrading</h1>
-<h2>Using the Automatic Upgrader</h2>
-<p>If you are upgrading from version 2.7 or higher, you can use the automatic upgrader:</p>
+<h1>Updating</h1>
+<h2>Using the Automatic Updater</h2>
+<p>If you are updating from version 2.7 or higher, you can use the automatic updater:</p>
 <ol>
         <li>Open the <span class="file"><a href="wp-admin/update-core.php">wp-admin/update-core.php</a></span> in your browser and follow the instructions.</li>
@@ -40 +40 @@
 </ol>
 
-<h2>Upgrading Manually</h2>
+<h2>Updating Manually</h2>
 <ol>
-        <li>Before you upgrade anything, make sure you have backup copies of any files you may have modified such as <code>index.php</code>.</li>
+        <li>Before you update anything, make sure you have backup copies of any files you may have modified such as <code>index.php</code>.</li>
         <li>Delete your old WordPress files, saving ones you've modified.</li>
         <li>Upload the new files.</li>
@@ -102 +102 @@
 <p>WordPress is the official continuation of <a href="http://cafelog.com/">b2/caf&#233;log</a>, which came from Michel V. The work has been continued by the <a href="http://wordpress.org/about/">WordPress developers</a>. If you would like to support WordPress, please consider <a href="http://wordpress.org/donate/" title="Donate to WordPress">donating</a>.</p>
 
-<h1>Copyright</h1>
+<h1>License</h1>
 <p>WordPress is free software, and is released under the terms of the <abbr title="GNU General Public License">GPL</abbr> version 2 or (at your option) any later version. See <a href="license.txt">license.txt</a>.</p>