summaryrefslogtreecommitdiff
path: root/pod/perlfaq2.pod
diff options
context:
space:
mode:
Diffstat (limited to 'pod/perlfaq2.pod')
-rw-r--r--pod/perlfaq2.pod48
1 files changed, 23 insertions, 25 deletions
diff --git a/pod/perlfaq2.pod b/pod/perlfaq2.pod
index 4d873c7561..a994042fef 100644
--- a/pod/perlfaq2.pod
+++ b/pod/perlfaq2.pod
@@ -1,6 +1,6 @@
=head1 NAME
-perlfaq2 - Obtaining and Learning about Perl ($Revision: 1.16 $, $Date: 1997/04/23 18:04:09 $)
+perlfaq2 - Obtaining and Learning about Perl ($Revision: 1.20 $, $Date: 1998/07/05 15:07:20 $)
=head1 DESCRIPTION
@@ -204,7 +204,7 @@ we try to provide in the Llama or its defurred cousin the Gecko, please
check out the delightful book, I<Perl: The Programmer's Companion>,
written by Nigel Chapman.
-You can order O'Reilly books diretly from O'Reilly & Associates,
+You can order O'Reilly books directly from O'Reilly & Associates,
1-800-998-9938. Local/overseas is 1-707-829-0515. If you can
locate an O'Reilly order form, you can also fax to 1-707-829-0104.
See http://www.ora.com/ on the Web.
@@ -280,7 +280,7 @@ send mail to subscriptions@tpj.com.
Beyond this, magazines that frequently carry high-quality articles
on Perl are I<Web Techniques> (see http://www.webtechniques.com/),
-I<Performance Computing> at www.performance-computing.com, and Usenix's
+I<Performance Computing> (http://www.performance-computing.com/), and Usenix's
newsletter/magazine to its members, I<login:>, at http://www.usenix.org/.
Randal's Web Technique's columns are available on the web at
http://www.stonehenge.com/merlyn/WebTechniques/.
@@ -351,7 +351,7 @@ to join or leave this list.
=item Perl-Packrats
Discussion related to archiving of perl materials, particularly the
-Comprehensive Perl Archive Network (CPAN). Subscribe by mailing
+Comprehensive Perl Archive Network (CPAN). Subscribe by emailing
majordomo@cis.ufl.edu:
subscribe perl-packrats
@@ -386,15 +386,15 @@ let perlfaq-suggestions@perl.com know.
=head2 Perl Training
While some large training companies offer their own courses on
-Perl, you may prefer to contact individuals near and dear to the
-heart of Perl development. Two well-known members of the Perl
-development team head companies which offer such things are
-Tom Christiansen <perl-classes@perl.com> and Randal Schwartz
-<perl-training-info@stonehenge.com>, plus their respective
-minions, who offer a variety of professional tutorials and
-seminars on Perl. These courses include large public seminars,
-private corporate training, and fly-ins to Colorado and Oregon.
-See http://www.perl.com/perl/info/training.html for more details.
+Perl, you may prefer to contact individuals near and dear to
+the heart of Perl development. Two well-known members of the
+Perl development team head companies which offer such things
+are Tom Christiansen <perl-classes@perl.com> and Randal Schwartz
+<perl-training-info@stonehenge.com>, plus their respective minions,
+who offer a variety of professional tutorials and seminars on Perl.
+These courses include large public seminars, private corporate training,
+and fly-ins to Colorado and Oregon. Contact Tom or Randal for details,
+or see http://www.perl.com/perl/info/training.html on the web.
=head2 Where can I buy a commercial version of Perl?
@@ -483,15 +483,13 @@ while L<perlbot> has some excellent tips and tricks.
Copyright (c) 1997, 1998 Tom Christiansen and Nathan Torkington.
All rights reserved.
-When included as part of the Standard Version of Perl, or as part of
-its complete documentation whether printed or otherwise, this work
-may be distributed only under the terms of Perl's Artistic License.
-Any distribution of this file or derivatives thereof I<outside>
-of that package require that special arrangements be made with
-copyright holder.
-
-Irrespective of its distribution, all code examples in this file
-are hereby placed into the public domain. You are permitted and
-encouraged to use this code in your own programs for fun
-or for profit as you see fit. A simple comment in the code giving
-credit would be courteous but is not required.
+When included as an integrated part of the Standard Distribution
+of Perl or of its documentation (printed or otherwise), this works is
+covered under Perl's Artistic Licence. For separate distributions of
+all or part of this FAQ outside of that, see L<perlfaq>.
+
+Irrespective of its distribution, all code examples here are public
+domain. You are permitted and encouraged to use this code and any
+derivatives thereof in your own programs for fun or for profit as you
+see fit. A simple comment in the code giving credit to the FAQ would
+be courteous but is not required.