[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.3rc1-1-gbd8e000

[Alex Vandiver]

The branch, 4.2-trunk has been updated
       via  bd8e00059ed26e5797bdef85cf984db27a59ed92 (commit)
      from  cce632b20ca0e16a67945bab3a1e81f1ffdb9216 (commit)

Summary of changes:
 etc/upgrade/4.1.20/content    | 4 ++--
 lib/RT/Migrate/Incremental.pm | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit bd8e00059ed26e5797bdef85cf984db27a59ed92
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Sun Feb 16 18:20:57 2014 -0500

    Correct the name of the upgrading documentation in error messages

diff --git a/etc/upgrade/4.1.20/content b/etc/upgrade/4.1.20/content
index afed9c3..edde022 100644
--- a/etc/upgrade/4.1.20/content
+++ b/etc/upgrade/4.1.20/content
@@ -33,7 +33,7 @@ our @Initial = (
 });
         }
         else {
-            RT->Logger->error('Current "Forward" template is not the default version, please check docs/4.2-UPGRADING');
+            RT->Logger->error('Current "Forward" template is not the default version, please check docs/UPGRADING-4.2');
         }
 
         my $forward_ticket_template = RT::Template->new(RT->SystemUser);
@@ -50,7 +50,7 @@ This is a forward of ticket #{ $Ticket->id }
 
         }
         else {
-            RT->Logger->error('Current "Forward Ticket" template is not the default version, please check docs/4.2-UPGRADING');
+            RT->Logger->error('Current "Forward Ticket" template is not the default version, please check docs/UPGRADING-4.2');
         }
     },
 );
diff --git a/lib/RT/Migrate/Incremental.pm b/lib/RT/Migrate/Incremental.pm
index c0bc440..e5f723b 100644
--- a/lib/RT/Migrate/Incremental.pm
+++ b/lib/RT/Migrate/Incremental.pm
@@ -590,7 +590,7 @@ s!(?<=Your ticket has been (?:approved|rejected) by { eval { )\$Approval->OwnerO
 { $ForwardTransaction->Content =~ /\S/ ? $ForwardTransaction->Content : "This is a forward of transaction #".$Transaction->id." of ticket #". $Ticket->id }
 };
                 } else {
-                    RT->Logger->error('Current "Forward" template is not the default version, please check docs/4.2-UPGRADING');
+                    RT->Logger->error('Current "Forward" template is not the default version, please check docs/UPGRADING-4.2');
                 }
             } elsif ($ref->{Name} eq 'Forward Ticket') {
                 $ref->{Description} = 'Forwarded ticket message';
@@ -602,7 +602,7 @@ This is a forward of ticket #{ $Ticket->id }
 { $ForwardTransaction->Content =~ /\S/ ? $ForwardTransaction->Content : "This is a forward of ticket #". $Ticket->id }
 };
                 } else {
-                    RT->Logger->error('Current "Forward Ticket" template is not the default version, please check docs/4.2-UPGRADING');
+                    RT->Logger->error('Current "Forward Ticket" template is not the default version, please check docs/UPGRADING-4.2');
                 }
             }
         },

-----------------------------------------------------------------------