Move perldoc.pod to the dist it belongs to

diff --git a/MANIFEST b/MANIFEST
index 842daa3..c03f829 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -3183,6 +3183,7 @@ dist/Net-Ping/t/410_syn_host.t            Ping Net::Ping
 dist/Net-Ping/t/450_service.t          Ping Net::Ping
 dist/Net-Ping/t/500_ping_icmp.t                Ping Net::Ping
 dist/Net-Ping/t/510_ping_udp.t         Ping Net::Ping
+dist/Pod-Perldoc/lib/perldoc.pod                       Look up Perl documentation in Pod format
 dist/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm     utility module for perldoc
 dist/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm  options parsing for perldoc
 dist/Pod-Perldoc/lib/Pod/Perldoc.pm            guts of the 'perldoc' utility
@@ -4363,7 +4364,6 @@ pod/perldebtut.pod                Perl debugging tutorial
 pod/perldebug.pod              Perl debugging
 pod/perldelta.pod              Perl changes since previous version
 pod/perldiag.pod               Perl diagnostic messages
-pod/perldoc.pod                        Look up Perl documentation in Pod format
 pod/perldsc.pod                        Perl data structures intro
 pod/perlebcdic.pod             Considerations for running Perl on EBCDIC platforms
 pod/perlembed.pod              Perl ways to embed perl in your C or C++ application

diff --git a/META.yml b/META.yml
index 6337147..1b61158 100644 (file)
--- a/META.yml
+++ b/META.yml
@@ -102,7 +102,6 @@ no_index:
     - lib/version.pm
     - lib/version.pod
     - lib/version.t
-    - pod/perldoc.pod
     - pod/perlfilter.pod
     - pod/perlpodstyle.pod
     - Porting/Maintainers.pm

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 9d1c3a7..1d8dd82 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1546,20 +1546,12 @@ use File::Glob qw(:case);
        {
        'MAINTAINER'    => 'ferreira',
        'DISTRIBUTION'  => 'FERREIRA/Pod-Perldoc-3.15_01.tar.gz',
-       # I don't know whether it's conceptually cleaner to a rule to copy
-       # ext/Pod-Perldoc/pod/perldoc.pod to pod/perldoc.pod at make time
-       # (in 4 places), or leave it as 1 mapping here.
-       'FILES'         => q[dist/Pod-Perldoc
-                            pod/perldoc.pod
-                           ],
+       'FILES'         => q[dist/Pod-Perldoc],
        # in blead, the perldoc executable is generated by perldoc.PL
        # instead
        # XXX We can and should fix this, but clean up the DRY-failure in utils
        # first
        'EXCLUDED'      => [ qw( perldoc ) ],
-       'MAP'           => { '' => 'dist/Pod-Perldoc/',
-                            'lib/perldoc.pod' => 'pod/perldoc.pod',
-                          },
        'UPSTREAM'      => 'blead',
        },
 

diff --git a/pod/perldoc.pod b/dist/Pod-Perldoc/lib/perldoc.pod
similarity index 97%
rename from pod/perldoc.pod
rename to dist/Pod-Perldoc/lib/perldoc.pod
index 7a60959..d70625c 100644 (file)
--- a/pod/perldoc.pod
+++ b/dist/Pod-Perldoc/lib/perldoc.pod
@@ -146,7 +146,7 @@ For example: C<perldoc -MPod::Perldoc::ToChecker>.
 You can specify several classes to try by joining them with commas
 or semicolons, as in C<-MTk::SuperPod;Tk::Pod>.
 
-=item B<-w> I<option:value> or B<-w> I<option> 
+=item B<-w> I<option:value> or B<-w> I<option>
 
 This specifies an option to call the formatter B<w>ith.  For example,
 C<-w textsize:15> will call
@@ -174,7 +174,7 @@ qualified filenames, one per line.
 
 This allows one to specify the I<language code> for the desired language
 translation. If the C<POD2::E<lt>language_codeE<gt>> package isn't
