Merge branch 'master' into wdk

plugins/perl/lib/Xchat.pod

@@ -723,7 +723,7 @@ Send multiple mode changes for the current channel. It may send multiple MODE li
 Example:
 
 =begin html
-<<div class="example">
+<div class="example">
 <code>
 use strict;
 use warning;

plugins/perl/perl.c

@@ -1357,14 +1357,18 @@ perl_load_file (char *filename)
 					FreeLibrary (lib);
 					lib = NULL;
 					thread_mbox ("Cannot open " PERL_DLL "\n\n"
-									 "You must have Strawberry Perl " PERL_REQUIRED_VERSION " installed in order to\n"
+									 "You must have either ActivePerl or Straberry Perl"
+									 PERL_REQUIRED_VERSION
+									 " installed in order to\n"
 									 "run perl scripts.\n\n"
 									 "I have found Perl 5.6, but that is too old.");
 				} else {
 					thread_mbox ("Cannot open " PERL_DLL "\n\n"
-									 "You must have Strawberry Perl " PERL_REQUIRED_VERSION " installed in order to\n"
+									 "You must have either ActivePerl or Strawberry Perl "
+									 PERL_REQUIRED_VERSION " installed in order to\n"
 									 "run perl scripts.\n\n"
-									 "http://strawberryperl.com\n\n"
+									 "http://www.activestate.com/ActivePerl/\n"
+									 "http://strawberryperl.com/\n"
 									 "Make sure perl's bin directory is in your PATH.");
 				}
 			}

plugins/perl/xchat2-perl.html

@@ -686,7 +686,7 @@ One is the original and the second is the one you emit.</p>
 </ul>
 <p>Send multiple mode changes for the current channel. It may send multiple MODE lines if the request doesn't fit on one.</p>
 <p>Example:</p>
-<<div class="example synNormal"><div class='line_number'>
+<div class="example synNormal"><div class='line_number'>
 <div>1</div>
 <div>2</div>
 <div>3</div>