summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Williamson <public@khwilliamson.com>2014-04-01 17:21:48 -0600
committerKarl Williamson <public@khwilliamson.com>2014-04-01 17:30:46 -0600
commita04e6aad3b10787abd99c78eeac04ca9f4b33d0b (patch)
tree37b2e7e9e1a10ace0562027b11b78235b9054183
parent2941e8b221c62b36c8b953d6149d63ce7ebedba4 (diff)
downloadperl-a04e6aad3b10787abd99c78eeac04ca9f4b33d0b.tar.gz
Fix comments and pod that mention 5.20 erroneously
In certain places in the documentation, "5.20" is no longer applicable. Also, a message referred to in perldiag got reworded, but our checks did not catch that perldiag should have been updated.
-rw-r--r--handy.h4
-rw-r--r--intrpvar.h2
-rw-r--r--pod/perldiag.pod11
-rw-r--r--pod/perlrecharclass.pod2
4 files changed, 10 insertions, 9 deletions
diff --git a/handy.h b/handy.h
index 16264fe140..3f84eff9af 100644
--- a/handy.h
+++ b/handy.h
@@ -634,7 +634,7 @@ Returns a boolean indicating whether the specified character is a
whitespace character. This is analogous
to what C<m/\s/> matches in a regular expression. Starting in Perl 5.18
(experimentally), this also matches what C<m/[[:space:]]/> does.
-("Experimentally" means that this change may be backed out in 5.20 or 5.22 if
+("Experimentally" means that this change may be backed out in 5.22 if
field experience indicates that it was unwise.) Prior to 5.18, only the
locale forms of this macro (the ones with C<LC> in their names) matched
precisely what C<m/[[:space:]]/> does. In those releases, the only difference,
@@ -648,7 +648,7 @@ C<isSPACE_LC_uvchr>, and C<isSPACE_LC_utf8>.
(short for Posix Space)
Starting in 5.18, this is identical (experimentally) in all its forms to the
corresponding C<isSPACE()> macros. ("Experimentally" means that this change
-may be backed out in 5.20 or 5.22 if field experience indicates that it
+may be backed out in 5.22 if field experience indicates that it
was unwise.)
The locale forms of this macro are identical to their corresponding
C<isSPACE()> forms in all Perl releases. In releases prior to 5.18, the
diff --git a/intrpvar.h b/intrpvar.h
index 6460f04292..dec3a87d25 100644
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -110,7 +110,7 @@ PERLVAR(I, mainstack, AV *) /* the stack when nothing funny is
/* memory management */
PERLVAR(I, sv_count, IV) /* how many SV* are currently allocated */
PERLVAR(I, sv_objcount, IV) /* DEPRECATED AND UNMAINTAINED.
- * Will be removed in Perl 5.20.
+ * Will be removed in Perl 5.22.
* Used to be: how many objects are currently allocated. */
PERLVAR(I, sv_root, SV *) /* storage for SVs belonging to interp */
diff --git a/pod/perldiag.pod b/pod/perldiag.pod
index 09281ee6c8..8cf416b59d 100644
--- a/pod/perldiag.pod
+++ b/pod/perldiag.pod
@@ -1304,15 +1304,16 @@ or if you use an explicit C<continue>.)
with an assignment operator, which implies modifying the value itself.
Perhaps you need to copy the value to a temporary, and repeat that.
-=item Character following "\c" must be ASCII
+=item Character following "\c" must be printable ASCII
-(F)(D deprecated, syntax) In C<\cI<X>>, I<X> must be an ASCII character.
-It is planned to make this fatal in all instances in Perl v5.20. In
+(F)(D deprecated, syntax) In C<\cI<X>>, I<X> must be a printable
+(non-control) ASCII character. This is fatal starting in v5.20 for
+non-ASCII characters, and it is planned to make this fatal in all
+instances in Perl v5.22. In
the cases where it isn't fatal, the character this evaluates to is
derived by exclusive or'ing the code point of this character with 0x40.
-Note that non-alphabetic ASCII characters are discouraged here as well,
-and using non-printable ones will be deprecated starting in v5.18.
+Note that non-alphabetic ASCII characters are discouraged here as well.
=item Character in 'C' format wrapped in pack
diff --git a/pod/perlrecharclass.pod b/pod/perlrecharclass.pod
index 7dae097c73..ba49ba0d0e 100644
--- a/pod/perlrecharclass.pod
+++ b/pod/perlrecharclass.pod
@@ -326,7 +326,7 @@ effect that changes the C<\s> matching).
Prior to Perl v5.18, C<\s> did not match the vertical tab. The change
in v5.18 is considered an experiment, which means it could be backed out
-in v5.20 or v5.22 if experience indicates that it breaks too much
+in v5.22 if experience indicates that it breaks too much
existing code. If this change adversely affects you, send email to
C<perlbug@perl.org>; if it affects you positively, email
C<perlthanks@perl.org>. In the meantime, C<[^\S\cK]> (obscurely)