[Rt-commit] rtir branch, 2.9-trunk, updated. 2.6.1-514-g334b4c0

[? sunnavy]

The branch, 2.9-trunk has been updated
       via  334b4c08caf2b6b6ce356519330658e338502f3d (commit)
      from  40fb0fc3d72d69bebf522ddbb961f8453ce54765 (commit)

Summary of changes:
 README                         |    4 ++--
 etc/initialdata                |    4 ++--
 html/RTIR/Create.html          |    2 +-
 lib/RT/IR/Tutorial.pod         |    2 +-
 t/005-resolve-investigations.t |    2 +-
 t/rtfm/basics.t                |    4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

- Log -----------------------------------------------------------------
commit 334b4c08caf2b6b6ce356519330658e338502f3d
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Oct 19 21:01:12 2011 +0800

    update "RTFM" word as it's in core in RT4
    
    also fix a wrongly used one in test, which is just a typo

diff --git a/README b/README
index 08e7aac..8834fcb 100644
--- a/README
+++ b/README
@@ -167,8 +167,8 @@ To run tests:
 $ RTHOME=/opt/my-rt perl Makefile.PL
 $ RT_DBA_USER=user RT_DBA_PASSWORD=password make test
 
-These are intended to be run before installing RTIR.  RTFM, however,
-must already be installed.
+These are intended to be run before installing RTIR.
+RTFM, however, must already be installed( except RT version >= 4 ).
 
 Like RT, RTIR expects to be able to create a new database called rt3test
 on your system.
diff --git a/etc/initialdata b/etc/initialdata
index ee61903..9589984 100644
--- a/etc/initialdata
+++ b/etc/initialdata
@@ -620,7 +620,7 @@ for my $cf (@CustomFields) {
     my $class = RT::Class->new($CurrentUser);
     $class->Load('Templates');
     unless ($class->Id) {
-        $RT::Logger->info("Creating 'Templates' RTFM class.");
+        $RT::Logger->info("Creating 'Templates' Article class.");
         my ($id, $msg) = $class->Create(
             Name => 'Templates',
             Description => 'Response templates',
@@ -643,7 +643,7 @@ for my $cf (@CustomFields) {
     my $response = RT::CustomField->new($CurrentUser);
     $response->Load('Response');
     unless ($response->Id and $response->LookupType eq RT::Article->CustomFieldLookupType) {
-        $RT::Logger->info("Creating 'Response' RTFM custom field.");
+        $RT::Logger->info("Creating 'Response' Article custom field.");
         my ($id, $msg) = $response->Create(
             Name => 'Response',
             Type => 'Text',
diff --git a/html/RTIR/Create.html b/html/RTIR/Create.html
index b651eb1..1be3ea7 100644
--- a/html/RTIR/Create.html
+++ b/html/RTIR/Create.html
@@ -429,7 +429,7 @@ unless ( $skip_create ) {
     );
 }
 
-# for RTFM and other things
+# for articles and other things
 $m->callback(
     CallbackName => 'BeforeCreate', CallbackPage => '/Ticket/Create.html',
     ARGSRef => \%ARGS, results => \@results,
diff --git a/lib/RT/IR/Tutorial.pod b/lib/RT/IR/Tutorial.pod
index 49aec17..50fcfe1 100644
--- a/lib/RT/IR/Tutorial.pod
+++ b/lib/RT/IR/Tutorial.pod
@@ -293,7 +293,7 @@ and linking them to this IR by clicking the "[New]" button next to the
 =head4 Linking Incidents to IRs, Investigations, etc.
 
 You may link Incidents with existing Incident Responses, Investigations,
-Blocks, and RTFM articles. On the Incident display page there are sections for
+Blocks, and Articles. On the Incident display page there are sections for
 each of these, each with a C<Link> button and the list of already-linked
 tickets. Clicking on C<Link> lets you link one or more tickets of that type to
 the Incident.
diff --git a/t/005-resolve-investigations.t b/t/005-resolve-investigations.t
index 34090a7..82fdb6f 100644
--- a/t/005-resolve-investigations.t
+++ b/t/005-resolve-investigations.t
@@ -12,7 +12,7 @@ my $inv_id  = $agent->create_investigation( {Subject => "i want to quick-resolve
 
 $agent->display_ticket( $inv_id);
 
-$agent->follow_link_ok({text => "Quick Resolve"}, "followed 'RTFM' overview link");
+$agent->follow_link_ok({text => "Quick Resolve"}, "followed 'Quick Resolve' link");
 like($agent->content, qr/Status changed from \S*open\S* to \S*resolved\S*/, "it got resolved");
 
 $inv_id = $agent->create_investigation( {Subject => "resolve me slower"});
diff --git a/t/rtfm/basics.t b/t/rtfm/basics.t
index 35f2b8d..c8a9073 100644
--- a/t/rtfm/basics.t
+++ b/t/rtfm/basics.t
@@ -8,7 +8,7 @@ use RT::IR::Test tests => 20;
 RT::Test->started_ok;
 my $agent = default_agent();
 
-my $ir_id  = $agent->create_ir( {Subject => "looking for rtfm"});
+my $ir_id  = $agent->create_ir( {Subject => "looking for articles"});
 
 $agent->display_ticket( $ir_id);
 
@@ -31,7 +31,7 @@ $agent->submit();
 
 is($agent->status, 200, "attempt to create succeeded");
 
-like($agent->content, qr/Incident Report #\d+: looking for rtfm/, "back on IR page");
+like($agent->content, qr/Incident Report #\d+: looking for articles/, "back on IR page");
 
 $agent->follow_link_ok({text => $article_name}, "back to article");
 like($agent->content, qr/this is a summary/, "found the summary of the article");

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