-installed in your system, the switch is ignored. 
+installed in your system, the switch is ignored.
 All available translation packages are to be found under the C<POD2::>
 namespace. See L<POD2::IT> (or L<POD2::FR>) to see how to create new
 localized C<POD2::*> documentation packages and integrate them into
@@ -183,7 +183,7 @@ L<Pod::Perldoc>.
 =item B<PageName|ModuleName|ProgramName>
 
 The item you want to look up.  Nested modules (such as C<File::Basename>)
-are specified either as C<File::Basename> or C<File/Basename>.  You may also
+are specified either as C<File::Basename> or C<< File/Basename >>.  You may also
 give a descriptive name of a page, such as C<perlfunc>.
 
 For simple names like 'foo', when the normal search fails to find
@@ -216,7 +216,7 @@ Because B<perldoc> does not run properly tainted, and is known to
 have security issues, when run as the superuser it will attempt to
 drop privileges by setting the effective and real IDs to nobody's
 or nouser's account, or -2 if unavailable.  If it cannot relinquish
-its privileges, it will not run.  
+its privileges, it will not run.
 
 
 =head1 ENVIRONMENT
@@ -267,4 +267,3 @@ Andy Dougherty  <doughera@lafcol.lafayette.edu>,
 and many others.
 
 =cut
-

diff --git a/lib/.gitignore b/lib/.gitignore
index bf848f2..e51dce1 100644 (file)
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -392,6 +392,7 @@
 /lib.pm
 /ops.pm
 /parent.pm
+/perldoc.pod
 /re.pm
 /threads
 /threads.pm

diff --git a/pod.lst b/pod.lst
index 21c3b31..2ac5f21 100644 (file)
--- a/pod.lst
+++ b/pod.lst
@@ -135,7 +135,7 @@ h Miscellaneous
   perlcommunity                Perl community information
   perltodo             Perl things to do
 
-  perldoc              Look up Perl documentation in Pod format
+  dist/Pod-Perldoc/lib/perldoc Look up Perl documentation in Pod format
 
   perlhist             Perl history records
   perldelta            Perl changes since previous version

diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template
index 112c69b..ee8e733 100644 (file)
--- a/vms/descrip_mms.template
+++ b/vms/descrip_mms.template
@@ -412,11 +412,11 @@ pod11 = [.lib.pods]perlamiga.pod [.lib.pods]perlapi.pod [.lib.pods]perlapio.pod
 pod12 = [.lib.pods]perlboot.pod [.lib.pods]perlbot.pod [.lib.pods]perlbs2000.pod [.lib.pods]perlcall.pod [.lib.pods]perlce.pod [.lib.pods]perlcheat.pod
 pod13 = [.lib.pods]perlclib.pod [.lib.pods]perlcn.pod [.lib.pods]perlcommunity.pod [.lib.pods]perlcompile.pod [.lib.pods]perlcygwin.pod
 pod14 = [.lib.pods]perldata.pod [.lib.pods]perldbmfilter.pod [.lib.pods]perldebguts.pod [.lib.pods]perldebtut.pod [.lib.pods]perldebug.pod
