Merge 'trunk' into 'better_scripts'

r12035@t0mlaptop (orig r12000):  t0m | 2009-11-24 09:50:07 +0000
Trivial Pod fixes
r12055@t0mlaptop (orig r12020):  t0m | 2009-11-26 01:07:08 +0000
Remove test spraff

diff --git a/Changes b/Changes
index 1901419..012815c 100644 (file)
--- a/Changes
+++ b/Changes
@@ -13,6 +13,9 @@
    - NoTabs and Pod tests moved to t/author so that they're not run
      (and then skipped) normally.
 
+  Documentation:
+    - Fix Pod nits in Catalyst::Response (RT#51818)
+
 5.80014_01 2009-11-22 20:01:23
 
   Bug fixes:

diff --git a/lib/Catalyst/Response.pm b/lib/Catalyst/Response.pm
index bbfa316..f268aef 100644 (file)
--- a/lib/Catalyst/Response.pm
+++ b/lib/Catalyst/Response.pm
@@ -150,7 +150,7 @@ C<302>.
 
 This is a convenience method that sets the Location header to the
 redirect destination, and then sets the response status.  You will
-want to C< return; > or C< $c->detach() > to interrupt the normal
+want to C< return > or C<< $c->detach() >> to interrupt the normal
 processing flow if you want the redirect to occur straight away.
 
 =cut

diff --git a/t/aggregate/unit_core_setup_log.t b/t/aggregate/unit_core_setup_log.t
index 1406944..e2dba17 100644 (file)
--- a/t/aggregate/unit_core_setup_log.t
+++ b/t/aggregate/unit_core_setup_log.t
@@ -8,7 +8,6 @@ use Catalyst ();
 
 sub mock_app {
     my $name = shift;
-    print "Setting up mock application: $name\n";
     my $meta = Moose->init_meta( for_class => $name );
     $meta->superclasses('Catalyst');
     return $meta->name;