diff options
| author | Berke Viktor <berkeviktor@aol.com> | 2011-11-23 03:19:13 +0100 |
|---|---|---|
| committer | Berke Viktor <berkeviktor@aol.com> | 2011-11-23 03:19:13 +0100 |
| commit | 845d8db211680003762f5fe6633e306ec152ffe3 (patch) | |
| tree | f1d0aa3d10c478bfd07debb7724c859ccb5ba831 | |
| parent | b2c45b196c9a09fd2c1c7e86fe7f4391e93e0c1a (diff) | |
| parent | 774ff23920e1e2f3f2f23c7be3da27497c1b5df6 (diff) | |
Merge branch 'master' into wdk
| -rw-r--r-- | plugins/perl/lib/Xchat.pod | 2 | ||||
| -rw-r--r-- | plugins/perl/perl.c | 10 | ||||
| -rw-r--r-- | plugins/perl/xchat2-perl.html | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/plugins/perl/lib/Xchat.pod b/plugins/perl/lib/Xchat.pod index a55a9bce..5b1bc201 100644 --- a/plugins/perl/lib/Xchat.pod +++ b/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; diff --git a/plugins/perl/perl.c b/plugins/perl/perl.c index 2f297769..a454b43d 100644 --- a/plugins/perl/perl.c +++ b/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."); } } diff --git a/plugins/perl/xchat2-perl.html b/plugins/perl/xchat2-perl.html index 38dd3912..d555594e 100644 --- a/plugins/perl/xchat2-perl.html +++ b/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> |