Reverted of changes in 1704, see ticket #160

[mailer.git] / inc / phpmailer / README

diff --git a/inc/phpmailer/README b/inc/phpmailer/README
index 900c63043e418c0e6c865f658d4969798863eae2..57a9f4bc5ca450c9eb2ccc4c1ae334dc76e7ee29 100644 (file)
--- a/inc/phpmailer/README
+++ b/inc/phpmailer/README
@@ -1,7 +1,55 @@
+/*******************************************************************\r
+* The http://phpmailer.codeworxtech.com/ website now carries a few *\r
+* advertisements through the Google Adsense network. Please visit  *\r
+* the advertiser sites and help us offset some of our costs.       *\r
+* Thanks ....                                                      *\r
+********************************************************************/\r
+\r

 PHPMailer\r
 Full Featured Email Transfer Class for PHP\r
 ==========================================\r
 \r
 PHPMailer\r
 Full Featured Email Transfer Class for PHP\r
 ==========================================\r
 \r

+Version 2.3 (November 08, 2008)\r
+\r
+PHP4 continues to be a major platform for developers. We are responding\r
+to the emails received to continue development for PHP4 with this \r
+release.\r
+\r
+We have removed the /phpdoc from the downloads. All documentation is now on\r
+the http://phpmailer.codeworxtech.com website.\r
+\r
+For all other changes and notes, please see the changelog.\r
+\r
+Donations are accepted at PayPal with our id "paypal@worxteam.com".\r
+\r
+Version 2.2 (July 15 2008)\r
+\r
+- see the changelog.\r
+\r
+Version 2.0.2 (June 04 2008)\r
+\r
+With this release, we are announcing that the development of PHPMailer for PHP5\r
+will be our focus from this date on. We have implemented all the enhancements\r
+and fixes from the sourceforge.net Tracker.\r
+\r
+** NOTE: WE HAVE A NEW LANGUAGE VARIABLE FOR DIGITALLY SIGNED S/MIME EMAILS.\r
+   IF YOU CAN HELP WITH LANGUAGES OTHER THAN ENGLISH AND SPANISH, IT WOULD BE\r
+   APPRECIATED.\r
+\r
+We have now added S/MIME functionality (ability to digitally sign emails).\r
+BIG THANKS TO "sergiocambra" for posting this patch back in November 2007.\r
+The "Signed Emails" functionality adds the Sign method to pass the private key\r
+filename and the password to read it, and then email will be sent with\r
+content-type multipart/signed and with the digital signature attached.\r
+\r
+We have also included more example files to show the use of "sendmail", "mail()",\r
+"smtp", and "gmail".\r
+\r
+We are also looking for more programmers to join the volunteer development team.\r
+If you have an interest in this, please let us know.\r
+\r
+Enjoy!\r
+\r

 ** NOTE:\r
 \r
 As of November 2007, PHPMailer has a new project team headed by industry\r
 ** NOTE:\r
 \r
 As of November 2007, PHPMailer has a new project team headed by industry\r


@@ -16,7 +64,7 @@ its leadership position. Our goals are to simplify use of PHPMailer, provide
 good documentation and examples, and retain backward compatibility to level\r
 1.7.3 standards.\r
 \r
 good documentation and examples, and retain backward compatibility to level\r
 1.7.3 standards.\r
 \r

-If you are interested in helping out, visit http://sourceforge.net/phpmailer \r
+If you are interested in helping out, visit http://sourceforge.net/projects/phpmailer\r

 and indicate your interest.\r
 \r
 **\r
 and indicate your interest.\r
 \r
 **\r


@@ -58,14 +106,14 @@ Installation:
 \r
 Copy class.phpmailer.php into your php.ini include_path. If you are\r
 using the SMTP mailer then place class.smtp.php in your path as well.\r
 \r
 Copy class.phpmailer.php into your php.ini include_path. If you are\r
 using the SMTP mailer then place class.smtp.php in your path as well.\r

-In the language directory you will find several files like \r
-phpmailer.lang-en.php.  If you look right before the .php extension \r
-that there are two letters.  These represent the language type of the \r
-translation file.  For instance "en" is the English file and "br" is \r
-the Portuguese file.  Chose the file that best fits with your language \r
-and place it in the PHP include path.  If your language is English \r
-then you have nothing more to do.  If it is a different language then \r
-you must point PHPMailer to the correct translation.  To do this, call \r
+In the language directory you will find several files like\r
+phpmailer.lang-en.php.  If you look right before the .php extension\r
+that there are two letters.  These represent the language type of the\r
+translation file.  For instance "en" is the English file and "br" is\r
+the Portuguese file.  Chose the file that best fits with your language\r
+and place it in the PHP include path.  If your language is English\r
+then you have nothing more to do.  If it is a different language then\r
+you must point PHPMailer to the correct translation.  To do this, call\r

 the PHPMailer SetLanguage method like so:\r
 \r
 // To load the Portuguese version\r
 the PHPMailer SetLanguage method like so:\r
 \r
 // To load the Portuguese version\r