Doc fix. Thanks to Bram.

[perl5.git] / pod / perlfaq1.pod

diff --git a/pod/perlfaq1.pod b/pod/perlfaq1.pod
index a6d3990..7fb8ba1 100644 (file)
--- a/pod/perlfaq1.pod
+++ b/pod/perlfaq1.pod
@@ -1,6 +1,6 @@
 =head1 NAME
 
-perlfaq1 - General Questions About Perl ($Revision: 10127 $)
+perlfaq1 - General Questions About Perl
 
 =head1 DESCRIPTION
 
@@ -59,9 +59,9 @@ users the informal support will more than suffice.  See the answer to
 (contributed by brian d foy)
 
 There is often a matter of opinion and taste, and there isn't any one
-answer that fits anyone.  In general, you want to use either the current
+answer that fits everyone. In general, you want to use either the current
 stable release, or the stable release immediately prior to that one.
-Currently, those are perl5.8.x and perl5.6.x, respectively.
+Currently, those are perl5.10.x and perl5.8.x, respectively.
 
 Beyond that, you have to consider several things and decide which is best
 for you.
@@ -96,7 +96,7 @@ problems others have if you are risk averse.
 
 =item *
 
-The immediate, previous releases (i.e. perl5.6.x ) are usually maintained
+The immediate, previous releases (i.e. perl5.8.x ) are usually maintained
 for a while, although not at the same level as the current releases.
 
 =item *
@@ -107,15 +107,15 @@ as its whitewashed bones have fractured or eroded.
 
 =item *
 
-There is no Perl 6 for the next couple of years.  Stay tuned, but don't
-worry that you'll have to change major versions of Perl soon (i.e. before
-2008).
+There is no Perl 6 release scheduled, but it will be available when
+it's ready.  Stay tuned, but don't worry that you'll have to change
+major versions of Perl; no one is going to take Perl 5 away from you.
 
 =item *
 
 There are really two tracks of perl development: a maintenance version
 and an experimental version.  The maintenance versions are stable, and
-have an even number as the minor release (i.e. perl5.8.x, where 8 is the
+have an even number as the minor release (i.e. perl5.10.x, where 10 is the
 minor release).  The experimental versions may include features that
 don't make it into the stable versions, and have an odd number as the
 minor release (i.e. perl5.9.x, where 9 is the minor release).
@@ -285,7 +285,7 @@ will sleep easier, too--Wall Street programs not withstanding. :-)
 One bit.  Oh, you weren't talking ASCII? :-) Larry now uses "Perl" to
 signify the language proper and "perl" the implementation of it, i.e.
 the current interpreter.  Hence Tom's quip that "Nothing but perl can
-parse Perl."  
+parse Perl."
 
 Before the first edition of I<Programming perl>, people commonly
 referred to the language as "perl", and its name appeared that way in
@@ -335,10 +335,7 @@ to sign email and usenet messages starting in the late 1980s. He
 previously used the phrase with many subjects ("Just another x hacker,"),
 so to distinguish his JAPH, he started to write them as Perl programs:
 
-       print "Just another Perl hacker, ";
-
-Note the trailing comma and space, which allows the addition of other
-JAxH clauses for his many other interests.
+       print "Just another Perl hacker,";
 
 Other people picked up on this and started to write clever or obfuscated
 programs to produce the same output, spinning things quickly out of
@@ -398,17 +395,9 @@ You might find these links useful:
 
 =back
 
-=head1 REVISION
-
-Revision: $Revision: 10127 $
-
-Date: $Date: 2007-10-27 21:40:20 +0200 (Sat, 27 Oct 2007) $
-
-See L<perlfaq> for source control details and availability.
-
 =head1 AUTHOR AND COPYRIGHT
 
-Copyright (c) 1997-2007 Tom Christiansen, Nathan Torkington, and
+Copyright (c) 1997-2010 Tom Christiansen, Nathan Torkington, and
 other authors as noted. All rights reserved.
 
 This documentation is free; you can redistribute it and/or modify it