Change files which are mysteriously different to mainline to be

[p5sagit/p5-mst-13.2.git] / pod / perlfaq1.pod

diff --git a/pod/perlfaq1.pod b/pod/perlfaq1.pod
index 43802d6..ec61e8b 100644 (file)
--- a/pod/perlfaq1.pod
+++ b/pod/perlfaq1.pod
@@ -36,7 +36,7 @@ In particular, the core development team (known as the Perl Porters)
 are a rag-tag band of highly altruistic individuals committed
 to producing better software for free than you could hope to
 purchase for money.  You may snoop on pending developments via
-news://news.perl.com/perl.porters-gw/ and the Deja archive at
+nntp://news.perl.com/perl.porters-gw/ and the Deja archive at
 http://www.deja.com/ using the perl.porters-gw newsgroup, or you can
 subscribe to the mailing list by sending perl5-porters-request@perl.org
 a subscription request.
@@ -89,12 +89,12 @@ See L<perlhist> for a history of Perl revisions.
 
 =head2 What is perl6?
 
-At O'Reilly's Second Open Source Convention (also known as the Fourth
-Perl Conference, or TPC4) in July 2000, Larry Wall announced that
-Perl6 development would begin in earnest. Perl6 was an oft used term
-for Chip Salzenberg's project Topaz, but should not be confused with
-the new effort to rewrite Perl while keeping the lessons learned from
-Perl5 and other software in mind.
+At The Second O'Reilly Open Source Software Convention, Larry Wall            
+announced Perl6 development would begin in earnest. Perl6 was an oft
+used term for Chip Salzenberg's project to rewrite Perl in C++ named
+Topaz. However, Topaz should not be confused with the nisus to rewrite
+Perl while keeping the lessons learned from other software, as well as
+Perl5, in mind.
 
 If you have a desire to help in the crusade to make Perl a better place
 then peruse the Perl6 developers page at http://www.perl.org/perl6/ and