Move the latest perldelta to pod/perldelta.pod

This way patches including perldelta entries will apply properly, no matter when
they are applied. If there's conflicts, they'll at least be in the right file.

diff --git a/INSTALL b/INSTALL
index e73fa53..892dda5 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -47,7 +47,7 @@ If you have problems, corrections, or questions, please see
 L<"Reporting Problems"> below.
 
 For information on what's new in this release, see the
-pod/perl5135delta.pod file.  For more information about how to find more
+pod/perldelta.pod file.  For more information about how to find more
 specific detail about changes, see the Changes file.
 
 =head1 DESCRIPTION
@@ -80,10 +80,10 @@ directory.
 
 =head2 Changes and Incompatibilities
 
-Please see pod/perl5135delta.pod for a description of the changes and
+Please see pod/perldelta.pod for a description of the changes and
 potential incompatibilities introduced with this release.  A few of
 the most important issues are listed below, but you should refer
-to pod/perl5135delta.pod for more detailed information.
+to pod/perldelta.pod for more detailed information.
 
 B<WARNING:> This version is not binary compatible with prior releases of Perl.
 If you have built extensions (i.e. modules that include C code)
@@ -98,7 +98,7 @@ The standard extensions supplied with Perl will be handled automatically.
 
 On a related issue, old modules may possibly be affected by the changes
 in the Perl language in the current release.  Please see
-pod/perl5135delta.pod for a description of what's changed.  See your
+pod/perldelta.pod for a description of what's changed.  See your
 installed copy of the perllocal.pod file for a (possibly incomplete)
 list of locally installed modules.  Also see CPAN::autobundle for one
 way to make a "bundle" of your currently installed modules.

diff --git a/MANIFEST b/MANIFEST
index 8abd94d..dd2c87c 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -3975,7 +3975,6 @@ pod/perl5131delta.pod             Perl changes in version 5.13.1
 pod/perl5132delta.pod          Perl changes in version 5.13.2
 pod/perl5133delta.pod          Perl changes in version 5.13.3
 pod/perl5134delta.pod          Perl changes in version 5.13.4
-pod/perl5135delta.pod          Perl changes in version 5.13.5
 pod/perl561delta.pod           Perl changes in version 5.6.1
 pod/perl56delta.pod            Perl changes in version 5.6
 pod/perl570delta.pod           Perl changes in version 5.7.0
@@ -4013,6 +4012,7 @@ pod/perldbmfilter.pod             Perl DBM filters
 pod/perldebguts.pod            Perl debugging guts and tips
 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

diff --git a/Makefile.SH b/Makefile.SH
index 5948f4d..89d5c44 100755 (executable)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -483,7 +483,7 @@ mini_obj =  $(obj1) $(obj2) $(obj3) $(ARCHOBJS) $(DTRACE_O)
 ndt_obj = $(obj0) $(obj1) $(obj2) $(obj3) $(ARCHOBJS)
 obj = $(ndt_obj) $(DTRACE_O)
 
-perltoc_pod_prereqs = extra.pods pod/perlapi.pod pod/perldelta.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod
+perltoc_pod_prereqs = extra.pods pod/perl5135delta.pod pod/perlapi.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod
 generated_pods = pod/perltoc.pod $(perltoc_pod_prereqs)
 
 Icwd = -Idist/Cwd -Idist/Cwd/lib
@@ -1024,8 +1024,8 @@ pod/perlintern.pod: $(MINIPERL_EXE) autodoc.pl embed.fnc
 pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST
        $(MINIPERL) $(Icwd) pod/perlmodlib.PL -q
 
-pod/perldelta.pod: pod/perl5135delta.pod
-       $(LNS) perl5135delta.pod pod/perldelta.pod
+pod/perl5135delta.pod: pod/perldelta.pod
+       $(LNS) perldelta.pod pod/perl5135delta.pod
 
 extra.pods: $(MINIPERL_EXE)
        -@test ! -f extra.pods || rm -f `cat extra.pods`

diff --git a/README b/README
index 4faf146..3c614d0 100644 (file)
--- a/README
+++ b/README
@@ -22,7 +22,7 @@ third-party modules.
 For an introduction to the language's features, see pod/perlintro.pod.
 
 For a discussion of the important changes in this release, see
-pod/perl5135delta.pod.  (This will also be installed as perldelta.pod).
+pod/perldelta.pod.
 
 There are also many Perl books available, covering a wide variety of topics,
 from various publishers.  See pod/perlbook.pod for more information.

diff --git a/pod.lst b/pod.lst
index 030e58b..4de3a1e 100644 (file)
--- a/pod.lst
+++ b/pod.lst
@@ -135,8 +135,8 @@ h Miscellaneous
   perldoc              Look up Perl documentation in Pod format
 
   perlhist             Perl history records
-d perldelta            Perl changes since previous version
-D perl5135delta                Perl changes in version 5.13.5
+D perldelta            Perl changes since previous version
+d perl5135delta                Perl changes in version 5.13.5
   perl5134delta                Perl changes in version 5.13.4
   perl5133delta                Perl changes in version 5.13.3
   perl5132delta                Perl changes in version 5.13.2

diff --git a/pod/.gitignore b/pod/.gitignore
index 61b9c7b..60ee9b7 100644 (file)
--- a/pod/.gitignore
+++ b/pod/.gitignore
@@ -59,6 +59,6 @@
 /podselect.bat
 
 # generated
-/perldelta.pod
+/perl5135delta.pod
 /perlapi.pod
 /perlintern.pod

