svn commit: r1673799 - in /spamassassin/trunk: build/announcements/3.4.1-rc2.txt lib/Mail/SpamAssassin/Conf.pm

[mm...@apache.org]

Author: mmartinec
Date: Wed Apr 15 14:55:52 2015
New Revision: 1673799

URL: http://svn.apache.org/r1673799
Log:
documentation of "perl_version" (wrong version, wrapped long lines)

Modified:
    spamassassin/trunk/build/announcements/3.4.1-rc2.txt
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm

Modified: spamassassin/trunk/build/announcements/3.4.1-rc2.txt
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/announcements/3.4.1-rc2.txt?rev=1673799&r1=1673798&r2=1673799&view=diff
==============================================================================
--- spamassassin/trunk/build/announcements/3.4.1-rc2.txt (original)
+++ spamassassin/trunk/build/announcements/3.4.1-rc2.txt Wed Apr 15 14:55:52 2015
@@ -113,13 +113,16 @@ The configuration option 'check_rbl_from
 in a From mail address as an alternate to check_rbl_from_host. As of
 v3.4.1, it has been improved to include a subtest for a specific octet.
 
+The 'if (boolean perl expression)' now accepts 'perl_version' in the
+expression. The 'perl_version' will be replaced with the version number
+of the currently-running perl engine. Another way of testing perl
+version in a conditional of a configuration file is:
+  if can(Mail::SpamAssassin::Conf::perl_min_version_5010000)
+Please see documentation in the Mail::SpamAssassin::Conf man page.
 
 
 
 
-??? perl_version
-???   (Introduced in 3.4.2)  This will be replaced with the version
-???-->>  THIS NEEDS TO BE FIXED in Conf.pm, WE ARE AT 3.4.1
 
 Added flag 'noawl' to the 'tflags' configuration option.
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=1673799&r1=1673798&r2=1673799&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Wed Apr 15 14:55:52 2015
@@ -4224,17 +4224,18 @@ Namely these characters and ranges:
 This will be replaced with the version number of the currently-running
 SpamAssassin engine.  Note: The version used is in the internal SpamAssassin
 version format which is C<x.yyyzzz>, where x is major version, y is minor
-version, and z is maintenance version.  So 3.0.0 is C<3.000000>, and 3.4.80 is
-C<3.004080>.
+version, and z is maintenance version.  So 3.0.0 is C<3.000000>, and 3.4.80
+is C<3.004080>.
 
 =item perl_version
 
-(Introduced in 3.4.2)  This will be replaced with the version number of the currently-running
-perl engine.  Note: The version used is in the $] version format which is
-C<x.yyyzzz>, where x is major version, y is minor version, and z is maintenance
-version.  So 5.8.8 is C<5.008008>, and 5.10.0 is C<5.010000>. Use to protect rules
-that incorporate RE syntax elements introduced in later versions of perl, such
-as the C<++> non-backtracking match introduced in perl 5.10. For example:
+(Introduced in 3.4.1)  This will be replaced with the version number of the
+currently-running perl engine.  Note: The version used is in the $] version
+format which is C<x.yyyzzz>, where x is major version, y is minor version,
+and z is maintenance version.  So 5.8.8 is C<5.008008>, and 5.10.0 is
+C<5.010000>. Use to protect rules that incorporate RE syntax elements
+introduced in later versions of perl, such as the C<++> non-backtracking
+match introduced in perl 5.10. For example:
 
   # Avoid lint error on older perl installs
   # Check SA version first to avoid warnings on checking perl_version on older SA