From: Jesse Sheidlower <jester@panix.com>
Date: Sat, 8 May 2010 23:41:02 +0000 (+0000)
Subject: I give a fuck about an Oxford comma (tm Vampire Weekend)
X-Git-Tag: v0.35~6
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-View-TT.git;a=commitdiff_plain;h=3d543eda0c6f0e5ede10c93f265f9678bd31b0d5

I give a fuck about an Oxford comma (tm Vampire Weekend)
---

diff --git a/lib/Catalyst/View/TT.pm b/lib/Catalyst/View/TT.pm
index 07b3e2d..964411d 100644
--- a/lib/Catalyst/View/TT.pm
+++ b/lib/Catalyst/View/TT.pm
@@ -546,10 +546,10 @@ object upon error.
 
 The template variables are set to C<%$args> if C<$args> is a hashref, or
 C<< $c->stash >> otherwise. In either case the variables are augmented with
-C<base> set to C<< $c->req->base >>, C<c> to C<$c> and C<name> to
+C<base> set to C<< $c->req->base >>, C<c> to C<$c>, and C<name> to
 C<< $c->config->{name} >>. Alternately, the C<CATALYST_VAR> configuration item
 can be defined to specify the name of a template variable through which the
-context reference (C<$c>) can be accessed. In this case, the C<c>, C<base> and
+context reference (C<$c>) can be accessed. In this case, the C<c>, C<base>, and
 C<name> variables are omitted.
 
 C<$template> can be anything that Template::process understands how to