diff --git a/pod/buildtoc b/pod/buildtoc
index 12cbc94..018db12 100644 (file)
--- a/pod/buildtoc
+++ b/pod/buildtoc
@@ -111,11 +111,11 @@ foreach (<MASTER>) {
     $flags{aux} = 1 if $flags =~ tr/a//d;
 
     if ($flags =~ tr/D//d) {
-      $flags{perlpod_omit} = 1;
+      $flags{manifest_omit} = 1;
       $delta_source = "$filename.pod";
     }
     if ($flags =~ tr/d//d) {
-      $flags{manifest_omit} = 1;
+      $flags{perlpod_omit} = 1;
       $delta_target = "$filename.pod";
     }
     $Generated{"$filename.pod"}++ if $flags =~ tr/g//d;
@@ -713,8 +713,8 @@ sub do_unix {
                        sort keys %Copies, grep {!/perltoc/} keys %Generated
                    }mge;
 
-# pod/perldelta.pod: pod/perl511delta.pod
-#      cd pod && $(LNS) perl511delta.pod perldelta.pod
+# pod/perl511delta.pod: pod/perldelta.pod
+#      cd pod && $(LNS) perldelta.pod perl511delta.pod
 
   $makefile_SH =~ s!(
 pod/perl[a-z0-9_]+\.pod: pod/perl[a-z0-9_]+\.pod

diff --git a/pod/perl5135delta.pod b/pod/perldelta.pod
similarity index 100%
rename from pod/perl5135delta.pod
rename to pod/perldelta.pod

diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template
index cf201ec..f2fdbf8 100644 (file)
--- a/vms/descrip_mms.template
+++ b/vms/descrip_mms.template
@@ -437,7 +437,7 @@ pod = $(pod0) $(pod1) $(pod2) $(pod3) $(pod4) $(pod5) $(pod6) $(pod7) $(pod8) $(
 
 # Would be useful to automate the generation of this rule from pod/buildtoc
 # Plus its corresponding delete in the clean target.
-[.pod]perldelta.pod : [.pod]perl5135delta.pod
+[.pod]perl5135delta.pod : [.pod]perldelta.pod
        Copy/NoConfirm/Log $(MMS$SOURCE) $(MMS$TARGET)
 
 [.pod]perlapi.pod : embed.fnc autodoc.pl $(MINIPERL_EXE)
@@ -449,7 +449,7 @@ pod = $(pod0) $(pod1) $(pod2) $(pod3) $(pod4) $(pod5) $(pod6) $(pod7) $(pod8) $(
 [.pod]perlintern.pod : embed.fnc autodoc.pl $(MINIPERL_EXE)
        $(MINIPERL) autodoc.pl
 
-[.pod]perltoc.pod : [.pod]perldelta.pod [.pod]perlapi.pod [.pod]perlintern.pod  [.pod]perlmodlib.pod extra.pods $(PERL_EXE)
+[.pod]perltoc.pod : [.pod]perl5135delta.pod [.pod]perlapi.pod [.pod]perlintern.pod  [.pod]perlmodlib.pod extra.pods $(PERL_EXE)
        @ define/user_mode $(DBG)PERLSHR SYS$DISK:[]$(DBG)perlshr$(E)
        $(PERL) "-f" [.pod]buildtoc "-q" "--build-toc"
 
@@ -1898,8 +1898,8 @@ clean : tidy cleantest
        - If F$Search("[.vms.ext...]*.C").nes."" Then Delete/NoConfirm/Log [.vms.ext...]*.C;*
        - If F$Search("[.vms.ext...]*$(O)").nes."" Then Delete/NoConfirm/Log [.vms.ext...]*$(O);*
        - If F$Search("[.pod]*.com").nes."" Then Delete/NoConfirm/Log [.pod]*.com;*
+       - If F$Search("[.pod]perl5135delta.pod").nes."" Then Delete/NoConfirm/Log [.pod]perl5135delta.pod;*
        - If F$Search("[.pod]perlapi.pod").nes."" Then Delete/NoConfirm/Log [.pod]perlapi.pod;*
-       - If F$Search("[.pod]perldelta.pod").nes."" Then Delete/NoConfirm/Log [.pod]perldelta.pod;*
        - If F$Search("[.pod]perlintern.pod").nes."" Then Delete/NoConfirm/Log [.pod]perlintern.pod;*
        - If F$Search("[.pod]perlmodlib.pod").nes."" Then Delete/NoConfirm/Log [.pod]perlmodlib.pod;*
        - If F$Search("[.pod]perltoc.pod").nes."" Then Delete/NoConfirm/Log [.pod]perltoc.pod;*

diff --git a/win32/Makefile b/win32/Makefile
index e7370dc..beb3913 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -1101,7 +1101,7 @@ utils: $(PERLEXE) $(X2P)
        copy ..\README.vmesa    ..\pod\perlvmesa.pod
        copy ..\README.vos      ..\pod\perlvos.pod
        copy ..\README.win32    ..\pod\perlwin32.pod
-       copy ..\pod\perl5135delta.pod ..\pod\perldelta.pod
+       copy ..\pod\perldelta.pod ..\pod\perl5135delta.pod
        $(MAKE) -f ..\win32\pod.mak converters
        cd ..\win32
        $(PERLEXE) $(PL2BAT) $(UTILS)

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 7add8cb..68974fb 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1465,7 +1465,7 @@ utils: $(PERLEXE) $(X2P)
        copy ..\README.vmesa    ..\pod\perlvmesa.pod
        copy ..\README.vos      ..\pod\perlvos.pod
        copy ..\README.win32    ..\pod\perlwin32.pod
-       copy ..\pod\perl5135delta.pod ..\pod\perldelta.pod
+       copy ..\pod\perldelta.pod ..\pod\perl5135delta.pod
        cd ..\pod && $(MAKE) -f ..\win32\pod.mak converters
        $(PERLEXE) $(PL2BAT) $(UTILS)
        $(PERLEXE) $(ICWD) ..\autodoc.pl ..