### Eclipse Workspace Patch 1.0
#P wordpress-trunk merger
Index: wp-includes/class-pop3.php
===================================================================
--- wp-includes/class-pop3.php	(revision 16173)
+++ wp-includes/class-pop3.php	(working copy)
@@ -11,6 +11,7 @@
  * An RFC 1939 compliant wrapper class for the POP3 protocol.
  *
  * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * @license http://www.gnu.org/licenses/lgpl.html LGPL
  *
  * pop3 class
  *
Index: wp-admin/includes/class-pclzip.php
===================================================================
--- wp-admin/includes/class-pclzip.php	(revision 16173)
+++ wp-admin/includes/class-pclzip.php	(working copy)
@@ -1,4 +1,16 @@
 <?php
+/**
+ * PhpConcept Library - Zip Module 2.8.2
+ *
+ * @package PclZip
+ * @since {@internal unknown}}
+ *
+ * @version 2.8.2
+ * @copyright August 2009, Vincent Blavet
+ * @author Vincent Blavet <vincent@phpconcept.net>
+ * @link http://www.phpconcept.net
+ * @license http://www.gnu.org/licenses/lgpl.html LGPL
+ */
 // --------------------------------------------------------------------------------
 // PhpConcept Library - Zip Module 2.8.2
 // --------------------------------------------------------------------------------
Index: wp-admin/includes/class-ftp.php
===================================================================
--- wp-admin/includes/class-ftp.php	(revision 16173)
+++ wp-admin/includes/class-ftp.php	(working copy)
@@ -9,7 +9,7 @@
  * @copyright Alexey Dotsenko
  * @author Alexey Dotsenko
  * @link http://www.phpclasses.org/browse/package/1743.html Site
