X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FView.pm;h=4c0756293467750c2d148644e1922ff094048e28;hb=6d62355b6e08f1234fefbdebaacc9ced07b0bc6c;hp=a08bbbf711d47c190df0788d0ced9008351f2ca6;hpb=46d0346ddafe8e167c679cddef9834946598e689;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/View.pm b/lib/Catalyst/View.pm
index a08bbbf..4c07562 100644
--- a/lib/Catalyst/View.pm
+++ b/lib/Catalyst/View.pm
@@ -19,15 +19,15 @@ Catalyst::View - Catalyst View base class
 
 =head1 DESCRIPTION
 
-This is the Catalyst View base class. It's meant to be used as 
+This is the Catalyst View base class. It's meant to be used as
 a base class by Catalyst views.
 
-As a convention, views are expected to read template names from 
+As a convention, views are expected to read template names from
 $c->stash->{template}, and put the output into $c->res->body.
 Some views default to render a template named after the dispatched
 action's private name. (See L<Catalyst::Action>.)
 
-=head1 METHODS 
+=head1 METHODS
 
 Implements the same methods as other Catalyst components, see
 L<Catalyst::Component>
@@ -46,20 +46,13 @@ sub process {
 
 }
 
-=head2 $c->merge_hash_config( $hashref, $hashref )
+=head1 AUTHORS
 
-Merges two hashes together recursively, giving right-hand precedence.
-
-=cut
-
-=head1 AUTHOR
-
-Sebastian Riedel, C<sri@oook.de>
-Marcus Ramberg, C<mramberg@cpan.org>
+Catalyst Contributors, see Catalyst.pm
 
 =head1 COPYRIGHT
 
-This program is free software, you can redistribute it and/or modify it under
+This library is free software. You can redistribute it and/or modify it under
 the same terms as Perl itself.
 
 =cut