diff options
| -rw-r--r-- | MANIFEST | 5 | ||||
| -rw-r--r-- | cpan/perlfaq/lib/perlfaq2.pod | 3 | ||||
| -rw-r--r-- | cpan/perlfaq/lib/perlfaq3.pod | 4 | ||||
| -rw-r--r-- | cpan/perlfaq/lib/perlfaq4.pod | 2 | ||||
| -rw-r--r-- | cpan/perlfaq/lib/perlfaq7.pod | 14 | ||||
| -rw-r--r-- | plan9/mkfile | 2 | ||||
| -rw-r--r-- | pod.lst | 5 | ||||
| -rw-r--r-- | pod/perl.pod | 8 | ||||
| -rw-r--r-- | pod/perlfunc.pod | 3 | ||||
| -rw-r--r-- | pod/perlintro.pod | 2 | ||||
| -rw-r--r-- | pod/perlmod.pod | 4 | ||||
| -rw-r--r-- | pod/perlmodlib.PL | 4 | ||||
| -rw-r--r-- | pod/perlref.pod | 2 | ||||
| -rw-r--r-- | pod/perlsub.pod | 2 | ||||
| -rw-r--r-- | pod/roffitall | 4 | ||||
| -rw-r--r-- | t/porting/known_pod_issues.dat | 1 | ||||
| -rw-r--r-- | win32/pod.mak | 20 |
17 files changed, 27 insertions, 58 deletions
@@ -4406,8 +4406,6 @@ pod/perl58delta.pod Perl changes in version 5.8.0 pod/perlapio.pod Perl internal IO abstraction interface pod/perlartistic.pod Perl Artistic License pod/perlbook.pod Perl book information -pod/perlboot.pod Perl OO tutorial for beginners -pod/perlbot.pod Perl OO tricks and examples pod/perlcall.pod Perl calling conventions from C pod/perlcheat.pod Perl cheat sheet pod/perlclib.pod Internal replacements for standard C library functions @@ -4451,6 +4449,7 @@ pod/perlmroapi.pod Perl method resolution plugin interface pod/perlnewmod.pod Perl modules: preparing a new module for distribution pod/perlnumber.pod Perl number semantics pod/perlobj.pod Perl objects +pod/perlootut.pod Perl OO tutorial for beginners pod/perlopentut.pod Perl open() tutorial pod/perlop.pod Perl operators and precedence pod/perlpacktut.pod Perl pack() and unpack() tutorial @@ -4481,8 +4480,6 @@ pod/perlsyn.pod Perl syntax pod/perlthrtut.pod Perl threads tutorial pod/perltie.pod Perl objects hidden behind simple variables pod/perltodo.pod Perl things to do -pod/perltooc.pod Perl OO tutorial, part 2 -pod/perltoot.pod Perl OO tutorial, part 1 pod/perltrap.pod Perl traps for the unwary pod/perlunicode.pod Perl Unicode support pod/perlunifaq.pod Perl Unicode FAQ diff --git a/cpan/perlfaq/lib/perlfaq2.pod b/cpan/perlfaq/lib/perlfaq2.pod index cf778ee4a2..4a6d8406d6 100644 --- a/cpan/perlfaq/lib/perlfaq2.pod +++ b/cpan/perlfaq/lib/perlfaq2.pod @@ -150,8 +150,7 @@ Many good books have been written about Perl--see the section later in L<perlfaq2> for more details. Tutorial documents included in current or upcoming Perl releases -include L<perltoot> for objects or L<perlboot> for a beginner's -approach to objects, L<perlopentut> for file opening semantics, +include L<perlootut> for objects, L<perlopentut> for file opening semantics, L<perlreftut> for managing references, L<perlretut> for regular expressions, L<perlthrtut> for threads, L<perldebtut> for debugging, and L<perlxstut> for linking C and Perl together. There may be more diff --git a/cpan/perlfaq/lib/perlfaq3.pod b/cpan/perlfaq/lib/perlfaq3.pod index 689523ca46..9772349b0f 100644 --- a/cpan/perlfaq/lib/perlfaq3.pod +++ b/cpan/perlfaq/lib/perlfaq3.pod @@ -1024,8 +1024,8 @@ guides and references in L<perlfaq9> or in the CGI MetaFAQ: =head2 Where can I learn about object-oriented Perl programming? -A good place to start is L<perltoot>, and you can use L<perlobj>, -L<perlboot>, L<perltoot>, L<perltooc>, and L<perlbot> for reference. +A good place to start is L<perlootut>, and you can use L<perlobj>, +for reference. A good book on OO on Perl is the "Object-Oriented Perl" by Damian Conway from Manning Publications, or "Intermediate Perl" diff --git a/cpan/perlfaq/lib/perlfaq4.pod b/cpan/perlfaq/lib/perlfaq4.pod index 6bca48e794..363f1176cb 100644 --- a/cpan/perlfaq/lib/perlfaq4.pod +++ b/cpan/perlfaq/lib/perlfaq4.pod @@ -2435,7 +2435,7 @@ Usually a hash ref, perhaps like this: References are documented in L<perlref> and L<perlreftut>. Examples of complex data structures are given in L<perldsc> and L<perllol>. Examples of structures and object-oriented classes are -in L<perltoot>. +in L<perlootut>. =head2 How can I use a reference as a hash key? diff --git a/cpan/perlfaq/lib/perlfaq7.pod b/cpan/perlfaq/lib/perlfaq7.pod index df7a07ae9f..38329b229e 100644 --- a/cpan/perlfaq/lib/perlfaq7.pod +++ b/cpan/perlfaq/lib/perlfaq7.pod @@ -174,7 +174,7 @@ Here's an example: $person->{AGE} = 24; # set field AGE to 24 $person->{NAME} = "Nat"; # set field NAME to "Nat" -If you're looking for something a bit more rigorous, try L<perltoot>. +If you're looking for something a bit more rigorous, try L<perlootut>. =head2 How do I create a module? @@ -248,10 +248,8 @@ Perl doesn't get more formal than that and lets you set up the package just the way that you like it (that is, it doesn't set up anything for you). -The Perl documentation has several tutorials that cover class -creation, including L<perlboot> (Barnyard Object Oriented Tutorial), -L<perltoot> (Tom's Object Oriented Tutorial), L<perlbot> (Bag o' -Object Tricks), and L<perlobj>. +The Perl documentation has a tutorial on object oriented programming in +L<perlootut>. Also see the perl objects reference docs in L<perlobj>. =head2 How can I tell if a variable is tainted? @@ -641,7 +639,7 @@ then you'll want to use the C<use overload> pragma, documented in L<overload>. If you're talking about obscuring method calls in parent classes, -see L<perltoot/"Overridden Methods">. +see L<perlobj/"Inheritance">. =head2 What's the difference between calling a function as &foo and foo()? @@ -781,7 +779,7 @@ when complex syntax is involved. =head2 How can I catch accesses to undefined variables, functions, or methods? The AUTOLOAD method, discussed in L<perlsub/"Autoloading"> and -L<perltoot/"AUTOLOAD: Proxy Methods">, lets you capture calls to +L<perlobj/"AUTOLOAD">, lets you capture calls to undefined functions and methods. When it comes to undefined variables that would trigger a warning @@ -793,7 +791,7 @@ under C<use warnings>, you can promote the warning to an error. Some possible reasons: your inheritance is getting confused, you've misspelled the method name, or the object is of the wrong type. Check -out L<perltoot> for details about any of the above cases. You may +out L<perlobj> for details about any of the above cases. You may also use C<print ref($object)> to find out the class C<$object> was blessed into. diff --git a/plan9/mkfile b/plan9/mkfile index 2d7b4bf013..8f086b0440 100644 --- a/plan9/mkfile +++ b/plan9/mkfile @@ -20,7 +20,7 @@ perlshr = $archlib/CORE/libperlshr.a installman1dir = /sys/man/1 installman3dir = /sys/man/2 -podnames = perl perlbook perlboot perlbot perldata perldebtut perldiag perldsc perlform perlfunc perlipc perllexwarn perllol perlmod perlmodlib perlmodinstall perlnewmod perlop perlopentut perlpacktut perlpod perlport perlrequick perlretut perlref perlreftut perlrequick perlrun perlsec perlstyle perlsub perlsyn perltie perltoc perltooc perltoot perltrap perlutil perlunifaq perluniintro perlvar +podnames = perl perlbook perldata perldebtut perldiag perldsc perlform perlfunc perlipc perllexwarn perllol perlmod perlmodlib perlmodinstall perlnewmod perlop perlootut perlopentut perlpacktut perlpod perlport perlrequick perlretut perlref perlreftut perlrequick perlrun perlsec perlstyle perlsub perlsyn perltie perltrap perlutil perlunifaq perluniintro perlvar faqpodnames = perlfaq perlfaq1 perlfaq2 perlfaq3 perlfaq4 perlfaq5 perlfaq6 perlfaq7 perlfaq8 perlfaq9 advpodnames = perlapi perlapio perlcall perlclib perlcompile perldebguts perldbmfilter perldebug perldelta perldiag perlebcdic perlembed perlfilter perlfork perlguts perlhack perlintern perliol perllocale perlnumber perlobj perlpodspec perlre perlthrtut perltodo perlunicode perlxs perlxs perlxstut archpodnames = perlaix perlamiga perlbeos perlbs2000 perlce perlcygwin perldgux perldos perlepoc perlfreebsd perlhpux perlhurd perlirix perlmacos perlmpeix perlnetware perlos2 perlos390 perlos400 perlplan9 perlqnx perlsolaris perltru64 perluts perlvmesa perlvms perlvos perlwin32 @@ -20,10 +20,7 @@ h Tutorials perlrequick Perl regular expressions quick start perlretut Perl regular expressions tutorial - perlboot Perl OO tutorial for beginners - perltoot Perl OO tutorial, part 1 - perltooc Perl OO tutorial, part 2 - perlbot Perl OO tricks and examples + perlootut Perl OO tutorial for beginners perlperf Perl Performance and Optimization Techniques diff --git a/pod/perl.pod b/pod/perl.pod index a8509377fe..8b5ed2eb3f 100644 --- a/pod/perl.pod +++ b/pod/perl.pod @@ -43,10 +43,7 @@ For ease of access, the Perl manual has been split up into several sections. perlrequick Perl regular expressions quick start perlretut Perl regular expressions tutorial - perlboot Perl OO tutorial for beginners - perltoot Perl OO tutorial, part 1 - perltooc Perl OO tutorial, part 2 - perlbot Perl OO tricks and examples + perlootut Perl OO tutorial for beginners perlperf Perl Performance and Optimization Techniques @@ -319,8 +316,7 @@ Described in L<perlreftut>, L<perlref>, L<perldsc>, and L<perllol>. object-oriented programming -Described in L<perlobj>, L<perlboot>, L<perltoot>, L<perltooc>, -and L<perlbot>. +Described in L<perlobj> and L<perlootut>. =item * diff --git a/pod/perlfunc.pod b/pod/perlfunc.pod index f457188b6e..f76c47cd14 100644 --- a/pod/perlfunc.pod +++ b/pod/perlfunc.pod @@ -635,8 +635,7 @@ in the CLASSNAME package. If CLASSNAME is omitted, the current package is used. Because a C<bless> is often the last thing in a constructor, it returns the reference for convenience. Always use the two-argument version if a derived class might inherit the function doing the blessing. -See L<perltoot> and L<perlobj> for more about the blessing (and blessings) -of objects. +SeeL<perlobj> for more about the blessing (and blessings) of objects. Consider always blessing objects in CLASSNAMEs that are mixed case. Namespaces with all lowercase names are considered reserved for diff --git a/pod/perlintro.pod b/pod/perlintro.pod index 2d0076a029..5e2fe5c9af 100644 --- a/pod/perlintro.pod +++ b/pod/perlintro.pod @@ -660,7 +660,7 @@ For more information on writing subroutines, see L<perlsub>. OO Perl is relatively simple and is implemented using references which know what sort of object they are based on Perl's concept of packages. However, OO Perl is largely beyond the scope of this document. -Read L<perlboot>, L<perltoot>, L<perltooc> and L<perlobj>. +Read L<perlootut> and L<perlobj>. As a beginning Perl programmer, your most common use of OO Perl will be in using third-party modules, which are documented below. diff --git a/pod/perlmod.pod b/pod/perlmod.pod index f02193324f..e31b0b9fce 100644 --- a/pod/perlmod.pod +++ b/pod/perlmod.pod @@ -381,7 +381,7 @@ package may also derive some of its methods from another class (package) by listing the other package name(s) in its global @ISA array (which must be a package global, not a lexical). -For more on this, see L<perltoot> and L<perlobj>. +For more on this, see L<perlootut> and L<perlobj>. =head2 Perl Modules X<module> @@ -606,7 +606,7 @@ C<1> value. See L<perlmodlib> for general style issues related to building Perl modules and classes, as well as descriptions of the standard library and CPAN, L<Exporter> for how Perl's standard import/export mechanism -works, L<perltoot> and L<perltooc> for an in-depth tutorial on +works, L<perlootut> and L<perlobj> for in-depth information on creating classes, L<perlobj> for a hard-core reference document on objects, L<perlsub> for an explanation of functions and scoping, and L<perlxstut> and L<perlguts> for more information on writing diff --git a/pod/perlmodlib.PL b/pod/perlmodlib.PL index 26f69cb3e8..74e85e7afa 100644 --- a/pod/perlmodlib.PL +++ b/pod/perlmodlib.PL @@ -1044,7 +1044,7 @@ its methods by loading dynamic C or C++ objects, but that should be totally transparent to the user of the module. Likewise, the module might set up an AUTOLOAD function to slurp in subroutine definitions on demand, but this is also transparent. Only the F<.pm> file is required to -exist. See L<perlsub>, L<perltoot>, and L<AutoLoader> for details about +exist. See L<perlsub>, L<perlobj>, and L<AutoLoader> for details about the AUTOLOAD mechanism. =head2 Guidelines for Module Creation @@ -1104,7 +1104,7 @@ Let the objects look after themselves! Generally, avoid hard-wired class names as far as possible. Avoid C<< $r->Class::func() >> where using C<@ISA=qw(... Class ...)> and -C<< $r->func() >> would work (see L<perlbot> for more details). +C<< $r->func() >> would work. Use autosplit so little used or newly added functions won't be a burden to programs that don't use them. Add test functions to diff --git a/pod/perlref.pod b/pod/perlref.pod index f1dffceeff..9189de2eb4 100644 --- a/pod/perlref.pod +++ b/pod/perlref.pod @@ -747,5 +747,5 @@ Some pathological examples of the use of references can be found in the F<t/op/ref.t> regression test in the Perl source directory. See also L<perldsc> and L<perllol> for how to use references to create -complex data structures, and L<perltoot>, L<perlobj>, and L<perlbot> +complex data structures, and L<perlootut> and L<perlobj> for how to use them to create objects. diff --git a/pod/perlsub.pod b/pod/perlsub.pod index e2a9bcfaf5..4c6f401fde 100644 --- a/pod/perlsub.pod +++ b/pod/perlsub.pod @@ -1520,4 +1520,4 @@ See L<perlxs> if you'd like to learn about calling C subroutines from Perl. See L<perlembed> if you'd like to learn about calling Perl subroutines from C. See L<perlmod> to learn about bundling up your functions in separate files. See L<perlmodlib> to learn what library modules come standard on your system. -See L<perltoot> to learn how to make object method calls. +See L<perlootut> to learn how to make object method calls. diff --git a/pod/roffitall b/pod/roffitall index e9495a74ff..d504c47977 100644 --- a/pod/roffitall +++ b/pod/roffitall @@ -37,8 +37,6 @@ toroff=` $mandir/perlapi.1 \ $mandir/perlapio.1 \ $mandir/perlbook.1 \ - $mandir/perlboot.1 \ - $mandir/perlbot.1 \ $mandir/perlcall.1 \ $mandir/perlcompile.1 \ $mandir/perldata.1 \ @@ -95,8 +93,6 @@ toroff=` $mandir/perltie.1 \ $mandir/perltoc.1 \ $mandir/perltodo.1 \ - $mandir/perltooc.1 \ - $mandir/perltoot.1 \ $mandir/perltrap.1 \ $mandir/perlunicode.1 \ $mandir/perlutil.1 \ diff --git a/t/porting/known_pod_issues.dat b/t/porting/known_pod_issues.dat index bee98ef34a..5290506ff1 100644 --- a/t/porting/known_pod_issues.dat +++ b/t/porting/known_pod_issues.dat @@ -263,7 +263,6 @@ pod/perlthrtut.pod Verbatim line length including indents exceeds 79 by 5 pod/perltie.pod Verbatim line length including indents exceeds 79 by 13 pod/perltodo.pod Verbatim line length including indents exceeds 79 by 7 pod/perltodo.pod empty section in previous paragraph 2 -pod/perltoot.pod Verbatim line length including indents exceeds 79 by 1 pod/perltrap.pod ? Should you be using F<...> or maybe L<...> instead of 1 pod/perltrap.pod Verbatim line length including indents exceeds 79 by 15 pod/perltru64.pod ? Should you be using F<...> or maybe L<...> instead of 1 diff --git a/win32/pod.mak b/win32/pod.mak index ccce177036..8a75fe79e3 100644 --- a/win32/pod.mak +++ b/win32/pod.mak @@ -47,8 +47,6 @@ POD = perl.pod \ perlapio.pod \ perlartistic.pod \ perlbook.pod \ - perlboot.pod \ - perlbot.pod \ perlcall.pod \ perlcheat.pod \ perlclib.pod \ @@ -93,6 +91,7 @@ POD = perl.pod \ perlnewmod.pod \ perlnumber.pod \ perlobj.pod \ + perlootut.pod \ perlop.pod \ perlopentut.pod \ perlpacktut.pod \ @@ -123,8 +122,6 @@ POD = perl.pod \ perltie.pod \ perltoc.pod \ perltodo.pod \ - perltooc.pod \ - perltoot.pod \ perltrap.pod \ perlunicode.pod \ perlunifaq.pod \ @@ -167,8 +164,6 @@ MAN = perl.man \ perlapio.man \ perlartistic.man \ perlbook.man \ - perlboot.man \ - perlbot.man \ perlcall.man \ perlcheat.man \ perlclib.man \ @@ -213,6 +208,7 @@ MAN = perl.man \ perlnewmod.man \ perlnumber.man \ perlobj.man \ + perlootut.man \ perlop.man \ perlopentut.man \ perlpacktut.man \ @@ -243,8 +239,6 @@ MAN = perl.man \ perltie.man \ perltoc.man \ perltodo.man \ - perltooc.man \ - perltoot.man \ perltrap.man \ perlunicode.man \ perlunifaq.man \ @@ -287,8 +281,6 @@ HTML = perl.html \ perlapio.html \ perlartistic.html \ perlbook.html \ - perlboot.html \ - perlbot.html \ perlcall.html \ perlcheat.html \ perlclib.html \ @@ -333,6 +325,7 @@ HTML = perl.html \ perlnewmod.html \ perlnumber.html \ perlobj.html \ + perlootut.html \ perlop.html \ perlopentut.html \ perlpacktut.html \ @@ -362,8 +355,6 @@ HTML = perl.html \ perlthrtut.html \ perltie.html \ perltodo.html \ - perltooc.html \ - perltoot.html \ perltrap.html \ perlunicode.html \ perlunifaq.html \ @@ -407,8 +398,6 @@ TEX = perl.tex \ perlapio.tex \ perlartistic.tex \ perlbook.tex \ - perlboot.tex \ - perlbot.tex \ perlcall.tex \ perlcheat.tex \ perlclib.tex \ @@ -453,6 +442,7 @@ TEX = perl.tex \ perlnewmod.tex \ perlnumber.tex \ perlobj.tex \ + perlootut.tex \ perlop.tex \ perlopentut.tex \ perlpacktut.tex \ @@ -483,8 +473,6 @@ TEX = perl.tex \ perltie.tex \ perltoc.tex \ perltodo.tex \ - perltooc.tex \ - perltoot.tex \ perltrap.tex \ perlunicode.tex \ perlunifaq.tex \ |