-pod15 = [.lib.pods]perldelta.pod [.lib.pods]perldgux.pod [.lib.pods]perldiag.pod [.lib.pods]perldoc.pod [.lib.pods]perldos.pod [.lib.pods]perldsc.pod
-pod16 = [.lib.pods]perlebcdic.pod [.lib.pods]perlembed.pod [.lib.pods]perlepoc.pod [.lib.pods]perlfaq.pod [.lib.pods]perlfaq1.pod [.lib.pods]perlfaq2.pod
-pod17 = [.lib.pods]perlfaq3.pod [.lib.pods]perlfaq4.pod [.lib.pods]perlfaq5.pod [.lib.pods]perlfaq6.pod [.lib.pods]perlfaq7.pod [.lib.pods]perlfaq8.pod
-pod18 = [.lib.pods]perlfaq9.pod [.lib.pods]perlfilter.pod [.lib.pods]perlfork.pod [.lib.pods]perlform.pod [.lib.pods]perlfreebsd.pod [.lib.pods]perlfunc.pod
-pod19 = [.lib.pods]perlgit.pod [.lib.pods]perlglossary.pod [.lib.pods]perlgpl.pod [.lib.pods]perlguts.pod [.lib.pods]perlhack.pod [.lib.pods]perlhacktips.pod
+pod15 = [.lib.pods]perldelta.pod [.lib.pods]perldgux.pod [.lib.pods]perldiag.pod [.lib.pods]perldos.pod [.lib.pods]perldsc.pod [.lib.pods]perlebcdic.pod
+pod16 = [.lib.pods]perlembed.pod [.lib.pods]perlepoc.pod [.lib.pods]perlfaq.pod [.lib.pods]perlfaq1.pod [.lib.pods]perlfaq2.pod [.lib.pods]perlfaq3.pod
+pod17 = [.lib.pods]perlfaq4.pod [.lib.pods]perlfaq5.pod [.lib.pods]perlfaq6.pod [.lib.pods]perlfaq7.pod [.lib.pods]perlfaq8.pod [.lib.pods]perlfaq9.pod
+pod18 = [.lib.pods]perlfilter.pod [.lib.pods]perlfork.pod [.lib.pods]perlform.pod [.lib.pods]perlfreebsd.pod [.lib.pods]perlfunc.pod [.lib.pods]perlgit.pod
+pod19 = [.lib.pods]perlglossary.pod [.lib.pods]perlgpl.pod [.lib.pods]perlguts.pod [.lib.pods]perlhack.pod [.lib.pods]perlhacktips.pod
 pod20 = [.lib.pods]perlhacktut.pod [.lib.pods]perlhaiku.pod [.lib.pods]perlhist.pod [.lib.pods]perlhpux.pod [.lib.pods]perlhurd.pod [.lib.pods]perlintern.pod
 pod21 = [.lib.pods]perlinterp.pod [.lib.pods]perlintro.pod [.lib.pods]perliol.pod [.lib.pods]perlipc.pod [.lib.pods]perlirix.pod [.lib.pods]perljp.pod
 pod22 = [.lib.pods]perlko.pod [.lib.pods]perllexwarn.pod [.lib.pods]perllinux.pod [.lib.pods]perllocale.pod [.lib.pods]perllol.pod [.lib.pods]perlmacos.pod
@@ -1021,10 +1021,6 @@ makeppport : $(MINIPERL_EXE) $(ARCHDIR)Config.pm nonxsext
        @ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
        Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods]
 
-[.lib.pods]perldoc.pod : [.pod]perldoc.pod
-       @ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
-       Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods]
-
 [.lib.pods]perldos.pod : [.pod]perldos.pod
        @ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods]
        Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.pods]

diff --git a/win32/pod.mak b/win32/pod.mak
index e35fd6d..a8b8700 100644 (file)
--- a/win32/pod.mak
+++ b/win32/pod.mak
@@ -88,7 +88,6 @@ POD = \
        perldebug.pod   \
        perldelta.pod   \
        perldiag.pod    \
-       perldoc.pod     \
        perldsc.pod     \
        perlebcdic.pod  \
        perlembed.pod   \
@@ -247,7 +246,6 @@ MAN = \
        perldebug.man   \
        perldelta.man   \
        perldiag.man    \
-       perldoc.man     \
        perldsc.man     \
        perlebcdic.man  \
        perlembed.man   \
@@ -406,7 +404,6 @@ HTML = \
        perldebug.html  \
        perldelta.html  \
        perldiag.html   \
-       perldoc.html    \
        perldsc.html    \
        perlebcdic.html \
        perlembed.html  \
@@ -565,7 +562,6 @@ TEX = \
        perldebug.tex   \
        perldelta.tex   \
        perldiag.tex    \
-       perldoc.tex     \
        perldsc.tex     \
        perlebcdic.tex  \
        perlembed.tex   \