- * @license LGPL License http://www.opensource.org/licenses/lgpl-license.html
+ * @license http://www.gnu.org/licenses/lgpl.html LGPL
  */
 
 /**
Index: wp-includes/Text/Diff/Engine/xdiff.php
===================================================================
--- wp-includes/Text/Diff/Engine/xdiff.php	(revision 16173)
+++ wp-includes/Text/Diff/Engine/xdiff.php	(working copy)
@@ -12,6 +12,7 @@
  *
  * @author  Jon Parise <jon@horde.org>
  * @package Text_Diff
+ * @license http://www.gnu.org/licenses/lgpl.html LGPL
  */
 class Text_Diff_Engine_xdiff {
 
Index: wp-includes/class-json.php
===================================================================
--- wp-includes/class-json.php	(revision 16173)
+++ wp-includes/class-json.php	(working copy)
@@ -52,7 +52,7 @@
  * @author		Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
  * @copyright	2005 Michal Migurski
  * @version     CVS: $Id: JSON.php 288200 2009-09-09 15:41:29Z alan_k $
- * @license		http://www.opensource.org/licenses/bsd-license.php
+ * @license		http://www.opensource.org/licenses/bsd-license.php BSD
  * @link		http://pear.php.net/pepr/pepr-proposal-show.php?id=198
  */
 
Index: wp-includes/Text/Diff/Renderer.php
===================================================================
--- wp-includes/Text/Diff/Renderer.php	(revision 16173)
+++ wp-includes/Text/Diff/Renderer.php	(working copy)
@@ -11,6 +11,7 @@
  * not receive this file, see http://opensource.org/licenses/lgpl-license.php.
  *
  * @package Text_Diff
+ * @license http://www.gnu.org/licenses/lgpl.html LGPL
  */
 class Text_Diff_Renderer {
 
Index: wp-includes/Text/Diff/Engine/string.php
===================================================================
--- wp-includes/Text/Diff/Engine/string.php	(revision 16173)
+++ wp-includes/Text/Diff/Engine/string.php	(working copy)
@@ -10,15 +10,16 @@
  * echo $renderer->render($diff);
  * </code>
  *
- * Copyright 2005 Örjan Persson <o@42mm.org>
+ * Copyright 2005 Ă–rjan Persson <o@42mm.org>
  * Copyright 2005-2010 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you did
  * not receive this file, see http://opensource.org/licenses/lgpl-license.php.
  *
- * @author  Örjan Persson <o@42mm.org>
+ * @author  Ă–rjan Persson <o@42mm.org>
  * @package Text_Diff
  * @since   0.2.0
+ * @license http://www.gnu.org/licenses/lgpl.html LGPL
  */
 class Text_Diff_Engine_string {
 
Index: wp-includes/class-phpmailer.php
===================================================================
--- wp-includes/class-phpmailer.php	(revision 16173)
+++ wp-includes/class-phpmailer.php	(working copy)
@@ -29,6 +29,8 @@
  * @package PHPMailer
  * @author Andy Prevost
  * @copyright 2004 - 2009 Andy Prevost
+ * @copyright 2001 - 2003 Brent R. Matzelle
+ * @license http://www.gnu.org/licenses/lgpl.html LGPL
  */
 
 class PHPMailer {
Index: wp-includes/formatting.php
===================================================================
--- wp-includes/formatting.php	(revision 16173)
+++ wp-includes/formatting.php	(working copy)
@@ -996,7 +996,7 @@
  * @since 2.0.4
  *
  * @author Leonard Lin <leonard@acm.org>
- * @license GPL
+ * @license http://www.gnu.org/licenses/gpl.html GPL
  * @copyright November 4, 2001
  * @version 1.1
  * @todo Make better - change loop condition to $text in 1.2
Index: wp-includes/class-simplepie.php
===================================================================
--- wp-includes/class-simplepie.php	(revision 16173)
+++ wp-includes/class-simplepie.php	(working copy)
@@ -40,7 +40,7 @@
  * @author Geoffrey Sneddon
  * @link http://simplepie.org/ SimplePie
  * @link http://simplepie.org/support/ Please submit all bug reports and feature requests to the SimplePie forums
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD
  * @todo phpDoc comments
  */
 
@@ -12312,7 +12312,7 @@
  *
  * @package SimplePie
  * @copyright 2003-2005 The PHP Group
- * @license http://www.opensource.org/licenses/bsd-license.php
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD
  * @link http://pear.php.net/package/Net_IPv6
  * @author Alexander Merz <alexander.merz@web.de>
  * @author elfrink at introweb dot nl
Index: wp-admin/includes/class-ftp-pure.php
===================================================================
--- wp-admin/includes/class-ftp-pure.php	(revision 16173)
+++ wp-admin/includes/class-ftp-pure.php	(working copy)
@@ -9,21 +9,11 @@
  * @copyright Alexey Dotsenko
  * @author Alexey Dotsenko
  * @link http://www.phpclasses.org/browse/package/1743.html Site
- * @license LGPL License http://www.opensource.org/licenses/lgpl-license.html
+ * @license http://www.gnu.org/licenses/lgpl.html LGPL
  */
 
 /**
  * FTP implementation using fsockopen to connect.
- *
- * @package PemFTP
- * @subpackage Pure
- * @since 2.5
- *
- * @version 1.0
- * @copyright Alexey Dotsenko
- * @author Alexey Dotsenko
- * @link http://www.phpclasses.org/browse/package/1743.html Site
- * @license LGPL License http://www.opensource.org/licenses/lgpl-license.html
  */
 class ftp extends ftp_base {
 
Index: wp-includes/class-snoopy.php
===================================================================
--- wp-includes/class-snoopy.php	(revision 16173)
+++ wp-includes/class-snoopy.php	(working copy)
@@ -1,6 +1,11 @@
 <?php
-
 /**
+ * Snoopy - the PHP net client
+ * 
+ * @package Snoopy
+ * @license http://www.gnu.org/licenses/lgpl.html LGPL
+ */
+/**
  * Deprecated. Use WP_HTTP (http.php, class-http.php) instead.
  */
 _deprecated_file( basename( __FILE__ ), '3.0', WPINC . '/http.php' );
@@ -35,6 +40,9 @@
 
 *************************************************/
 
+/**
+ * @deprecated deprecated since version 3.0
+ */
 class Snoopy
 {
 	/**** Public variables ****/
Index: wp-includes/Text/Diff/Engine/shell.php
===================================================================
--- wp-includes/Text/Diff/Engine/shell.php	(revision 16173)
+++ wp-includes/Text/Diff/Engine/shell.php	(working copy)
@@ -13,6 +13,7 @@
  * @author  Milian Wolff <mail@milianw.de>
  * @package Text_Diff
  * @since   0.3.0
+ * @license http://www.gnu.org/licenses/lgpl.html LGPL
  */
 class Text_Diff_Engine_shell {
 
Index: wp-includes/class-smtp.php
===================================================================
--- wp-includes/class-smtp.php	(revision 16173)
+++ wp-includes/class-smtp.php	(working copy)
@@ -31,6 +31,7 @@
  * to an SMTP server.
  * @package PHPMailer
  * @author Chris Ryan
+ * @license http://www.gnu.org/licenses/lgpl.html LGPL
  */
 
 class SMTP
Index: wp-includes/Text/Diff.php
===================================================================
--- wp-includes/Text/Diff.php	(revision 16173)
+++ wp-includes/Text/Diff.php	(working copy)
@@ -14,6 +14,7 @@
  *
  * @package Text_Diff
  * @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
+ * @license http://www.gnu.org/licenses/lgpl.html LGPL
  */
 class Text_Diff {
 
Index: wp-admin/includes/class-ftp-sockets.php
===================================================================
--- wp-admin/includes/class-ftp-sockets.php	(revision 16173)
+++ wp-admin/includes/class-ftp-sockets.php	(working copy)
@@ -9,21 +9,11 @@
  * @copyright Alexey Dotsenko
  * @author Alexey Dotsenko
  * @link http://www.phpclasses.org/browse/package/1743.html Site
- * @license LGPL License http://www.opensource.org/licenses/lgpl-license.html
+ * @license http://www.gnu.org/licenses/lgpl.html LGPL
  */
 
 /**
  * Socket Based FTP implementation
- *
- * @package PemFTP
- * @subpackage Socket
- * @since 2.5
- *
- * @version 1.0
- * @copyright Alexey Dotsenko
- * @author Alexey Dotsenko
- * @link http://www.phpclasses.org/browse/package/1743.html Site
- * @license LGPL License http://www.opensource.org/licenses/lgpl-license.html
  */
 class ftp extends ftp_base {
 
Index: wp-includes/rss.php
===================================================================
--- wp-includes/rss.php	(revision 16173)
+++ wp-includes/rss.php	(working copy)
@@ -6,7 +6,7 @@
  *
  * @author Kellan Elliott-McCrea <kellan@protest.net>
  * @version 0.51
- * @license GPL
+ * @license http://www.gnu.org/licenses/gpl.html GPL
  *
  * @package External
  * @subpackage MagpieRSS
Index: wp-includes/Text/Diff/Engine/native.php
===================================================================
--- wp-includes/Text/Diff/Engine/native.php	(revision 16173)
+++ wp-includes/Text/Diff/Engine/native.php	(working copy)
@@ -25,6 +25,7 @@
  *
  * @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
  * @package Text_Diff
+ * @license http://www.gnu.org/licenses/lgpl.html LGPL
  */
 class Text_Diff_Engine_native {
 
Index: wp-includes/Text/Diff/Renderer/inline.php
===================================================================
--- wp-includes/Text/Diff/Renderer/inline.php	(revision 16173)
+++ wp-includes/Text/Diff/Renderer/inline.php	(working copy)
@@ -9,6 +9,7 @@
  *
  * @author  Ciprian Popovici
  * @package Text_Diff
+ * @license http://www.gnu.org/licenses/lgpl.html LGPL
  */
 
 /** Text_Diff_Renderer */