The Perl Toolchain Summit needs more sponsors. If your company depends on Perl, please support this very important event.
Changes 317
INSTALL 10
LICENSE 44
MANIFEST 1223
META.json 8528
META.yml 16410
Makefile.PL 3130
README 1880
README.md 0198
bin/convert0.6.pl 7397
bin/convert0.8.pl 111124
bin/mason.pl 3540
cpanfile 031
dist.ini 047
inc/Pod/Weaver/Section/SeeAlsoMason.pm 040
lib/HTML/Mason/Admin.pod 390
lib/HTML/Mason/Apache/Request.pm 41
lib/HTML/Mason/ApacheHandler.pm 361
lib/HTML/Mason/CGIHandler.pm 514
lib/HTML/Mason/Cache/BaseCache.pm 381
lib/HTML/Mason/Compiler/ToObject.pm 391
lib/HTML/Mason/Compiler.pm 391
lib/HTML/Mason/Component/FileBased.pm 391
lib/HTML/Mason/Component/Subcomponent.pm 391
lib/HTML/Mason/Component.pm 391
lib/HTML/Mason/ComponentSource.pm 435
lib/HTML/Mason/Devel.pod 434
lib/HTML/Mason/Escapes.pm 391
lib/HTML/Mason/Exceptions.pm 434
lib/HTML/Mason/FAQ.pod 8630
lib/HTML/Mason/FakeApache.pm 454
lib/HTML/Mason/Handler.pm 41
lib/HTML/Mason/Interp.pm 391
lib/HTML/Mason/Lexer.pm 391
lib/HTML/Mason/MethodMaker.pm 391
lib/HTML/Mason/Params.pod 39189
lib/HTML/Mason/Parser.pm 330
lib/HTML/Mason/Plugin/Context.pm 505
lib/HTML/Mason/Plugin.pm 5517
lib/HTML/Mason/Request.pm 465
lib/HTML/Mason/Resolver/File.pm 391
lib/HTML/Mason/Resolver/Null.pm 402
lib/HTML/Mason/Resolver.pm 402
lib/HTML/Mason/Subclassing.pod 370
lib/HTML/Mason/Tests.pm 391
lib/HTML/Mason/Tools.pm 391
lib/HTML/Mason/Utils.pm 393
lib/HTML/Mason.pm 2344
live-tests/live/CGIHandler.t 013
live-tests/live/apache-filter.t 016
live-tests/live/cgi-no-handler.t 015
live-tests/live/cgi-with-handler.t 015
live-tests/live/libapreq-no-handler.t 015
live-tests/live/libapreq-with-handler.t 015
live-tests/live/multi-conf.t 013
live-tests/live/no-config.t 015
live-tests/live/set-content-type.t 015
live-tests/live/single-level-server-root.t 013
live-tests/live/taint.t 013
t/00-report-prereqs.dd 041
t/00-report-prereqs.t 0176
t/14-cgi.t 11
t/99-pod.t 110
t/author-live/CGIHandler.t 210
t/author-live/apache-filter.t 240
t/author-live/cgi-no-handler.t 230
t/author-live/cgi-with-handler.t 230
t/author-live/libapreq-no-handler.t 230
t/author-live/libapreq-with-handler.t 230
t/author-live/multi-conf.t 210
t/author-live/no-config.t 230
t/author-live/set-content-type.t 230
t/author-live/single-level-server-root.t 210
t/author-live/taint.t 210
t/author-no-tabs.t 0107
t/author-pod-spell.t 0265
t/release-pod-syntax.t 014
tidyall.ini 00
weaver.ini 010
79 files changed (This is a version diff) 20422695
@@ -2,6 +2,20 @@ Revision history for HTML::Mason.
 
 ** denotes an incompatible change
 
+1.56     2014-11-14
+
+    [ BUG FIXES ]
+
+    - Fix a packaging issue with the last release that prevent PAUSE from
+      indexing some modules in the tarball.
+
+1.55     2014-11-14
+
+    [ BUG FIXES ]
+
+    - Shut up warnings from recent versions of CGI.pm. Patch by Kevin
+      Falcone. GitHub PR #1.
+
 1.54  Jan 19, 2014
 
     [ DISTRIBUTION ]
@@ -666,7 +680,7 @@ Revision history for HTML::Mason.
     - ** The semantics of @_ for components now match Perl subroutines: @_
       contains aliases to the caller's arguments, instead of copies.  For
       example, if a component updates $_[0], the corresponding argument is
-      updated (or an error occurs if it is not updatable). The only users
+      updated (or an error occurs if it is not updateable). The only users
       that will notice this are those that update elements of @_ in
       components and do not expect those changes to affect the caller. If
       you have any doubts, grep your component tree for '\$_\[' and look for
@@ -962,7 +976,7 @@ Revision history for HTML::Mason.
     - Unreadable component source files caused the confusing error message
       "source callback returned no source".  This will now throw a much more
       helpful exception.
-    - Errors occuring in subrequests would cause error output to be mixed
+    - Errors occurring in subrequests would cause error output to be mixed
       with regular output when the error_mode was "output" (the default with
       ApacheHandler and CGIHandler).  Errors in subrequests should now look
       the same as errors in the top request.
@@ -1035,7 +1049,7 @@ Revision history for HTML::Mason.
 
     [ BUG FIXES ]
 
-    - Fixed a compilation error in HTML::Mason::Tools that was occuring
+    - Fixed a compilation error in HTML::Mason::Tools that was occurring
       with Perl 5.00503.
     - Made sure that <%method> and <%def> tags are treated
       case-insensitively.
@@ -1,4 +1,3 @@
-
 This is the Perl distribution HTML-Mason.
 
 Installing HTML-Mason is straightforward.
@@ -1,4 +1,4 @@
-This software is copyright (c) 2012 by Jonathan Swartz.
+This software is copyright (c) 1998 - 2014 by Jonathan Swartz.
 
 This is free software; you can redistribute it and/or modify it under
 the same terms as the Perl 5 programming language system itself.
@@ -12,7 +12,7 @@ b) the "Artistic License"
 
 --- The GNU General Public License, Version 1, February 1989 ---
 
-This software is Copyright (c) 2012 by Jonathan Swartz.
+This software is Copyright (c) 1998 - 2014 by Jonathan Swartz.
 
 This is free software, licensed under:
 
@@ -22,7 +22,7 @@ This is free software, licensed under:
                      Version 1, February 1989
 
  Copyright (C) 1989 Free Software Foundation, Inc.
- 51 Franklin St, Suite 500, Boston, MA  02110-1335  USA
+ 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
@@ -272,7 +272,7 @@ That's all there is to it!
 
 --- The Artistic License 1.0 ---
 
-This software is Copyright (c) 2012 by Jonathan Swartz.
+This software is Copyright (c) 1998 - 2014 by Jonathan Swartz.
 
 This is free software, licensed under:
 
@@ -1,3 +1,4 @@
+# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.025.
 CREDITS
 Changes
 INSTALL
@@ -6,6 +7,7 @@ MANIFEST
 META.json
 META.yml
 Makefile.PL
+README.md
 UPGRADE
 benchmarks/bench.pl
 benchmarks/comps/comp.mas
@@ -17,9 +19,12 @@ bin/convert0.6.pl
 bin/convert0.8.README
 bin/convert0.8.pl
 bin/mason.pl
+cpanfile
+dist.ini
 eg/MyApp/Mason.pm
 eg/MyApp/MasonWithSession.pm
 eg/httpd.conf
+inc/Pod/Weaver/Section/SeeAlsoMason.pm
 lib/HTML/Mason.pm
 lib/HTML/Mason/Admin.pod
 lib/HTML/Mason/Apache/Request.pm
@@ -53,9 +58,22 @@ lib/HTML/Mason/Subclassing.pod
 lib/HTML/Mason/Tests.pm
 lib/HTML/Mason/Tools.pm
 lib/HTML/Mason/Utils.pm
+live-tests/live/CGIHandler.t
+live-tests/live/apache-filter.t
+live-tests/live/cgi-no-handler.t
+live-tests/live/cgi-with-handler.t
+live-tests/live/libapreq-no-handler.t
+live-tests/live/libapreq-with-handler.t
+live-tests/live/multi-conf.t
+live-tests/live/no-config.t
+live-tests/live/set-content-type.t
+live-tests/live/single-level-server-root.t
+live-tests/live/taint.t
 samples/README
 samples/dump-request
 samples/show-env
+t/00-report-prereqs.dd
+t/00-report-prereqs.t
 t/01-syntax.t
 t/01a-comp-calls.t
 t/02-sections.t
@@ -91,23 +109,16 @@ t/23-leak2.t
 t/24-tools.t
 t/25-flush-in-content.t
 t/25-log.t
-t/99-pod.t
-t/author-live/CGIHandler.t
-t/author-live/apache-filter.t
-t/author-live/cgi-no-handler.t
-t/author-live/cgi-with-handler.t
-t/author-live/libapreq-no-handler.t
-t/author-live/libapreq-with-handler.t
-t/author-live/multi-conf.t
-t/author-live/no-config.t
-t/author-live/set-content-type.t
-t/author-live/single-level-server-root.t
-t/author-live/taint.t
+t/author-no-tabs.t
+t/author-pod-spell.t
 t/lib/Apache/test.pm
 t/lib/BadModule.pm
 t/lib/LoadTest.pm
 t/lib/Mason/ApacheTest.pm
+t/release-pod-syntax.t
 t/run_one_test
 t/run_tests
 t/single_test.pl
 t/taint.comp
+tidyall.ini
+weaver.ini
@@ -6,7 +6,7 @@
       "Ken Williams <ken@mathforum.org>"
    ],
    "dynamic_config" : 0,
-   "generated_by" : "Dist::Zilla version 4.300034, CPAN::Meta::Converter version 2.131560",
+   "generated_by" : "Dist::Zilla version 5.025, CPAN::Meta::Converter version 2.142690",
    "license" : [
       "perl_5"
    ],
@@ -26,7 +26,15 @@
    "prereqs" : {
       "configure" : {
          "requires" : {
-            "ExtUtils::MakeMaker" : "6.30"
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
+      "develop" : {
+         "requires" : {
+            "Test::More" : "0",
+            "Test::NoTabs" : "0",
+            "Test::Pod" : "1.41",
+            "Test::Spelling" : "0.12"
          }
       },
       "runtime" : {
@@ -43,23 +51,535 @@
          }
       },
       "test" : {
+         "recommends" : {
+            "CPAN::Meta" : "2.120900"
+         },
          "requires" : {
-            "Test::Deep" : "0"
+            "ExtUtils::MakeMaker" : "0",
+            "File::Spec" : "0.8",
+            "Test::Deep" : "0",
+            "Test::More" : "0.88"
          }
       }
    },
    "release_status" : "stable",
    "resources" : {
       "bugtracker" : {
-         "mailto" : "bug-mason@rt.cpan.org",
-         "web" : "http://rt.cpan.org/NoAuth/Bugs.html?Dist=HTML::Mason"
+         "mailto" : "bug-html-mason@rt.cpan.org",
+         "web" : "http://rt.cpan.org/Public/Dist/Display.html?Name=HTML-Mason"
       },
+      "homepage" : "http://metacpan.org/release/HTML-Mason",
       "repository" : {
          "type" : "git",
-         "url" : "git://github.com/jonswar/perl-HTML-Mason.git",
-         "web" : "https://github.com/jonswar/perl-HTML-Mason"
+         "url" : "git://github.com/autarch/HTML-Mason.git",
+         "web" : "https://github.com/autarch/HTML-Mason"
+      }
+   },
+   "version" : "1.56",
+   "x_Dist_Zilla" : {
+      "perl" : {
+         "version" : "5.016003"
+      },
+      "plugins" : [
+         {
+            "class" : "Dist::Zilla::Plugin::FileFinder::Filter",
+            "name" : "SkipApacheHandler",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::MakeMaker",
+            "config" : {
+               "Dist::Zilla::Role::TestRunner" : {
+                  "default_jobs" : 1
+               }
+            },
+            "name" : "@DROLSKY/MakeMaker",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Authority",
+            "name" : "@DROLSKY/Authority",
+            "version" : "1.009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::CopyFilesFromBuild",
+            "name" : "@DROLSKY/CopyFilesFromBuild",
+            "version" : "0.103510"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::GatherDir",
+            "config" : {
+               "Dist::Zilla::Plugin::GatherDir" : {
+                  "exclude_filename" : [
+                     "README.md",
+                     "cpanfile",
+                     "LICENSE"
+                  ],
+                  "exclude_match" : [],
+                  "follow_symlinks" : "0",
+                  "include_dotfiles" : "0",
+                  "prefix" : "",
+                  "prune_directory" : [],
+                  "root" : "."
+               }
+            },
+            "name" : "@DROLSKY/GatherDir",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::GitHub::Meta",
+            "name" : "@DROLSKY/GitHub::Meta",
+            "version" : "0.38"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::GitHub::Update",
+            "name" : "@DROLSKY/GitHub::Update",
+            "version" : "0.38"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::MetaResources",
+            "name" : "@DROLSKY/MetaResources",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::NextRelease",
+            "name" : "@DROLSKY/NextRelease",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::PkgVersion",
+            "name" : "@DROLSKY/PkgVersion",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Prereqs",
+            "config" : {
+               "Dist::Zilla::Plugin::Prereqs" : {
+                  "phase" : "test",
+                  "type" : "requires"
+               }
+            },
+            "name" : "@DROLSKY/TestMoreDoneTesting",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::PromptIfStale",
+            "config" : {
+               "Dist::Zilla::Plugin::PromptIfStale" : {
+                  "check_all_plugins" : "1",
+                  "check_all_prereqs" : "1",
+                  "modules" : [],
+                  "phase" : "release",
+                  "skip" : [
+                     "Dist::Zilla::Plugin::DROLSKY::Contributors",
+                     "Dist::Zilla::Plugin::DROLSKY::License"
+                  ]
+               }
+            },
+            "name" : "@DROLSKY/stale modules, release",
+            "version" : "0.030"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::ReadmeAnyFromPod",
+            "name" : "@DROLSKY/ReadmeMarkdownInBuild",
+            "version" : "0.142470"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::ReadmeAnyFromPod",
+            "name" : "@DROLSKY/ReadmeMarkdownInRoot",
+            "version" : "0.142470"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Test::PodSpelling",
+            "name" : "@DROLSKY/Test::PodSpelling",
+            "version" : "2.006008"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Test::ReportPrereqs",
+            "name" : "@DROLSKY/Test::ReportPrereqs",
+            "version" : "0.019"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::PruneCruft",
+            "name" : "@DROLSKY/PruneCruft",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::ManifestSkip",
+            "name" : "@DROLSKY/ManifestSkip",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::MetaYAML",
+            "name" : "@DROLSKY/MetaYAML",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::License",
+            "name" : "@DROLSKY/License",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::ExtraTests",
+            "name" : "@DROLSKY/ExtraTests",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::ExecDir",
+            "name" : "@DROLSKY/ExecDir",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::ShareDir",
+            "name" : "@DROLSKY/ShareDir",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Manifest",
+            "name" : "@DROLSKY/Manifest",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::TestRelease",
+            "name" : "@DROLSKY/TestRelease",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::ConfirmRelease",
+            "name" : "@DROLSKY/ConfirmRelease",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::UploadToCPAN",
+            "name" : "@DROLSKY/UploadToCPAN",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::CheckPrereqsIndexed",
+            "name" : "@DROLSKY/CheckPrereqsIndexed",
+            "version" : "0.012"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::CPANFile",
+            "name" : "@DROLSKY/CPANFile",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::DROLSKY::Contributors",
+            "name" : "@DROLSKY/DROLSKY::Contributors",
+            "version" : "0.25"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::DROLSKY::License",
+            "name" : "@DROLSKY/DROLSKY::License",
+            "version" : "0.25"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Git::CheckFor::CorrectBranch",
+            "config" : {
+               "Dist::Zilla::Role::Git::Repo" : {
+                  "repo_root" : "."
+               }
+            },
+            "name" : "@DROLSKY/Git::CheckFor::CorrectBranch",
+            "version" : "0.011"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Git::Contributors",
+            "config" : {
+               "Dist::Zilla::Plugin::Git::Contributors" : {
+                  "include_authors" : "0",
+                  "include_releaser" : "1",
+                  "order_by" : "name",
+                  "paths" : []
+               }
+            },
+            "name" : "@DROLSKY/Git::Contributors",
+            "version" : "0.008"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Git::Describe",
+            "name" : "@DROLSKY/Git::Describe",
+            "version" : "0.003"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::InstallGuide",
+            "name" : "@DROLSKY/InstallGuide",
+            "version" : "1.200005"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Meta::Contributors",
+            "name" : "@DROLSKY/Meta::Contributors",
+            "version" : "0.001"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::MetaConfig",
+            "name" : "@DROLSKY/MetaConfig",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::MetaJSON",
+            "name" : "@DROLSKY/MetaJSON",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::SurgicalPodWeaver",
+            "config" : {
+               "Dist::Zilla::Plugin::PodWeaver" : {
+                  "finder" : [
+                     ":InstallModules",
+                     ":ExecFiles"
+                  ],
+                  "plugins" : [
+                     {
+                        "class" : "Pod::Weaver::Plugin::EnsurePod5",
+                        "name" : "@CorePrep/EnsurePod5",
+                        "version" : "4.008"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Plugin::H1Nester",
+                        "name" : "@CorePrep/H1Nester",
+                        "version" : "4.008"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Generic",
+                        "name" : "NAME",
+                        "version" : "4.008"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Version",
+                        "name" : "Version",
+                        "version" : "4.008"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Generic",
+                        "name" : "SYNOPSIS",
+                        "version" : "4.008"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Generic",
+                        "name" : "DESCRIPTION",
+                        "version" : "4.008"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Leftovers",
+                        "name" : "Leftovers",
+                        "version" : "4.008"
+                     },
+                     {
+                        "class" : "inc::Pod::Weaver::Section::SeeAlsoMason",
+                        "name" : "=inc::Pod::Weaver::Section::SeeAlsoMason",
+                        "version" : null
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Authors",
+                        "name" : "Authors",
+                        "version" : "4.008"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Contributors",
+                        "name" : "Contributors",
+                        "version" : "0.008"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Legal",
+                        "name" : "Legal",
+                        "version" : "4.008"
+                     }
+                  ]
+               }
+            },
+            "name" : "@DROLSKY/SurgicalPodWeaver",
+            "version" : "0.0023"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::PodSyntaxTests",
+            "name" : "@DROLSKY/PodSyntaxTests",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Test::NoTabs",
+            "config" : {
+               "Dist::Zilla::Plugin::Test::NoTabs" : {
+                  "filename" : "xt/author/no-tabs.t",
+                  "finder" : [
+                     ":InstallModules",
+                     ":ExecFiles",
+                     ":TestFiles"
+                  ]
+               }
+            },
+            "name" : "@DROLSKY/Test::NoTabs",
+            "version" : "0.09"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Git::Check",
+            "config" : {
+               "Dist::Zilla::Plugin::Git::Check" : {
+                  "untracked_files" : "die"
+               },
+               "Dist::Zilla::Role::Git::DirtyFiles" : {
+                  "allow_dirty" : [
+                     "Changes",
+                     "cpanfile",
+                     "CONTRIBUTING.md",
+                     "LICENSE",
+                     "README.md"
+                  ],
+                  "allow_dirty_match" : [],
+                  "changelog" : "Changes"
+               },
+               "Dist::Zilla::Role::Git::Repo" : {
+                  "repo_root" : "."
+               }
+            },
+            "name" : "@DROLSKY/Git::Check",
+            "version" : "2.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Git::Commit",
+            "config" : {
+               "Dist::Zilla::Plugin::Git::Commit" : {
+                  "add_files_in" : [],
+                  "commit_msg" : "v%v%n%n%c",
+                  "time_zone" : "local"
+               },
+               "Dist::Zilla::Role::Git::DirtyFiles" : {
+                  "allow_dirty" : [
+                     "Changes",
+                     "cpanfile",
+                     "CONTRIBUTING.md",
+                     "LICENSE",
+                     "README.md"
+                  ],
+                  "allow_dirty_match" : [],
+                  "changelog" : "Changes"
+               },
+               "Dist::Zilla::Role::Git::Repo" : {
+                  "repo_root" : "."
+               }
+            },
+            "name" : "@DROLSKY/Git::Commit",
+            "version" : "2.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Git::Tag",
+            "config" : {
+               "Dist::Zilla::Plugin::Git::Tag" : {
+                  "branch" : null,
+                  "signed" : 0,
+                  "tag" : "v1.56",
+                  "tag_format" : "v%v",
+                  "tag_message" : "v%v",
+                  "time_zone" : "local"
+               },
+               "Dist::Zilla::Role::Git::Repo" : {
+                  "repo_root" : "."
+               }
+            },
+            "name" : "@DROLSKY/Git::Tag",
+            "version" : "2.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Git::Push",
+            "config" : {
+               "Dist::Zilla::Plugin::Git::Push" : {
+                  "push_to" : [
+                     "origin"
+                  ],
+                  "remotes_must_exist" : 1
+               },
+               "Dist::Zilla::Role::Git::Repo" : {
+                  "repo_root" : "."
+               }
+            },
+            "name" : "@DROLSKY/Git::Push",
+            "version" : "2.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::MetaNoIndex",
+            "name" : "MetaNoIndex",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Prereqs",
+            "config" : {
+               "Dist::Zilla::Plugin::Prereqs" : {
+                  "phase" : "runtime",
+                  "type" : "requires"
+               }
+            },
+            "name" : "RuntimeRequires",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Prereqs",
+            "config" : {
+               "Dist::Zilla::Plugin::Prereqs" : {
+                  "phase" : "test",
+                  "type" : "requires"
+               }
+            },
+            "name" : "TestRequires",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":InstallModules",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":IncModules",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":TestFiles",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":ExecFiles",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":ShareFiles",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":MainModule",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":AllFiles",
+            "version" : "5.025"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":NoFiles",
+            "version" : "5.025"
+         }
+      ],
+      "zilla" : {
+         "class" : "Dist::Zilla::Dist::Builder",
+         "config" : {
+            "is_trial" : "0"
+         },
+         "version" : "5.025"
       }
    },
-   "version" : "1.54"
+   "x_authority" : "cpan:DROLSKY",
+   "x_contributors" : [
+      "Ævar Arnfjörð Bjarmason <avarab@gmail.com>",
+      "Alex Vandiver <alex@chmrr.net>",
+      "John Williams <jwilliams@cpan.org>",
+      "Kevin Falcone <falcone@bestpractical.com>",
+      "Patrick Kane <modus-cpan@pr.es.to>",
+      "Ricardo Signes <rjbs@cpan.org>"
+   ]
 }
 
@@ -5,15 +5,18 @@ author:
   - 'Dave Rolsky <autarch@urth.org>'
   - 'Ken Williams <ken@mathforum.org>'
 build_requires:
-  Test::Deep: 0
+  ExtUtils::MakeMaker: '0'
+  File::Spec: '0.8'
+  Test::Deep: '0'
+  Test::More: '0.88'
 configure_requires:
-  ExtUtils::MakeMaker: 6.30
+  ExtUtils::MakeMaker: '0'
 dynamic_config: 0
-generated_by: 'Dist::Zilla version 4.300034, CPAN::Meta::Converter version 2.131560'
+generated_by: 'Dist::Zilla version 5.025, CPAN::Meta::Converter version 2.142690'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: 1.4
+  version: '1.4'
 name: HTML-Mason
 no_index:
   directory:
@@ -21,16 +24,407 @@ no_index:
   file:
     - lib/HTML/Mason/Tests.pm
 requires:
-  CGI: 2.46
-  Cache::Cache: 1.00
-  Class::Container: 0.07
-  Exception::Class: 1.15
-  File::Spec: 0.8
-  HTML::Entities: 0
-  Log::Any: 0.08
-  Params::Validate: 0.70
-  Scalar::Util: 1.01
+  CGI: '2.46'
+  Cache::Cache: '1.00'
+  Class::Container: '0.07'
+  Exception::Class: '1.15'
+  File::Spec: '0.8'
+  HTML::Entities: '0'
+  Log::Any: '0.08'
+  Params::Validate: '0.70'
+  Scalar::Util: '1.01'
 resources:
-  bugtracker: http://rt.cpan.org/NoAuth/Bugs.html?Dist=HTML::Mason
-  repository: git://github.com/jonswar/perl-HTML-Mason.git
-version: 1.54
+  bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=HTML-Mason
+  homepage: http://metacpan.org/release/HTML-Mason
+  repository: git://github.com/autarch/HTML-Mason.git
+version: '1.56'
+x_Dist_Zilla:
+  perl:
+    version: '5.016003'
+  plugins:
+    -
+      class: Dist::Zilla::Plugin::FileFinder::Filter
+      name: SkipApacheHandler
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::MakeMaker
+      config:
+        Dist::Zilla::Role::TestRunner:
+          default_jobs: 1
+      name: '@DROLSKY/MakeMaker'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::Authority
+      name: '@DROLSKY/Authority'
+      version: '1.009'
+    -
+      class: Dist::Zilla::Plugin::CopyFilesFromBuild
+      name: '@DROLSKY/CopyFilesFromBuild'
+      version: '0.103510'
+    -
+      class: Dist::Zilla::Plugin::GatherDir
+      config:
+        Dist::Zilla::Plugin::GatherDir:
+          exclude_filename:
+            - README.md
+            - cpanfile
+            - LICENSE
+          exclude_match: []
+          follow_symlinks: '0'
+          include_dotfiles: '0'
+          prefix: ''
+          prune_directory: []
+          root: .
+      name: '@DROLSKY/GatherDir'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::GitHub::Meta
+      name: '@DROLSKY/GitHub::Meta'
+      version: '0.38'
+    -
+      class: Dist::Zilla::Plugin::GitHub::Update
+      name: '@DROLSKY/GitHub::Update'
+      version: '0.38'
+    -
+      class: Dist::Zilla::Plugin::MetaResources
+      name: '@DROLSKY/MetaResources'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::NextRelease
+      name: '@DROLSKY/NextRelease'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::PkgVersion
+      name: '@DROLSKY/PkgVersion'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::Prereqs
+      config:
+        Dist::Zilla::Plugin::Prereqs:
+          phase: test
+          type: requires
+      name: '@DROLSKY/TestMoreDoneTesting'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::PromptIfStale
+      config:
+        Dist::Zilla::Plugin::PromptIfStale:
+          check_all_plugins: '1'
+          check_all_prereqs: '1'
+          modules: []
+          phase: release
+          skip:
+            - Dist::Zilla::Plugin::DROLSKY::Contributors
+            - Dist::Zilla::Plugin::DROLSKY::License
+      name: '@DROLSKY/stale modules, release'
+      version: '0.030'
+    -
+      class: Dist::Zilla::Plugin::ReadmeAnyFromPod
+      name: '@DROLSKY/ReadmeMarkdownInBuild'
+      version: '0.142470'
+    -
+      class: Dist::Zilla::Plugin::ReadmeAnyFromPod
+      name: '@DROLSKY/ReadmeMarkdownInRoot'
+      version: '0.142470'
+    -
+      class: Dist::Zilla::Plugin::Test::PodSpelling
+      name: '@DROLSKY/Test::PodSpelling'
+      version: '2.006008'
+    -
+      class: Dist::Zilla::Plugin::Test::ReportPrereqs
+      name: '@DROLSKY/Test::ReportPrereqs'
+      version: '0.019'
+    -
+      class: Dist::Zilla::Plugin::PruneCruft
+      name: '@DROLSKY/PruneCruft'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::ManifestSkip
+      name: '@DROLSKY/ManifestSkip'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::MetaYAML
+      name: '@DROLSKY/MetaYAML'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::License
+      name: '@DROLSKY/License'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::ExtraTests
+      name: '@DROLSKY/ExtraTests'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::ExecDir
+      name: '@DROLSKY/ExecDir'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::ShareDir
+      name: '@DROLSKY/ShareDir'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::Manifest
+      name: '@DROLSKY/Manifest'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::TestRelease
+      name: '@DROLSKY/TestRelease'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::ConfirmRelease
+      name: '@DROLSKY/ConfirmRelease'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::UploadToCPAN
+      name: '@DROLSKY/UploadToCPAN'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::CheckPrereqsIndexed
+      name: '@DROLSKY/CheckPrereqsIndexed'
+      version: '0.012'
+    -
+      class: Dist::Zilla::Plugin::CPANFile
+      name: '@DROLSKY/CPANFile'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::DROLSKY::Contributors
+      name: '@DROLSKY/DROLSKY::Contributors'
+      version: '0.25'
+    -
+      class: Dist::Zilla::Plugin::DROLSKY::License
+      name: '@DROLSKY/DROLSKY::License'
+      version: '0.25'
+    -
+      class: Dist::Zilla::Plugin::Git::CheckFor::CorrectBranch
+      config:
+        Dist::Zilla::Role::Git::Repo:
+          repo_root: .
+      name: '@DROLSKY/Git::CheckFor::CorrectBranch'
+      version: '0.011'
+    -
+      class: Dist::Zilla::Plugin::Git::Contributors
+      config:
+        Dist::Zilla::Plugin::Git::Contributors:
+          include_authors: '0'
+          include_releaser: '1'
+          order_by: name
+          paths: []
+      name: '@DROLSKY/Git::Contributors'
+      version: '0.008'
+    -
+      class: Dist::Zilla::Plugin::Git::Describe
+      name: '@DROLSKY/Git::Describe'
+      version: '0.003'
+    -
+      class: Dist::Zilla::Plugin::InstallGuide
+      name: '@DROLSKY/InstallGuide'
+      version: '1.200005'
+    -
+      class: Dist::Zilla::Plugin::Meta::Contributors
+      name: '@DROLSKY/Meta::Contributors'
+      version: '0.001'
+    -
+      class: Dist::Zilla::Plugin::MetaConfig
+      name: '@DROLSKY/MetaConfig'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::MetaJSON
+      name: '@DROLSKY/MetaJSON'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::SurgicalPodWeaver
+      config:
+        Dist::Zilla::Plugin::PodWeaver:
+          finder:
+            - ':InstallModules'
+            - ':ExecFiles'
+          plugins:
+            -
+              class: Pod::Weaver::Plugin::EnsurePod5
+              name: '@CorePrep/EnsurePod5'
+              version: '4.008'
+            -
+              class: Pod::Weaver::Plugin::H1Nester
+              name: '@CorePrep/H1Nester'
+              version: '4.008'
+            -
+              class: Pod::Weaver::Section::Generic
+              name: NAME
+              version: '4.008'
+            -
+              class: Pod::Weaver::Section::Version
+              name: Version
+              version: '4.008'
+            -
+              class: Pod::Weaver::Section::Generic
+              name: SYNOPSIS
+              version: '4.008'
+            -
+              class: Pod::Weaver::Section::Generic
+              name: DESCRIPTION
+              version: '4.008'
+            -
+              class: Pod::Weaver::Section::Leftovers
+              name: Leftovers
+              version: '4.008'
+            -
+              class: inc::Pod::Weaver::Section::SeeAlsoMason
+              name: =inc::Pod::Weaver::Section::SeeAlsoMason
+              version: ~
+            -
+              class: Pod::Weaver::Section::Authors
+              name: Authors
+              version: '4.008'
+            -
+              class: Pod::Weaver::Section::Contributors
+              name: Contributors
+              version: '0.008'
+            -
+              class: Pod::Weaver::Section::Legal
+              name: Legal
+              version: '4.008'
+      name: '@DROLSKY/SurgicalPodWeaver'
+      version: '0.0023'
+    -
+      class: Dist::Zilla::Plugin::PodSyntaxTests
+      name: '@DROLSKY/PodSyntaxTests'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::Test::NoTabs
+      config:
+        Dist::Zilla::Plugin::Test::NoTabs:
+          filename: xt/author/no-tabs.t
+          finder:
+            - ':InstallModules'
+            - ':ExecFiles'
+            - ':TestFiles'
+      name: '@DROLSKY/Test::NoTabs'
+      version: '0.09'
+    -
+      class: Dist::Zilla::Plugin::Git::Check
+      config:
+        Dist::Zilla::Plugin::Git::Check:
+          untracked_files: die
+        Dist::Zilla::Role::Git::DirtyFiles:
+          allow_dirty:
+            - Changes
+            - cpanfile
+            - CONTRIBUTING.md
+            - LICENSE
+            - README.md
+          allow_dirty_match: []
+          changelog: Changes
+        Dist::Zilla::Role::Git::Repo:
+          repo_root: .
+      name: '@DROLSKY/Git::Check'
+      version: '2.025'
+    -
+      class: Dist::Zilla::Plugin::Git::Commit
+      config:
+        Dist::Zilla::Plugin::Git::Commit:
+          add_files_in: []
+          commit_msg: v%v%n%n%c
+          time_zone: local
+        Dist::Zilla::Role::Git::DirtyFiles:
+          allow_dirty:
+            - Changes
+            - cpanfile
+            - CONTRIBUTING.md
+            - LICENSE
+            - README.md
+          allow_dirty_match: []
+          changelog: Changes
+        Dist::Zilla::Role::Git::Repo:
+          repo_root: .
+      name: '@DROLSKY/Git::Commit'
+      version: '2.025'
+    -
+      class: Dist::Zilla::Plugin::Git::Tag
+      config:
+        Dist::Zilla::Plugin::Git::Tag:
+          branch: ~
+          signed: 0
+          tag: v1.56
+          tag_format: v%v
+          tag_message: v%v
+          time_zone: local
+        Dist::Zilla::Role::Git::Repo:
+          repo_root: .
+      name: '@DROLSKY/Git::Tag'
+      version: '2.025'
+    -
+      class: Dist::Zilla::Plugin::Git::Push
+      config:
+        Dist::Zilla::Plugin::Git::Push:
+          push_to:
+            - origin
+          remotes_must_exist: 1
+        Dist::Zilla::Role::Git::Repo:
+          repo_root: .
+      name: '@DROLSKY/Git::Push'
+      version: '2.025'
+    -
+      class: Dist::Zilla::Plugin::MetaNoIndex
+      name: MetaNoIndex
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::Prereqs
+      config:
+        Dist::Zilla::Plugin::Prereqs:
+          phase: runtime
+          type: requires
+      name: RuntimeRequires
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::Prereqs
+      config:
+        Dist::Zilla::Plugin::Prereqs:
+          phase: test
+          type: requires
+      name: TestRequires
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::FinderCode
+      name: ':InstallModules'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::FinderCode
+      name: ':IncModules'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::FinderCode
+      name: ':TestFiles'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::FinderCode
+      name: ':ExecFiles'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::FinderCode
+      name: ':ShareFiles'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::FinderCode
+      name: ':MainModule'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::FinderCode
+      name: ':AllFiles'
+      version: '5.025'
+    -
+      class: Dist::Zilla::Plugin::FinderCode
+      name: ':NoFiles'
+      version: '5.025'
+  zilla:
+    class: Dist::Zilla::Dist::Builder
+    config:
+      is_trial: '0'
+    version: '5.025'
+x_authority: cpan:DROLSKY
+x_contributors:
+  - 'Ævar Arnfjörð Bjarmason <avarab@gmail.com>'
+  - 'Alex Vandiver <alex@chmrr.net>'
+  - 'John Williams <jwilliams@cpan.org>'
+  - 'Kevin Falcone <falcone@bestpractical.com>'
+  - 'Patrick Kane <modus-cpan@pr.es.to>'
+  - 'Ricardo Signes <rjbs@cpan.org>'
@@ -1,27 +1,27 @@
 
+# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.025.
 use strict;
 use warnings;
 
 
 
-use ExtUtils::MakeMaker 6.30;
+use ExtUtils::MakeMaker;
 
 
 
 my %WriteMakefileArgs = (
   "ABSTRACT" => "High-performance, dynamic web site authoring system",
   "AUTHOR" => "Jonathan Swartz <swartz\@pobox.com>, Dave Rolsky <autarch\@urth.org>, Ken Williams <ken\@mathforum.org>",
-  "BUILD_REQUIRES" => {},
   "CONFIGURE_REQUIRES" => {
-    "ExtUtils::MakeMaker" => "6.30"
+    "ExtUtils::MakeMaker" => 0
   },
   "DISTNAME" => "HTML-Mason",
   "EXE_FILES" => [
     "bin/convert0.6.pl",
     "bin/convert0.6.README",
     "bin/convert0.8.pl",
-    "bin/convert0.8.README",
-    "bin/mason.pl"
+    "bin/mason.pl",
+    "bin/convert0.8.README"
   ],
   "LICENSE" => "perl",
   "NAME" => "HTML::Mason",
@@ -37,39 +37,38 @@ my %WriteMakefileArgs = (
     "Scalar::Util" => "1.01"
   },
   "TEST_REQUIRES" => {
-    "Test::Deep" => 0
+    "ExtUtils::MakeMaker" => 0,
+    "File::Spec" => "0.8",
+    "Test::Deep" => 0,
+    "Test::More" => "0.88"
   },
-  "VERSION" => "1.54",
+  "VERSION" => "1.56",
   "test" => {
-    "TESTS" => "t/*.t t/author-live/*.t"
+    "TESTS" => "t/*.t"
   }
 );
 
 
-unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) {
-  my $tr = delete $WriteMakefileArgs{TEST_REQUIRES};
-  my $br = $WriteMakefileArgs{BUILD_REQUIRES};
-  for my $mod ( keys %$tr ) {
-    if ( exists $br->{$mod} ) {
-      $br->{$mod} = $tr->{$mod} if $tr->{$mod} > $br->{$mod};
-    }
-    else {
-      $br->{$mod} = $tr->{$mod};
-    }
-  }
-}
+my %FallbackPrereqs = (
+  "CGI" => "2.46",
+  "Cache::Cache" => "1.00",
+  "Class::Container" => "0.07",
+  "Exception::Class" => "1.15",
+  "ExtUtils::MakeMaker" => 0,
+  "File::Spec" => "0.8",
+  "HTML::Entities" => 0,
+  "Log::Any" => "0.08",
+  "Params::Validate" => "0.70",
+  "Scalar::Util" => "1.01",
+  "Test::Deep" => 0,
+  "Test::More" => "0.88"
+);
 
-unless ( eval { ExtUtils::MakeMaker->VERSION(6.56) } ) {
-  my $br = delete $WriteMakefileArgs{BUILD_REQUIRES};
-  my $pp = $WriteMakefileArgs{PREREQ_PM};
-  for my $mod ( keys %$br ) {
-    if ( exists $pp->{$mod} ) {
-      $pp->{$mod} = $br->{$mod} if $br->{$mod} > $pp->{$mod};
-    }
-    else {
-      $pp->{$mod} = $br->{$mod};
-    }
-  }
+
+unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) {
+  delete $WriteMakefileArgs{TEST_REQUIRES};
+  delete $WriteMakefileArgs{BUILD_REQUIRES};
+  $WriteMakefileArgs{PREREQ_PM} = \%FallbackPrereqs;
 }
 
 delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
@@ -1,188 +0,0 @@
-NAME
-    Mason - High-performance, dynamic web site authoring system
-
-VERSION
-    version 1.54
-
-SYNOPSIS
-        PerlModule HTML::Mason::ApacheHandler
-
-        <Location />
-            SetHandler perl-script
-            PerlHandler HTML::Mason::ApacheHandler
-        </Location>
-
-DESCRIPTION
-    Mason is a tool for building, serving and managing large web sites. Its
-    features make it an ideal backend for high load sites serving dynamic
-    content, such as online newspapers or database driven e-commerce sites.
-
-    Actually, Mason can be used to generate any sort of text, whether for a
-    web site or not. But it was originally built for web sites and since
-    that's why most people are interested in it, that is the focus of this
-    documentation.
-
-    Mason's various pieces revolve around the notion of "components''. A
-    component is a mix of HTML, Perl, and special Mason commands, one
-    component per file. So-called "top-level" components represent entire
-    web-pages, while smaller components typically return HTML snippets for
-    embedding in top-level components. This object-like architecture greatly
-    simplifies site maintenance: change a shared component, and you
-    instantly changed all dependent pages that refer to it across a site (or
-    across many virtual sites).
-
-    Mason's component syntax lets designers separate a web page into
-    programmatic and design elements. This means the esoteric Perl bits can
-    be hidden near the bottom of a component, preloading simple variables
-    for use above in the HTML. In our own experience, this frees content
-    managers (i.e., non-programmers) to work on the layout without getting
-    mired in programming details. Techies, however, still enjoy the full
-    power of Perl.
-
-    Mason works by intercepting innocent-looking requests (say,
-    http://www.yoursite.com/index.html) and mapping them to requests for
-    Mason components. Mason then compiles the component, runs it, and feeds
-    the output back to the client.
-
-    Consider this simple Mason component:
-
-        % my $noun = 'World';
-        Hello <% $noun %>!
-        How are ya?
-
-    The output of this component is:
-
-        Hello World!
-        How are ya?
-
-    In this component you see a mix of standard HTML and Mason elements. The
-    bare '%' prefixing the first line tells Mason that this is a line of
-    Perl code. One line below, the embedded <% ... %> tag gets replaced with
-    the return value of its contents, evaluated as a Perl expression.
-
-    Beyond this trivial example, components can also embed serious chunks of
-    Perl code (say, to pull records from a database). They can also call
-    other components, cache results for later reuse, and perform all the
-    tricks you expect from a regular Perl program.
-
-WAIT - HAVE YOU SEEN MASON 2?
-    Version 1 of Mason (this distribution) -- has been around since 1998, is
-    in wide use, and is very stable. However it has not changed much in
-    years and is no longer actively developed.
-
-    Version 2 of Mason -- Mason -- was released in February of 2011. It is
-    being very actively developed and has a much more modern architecture.
-    If you are just starting out, we recommend you give Mason 2 a try.
-
-    For a summary of differences between Mason 1 and 2 see
-
-        http://www.openswartz.com/2011/02/21/announcing-mason-2/
-
-INSTALLATION
-    Mason has been tested under Linux, FreeBSD, Solaris, HPUX, and Win32. As
-    an all-Perl solution, it should work on any machine that has working
-    versions of Perl 5.00503+, mod_perl, and the required CPAN modules.
-
-    Mason has a standard MakeMaker-driven installation. See the README file
-    for details.
-
-CONFIGURING MASON
-    This section assumes that you are able to install and configure a
-    mod_perl server. Relevant documentation is available at
-    http://www.apache.org (Apache) and http://perl.apache.org (mod_perl).
-    The mod_perl mailing list, archive, and guide are also great resources.
-
-    The simplest configuration of Mason requires a few lines in your
-    httpd.conf:
-
-        PerlModule HTML::Mason::ApacheHandler
-
-        <Location />
-            SetHandler perl-script
-            PerlHandler HTML::Mason::ApacheHandler
-        </Location>
-
-    The PerlModule directive simply ensures that the Mason code is loaded in
-    the parent process before forking, which can save some memory when
-    running mod_perl.
-
-    The <Location> section routes all requests to the Mason handler, which
-    is a simple way to try out Mason. A more refined setup is discussed in
-    the Controlling Access via Filename Extension section of the
-    administrator's manual.
-
-    Once you have added the configuration directives, restart the server.
-    First, go to a standard URL on your site to make sure you haven't broken
-    anything. If all goes well you should see the same page as before. If
-    not, recheck your Apache config files and also tail your server's error
-    log.
-
-    If you are getting "404 Not Found" errors even when the files clearly
-    exist, Mason may be having trouble with your document root. One
-    situation that will unfortunately confuse Mason is if your document root
-    goes through a symbolic link. Try expressing your document root in terms
-    of the true filesystem path.
-
-    Next, try adding the tag <% 2+2 %> at the top of some HTML file. If you
-    reload this page and see a "4", Mason is working!
-
-DOCUMENTATION ROADMAP
-    Once Mason is on its feet, the next step is to write a component or two.
-    The Mason Developer's Manual is a complete tutorial for writing, using,
-    and debugging components. A reference companion to the Developer's
-    Manual is the Request API documentation, HTML::Mason::Request.
-
-    Whoever is responsible for setting up and tuning Mason should read the
-    Administrator's Manual, though developers will also benefit from reading
-    it as well. This document covers more advanced configuration scenarios
-    and performance optimization. The reference companion to the
-    Administrator's manual is the Parameters Reference, which describes all
-    the parameters you can use to configure Mason.
-
-    Most of this documentation assumes that you're running Mason on top of
-    mod_perl, since that is the most common configuration. If you would like
-    to run Mason via a CGI script, refer to the HTML::Mason::CGIHandler
-    documentation. If you are using Mason from a standalone program, refer
-    to the Using Mason from a Standalone Script section of the
-    administrator's manual.
-
-    There is also a book about Mason, *Embedding Perl in HTML with Mason*,
-    by Dave Rolsky and Ken Williams, published by O'Reilly and Associates.
-    The book's website is at http://www.masonbook.com/. This book goes into
-    detail on a number of topics, and includes a chapter of recipes as well
-    as a sample Mason-based website.
-
-GETTING HELP AND SOURCES
-    Questions and feedback are welcome, and should be directed to the Mason
-    mailing list. You must be subscribed to post.
-
-        https://lists.sourceforge.net/lists/listinfo/mason-users
-
-    You can also visit us at `#mason' on irc:.
-
-    Bugs and feature requests will be tracked at RT:
-
-        http://rt.cpan.org/NoAuth/Bugs.html?Dist=HTML-Mason
-        bug-html-mason@rt.cpan.org
-
-    The latest source code can be browsed and fetched at:
-
-        http://github.com/jonswar/perl-html-mason/tree/master
-        git clone git://github.com/jonswar/perl-html-mason.git
-
-SEE ALSO
-    Mason
-
-AUTHORS
-    *   Jonathan Swartz <swartz@pobox.com>
-
-    *   Dave Rolsky <autarch@urth.org>
-
-    *   Ken Williams <ken@mathforum.org>
-
-COPYRIGHT AND LICENSE
-    This software is copyright (c) 2012 by Jonathan Swartz.
-
-    This is free software; you can redistribute it and/or modify it under
-    the same terms as the Perl 5 programming language system itself.
-
@@ -0,0 +1,198 @@
+# VERSION
+
+version 1.56
+
+# SYNOPSIS
+
+    PerlModule HTML::Mason::ApacheHandler
+
+    <Location />
+        SetHandler perl-script
+        PerlHandler HTML::Mason::ApacheHandler
+    </Location>
+
+# DESCRIPTION
+
+Mason is a tool for building, serving and managing large web
+sites. Its features make it an ideal backend for high load sites
+serving dynamic content, such as online newspapers or database driven
+e-commerce sites.
+
+Actually, Mason can be used to generate any sort of text, whether for
+a web site or not.  But it was originally built for web sites and
+since that's why most people are interested in it, that is the focus
+of this documentation.
+
+Mason's various pieces revolve around the notion of "components''. A
+component is a mix of HTML, Perl, and special Mason commands, one
+component per file. So-called "top-level" components represent entire
+web-pages, while smaller components typically return HTML snippets for
+embedding in top-level components. This object-like architecture
+greatly simplifies site maintenance: change a shared component, and
+you instantly changed all dependent pages that refer to it across a
+site (or across many virtual sites).
+
+Mason's component syntax lets designers separate a web page into
+programmatic and design elements. This means the esoteric Perl bits
+can be hidden near the bottom of a component, preloading simple
+variables for use above in the HTML. In our own experience, this frees
+content managers (i.e., non-programmers) to work on the layout without
+getting mired in programming details. Techies, however, still enjoy
+the full power of Perl.
+
+Mason works by intercepting innocent-looking requests (say,
+http://www.yoursite.com/index.html) and mapping them to requests for
+Mason components.  Mason then compiles the component, runs it, and
+feeds the output back to the client.
+
+Consider this simple Mason component:
+
+    % my $noun = 'World';
+    Hello <% $noun %>!
+    How are ya?
+
+The output of this component is:
+
+    Hello World!
+    How are ya?
+
+In this component you see a mix of standard HTML and Mason
+elements. The bare '%' prefixing the first line tells Mason that this
+is a line of Perl code. One line below, the embedded <%
+...&nbsp;%> tag gets replaced with the return value of its contents,
+evaluated as a Perl expression.
+
+Beyond this trivial example, components can also embed serious chunks
+of Perl code (say, to pull records from a database). They can also
+call other components, cache results for later reuse, and perform all
+the tricks you expect from a regular Perl program.
+
+# WAIT - HAVE YOU SEEN MASON 2?
+
+Version 1 of Mason (this distribution) -- has been around since 1998, is in
+wide use, and is very stable. However it has not changed much in years and
+is no longer actively developed.
+
+Version 2 of Mason -- [Mason](https://metacpan.org/pod/Mason) -- was released in February of 2011. It is more
+actively developed and has a much more modern architecture. If you are just
+starting out, we recommend you give Mason 2 a try.
+
+For a summary of differences between Mason 1 and 2 see
+
+    http://www.openswartz.com/2011/02/21/announcing-mason-2/
+
+# INSTALLATION
+
+Mason has been tested under Linux, FreeBSD, Solaris, HPUX, and
+Win32. As an all-Perl solution, it should work on any machine that has
+working versions of Perl 5.00503+, mod\_perl, and the required CPAN
+modules.
+
+Mason has a standard MakeMaker-driven installation. See the README
+file for details.
+
+# CONFIGURING MASON
+
+This section assumes that you are able to install and configure a
+mod\_perl server. Relevant documentation is available at
+http://www.apache.org (Apache) and http://perl.apache.org
+(mod\_perl). The mod\_perl mailing list, archive, and guide are also
+great resources.
+
+The simplest configuration of Mason requires a few lines in your
+httpd.conf:
+
+    PerlModule HTML::Mason::ApacheHandler
+
+    <Location />
+        SetHandler perl-script
+        PerlHandler HTML::Mason::ApacheHandler
+    </Location>
+
+The PerlModule directive simply ensures that the Mason code is loaded
+in the parent process before forking, which can save some memory when
+running mod\_perl.
+
+The <Location> section routes all requests to the Mason handler, which
+is a simple way to try out Mason. A more refined setup is discussed
+in the [Controlling Access via Filename Extension](https://metacpan.org/pod/HTML::Mason::Admin#Controlling-Access-via-Filename-Extension) section of the administrator's manual.
+
+Once you have added the configuration directives, restart the
+server. First, go to a standard URL on your site to make sure you
+haven't broken anything. If all goes well you should see the same page
+as before. If not, recheck your Apache config files and also tail your
+server's error log.
+
+If you are getting "404 Not Found" errors even when the files clearly
+exist, Mason may be having trouble with your document root. One
+situation that will unfortunately confuse Mason is if your document
+root goes through a symbolic link. Try expressing your document root
+in terms of the true filesystem path.
+
+Next, try adding the tag <% 2+2 %> at the top of some HTML file. If you
+reload this page and see a "4", Mason is working!
+
+# DOCUMENTATION ROADMAP
+
+Once Mason is on its feet, the next step is to write a component or
+two. The [Mason Developer's Manual](https://metacpan.org/pod/HTML::Mason::Devel) is a
+complete tutorial for writing, using, and debugging components. A
+reference companion to the Developer's Manual is the Request API
+documentation, [HTML::Mason::Request](https://metacpan.org/pod/HTML::Mason::Request).
+
+Whoever is responsible for setting up and tuning Mason should read the
+[Administrator's Manual](https://metacpan.org/pod/HTML::Mason::Admin), though developers
+will also benefit from reading it as well. This document covers more
+advanced configuration scenarios and performance optimization. The
+reference companion to the Administrator's manual is the
+[Parameters Reference](https://metacpan.org/pod/HTML::Mason::Params), which describes all the
+parameters you can use to configure Mason.
+
+Most of this documentation assumes that you're running Mason on top of
+mod\_perl, since that is the most common configuration.  If you would
+like to run Mason via a CGI script, refer to the
+[HTML::Mason::CGIHandler](https://metacpan.org/pod/HTML::Mason::CGIHandler) documentation.
+If you are using Mason from a standalone program, refer to
+the [Using Mason from a Standalone Script](https://metacpan.org/pod/HTML::Mason::Admin#Using-Mason-from-a-Standalone-Script) section of the administrator's manual.
+
+There is also a book about Mason, _Embedding Perl in HTML with
+Mason_, by Dave Rolsky and Ken Williams, published by O'Reilly and
+Associates.  The book's website is at http://www.masonbook.com/.  This
+book goes into detail on a number of topics, and includes a chapter of
+recipes as well as a sample Mason-based website.
+
+# GETTING HELP AND SOURCES
+
+Questions and feedback are welcome, and should be directed to the Mason
+mailing list. You must be subscribed to post.
+
+    https://lists.sourceforge.net/lists/listinfo/mason-users
+
+You can also visit us at `#mason` on [irc://irc.perl.org/#mason](irc://irc.perl.org/#mason).
+
+Bugs and feature requests will be tracked at RT:
+
+    http://rt.cpan.org/NoAuth/Bugs.html?Dist=HTML-Mason
+    bug-html-mason@rt.cpan.org
+
+# AUTHORS
+
+- Jonathan Swartz <swartz@pobox.com>
+- Dave Rolsky <autarch@urth.org>
+- Ken Williams <ken@mathforum.org>
+
+# CONTRIBUTORS
+
+- Ævar Arnfjörð Bjarmason <avarab@gmail.com>
+- Alex Vandiver <alex@chmrr.net>
+- John Williams <jwilliams@cpan.org>
+- Kevin Falcone <falcone@bestpractical.com>
+- Patrick Kane <modus-cpan@pr.es.to>
+- Ricardo Signes <rjbs@cpan.org>
+
+# COPYRIGHT AND LICENSE
+
+This software is copyright (c) 1998 - 2014 by Jonathan Swartz.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
@@ -1,12 +1,12 @@
 #!/usr/bin/perl -w
 
 use Data::Dumper;
-use File::Find;	   
+use File::Find;
 use Getopt::Std;
 use IO::File;
 use strict;
 
-my ($EXCLUDE, $HELP, $LOWER, $QUIET, $TEST, $UPPER);
+my ( $EXCLUDE, $HELP, $LOWER, $QUIET, $TEST, $UPPER );
 
 my $usage = <<EOF;
 Usage: $0 -hlqtu [-e <regexp>] <directory> [<directory>...]
@@ -51,109 +51,133 @@ Warning: All directories will be traversed recursively.  Files are
 modified destructively and no automatic backups are created.
 EOF
 
-sub usage
-{
+sub usage {
     print $usage;
     exit;
 }
 
-sub main
-{
+sub main {
     my (%opts);
-    getopts('e:hlqtu',\%opts);
-    ($EXCLUDE, $HELP, $LOWER, $QUIET, $TEST, $UPPER) = @opts{qw(e h l q t u)};
-    if ($HELP) { print "$helpmsg\n$usage"; exit }
-    if (!@ARGV) { print "$usage\n$helpmsg"; exit }
+    getopts( 'e:hlqtu', \%opts );
+    ( $EXCLUDE, $HELP, $LOWER, $QUIET, $TEST, $UPPER )
+        = @opts{qw(e h l q t u)};
+    if ($HELP)    { print "$helpmsg\n$usage"; exit }
+    if ( !@ARGV ) { print "$usage\n$helpmsg"; exit }
     my @dirs = @ARGV;
-    
-    if (!$TEST) {
-	print "*** Mason 0.6 Conversion ***\n\n";
-	print "Quiet mode.\n" if defined($QUIET);
-	print "Excluding paths matching ($EXCLUDE).\n" if defined($EXCLUDE);
-	print "Processing ".(@dirs==1 ? "directory " : "directories ").join(",",@dirs)."\n";
-	print $warning;
-	print "\nProceed? [n] ";
-	exit if ((my $ans = <STDIN>) !~ /[Yy]/);
+
+    if ( !$TEST ) {
+        print "*** Mason 0.6 Conversion ***\n\n";
+        print "Quiet mode.\n"                          if defined($QUIET);
+        print "Excluding paths matching ($EXCLUDE).\n" if defined($EXCLUDE);
+        print "Processing "
+            . ( @dirs == 1 ? "directory " : "directories " )
+            . join( ",", @dirs ) . "\n";
+        print $warning;
+        print "\nProceed? [n] ";
+        exit if ( ( my $ans = <STDIN> ) !~ /[Yy]/ );
     }
     my $sub = sub {
-	if (-f $_ && -s _) {
-	    return if defined($EXCLUDE) && "$File::Find::dir/$_" =~ /$EXCLUDE/i;
-	    convert($_,"$File::Find::dir/$_");
-	}
+        if ( -f $_ && -s _ ) {
+            return
+                if defined($EXCLUDE) && "$File::Find::dir/$_" =~ /$EXCLUDE/i;
+            convert( $_, "$File::Find::dir/$_" );
+        }
     };
-    find($sub,@dirs);
+    find( $sub, @dirs );
 }
 
-sub convert
-{
-    my ($file,$path) = @_;
+sub convert {
+    my ( $file, $path ) = @_;
     my $buf;
     my $infh = new IO::File $file;
-    if (!$infh) { warn "cannot read $path: $!"; return }
+    if ( !$infh ) { warn "cannot read $path: $!"; return }
     { local $/ = undef; $buf = <$infh> }
 
     my $c = 0;
     my @changes;
-    my $report = sub { push(@changes,"$_[0]  -->  $_[1]") };
+    my $report = sub { push( @changes, "$_[0]  -->  $_[1]" ) };
 
     #
     # Convert section names to short versions
     #
     my $pat = "<(/?%)perl_(args|cleanup|doc|init|once|text)>";
-    if (!$TEST) {
-	if ($UPPER) {
-	    $c += ($buf =~ s{$pat}{"<$1".uc($2).">"}geio);
-	} elsif ($LOWER) {
-	    $c += ($buf =~ s{$pat}{"<$1".lc($2).">"}geio);
-	} else {
-	    $c += ($buf =~ s{$pat}{<$1$2>}gio);
-	}
-    } else {
-	while ($buf =~ m{($pat)}gio) {
-	    $report->($1,"<$2".($UPPER ? uc($3) : $LOWER ? lc($3) : $3).">");
-	}
+    if ( !$TEST ) {
+        if ($UPPER) {
+            $c += ( $buf =~ s{$pat}{"<$1".uc($2).">"}geio );
+        }
+        elsif ($LOWER) {
+            $c += ( $buf =~ s{$pat}{"<$1".lc($2).">"}geio );
+        }
+        else {
+            $c += ( $buf =~ s{$pat}{<$1$2>}gio );
+        }
+    }
+    else {
+        while ( $buf =~ m{($pat)}gio ) {
+            $report->(
+                $1,
+                "<$2" . ( $UPPER ? uc($3) : $LOWER ? lc($3) : $3 ) . ">"
+            );
+        }
     }
 
     #
     # Convert <% mc_comp ... %> to <& ... &>
     #
-    if (!$TEST) {
-	$c += ($buf =~ s{<%\s*mc_comp\s*\(\s*\'([^\']+)\'\s*(.*?)\s*\)\s*%>} {<& $1$2 &>}g);
-	$c += ($buf =~ s{<%\s*mc_comp\s*\(\s*\"([^\"\$]+)\"\s*(.*?)\s*\)\s*%>} {<& $1$2 &>}g);
-	$c += ($buf =~ s{<%\s*mc_comp\s*\(\s*(\"[^\"]+\")\s*(.*?)\s*\)\s*%>} {<& $1$2 &>}g);
-	$c += ($buf =~ s{<%\s*mc_comp\s*\(\s*(.*?)\s*\)\s*%>} {<& $1 &>}g);
-    } else {
-	while ($buf =~ m{(<%\s*mc_comp\s*\(\s*\'([^\']+)\'\s*(.*?)\s*\)\s*%>)}g) {
-	    $report->($1,"<& $2$3 &>");
-	}
-	$buf =~ s{<%\s*mc_comp\s*\(\s*\'([^\']+)\'\s*(.*?)\s*\)\s*%>} {<& $1$2 &>}g;
-	while ($buf =~ m{(<%\s*mc_comp\s*\(\s*\"([^\"\$]+)\"\s*(.*?)\s*\)\s*%>)}g) {
-	    $report->($1,"<& $2$3 &>");
-	}
-	$buf =~ s{<%\s*mc_comp\s*\(\s*\"([^\"\$]+)\"\s*(.*?)\s*\)\s*%>} {<& $1$2 &>}g;
-	while ($buf =~ m{(<%\s*mc_comp\s*\(\s*(\"[^\"]+\")\s*(.*?)\s*\)\s*%>)}g) {
-	    $report->($1,"<& $2$3 &>");
-	}
-	$buf =~ s{<%\s*mc_comp\s*\(\s*(\"[^\"]+\")\s*(.*?)\s*\)\s*%>} {<& $1$2 &>}g;
-        while ($buf =~ m{(<%\s*mc_comp\s*\((.*?)\s*\)\s*%>)}g) {
-	    $report->($1,"<& $2 &>");
-	}
+    if ( !$TEST ) {
+        $c
+            += ( $buf
+                =~ s{<%\s*mc_comp\s*\(\s*\'([^\']+)\'\s*(.*?)\s*\)\s*%>} {<& $1$2 &>}g
+            );
+        $c
+            += ( $buf
+                =~ s{<%\s*mc_comp\s*\(\s*\"([^\"\$]+)\"\s*(.*?)\s*\)\s*%>} {<& $1$2 &>}g
+            );
+        $c
+            += ( $buf
+                =~ s{<%\s*mc_comp\s*\(\s*(\"[^\"]+\")\s*(.*?)\s*\)\s*%>} {<& $1$2 &>}g
+            );
+        $c += ( $buf =~ s{<%\s*mc_comp\s*\(\s*(.*?)\s*\)\s*%>} {<& $1 &>}g );
+    }
+    else {
+        while (
+            $buf =~ m{(<%\s*mc_comp\s*\(\s*\'([^\']+)\'\s*(.*?)\s*\)\s*%>)}g )
+        {
+            $report->( $1, "<& $2$3 &>" );
+        }
+        $buf
+            =~ s{<%\s*mc_comp\s*\(\s*\'([^\']+)\'\s*(.*?)\s*\)\s*%>} {<& $1$2 &>}g;
+        while ( $buf
+            =~ m{(<%\s*mc_comp\s*\(\s*\"([^\"\$]+)\"\s*(.*?)\s*\)\s*%>)}g ) {
+            $report->( $1, "<& $2$3 &>" );
+        }
+        $buf
+            =~ s{<%\s*mc_comp\s*\(\s*\"([^\"\$]+)\"\s*(.*?)\s*\)\s*%>} {<& $1$2 &>}g;
+        while (
+            $buf =~ m{(<%\s*mc_comp\s*\(\s*(\"[^\"]+\")\s*(.*?)\s*\)\s*%>)}g )
+        {
+            $report->( $1, "<& $2$3 &>" );
+        }
+        $buf
+            =~ s{<%\s*mc_comp\s*\(\s*(\"[^\"]+\")\s*(.*?)\s*\)\s*%>} {<& $1$2 &>}g;
+        while ( $buf =~ m{(<%\s*mc_comp\s*\((.*?)\s*\)\s*%>)}g ) {
+            $report->( $1, "<& $2 &>" );
+        }
     }
 
     if ($TEST) {
-	if (@changes) {
-	    print scalar(@changes)." substitutions in $path:\n";
-	    print join("\n",@changes)."\n\n";
-	}
+        if (@changes) {
+            print scalar(@changes) . " substitutions in $path:\n";
+            print join( "\n", @changes ) . "\n\n";
+        }
     }
-    
-    if ($c && !$TEST) {
-	print "$c substitutions in $path\n" if !$QUIET;
-	my $outfh = new IO::File ">$file";
-	if (!$outfh) { warn "cannot write $path: $!"; return }
-	$outfh->print($buf);
+
+    if ( $c && !$TEST ) {
+        print "$c substitutions in $path\n" if !$QUIET;
+        my $outfh = new IO::File ">$file";
+        if ( !$outfh ) { warn "cannot write $path: $!"; return }
+        $outfh->print($buf);
     }
 }
 
-
 main();
@@ -1,12 +1,12 @@
 #!/usr/bin/perl -w
 
 use Data::Dumper;
-use File::Find;	   
+use File::Find;
 use Getopt::Std;
 use IO::File;
 use strict;
 
-my ($EXCLUDE, $HELP, $QUIET, $TEST);
+my ( $EXCLUDE, $HELP, $QUIET, $TEST );
 
 my $usage = <<EOF;
 Usage: $0 -hqt [-e <regexp>] <directory> [<directory>...]
@@ -37,162 +37,175 @@ Warning: All directories will be traversed recursively.  Files are
 modified destructively and no automatic backups are created.
 EOF
 
-sub usage
-{
+sub usage {
     print $usage;
     exit;
 }
 
-sub main
-{
+sub main {
     my (%opts);
-    getopts('e:hlqtu',\%opts);
-    ($EXCLUDE, $HELP, $QUIET, $TEST) = @opts{qw(e h q t)};
-    if ($HELP) { print "$helpmsg\n$usage"; exit }
-    if (!@ARGV) { print "$usage\n$helpmsg"; exit }
+    getopts( 'e:hlqtu', \%opts );
+    ( $EXCLUDE, $HELP, $QUIET, $TEST ) = @opts{qw(e h q t)};
+    if ($HELP)    { print "$helpmsg\n$usage"; exit }
+    if ( !@ARGV ) { print "$usage\n$helpmsg"; exit }
     my @dirs = @ARGV;
-    
-    if (!$TEST) {
-	print "*** Mason 0.8 Conversion ***\n\n";
-	print "Quiet mode.\n" if defined($QUIET);
-	print "Excluding paths matching ($EXCLUDE).\n" if defined($EXCLUDE);
-	print "Processing ".(@dirs==1 ? "directory " : "directories ").join(",",@dirs)."\n";
-	print $warning;
-	print "\nProceed? [n] ";
-	exit if ((my $ans = <STDIN>) !~ /[Yy]/);
+
+    if ( !$TEST ) {
+        print "*** Mason 0.8 Conversion ***\n\n";
+        print "Quiet mode.\n"                          if defined($QUIET);
+        print "Excluding paths matching ($EXCLUDE).\n" if defined($EXCLUDE);
+        print "Processing "
+            . ( @dirs == 1 ? "directory " : "directories " )
+            . join( ",", @dirs ) . "\n";
+        print $warning;
+        print "\nProceed? [n] ";
+        exit if ( ( my $ans = <STDIN> ) !~ /[Yy]/ );
     }
     my $sub = sub {
-	if (-f $_ && -s _) {
-	    return if defined($EXCLUDE) && "$File::Find::dir/$_" =~ /$EXCLUDE/i;
-	    convert($_,"$File::Find::dir/$_");
-	}
+        if ( -f $_ && -s _ ) {
+            return
+                if defined($EXCLUDE) && "$File::Find::dir/$_" =~ /$EXCLUDE/i;
+            convert( $_, "$File::Find::dir/$_" );
+        }
     };
-    find($sub,@dirs);
+    find( $sub, @dirs );
 }
 
-sub convert
-{
-    my ($file,$path) = @_;
+sub convert {
+    my ( $file, $path ) = @_;
     my $buf;
     my $infh = new IO::File $file;
-    if (!$infh) { warn "cannot read $path: $!"; return }
+    if ( !$infh ) { warn "cannot read $path: $!"; return }
     { local $/ = undef; $buf = <$infh> }
 
     my $c = 0;
-    my (@changes,@failures);
-    my $report = sub { push(@changes,$_[1] ? "$_[0]  -->  $_[1]" : "removed $_[0]") };
-    my $report_failure = sub { push(@failures,$_[0]) };
+    my ( @changes, @failures );
+    my $report = sub {
+        push( @changes, $_[1] ? "$_[0]  -->  $_[1]" : "removed $_[0]" );
+    };
+    my $report_failure = sub { push( @failures, $_[0] ) };
 
     #
     # Convert mc_ commands to $m-> method equivalents
     #
     # Easy substitutions
     #
-    my $easy_cmds = join("|",qw(abort cache cache_self call_self comp comp_exists dhandler_arg file file_root out time));
-    if (!$TEST) {
-	$c += ($buf =~ s{mc_($easy_cmds)(?![A-Za-z0-9 _])}{"\$m->$1"}geo);
-    } else {
-	while ($buf =~ m{(mc_($easy_cmds)(?![A-Za-z0-9 _]))}go) {
-	    $report->($1,"\$m->$2");
-	}
+    my $easy_cmds = join(
+        "|",
+        qw(abort cache cache_self call_self comp comp_exists dhandler_arg file file_root out time)
+    );
+    if ( !$TEST ) {
+        $c += ( $buf =~ s{mc_($easy_cmds)(?![A-Za-z0-9 _])}{"\$m->$1"}geo );
+    }
+    else {
+        while ( $buf =~ m{(mc_($easy_cmds)(?![A-Za-z0-9 _]))}go ) {
+            $report->( $1, "\$m->$2" );
+        }
     }
 
     # Boilerplate substitutions for methods with no arguments
-    my @subs =
-	(['mc_auto_comp',    '$m->fetch_next->path'],
-	 ['mc_caller',       '$m->callers(1)->path'],
-	 ['mc_comp_source',  '$m->current_comp->source_file'],
-	 ['mc_comp_stack',   'map($_->title,$m->callers)'],
-	 );
+    my @subs = (
+        [ 'mc_auto_comp',   '$m->fetch_next->path' ],
+        [ 'mc_caller',      '$m->callers(1)->path' ],
+        [ 'mc_comp_source', '$m->current_comp->source_file' ],
+        [ 'mc_comp_stack',  'map($_->title,$m->callers)' ],
+    );
     foreach my $sub (@subs) {
-	my ($mc_cmd,$repl) = @$sub;
-	if (!$TEST) {
-	    $c += ($buf =~ s{$mc_cmd(\s*\(\))?(?!\s*[\(])}{$repl}ge);
-	} else {
-	    while ($buf =~ m{($mc_cmd(\s*\(\))?(?!\s*[\(]))}g) {
-		$report->($1,$repl);
-	    }
-	}
+        my ( $mc_cmd, $repl ) = @$sub;
+        if ( !$TEST ) {
+            $c += ( $buf =~ s{$mc_cmd(\s*\(\))?(?!\s*[\(])}{$repl}ge );
+        }
+        else {
+            while ( $buf =~ m{($mc_cmd(\s*\(\))?(?!\s*[\(]))}g ) {
+                $report->( $1, $repl );
+            }
+        }
     }
 
     # Boilerplate substitutions for methods with arguments
-    @subs =
-	(['mc_auto_next',    '$m->call_next'],
-	 );
+    @subs = (
+        [ 'mc_auto_next', '$m->call_next' ],
+    );
     foreach my $sub (@subs) {
-	my ($mc_cmd,$repl) = @$sub;
-	if (!$TEST) {
-	    $c += ($buf =~ s{$mc_cmd}{$repl}ge);
-	} else {
-	    while ($buf =~ m{($mc_cmd)}g) {
-		$report->($1,$repl);
-	    }
-	}
+        my ( $mc_cmd, $repl ) = @$sub;
+        if ( !$TEST ) {
+            $c += ( $buf =~ s{$mc_cmd}{$repl}ge );
+        }
+        else {
+            while ( $buf =~ m{($mc_cmd)}g ) {
+                $report->( $1, $repl );
+            }
+        }
     }
 
     # mc_comp_source with simple argument
-    if (!$TEST) {
-	$c += ($buf =~ s{mc_comp_source\s*\(([^\(\)]+)\)}{"\$m->fetch_comp($1)->source_file"}ge);
-    } else {
-	while ($buf =~ m{(mc_comp_source\s*\(([^\(\)]+)\))}g) {
-	    $report->($1,"\$m->fetch_comp($2)->source_file");
-	}
+    if ( !$TEST ) {
+        $c
+            += ( $buf
+                =~ s{mc_comp_source\s*\(([^\(\)]+)\)}{"\$m->fetch_comp($1)->source_file"}ge
+            );
+    }
+    else {
+        while ( $buf =~ m{(mc_comp_source\s*\(([^\(\)]+)\))}g ) {
+            $report->( $1, "\$m->fetch_comp($2)->source_file" );
+        }
     }
 
     # mc_suppress_http_header with and without arguments
-    if (!$TEST) {
-	$c += ($buf =~ s{mc_suppress_http_header\s*(?!\s*\();?}{}g);
-	$c += ($buf =~ s{mc_suppress_http_header\s*\([^\(\)]*\)\s*;?}{}g);
-    } else {
-	while ($buf =~ m{(mc_suppress_http_header\s*(?!\s*\();?)}g) {
-	    $report->($1,"");
-	}
-	while ($buf =~ m{(mc_suppress_http_header\s*\([^\(\)]*\)\s*;?)}g) {
-	    $report->($1,"");
-	}
-    }    
-    
+    if ( !$TEST ) {
+        $c += ( $buf =~ s{mc_suppress_http_header\s*(?!\s*\();?}{}g );
+        $c += ( $buf =~ s{mc_suppress_http_header\s*\([^\(\)]*\)\s*;?}{}g );
+    }
+    else {
+        while ( $buf =~ m{(mc_suppress_http_header\s*(?!\s*\();?)}g ) {
+            $report->( $1, "" );
+        }
+        while ( $buf =~ m{(mc_suppress_http_header\s*\([^\(\)]*\)\s*;?)}g ) {
+            $report->( $1, "" );
+        }
+    }
+
     #
     # Convert $REQ to $m
     #
-    if (!$TEST) {
-	$c += ($buf =~ s{\$REQ(?![A-Za-z0-9_])}{\$m}go);
-    } else {
-	while ($buf =~ m{(\$REQ(?![A-Za-z0-9_]))}go) {
-	    $report->($1,"\$m");
-	}
-    }
-    
+    if ( !$TEST ) {
+        $c += ( $buf =~ s{\$REQ(?![A-Za-z0-9_])}{\$m}go );
+    }
+    else {
+        while ( $buf =~ m{(\$REQ(?![A-Za-z0-9_]))}go ) {
+            $report->( $1, "\$m" );
+        }
+    }
+
     # Report substitutions we can't handle
     foreach my $cmd (qw(mc_comp_source mc_suppress_http_header)) {
-	if ($buf =~ m{$cmd\s*\([^\)]*\(}) {
-	    $report_failure->("Can't convert $cmd with complex arguments");
-	}
+        if ( $buf =~ m{$cmd\s*\([^\)]*\(} ) {
+            $report_failure->("Can't convert $cmd with complex arguments");
+        }
     }
-    if ($buf =~ m{mc_date}) {
-	$report_failure->("Can't convert mc_date");
+    if ( $buf =~ m{mc_date} ) {
+        $report_failure->("Can't convert mc_date");
     }
-	
+
     if ($TEST) {
-	if (@changes) {
-	    print scalar(@changes)." substitutions in $path:\n";
-	    print join("\n",@changes)."\n";
-	}
-    }
-    
-    if ($c && !$TEST) {
-	print "$c substitutions in $path\n" if !$QUIET;
-	my $outfh = new IO::File ">$file";
-	if (!$outfh) { warn "cannot write $path: $!"; return }
-	$outfh->print($buf);
-    }
-    
+        if (@changes) {
+            print scalar(@changes) . " substitutions in $path:\n";
+            print join( "\n", @changes ) . "\n";
+        }
+    }
+
+    if ( $c && !$TEST ) {
+        print "$c substitutions in $path\n" if !$QUIET;
+        my $outfh = new IO::File ">$file";
+        if ( !$outfh ) { warn "cannot write $path: $!"; return }
+        $outfh->print($buf);
+    }
+
     foreach my $failure (@failures) {
-	print "** Warning: $failure; must fix manually\n";
+        print "** Warning: $failure; must fix manually\n";
     }
 
-    print "\n" if (($TEST && @changes) || @failures);
+    print "\n" if ( ( $TEST && @changes ) || @failures );
 }
 
-
 main();
@@ -4,56 +4,61 @@ use strict;
 use HTML::Mason '1.11';
 use File::Basename qw(dirname basename);
 use File::Spec ();
-use Cwd ();
+use Cwd        ();
 
-my ($params, $component, $args) = parse_command_line(@ARGV);
+my ( $params, $component, $args ) = parse_command_line(@ARGV);
 
 # Set a default comp_root
-unless (exists $params->{comp_root}) {
-  if (File::Spec->file_name_is_absolute($component)) {
-    $params->{comp_root} = dirname($component);
-    $component = '/' .  basename($component);
-  } else {
-    $params->{comp_root} = Cwd::cwd;
-    # Convert local path syntax to slashes
-    my ($dirs, $file) = (File::Spec->splitpath($component))[1,2];
-    $component = '/' . join '/', File::Spec->splitdir($dirs), $file;
-  }
+unless ( exists $params->{comp_root} ) {
+    if ( File::Spec->file_name_is_absolute($component) ) {
+        $params->{comp_root} = dirname($component);
+        $component = '/' . basename($component);
+    }
+    else {
+        $params->{comp_root} = Cwd::cwd;
+
+        # Convert local path syntax to slashes
+        my ( $dirs, $file ) = ( File::Spec->splitpath($component) )[ 1, 2 ];
+        $component = '/' . join '/', File::Spec->splitdir($dirs), $file;
+    }
 }
 
 my $interp = HTML::Mason::Interp->new(%$params);
-$interp->exec($component, @$args);
+$interp->exec( $component, @$args );
 
 #######################################################################################
 sub parse_command_line {
-  die usage() unless @_;
+    die usage() unless @_;
+
+    my %params;
+    while (@_) {
+        if ( $_[0] eq '--config_file' ) {
+            shift;
+            my $file = shift;
+            eval { require YAML; 1 }
+                or die
+                "--config_file requires the YAML Perl module to be installed.\n";
+            my $href = YAML::LoadFile($file);
+            @params{ keys %$href } = values %$href;
+
+        }
+        elsif ( $_[0] =~ /^--/ ) {
+            my ( $k, $v ) = ( shift, shift );
+            $k =~ s/^--//;
+            $params{$k} = $v;
 
-  my %params;
-  while (@_) {
-    if ( $_[0] eq '--config_file' ) {
-      shift;
-      my $file = shift;
-      eval {require YAML; 1}
-	or die "--config_file requires the YAML Perl module to be installed.\n";
-      my $href = YAML::LoadFile($file);
-      @params{keys %$href} = values %$href;
-      
-    } elsif ( $_[0] =~ /^--/ ) {
-      my ($k, $v) = (shift, shift);
-      $k =~ s/^--//;
-      $params{$k} = $v;
-      
-    } else {
-      my $comp = shift;
-      return (\%params, $comp, \@_);
+        }
+        else {
+            my $comp = shift;
+            return ( \%params, $comp, \@_ );
+        }
     }
-  }
 
-  die usage();
+    die usage();
 }
 
 sub usage {
-  return <<EOF;
+    return <<EOF;
 
  Usage: $0 [--param1 value1 ...] [--config_file file] component [arg1 arg2 ...]
   e.g.: $0 --comp_root /mason/comps component.mas
@@ -0,0 +1,31 @@
+requires "CGI" => "2.46";
+requires "Cache::Cache" => "1.00";
+requires "Class::Container" => "0.07";
+requires "Exception::Class" => "1.15";
+requires "File::Spec" => "0.8";
+requires "HTML::Entities" => "0";
+requires "Log::Any" => "0.08";
+requires "Params::Validate" => "0.70";
+requires "Scalar::Util" => "1.01";
+
+on 'test' => sub {
+  requires "ExtUtils::MakeMaker" => "0";
+  requires "File::Spec" => "0.8";
+  requires "Test::Deep" => "0";
+  requires "Test::More" => "0.88";
+};
+
+on 'test' => sub {
+  recommends "CPAN::Meta" => "2.120900";
+};
+
+on 'configure' => sub {
+  requires "ExtUtils::MakeMaker" => "0";
+};
+
+on 'develop' => sub {
+  requires "Test::More" => "0";
+  requires "Test::NoTabs" => "0";
+  requires "Test::Pod" => "1.41";
+  requires "Test::Spelling" => "0.12";
+};
@@ -0,0 +1,47 @@
+name             = HTML-Mason
+author           = Jonathan Swartz <swartz@pobox.com>
+author           = Dave Rolsky <autarch@urth.org>
+author           = Ken Williams <ken@mathforum.org>
+license          = Perl_5
+copyright_year   = 1998
+copyright_holder = Jonathan Swartz
+
+version = 1.56
+
+[FileFinder::Filter / SkipApacheHandler]
+finder = :InstallModules
+skip = lib/HTML/Mason/ApacheHandler.pm
+
+[@DROLSKY]
+dist = HTML-Mason
+PkgVersion.finder = SkipApacheHandler
+stopwords_file = .stopwords
+-remove = AutoPrereqs
+-remove = Git::CheckFor::MergeConflicts
+-remove = MetaProvides::Package
+-remove = Test::CPAN::Changes
+-remove = Test::Compile
+-remove = Test::EOL
+-remove = Test::Pod::Coverage::Configurable
+-remove = Test::Pod::LinkCheck
+-remove = Test::Pod::No404s
+-remove = Test::Portability
+-remove = Test::Synopsis
+
+[MetaNoIndex]
+directory = eg
+file = lib/HTML/Mason/Tests.pm
+
+[Prereqs / RuntimeRequires]
+Cache::Cache     = 1.00
+Class::Container = 0.07
+CGI              = 2.46
+Exception::Class = 1.15
+File::Spec       = 0.8
+HTML::Entities   = 0
+Log::Any         = 0.08
+Params::Validate = 0.70
+Scalar::Util     = 1.01
+
+[Prereqs / TestRequires]
+Test::Deep       = 0
@@ -0,0 +1,40 @@
+package inc::Pod::Weaver::Section::SeeAlsoMason;
+use Moose;
+with 'Pod::Weaver::Role::Section';
+
+use Moose::Autobox;
+
+# Add "SEE ALSO: Mason"
+
+sub weave_section {
+    my ( $self, $document, $input ) = @_;
+
+    return if $input->{filename} =~ m{\QHTML/Mason.pm};
+
+    my $idc = $input->{pod_document}->children;
+    for ( my $i = 0 ; $i < $idc->length ; $i++ ) {
+        next unless my $para = $idc->[$i];
+        return
+          if $para->can('command')
+              && $para->command eq 'head1'
+              && $para->content eq 'SEE ALSO';
+    }
+    $document->children->push(
+        Pod::Elemental::Element::Nested->new(
+            {
+                command  => 'head1',
+                content  => 'SEE ALSO',
+                children => [
+                    Pod::Elemental::Element::Pod5::Ordinary->new(
+                        { content => "L<Mason|Mason>" }
+                    ),
+                ],
+            }
+        ),
+    );
+}
+
+__PACKAGE__->meta->make_immutable;
+
+no Moose;
+1;
@@ -1,17 +1,7 @@
-
-
-__END__
-
-=pod
-
 =head1 NAME
 
 HTML::Mason::Admin - Mason Administrator's Manual
 
-=head1 VERSION
-
-version 1.54
-
 =head1 DESCRIPTION
 
 This manual is written for the sysadmin/webmaster in charge of
@@ -1134,33 +1124,4 @@ sending to standard output:
 
     # Do something with $outbuf
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -5,10 +5,7 @@
 # under the same terms as Perl itself.
 
 package HTML::Mason::Apache::Request;
-{
-  $HTML::Mason::Apache::Request::VERSION = '1.54';
-}
-
+$HTML::Mason::Apache::Request::VERSION = '1.56';
 use strict;
 use warnings;
 
@@ -1088,16 +1088,10 @@ EOF
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::ApacheHandler - Mason/mod_perl interface
 
-=head1 VERSION
-
-version 1.54
-
 =head1 SYNOPSIS
 
     use HTML::Mason::ApacheHandler;
@@ -1182,7 +1176,7 @@ example:
 
 =head1 OTHER METHODS
 
-The ApacheHandler object has a few other publically accessible methods
+The ApacheHandler object has a few other publicly accessible methods
 that may be of interest to end users.
 
 =over 4
@@ -1234,33 +1228,4 @@ value of the L<args_method|HTML::Mason::Params/args_method> parameter.
 
 =back
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -1,11 +1,11 @@
 package HTML::Mason::CGIHandler;
-
+$HTML::Mason::CGIHandler::VERSION = '1.56';
 use strict;
 use warnings;
 
 use HTML::Mason;
 use HTML::Mason::Utils;
-use CGI;
+use CGI 2.46;
 use File::Spec;
 use Params::Validate qw(:all);
 use HTML::Mason::Exceptions;
@@ -17,17 +17,6 @@ use base qw(Class::Container);
 use HTML::Mason::MethodMaker
     ( read_write => [ qw( interp ) ] );
 
-use vars qw($VERSION);
-
-# Why do we have a version?  I'm glad you asked.  See, dummy me
-# stupidly referenced it in the Subclassing docs _and_ the book.  It's
-# needed in order to dynamically have a request subclass change its
-# parent properly to work with CGIHandler or ApacheHandler.  It
-# doesn't really matter what the version is, as long as it's a true
-# value.  - dave
-$VERSION = '1.00';
-
-
 __PACKAGE__->valid_params
     (
      interp => { isa => 'HTML::Mason::Interp' },
@@ -154,7 +143,7 @@ sub request_args {
 ###########################################################
 package HTML::Mason::Request::CGI;
 # Subclass for HTML::Mason::Request object $m
-
+$HTML::Mason::Request::CGI::VERSION = '1.56';
 use HTML::Mason::Exceptions;
 use HTML::Mason::Request;
 use base qw(HTML::Mason::Request);
@@ -191,7 +180,7 @@ sub exec
 
     if (my $err = $@)
     {
-	$retval = isa_mason_exception($err, 'Abort')   ? $err->aborted_value  :
+    $retval = isa_mason_exception($err, 'Abort')   ? $err->aborted_value  :
                   isa_mason_exception($err, 'Decline') ? $err->declined_value :
                   rethrow_exception $err;
     }
@@ -223,19 +212,12 @@ sub redirect {
 }
 
 1;
-
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::CGIHandler - Use Mason in a CGI environment
 
-=head1 VERSION
-
-version 1.54
-
 =head1 SYNOPSIS
 
 In httpd.conf or .htaccess:
@@ -604,33 +586,4 @@ of its values will be in the table any longer.
 
 =back
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -3,9 +3,7 @@
 # under the same terms as Perl itself.
 
 package HTML::Mason::Cache::BaseCache;
-{
-  $HTML::Mason::Cache::BaseCache::VERSION = '1.54';
-}
+$HTML::Mason::Cache::BaseCache::VERSION = '1.56';
 use strict;
 use warnings;
 
@@ -81,16 +79,10 @@ sub expire_if
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::Cache::BaseCache - Base cache object
 
-=head1 VERSION
-
-version 1.54
-
 =head1 DESCRIPTION
 
 This is the base module for all cache implementations used in Mason.
@@ -177,33 +169,4 @@ days, w, week, weeks, M, month, months, y, year, and years.
 
 =back
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -3,10 +3,7 @@
 # it under the same terms as Perl itself.
 
 package HTML::Mason::Compiler::ToObject;
-{
-  $HTML::Mason::Compiler::ToObject::VERSION = '1.54';
-}
-
+$HTML::Mason::Compiler::ToObject::VERSION = '1.56';
 use strict;
 use warnings;
 
@@ -641,16 +638,10 @@ sub _declared_args
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::Compiler::ToObject - A Compiler subclass that generates Mason object code
 
-=head1 VERSION
-
-version 1.54
-
 =head1 SYNOPSIS
 
   my $compiler = HTML::Mason::Compiler::ToObject->new;
@@ -758,33 +749,4 @@ override the class into which the component is compiled.
 
 =back
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -3,10 +3,7 @@
 # under the same terms as Perl itself.
 
 package HTML::Mason::Compiler;
-{
-  $HTML::Mason::Compiler::VERSION = '1.54';
-}
-
+$HTML::Mason::Compiler::VERSION = '1.56';
 use strict;
 use warnings;
 use Data::Dumper;
@@ -713,16 +710,10 @@ sub HTML::Mason::Parser::new
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::Compiler - Compile Mason component source
 
-=head1 VERSION
-
-version 1.54
-
 =head1 SYNOPSIS
 
   package My::Funky::Compiler;
@@ -992,33 +983,4 @@ We recommend that any parameters you add to Compiler be read-only,
 because the compiler object_id is only computed once on creation
 and would not reflect any changes to Lexer parameters.
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -3,10 +3,7 @@
 # it under the same terms as Perl itself.
 
 package HTML::Mason::Component::FileBased;
-{
-  $HTML::Mason::Component::FileBased::VERSION = '1.54';
-}
-
+$HTML::Mason::Component::FileBased::VERSION = '1.56';
 use strict;
 use warnings;
 
@@ -55,16 +52,10 @@ sub assign_runtime_properties {
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::Component::FileBased - Mason File-Based Component Class
 
-=head1 VERSION
-
-version 1.54
-
 =head1 DESCRIPTION
 
 This is a subclass of
@@ -77,33 +68,4 @@ See L<the FILE-BASED METHODS section of
 HTML::Mason::Component|HTML::Mason::Component/FILE-BASED METHODS> for
 documentation.
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -3,10 +3,7 @@
 # it under the same terms as Perl itself.
 
 package HTML::Mason::Component::Subcomponent;
-{
-  $HTML::Mason::Component::Subcomponent::VERSION = '1.54';
-}
-
+$HTML::Mason::Component::Subcomponent::VERSION = '1.56';
 use strict;
 use warnings;
 
@@ -53,16 +50,10 @@ sub title { return $_[0]->owner->title . ":" . $_[0]->name }
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::Component::Subcomponent - Mason Subcomponent Class
 
-=head1 VERSION
-
-version 1.54
-
 =head1 DESCRIPTION
 
 This is a subclass of
@@ -92,33 +83,4 @@ was defined.
 
 =back
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -3,10 +3,7 @@
 # under the same terms as Perl itself.
 
 package HTML::Mason::Component;
-{
-  $HTML::Mason::Component::VERSION = '1.54';
-}
-
+$HTML::Mason::Component::VERSION = '1.56';
 use strict;
 use warnings;
 use File::Spec;
@@ -392,16 +389,10 @@ sub logger {
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::Component - Mason Component Class
 
-=head1 VERSION
-
-version 1.54
-
 =head1 SYNOPSIS
 
     my $comp1 = $m->current_comp;
@@ -644,33 +635,4 @@ Returns the directory of the source filename for this component.
 
 =back
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -3,10 +3,7 @@
 # under the same terms as Perl itself.
 
 package HTML::Mason::ComponentSource;
-{
-  $HTML::Mason::ComponentSource::VERSION = '1.54';
-}
-
+$HTML::Mason::ComponentSource::VERSION = '1.56';
 use strict;
 use warnings;
 use File::Basename;
@@ -62,7 +59,7 @@ sub comp_source_ref
 
     unless ( defined $source )
     {
-	error "source callback returned no source for $self->{friendly_name} component";
+        error "source callback returned no source for $self->{friendly_name} component";
     }
 
     my $sourceref = ref($source) ? $source : \$source;
@@ -77,9 +74,9 @@ sub object_code
     my %p = validate( @_, { compiler => { isa => 'HTML::Mason::Compiler' } } );
 
     return $p{compiler}->compile( comp_source => $self->comp_source,
-				  name => $self->friendly_name,
+                                  name => $self->friendly_name,
                                   comp_path => $self->comp_path,
-				  comp_class => $self->comp_class,
+                                  comp_class => $self->comp_class,
                                 );
 }
 
@@ -87,16 +84,10 @@ sub object_code
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::ComponentSource - represents information about an component
 
-=head1 VERSION
-
-version 1.54
-
 =head1 SYNOPSIS
 
     my $info = $resolver->get_info($comp_path);
@@ -122,7 +113,7 @@ The component's component path.
 
 =item * last_modified
 
-This is the last modificatoin time for the component, in Unix time
+This is the last modification time for the component, in Unix time
 (seconds since the epoch).
 
 =item * comp_id
@@ -210,33 +201,4 @@ L<HTML::Mason|HTML::Mason>,
 L<HTML::Mason::Admin|HTML::Mason::Admin>,
 L<HTML::Mason::Component|HTML::Mason::Component>
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -1,17 +1,7 @@
-
-
-__END__
-
-=pod
-
 =head1 NAME
 
 HTML::Mason::Devel - Mason Developer's Manual
 
-=head1 VERSION
-
-version 1.54
-
 =head1 DESCRIPTION
 
 This manual is written for content developers who know HTML and at
@@ -269,7 +259,7 @@ in strange and mysterious ways.
 =head2 Component Objects
 
 Mason provides an object API for components, allowing you to query a
-component's various asociated files, arguments, etc. For a description
+component's various associated files, arguments, etc. For a description
 of all methods see
 B<L<HTML::Mason::Component|HTML::Mason::Component>>.  Typically you
 get a handle on a component object from request methods like C<<
@@ -601,7 +591,7 @@ C<exec> method to execute it, which takes exactly the same parameters
 as the C<comp> method.
 
 Since subrequests inherit their parent request's parameters, output
-from a component called via a subrequest goes to the same desintation
+from a component called via a subrequest goes to the same destination
 as output from components called during the parent request.  Of course,
 you can change this.
 
@@ -950,7 +940,7 @@ In Mason 1.21 and beyond, this unnecessary copying was eliminated and
 @_ now contains I<aliases> to the caller's arguments, just as with
 regular Perl subroutines. For example, if a component updates $_[0],
 the corresponding argument is updated (or an error occurs if it is not
-updatable).
+updateable).
 
 Most users won't notice this change because C<< <%args> >> variables
 and the C<%ARGS> hash always contain copies of arguments.
@@ -1327,7 +1317,7 @@ Anything between these two lines
    % }
 
 will be skipped by Mason, including component calls.  While we don't
-recomend this for comments per se, it is a useful notation for
+recommend this for comments per se, it is a useful notation for
 "commenting out" code that you don't want to run.
 
 =head2 HTML/XML/... comments
@@ -2242,33 +2232,4 @@ Modules which work as source filters, such as C<Switch.pm>, will only
 work when you are using object files.  This is because of how source
 filters are implemented, and cannot be changed by the Mason authors.
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -7,10 +7,7 @@
 #
 
 package HTML::Mason::Escapes;
-{
-  $HTML::Mason::Escapes::VERSION = '1.54';
-}
-
+$HTML::Mason::Escapes::VERSION = '1.56';
 use strict;
 use warnings;
 
@@ -47,16 +44,10 @@ sub url_escape
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::Escapes - Functions to escape text for Mason
 
-=head1 VERSION
-
-version 1.54
-
 =head1 DESCRIPTION
 
 This module contains functions for implementing Mason's L<substitution
@@ -105,33 +96,4 @@ details.
 
 =back
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -1,12 +1,8 @@
 package HTML::Mason::Exceptions;
-
+$HTML::Mason::Exceptions::VERSION = '1.56';
 use strict;
 use warnings;
 
-use vars qw($VERSION);
-
-$VERSION = 1.43;
-
 my %e;
 
 BEGIN
@@ -130,7 +126,7 @@ sub rethrow_exception
 }
 
 package HTML::Mason::Exception;
-
+$HTML::Mason::Exception::VERSION = '1.56';
 use HTML::Mason::MethodMaker
     ( read_write => [ qw ( format ) ] );
 
@@ -422,7 +418,7 @@ EOF
 }
 
 package HTML::Mason::Exception::Compilation;
-
+$HTML::Mason::Exception::Compilation::VERSION = '1.56';
 sub full_message
 {
     my $self = shift;
@@ -431,7 +427,7 @@ sub full_message
 }
 
 package HTML::Mason::Exception::Syntax;
-
+$HTML::Mason::Exception::Syntax::VERSION = '1.56';
 sub full_message
 {
     my $self = shift;
@@ -443,16 +439,10 @@ sub full_message
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::Exceptions - Exception objects thrown by Mason
 
-=head1 VERSION
-
-version 1.54
-
 =head1 SYNOPSIS
 
   use HTML::Mason::Exceptions ( abbr => [ qw(system_error) ] );
@@ -623,33 +613,4 @@ or
 Note that when specifying a subclass you should not include the
 leading "HTML::Mason::Exception::" portion of the class name.
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -1,17 +1,9 @@
-
-
-__END__
-
 =pod
 
 =head1 NAME
 
 HTML::Mason::FAQ - Frequently asked questions
 
-=head1 VERSION
-
-version 1.54
-
 =head1 AUTOHANDLERS, METHODS, ATTRIBUTES, INHERITANCE
 
 =head2 Can I set a page's inheritance dynamically at request time (e.g. based on URL arguments)?
@@ -24,8 +16,6 @@ Usually this situation arises when a top-level component makes a run-time decisi
 
 Autohandlers and dhandlers are only triggered for the top-level component of a request. In 1.1, you can use an Apache internal redirect or a Mason subrequest ($m->subexec) to solve the problem.
 
-In 1.0x, your best bet is to use an Apache internal redirect, but see bug http://www.masonhq.com/resources/todo/access.html?id=292.
-
 =head2 I added a simple autohandler to a directory and now my pages don't appear.
 
 Make sure to include a call to $m->call_next somewhere in the autohandler.
@@ -44,8 +34,6 @@ and suppose a request comes in for /products/index.html. /dhandler will handle t
 
 This is not always the desired behavior, but there is no easy way to change it. If you want /products/* requests to use /products/autohandler, you'll need to create /products/dhandler as well.
 
-See http://www.masonhq.com/resources/todo/view.html?id=520
-
 =head2 Can I change the value of an attribute dynamically, based on the request?
 
 No, attributes are static. The closest thing to a dynamic attribute is a method. If you've been using an attribute widely and don't want to change it to a method everywhere, consider using an attribute/method combination. Suppose your attribute is called 'bgcolor'. Create a default method called 'bgcolor' in the autohandler:
@@ -72,6 +60,7 @@ Now you can leave the attribute definitions alone, but define a method if and wh
 
 =head2 When using multiple component roots and autohandlers, does every autohandler in every root get called, and in what or
 
+
 Mason will try each autohandler path in turn, e.g.
 
    /foo/bar/baz/autohandler
@@ -79,7 +68,7 @@ Mason will try each autohandler path in turn, e.g.
    /foo/autohandler
    /autohandler
 
-For each path, it will search all of the component roots, and only run the *first* autohandler found. Some of the autohandlers might come from one root and some from another.  However, there is no way that multiple autohandlers would be run for the same path (/foo/autohandler, for example.) There is also no way for /foo/autohandler in root 1 to explicitly call /foo/autohandler in root 2 - see the final question in http://www.masonhq.com/?FAQ:Components about multiple component roots.
+For each path, it will search all of the component roots, and only run the *first* autohandler found. Some of the autohandlers might come from one root and some from another.  However, there is no way that multiple autohandlers would be run for the same path (/foo/autohandler, for example.) There is also no way for /foo/autohandler in root 1 to explicitly call /foo/autohandler in root 2.
 
 People sometimes ask for this behavior to be changed. We feel it's a bad idea because multiple component roots, right now, are very clean in both behavior and implementation. Trying to run multiple autohandlers for the same path would require a complex set of precedence rules that would almost certainly lead to unpredictable behavior. (Think about multiple versions of multiple autohandlers at different directory levels, and trying to predict which order they'd run in.)
 
@@ -143,6 +132,7 @@ With Mason <= 1.05, the idiom looks like:
               (stat($m->current_comp->source_file))[9] > $_[0]
          } )
 
+
 =head1 COMPONENTS
 
 =head2 What is a component?
@@ -171,8 +161,6 @@ Technically you can just say "use module-name" at the beginning of a component.
 
 A more efficient method is to put the use line in the handler.pl or use the PerlModule directive. If you want components to be able to refer to symbols exported by the module, you need to use the module inside the HTML::Mason::Commands package. See the "External modules" section of the Administrator's Guide:
 
-      http://www.masonhq.com/docs/manual/Admin.html#external_modules
-
 =head2 Can I define subroutines in components?
 
 Defining a named subroutine in a <%perl> or <%init> section does not work reliably because such a definition would end up residing inside another subroutine, and Perl doesn't like that.
@@ -213,8 +201,6 @@ Often people expect the working directory to be the directory of the current com
 
 Use $m->abort, documented in the Request manual:
 
-      http://www.masonhq.com/docs/manual/Request.html#item_abort
-
 =head2 Why does my output have extra newlines/whitespace and how can I get rid of it?
 
 Any newlines that are not either inside a tag or on a %-line will become part of the output. Since browsers ignore extra whitespace this is not generally a problem, but there are situations where it matters, e.g. within <pre> tags.
@@ -262,10 +248,11 @@ To emit binary data without the risk of inserting extra whitespace, surround you
        $m->abort;
       </%init>
 
-At some point Mason will probably offer a "reasonable" whitespace removal feature, controlled by parameter. See http://www.masonhq.com/resources/todo/view.html?id=459
+At some point Mason will probably offer a "reasonable" whitespace removal feature, controlled by parameter.
 
 =head2 I'm trying to generate an image or other binary file, but it seems to be getting corrup
 
+
 This is almost always caused by unwanted whitespace at the beginning or end of your binary data. Put a $m->clear_buffer before, and an $m->abort after, your code. See the last part of the answer above.
 
 In Apache 1.0 a real working example looks like this:
@@ -324,8 +311,6 @@ Another way to block out code is with a <%doc> tag or a <%# %> comment, although
 
 Use $m->scomp, documented in the Request manual:
 
-http://www.masonhq.com/docs/manual/Request.html#item_scomp
-
 =head2 Can I use globals in components?
 
 All HTML::Mason components run in the same package (HTML::Mason::Commands), so if you set a global variable in one you'll be able to read it in all the others. The only problem is that Mason by default parses components with strict mode on, so you'll get a warning about the global (and Mason considers all such warnings fatal). To avoid errors, simply declare your globals via the MasonAllowGlobals parameter.
@@ -340,10 +325,6 @@ If you have a handler.pl file, you can also declare global variables in the hand
 
 or use the Parser allow_globals parameter.
 
-See the section on globals in the Administrator's Guide for more details:
-
-      http://www.masonhq.com/docs/manual/Admin.html#global_variables
-
 Alternatively you can turn off strict entirely by passing:
 
       use_strict => 0
@@ -352,9 +333,7 @@ when you create the Parser object. Then you can use all the globals you want. Do
 
 =head2 How do I share variables between components?
 
-First, you can pass variables from one component to another. See
-
-        http://www.masonhq.com/docs/manual/Devel.html#passing_parameters.
+First, you can pass variables from one component to another.
 
 Second, you can use globals. All components run in the same package (HTML::Mason::Commands as of this writing), so globals in this package are visible to all components. See the previous question.
 
@@ -374,16 +353,13 @@ This should no longer happen with Mason 1.10+. For those users still using older
 
 Since your server is most likely in batch mode, all Mason output gets buffered til the end of the request. print and $r->print circumvent the buffer and thus come out before other Mason output.
 
-Solution: don't use print or $r->print. Use $m->out if you must output inside a Perl section. See the section on output mode in the Administrator's Guide:
+Solution: don't use print or $r->print. Use $m->out if you must output inside a Perl section. See the section on output mode in the Administrator's Guide.
 
-      http://www.masonhq.com/docs/manual/1.05/Admin.html#out_mode
-
-and the section on $m->out in the Request manual:
-
-      http://www.masonhq.com/docs/manual/1.05/Request.html#item_out_string
+and the section on $m->out in the Request manual.
 
 =head2 Why doesn't my <%cleanup> code run every time the component runs?
 
+
 A <%cleanup> block is equivalent to a C<< <%perl> >> block at the end of the component. This means it will NOT execute if the component explicitly returns, or if an abort or error occurs in that component or one of its children.
 
 If you need code that is guaranteed to run when the component or
@@ -434,6 +410,7 @@ Or, in a top-level autohandler:
 
 =head2 When using multiple component roots, is there a way to explicitly call a component in a specific root?
 
+
 Multiple component roots were designed to work just like Perl's @INC.  A given component path matches exactly one file, the first file found in an ordered search through the roots. There is no way to explicitly ask for a file in a specific root.
 
 People sometimes ask for the ability to do this. We feel it's a bad idea because it would endanger the cleanliness of multiple component roots in both behavior and implementation. As it stands now, the rules are very easy to understand and the implementation is very clean and isolated; only the resolver really needs know about multiple component roots.
@@ -452,10 +429,10 @@ Alternatively, [http://search.cpan.org/dist/MasonX-Request-ExtendedCompRoot Maso
 
 =head2 Is there a syntax checker like perl -c for components?
 
+
 It is impossible to write a truly generic standalone script to syntax check components, because components rely on certain globals and modules to be present in their environment. Mason may report compile errors from such a script even though they would not occur in your normal web environment.
 
-The best you can do is write a standalone script (http://www.masonhq.com/docs/manual/Admin.html#using_mason_from_a_standalone_sc) that mimics your web environment as much as possible - in particular, declaring the same globals and loading the same modules. Instead of actually executing components, your script need only load them with $interp->load(). This method will throw a fatal error if a component fails to load.
-See this contribution: http://www.masonhq.com/?Compile
+The best you can do is write a standalone script that mimics your web environment as much as possible - in particular, declaring the same globals and loading the same modules. Instead of actually executing components, your script need only load them with $interp->load(). This method will throw a fatal error if a component fails to load.
 
 =head1 HTTP AND HTML
 
@@ -513,9 +490,7 @@ To print HTML constructs returned by CGI functions, just enclose them in <%%>, e
 
 =head2 How do I modify the outgoing HTTP headers?
 
-Use the usual Apache.pm functions, such as $r->header_out. See the "Sending HTTP Headers" section in the Component Developer's Guide:
-
-      http://www.masonhq.com/docs/manual/Devel.html#sending_http_headers
+Use the usual Apache.pm functions, such as $r->header_out. See the "Sending HTTP Headers" section in the Component Developer's Guide.
 
 =head2 How do I do an external redirect?
 
@@ -614,6 +589,8 @@ Under the 'mod_perl' method (default for 1.1x), the request object available as
    close($upload_fh);
   </%init>
 
+
+
 For more information on how to manually set the args method, see the !ApacheHandler documentation.
 
 If you are using CGI.pm, there are some configuration issues to be aware of. CGI.pm needs a tmp directory, and you probably want to be able to specify what that directory is.
@@ -673,17 +650,18 @@ These two examples are slightly different from each other, in that each makes a
 
 If you are planning on using Mason in a web environment with the Apache webserver, you'll need a working copy of Apache and mod_perl installed. Make sure that your mod_perl installation works correctly before trying to get Mason working. Also, if you are running RedHat Linux, beware the mod_perl RPMs that ship with RedHat. They were unreliable for a very long time, and their current state is still murky.
 
+
 =head2 What platforms does Mason run on?
 
 Because Mason consists of only Perl code, it should work anywhere Perl runs (including most Unix and Win32 variants). If it doesn't work on your operating system, let us know.
 
 =head2 Can I run Mason outside a web server?
 
-Yes, in fact Mason can be useful for generating a set of web pages offline, as a general templating tool, or even as a code generator for another language. See the "Standalone Mode" section of the Interpreter manual at http://www.masonhq.com/docs/manual/Admin.html#running_outside_of_mod_perl
+Yes, in fact Mason can be useful for generating a set of web pages offline, as a general templating tool, or even as a code generator for another language. See the "Standalone Mode" section of the Interpreter manual.
 
 =head2 Can I run Mason via CGI?
 
-Yes. See "Using Mason from a CGI script" in the Interpreter manual at http://www.masonhq.com/docs/manual/Admin.html#running_outside_of_mod_perl
+Yes. See "Using Mason from a CGI script" in the Interpreter manual.
 
 The examples in the docs requires that you have Mason 1.10+ installed.
 
@@ -717,7 +695,7 @@ Recent versions of Mason use that, or a variant of it.
 
 =head2 What does the error "Can't locate Apache/Request.pm in @INC" m
 
-You are using the default !ApacheHandler args_method ('mod_perl'), which requires that you have installed the Apache::Request package (libapreq). See http://www.masonhq.com/docs/manual/Params.html#args_method.
+You are using the default !ApacheHandler args_method ('mod_perl'), which requires that you have installed the Apache::Request package (libapreq).
 
 You can either install libapreq, or change args_method to 'CGI'. The latter is a bit slower and uses more memory.
 
@@ -731,6 +709,7 @@ There are a few known mod_perl issues that cause segmentation faults or a silent
 
 * Are you using Perl 5.6.0? Though not widespread, Perl 5.6.0 can generate sporadic segmentation faults at runtime for some Perl code. Specifically, evals of moderate complexity appear problematic. And, since Mason uses lots of evals of moderate complexity, you can't avoid them. If the two suggestions above don't solve your segfault problem and you are running Perl 5.6.0, try upgrading to Perl 5.6.1.
 
+
 MISCELLANEOUS
 
 =head2 Where did the name come from?
@@ -777,9 +756,10 @@ For more details see "Server Stopping and Restarting" in the mod_perl guide.
 
 =head2 What filename extensions should I use for Mason components?
 
+
 Unlike many templating systems, Mason comes with no obvious filenaming standards. While this flexibility was initially considered an advantage, in retrospect it has led to the proliferation of a million different component extensions (.m, .mc, .mhtml, .mcomp, ...) and has made it more difficult for users to share components and configuration.
 
-The Mason team now recommends a filenaming scheme with extensions like .html, .txt, .pl for top-level components, and .mhtml, .mtxt, .mpl for internal (non-top-level) components. See http://www.masonhq.com/docs/manual/Admin.html#controlling_access_via_filename_#controlling_access_via_filename_ for justification and configuration examples.
+The Mason team now recommends a filenaming scheme with extensions like .html, .txt, .pl for top-level components, and .mhtml, .mtxt, .mpl for internal (non-top-level) components.
 
 Whatever naming scheme you choose should ideally accomplish three things:
 
@@ -793,7 +773,7 @@ Whatever naming scheme you choose should ideally accomplish three things:
 
 If you put images in the same directories as components, you need to make sure that the images don't get handled through HTML::Mason. The reason is that HTML::Mason will try to parse the images and may inadvertently find HTML::Mason syntax (e.g. "<%"). Most images will probably pass through successfully but a few will cause HTML::Mason errors.
 
-The simplest remedy is to have HTML::Mason decline image and other non-HTML requests, thus letting Apache serve them in the normal way. See http://masonhq.com/docs/manual/Admin.html#controlling_access_via_filename_.
+The simplest remedy is to have HTML::Mason decline image and other non-HTML requests, thus letting Apache serve them in the normal way.
 
 Another solution is to put all images in a separate directory; it is then easier to tell Apache to serve them in the normal way. See the next question.
 
@@ -869,12 +849,12 @@ Use mod_perl's $r->content_type function to set the appropriate MIME type. This
 
 =head2 How do I bring in external modules?
 
-Use the PerlModule directive in your httpd.conf, or if you have a startup.pl file, put the 'use module' in there. If you want components to be able to refer to symbols exported by the module, however, you'll need to use the module inside the HTML::Mason::Commands package. See the "External modules" section of the Administrator's Guide:
 
-    http://www.masonhq.com/docs/manual/Admin.html#external_modules
+Use the PerlModule directive in your httpd.conf, or if you have a startup.pl file, put the 'use module' in there. If you want components to be able to refer to symbols exported by the module, however, you'll need to use the module inside the HTML::Mason::Commands package. See the "External modules" section of the Administrator's Guide.
 
 =head2 How do I adjust Perl's INC path so it can find my modules?
 
+
 You can do this:
 
     <Perl>
@@ -1016,8 +996,11 @@ Mason does not have anything to do with sending mail, or accessing a database, o
 
 =head2 I'm using HTML::Mason::!ApacheHandler and I have decline_dirs disabled and am using a dhandler to handle directory requests. But when a request comes in without the final slash after the directory name, relative links are broken. What gives?
 
+
 Mason has always incorrectly handled such directory requests; this issue will be resolved in the 1.3 release. The reason it will only be fixed in the next major version is that some folks may have come to rely on this functionality. So it's considered breaking backwards compatibility. But if you need it to do the right thing now, fear not! There are a number of workarounds to ensure that Apache adds a slash and redirects the browser to the appropriate URL. See HandlingDirectoriesWithDhandlers for all the juicy details.
 
+
+
 UPGRADING TO 1.1x
 
 =head2 After upgrading, I see this error whenever I load a page: "The following parameter was passed in the call to HTML::Mason::Component::FileBased->new() but was not listed in the validation options: create_time"
@@ -1032,11 +1015,11 @@ Are you using a handler.pl file created before version 1.10?  Please see the han
 
 You are explicitly creating an Interp object in your handler.pl and then passing that to ApacheHandler->new. 
 
-Instead, simply pass all of your Interp parameters to ApacheHandler->new directly. The parameters will end up going where they belong. See the upgrade guide - http://masonhq.com/docs/upgrading.html - for more details.
+Instead, simply pass all of your Interp parameters to ApacheHandler->new directly. The parameters will end up going where they belong.
 
 =head2 When I start Apache (or try to use Mason) I get an error like this: "The Parser module is no longer a part of HTML::Mason.  Please see the Lexer and Compiler modules, its replacements."
 
-The Parser module is no longer used. See the upgrade guide -- http://masonhq.com/docs/upgrading.html -- for more details.
+The Parser module is no longer used.
 
 =head2 I get an error like: "The following parameters were passed in the call to HTML::Mason::Container::new but were not listed in the validation options: error_format error_mode request_class resolver_class" when using ApacheHandler
 
@@ -1063,10 +1046,6 @@ The "perl_' prefix for Mason tags, like <%perl_args>, is no longer supported. Re
 
 =head1 WHERE TO FIND INFORMATION
 
-=head2 Does HTML::Mason have an official web site?
-
-Yes, at http://www.masonhq.com.
-
 =head2 Where do I obtain HTML::Mason?
 
 HTML::Mason is available from CPAN (the Comprehensive Perl Archive Network). Details about CPAN are available at http://www.perl.com/. See the [FAQ:Installation] section of this document for tips on obtaining and installing Mason.
@@ -1074,38 +1053,3 @@ HTML::Mason is available from CPAN (the Comprehensive Perl Archive Network). Det
 =head2 Where can I ask questions about HTML::Mason?
 
 See ContactUs and MailingLists.
-
-=head2 I think I've found a bug in Mason, what should I do?
-
-Check the known bugs page at http://masonhq.com/resources/bugs.html to see if it's already been reported; simplify the example as much as possible to make sure it's really Mason (i.e. try doing the same thing with just mod_perl and see if it still happens); finally, send a report to the user's list.
-
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
-=cut
@@ -1,3 +1,5 @@
+package HTML::Mason::FakeApache;
+$HTML::Mason::FakeApache::VERSION = '1.56';
 use strict;
 use warnings;
 
@@ -7,10 +9,6 @@ use warnings;
 # the CPAN indexer doesn't pick it up, which would be ugly.
 BEGIN { eval "package Apache" }
 
-package HTML::Mason::FakeApache;
-{
-  $HTML::Mason::FakeApache::VERSION = '1.54';
-}
 @HTML::Mason::FakeApache::ISA = qw(Apache);
 # Analogous to Apache request object $r (but not an actual Apache subclass)
 # In the future we'll probably want to switch this to Apache::Fake or similar
@@ -317,9 +315,7 @@ sub params {
 
 ###########################################################
 package HTML::Mason::FakeTable;
-{
-  $HTML::Mason::FakeTable::VERSION = '1.54';
-}
+$HTML::Mason::FakeTable::VERSION = '1.56';
 # Analogous to Apache::Table.
 use strict;
 use warnings;
@@ -374,9 +370,7 @@ sub do {
 
 ###########################################################
 package HTML::Mason::FakeTableHash;
-{
-  $HTML::Mason::FakeTableHash::VERSION = '1.54';
-}
+$HTML::Mason::FakeTableHash::VERSION = '1.56';
 # Used by HTML::Mason::FakeTable.
 use strict;
 use warnings;
@@ -479,16 +473,10 @@ sub _map_header_key_to_cgi_key {
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::FakeApache - An Apache object emulator for use with Mason
 
-=head1 VERSION
-
-version 1.54
-
 =head1 SYNOPSIS
 
 See L<HTML::Mason::CGIHandler|HTML::Mason::CGIHandler>.
@@ -497,33 +485,4 @@ See L<HTML::Mason::CGIHandler|HTML::Mason::CGIHandler>.
 
 This class's API is documented in L<HTML::Mason::CGIHandler|HTML::Mason::CGIHandler>.
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -9,10 +9,7 @@
 # 
 
 package HTML::Mason::Handler;
-{
-  $HTML::Mason::Handler::VERSION = '1.54';
-}
-
+$HTML::Mason::Handler::VERSION = '1.56';
 use strict;
 use warnings;
 
@@ -5,10 +5,7 @@
 # under the same terms as Perl itself.
 
 package HTML::Mason::Interp;
-{
-  $HTML::Mason::Interp::VERSION = '1.54';
-}
-
+$HTML::Mason::Interp::VERSION = '1.56';
 use strict;
 use warnings;
 
@@ -1027,16 +1024,10 @@ sub apply_escapes
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::Interp - Mason Component Interpreter
 
-=head1 VERSION
-
-version 1.54
-
 =head1 SYNOPSIS
 
     my $i = HTML::Mason::Interp->new (data_dir=>'/usr/local/mason',
@@ -1447,33 +1438,4 @@ C<strict>.
 
 =back
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -3,10 +3,7 @@
 # under the same terms as Perl itself.
 
 package HTML::Mason::Lexer;
-{
-  $HTML::Mason::Lexer::VERSION = '1.54';
-}
-
+$HTML::Mason::Lexer::VERSION = '1.56';
 use strict;
 use warnings;
 
@@ -577,16 +574,10 @@ sub throw_syntax_error
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::Lexer - Generates events based on component source lexing
 
-=head1 VERSION
-
-version 1.54
-
 =head1 SYNOPSIS
 
   my $lexer = HTML::Mason::Lexer->new;
@@ -660,33 +651,4 @@ We recommend that any parameters you add to Lexer be read-only,
 because the compiler object_id is only computed once on creation
 and would not reflect any changes to Lexer parameters.
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -3,10 +3,7 @@
 # under the same terms as Perl itself.
 
 package HTML::Mason::MethodMaker;
-{
-  $HTML::Mason::MethodMaker::VERSION = '1.54';
-}
-
+$HTML::Mason::MethodMaker::VERSION = '1.56';
 use strict;
 use warnings;
 
@@ -111,18 +108,12 @@ sub import
 
 1;
 
-__END__
-
 =pod
 
 =head1 NAME
 
 HTML::Mason::MethodMaker - Used to create simple get & get/set methods in other classes
 
-=head1 VERSION
-
-version 1.54
-
 =head1 SYNOPSIS
 
  use HTML::Mason::MethodMaker
@@ -178,33 +169,4 @@ reference.  The keys are the internal name of the contained object,
 such as "request" or "compiler".  The values for the keys are the same
 as the parameters given for 'read_write' accessors.
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -6,18 +6,10 @@
 # Edit that script instead of this document.
 #
 
-__END__
-
-=pod
-
 =head1 NAME
 
 HTML::Mason::Params - Mason configuration parameters
 
-=head1 VERSION
-
-version 1.54
-
 =head1 DESCRIPTION
 
 This document lists all of the Mason configuration parameters that are
@@ -81,6 +73,8 @@ L<make_subrequest|HTML::Mason::Request/item_make_subrequest>.
 
 =head1 PARAMETERS
 
+
+
 =head2 allow_globals
 
 =over 4
@@ -95,6 +89,9 @@ L<make_subrequest|HTML::Mason::Request/item_make_subrequest>.
 
 =item * Belongs to:          C<HTML::Mason::Compiler>
 
+
+
+
 =back
 
 List of variable names, complete with prefix (C<$@%>), that you intend
@@ -107,6 +104,7 @@ granted a reprieve via a "use vars" statement. For example:
 In a mod_perl environment, C<$r> (the request object) is automatically
 added to this list.
 
+
 =head2 apache_status_title
 
 =over 4
@@ -121,6 +119,9 @@ added to this list.
 
 =item * Belongs to:          C<HTML::Mason::ApacheHandler>
 
+
+
+
 =back
 
 Title that you want this ApacheHandler to appear as under
@@ -128,6 +129,7 @@ Apache::Status.  Default is "HTML::Mason status".  This is useful if
 you create more than one ApacheHandler object and want them all
 visible via Apache::Status.
 
+
 =head2 args_method
 
 =over 4
@@ -142,6 +144,9 @@ visible via Apache::Status.
 
 =item * Belongs to:          C<HTML::Mason::ApacheHandler>
 
+
+
+
 =back
 
 Method to use for unpacking GET and POST arguments. The valid options
@@ -166,6 +171,7 @@ While Mason will load C<Apache::Request> or C<CGI> as needed at runtime, it
 is recommended that you preload the relevant module either in your
 F<httpd.conf> or F<handler.pl> file, as this will save some memory.
 
+
 =head2 auto_send_headers
 
 =over 4
@@ -180,6 +186,9 @@ F<httpd.conf> or F<handler.pl> file, as this will save some memory.
 
 =item * Belongs to:          C<HTML::Mason::Request::ApacheHandler>
 
+
+
+
 =back
 
 =for html <a name="item_auto_send_headers"></a>
@@ -195,6 +204,7 @@ header feature.
 NOTE: This parameter has no effect under mod_perl-2, since calling
 C<$r-E<gt>send_http_header> is no longer needed.
 
+
 =head2 autoflush
 
 =over 4
@@ -209,6 +219,9 @@ C<$r-E<gt>send_http_header> is no longer needed.
 
 =item * Belongs to:          C<HTML::Mason::Request>
 
+
+
+
 =back
 
 True or false, default is false. Indicates whether to flush the output
@@ -222,6 +235,7 @@ have to check for autoflush. Before using autoflush you might consider
 whether a few manual C<$m-E<gt>flush_buffer> calls would work nearly
 as well.
 
+
 =head2 autohandler_name
 
 =over 4
@@ -236,6 +250,9 @@ as well.
 
 =item * Belongs to:          C<HTML::Mason::Interp>
 
+
+
+
 =back
 
 File name used for
@@ -243,6 +260,7 @@ L<autohandlers|HTML::Mason::Devel/autohandlers>. Default is
 "autohandler".  If this is set to an empty string ("") then
 autohandlers are turned off entirely.
 
+
 =head2 buffer_preallocate_size
 
 =over 4
@@ -257,6 +275,9 @@ autohandlers are turned off entirely.
 
 =item * Belongs to:          C<HTML::Mason::Interp>
 
+
+
+
 =back
 
 =for html <a name="item_buffer_preallocate_size"></a>
@@ -266,6 +287,7 @@ Defaults to 0. Setting this to, say, your maximum page size (or close
 to it) can reduce the number of reallocations Perl performs as
 components add to the output buffer.
 
+
 =head2 code_cache_max_size
 
 =over 4
@@ -280,6 +302,9 @@ components add to the output buffer.
 
 =item * Belongs to:          C<HTML::Mason::Interp>
 
+
+
+
 =back
 
 =for html <a name="item_code_cache_max_size"></a>
@@ -291,6 +316,7 @@ optimizations in this mode. Setting this to zero disables the code
 cache entirely. See the L<code cache|HTML::Mason::Admin/code cache>
 section of the administrator's manual for further details.
 
+
 =head2 comp_class
 
 =over 4
@@ -305,11 +331,15 @@ section of the administrator's manual for further details.
 
 =item * Belongs to:          C<HTML::Mason::Compiler::ToObject>
 
+
+
+
 =back
 
 The class into which component objects are blessed.  This defaults to
 L<HTML::Mason::Component|HTML::Mason::Component>.
 
+
 =head2 comp_root
 
 =over 4
@@ -324,6 +354,9 @@ L<HTML::Mason::Component|HTML::Mason::Component>.
 
 =item * Belongs to:          C<HTML::Mason::Interp>
 
+
+
+
 =back
 
 =for html <a name="item_comp_root"></a>
@@ -387,6 +420,7 @@ already-used key/path pair. The reason for this restriction is that
 the interpreter maintains a component cache per key that would become
 invalid if the associated paths were to change.
 
+
 =head2 compiler_class
 
 =over 4
@@ -401,11 +435,15 @@ invalid if the associated paths were to change.
 
 =item * Belongs to:          C<HTML::Mason::Interp>
 
+
+
+
 =back
 
 The class to use when creating a compiler. Defaults to
 L<HTML::Mason::Compiler::ToObject|HTML::Mason::Compiler::ToObject>.
 
+
 =head2 component_error_handler
 
 =over 4
@@ -420,6 +458,9 @@ L<HTML::Mason::Compiler::ToObject|HTML::Mason::Compiler::ToObject>.
 
 =item * Belongs to:          C<HTML::Mason::Request>
 
+
+
+
 =back
 
 A code reference used to handle errors thrown during component
@@ -433,6 +474,7 @@ cause the generation of a stack trace for each error. If you are using
 strings or unblessed references as exceptions in your code, you may
 want to turn this off as a performance boost.
 
+
 =head2 data_cache_api
 
 =over 4
@@ -447,6 +489,9 @@ want to turn this off as a performance boost.
 
 =item * Belongs to:          C<HTML::Mason::Request>
 
+
+
+
 =back
 
 The C<$m-E<gt>cache> API to use:
@@ -470,6 +515,7 @@ supported indefinitely.
 
 =back
 
+
 =head2 data_cache_defaults
 
 =over 4
@@ -484,6 +530,9 @@ supported indefinitely.
 
 =item * Belongs to:          C<HTML::Mason::Request>
 
+
+
+
 =back
 
 A hash reference of default options to use for the C<$m-E<gt>cache>
@@ -500,6 +549,7 @@ To use the CHI C<FastMmap> driver by default:
 These settings are overridden by options given to particular
 C<$m-E<gt>cache> calls.
 
+
 =head2 data_dir
 
 =over 4
@@ -514,6 +564,9 @@ C<$m-E<gt>cache> calls.
 
 =item * Belongs to:          C<HTML::Mason::Interp>
 
+
+
+
 =back
 
 The data directory is a writable directory that Mason uses for various
@@ -531,6 +584,7 @@ unspecified, Mason will not use L<object files|HTML::Mason::Admin/object files>,
 L<data cache class|HTML::Mason::Request/item_cache> will be
 C<MemoryCache> instead of C<FileCache>.
 
+
 =head2 decline_dirs
 
 =over 4
@@ -545,6 +599,9 @@ C<MemoryCache> instead of C<FileCache>.
 
 =item * Belongs to:          C<HTML::Mason::ApacheHandler>
 
+
+
+
 =back
 
 True or false, default is true. Indicates whether Mason should decline
@@ -552,6 +609,7 @@ directory requests, leaving Apache to serve up a directory index or a
 C<FORBIDDEN> error as appropriate. See the L<allowing directory requests|HTML::Mason::Admin/allowing directory requests> section of the administrator's manual
 for more information about handling directories with Mason.
 
+
 =head2 default_escape_flags
 
 =over 4
@@ -566,6 +624,9 @@ for more information about handling directories with Mason.
 
 =item * Belongs to:          C<HTML::Mason::Compiler>
 
+
+
+
 =back
 
 Escape flags to apply to all <% %> expressions by default. The current
@@ -580,6 +641,7 @@ basis; see the L<escaping expressions|HTML::Mason::Devel/escaping expressions> s
 If you want to set I<multiple> flags as the default, this should be
 given as a reference to an array of flags.
 
+
 =head2 define_args_hash
 
 =over 4
@@ -594,6 +656,9 @@ given as a reference to an array of flags.
 
 =item * Belongs to:          C<HTML::Mason::Compiler::ToObject>
 
+
+
+
 =back
 
 One of "always", "auto", or "never".  This determines whether or not
@@ -608,6 +673,7 @@ to false negatives.
 Not defining the args hash means that we can avoid copying component
 arguments, which can save memory and slightly improve execution speed.
 
+
 =head2 dhandler_name
 
 =over 4
@@ -622,12 +688,16 @@ arguments, which can save memory and slightly improve execution speed.
 
 =item * Belongs to:          C<HTML::Mason::Request>
 
+
+
+
 =back
 
 File name used for L<dhandlers|HTML::Mason::Devel/dhandlers>. Default
 is "dhandler".  If this is set to an empty string ("") then dhandlers
 are turned off entirely.
 
+
 =head2 dynamic_comp_root
 
 =over 4
@@ -642,6 +712,9 @@ are turned off entirely.
 
 =item * Belongs to:          C<HTML::Mason::Interp>
 
+
+
+
 =back
 
 True or false, defaults to false. Indicates whether the L<comp_root|HTML::Mason::Params/comp_root>
@@ -649,6 +722,7 @@ can be modified on this interpreter between requests. Mason can
 perform a few optimizations with a fixed component root, so you
 should only set this to true if you actually need it.
 
+
 =head2 enable_autoflush
 
 =over 4
@@ -663,6 +737,9 @@ should only set this to true if you actually need it.
 
 =item * Belongs to:          C<HTML::Mason::Compiler>
 
+
+
+
 =back
 
 True or false, default is true. Indicates whether components are
@@ -670,6 +747,7 @@ compiled with support for L<autoflush|HTML::Mason::Params/autoflush>. The compon
 to a more efficient form if it does not have to check for autoflush
 mode, so you should set this to 0 if you can.
 
+
 =head2 error_format
 
 =over 4
@@ -684,6 +762,9 @@ mode, so you should set this to 0 if you can.
 
 =item * Belongs to:          C<HTML::Mason::Request>
 
+
+
+
 =back
 
 Indicates how errors are formatted. The built-in choices are
@@ -720,6 +801,7 @@ appropriately named method; for example, to define an "xml" format,
 create a method C<HTML::Mason::Exception::as_xml> patterned after one of
 the built-in methods.
 
+
 =head2 error_mode
 
 =over 4
@@ -734,6 +816,9 @@ the built-in methods.
 
 =item * Belongs to:          C<HTML::Mason::Request>
 
+
+
+
 =back
 
 Indicates how errors are returned to the caller.  The choices are
@@ -745,6 +830,7 @@ L<CGI|HTML::Mason::CGIHandler> is I<output>, causing the error to be
 displayed in the browser.  The default for standalone mode is
 I<fatal>.
 
+
 =head2 escape_flags
 
 =over 4
@@ -759,12 +845,16 @@ I<fatal>.
 
 =item * Belongs to:          C<HTML::Mason::Interp>
 
+
+
+
 =back
 
 A hash reference of escape flags to set for this object.  See the
 section on the L<set_escape
 method|HTML::Mason::Interp/item_set_escape> for more details.
 
+
 =head2 ignore_warnings_expr
 
 =over 4
@@ -779,6 +869,9 @@ method|HTML::Mason::Interp/item_set_escape> for more details.
 
 =item * Belongs to:          C<HTML::Mason::Interp>
 
+
+
+
 =back
 
 Regular expression indicating which warnings to ignore when loading
@@ -795,6 +888,7 @@ By default, this is set to 'Subroutine .* redefined'.  This allows you
 to declare global subroutines inside <%once> sections and not receive
 an error when the component is reloaded.
 
+
 =head2 in_package
 
 =over 4
@@ -809,11 +903,15 @@ an error when the component is reloaded.
 
 =item * Belongs to:          C<HTML::Mason::Compiler::ToObject>
 
+
+
+
 =back
 
 This is the package in which a component's code is executed.  For
 historical reasons, this defaults to C<HTML::Mason::Commands>.
 
+
 =head2 interp_class
 
 =over 4
@@ -828,11 +926,15 @@ historical reasons, this defaults to C<HTML::Mason::Commands>.
 
 =item * Belongs to:          C<HTML::Mason::ApacheHandler>
 
+
+
+
 =back
 
 The class to use when creating a interpreter. Defaults to
 L<HTML::Mason::Interp|HTML::Mason::Interp>.
 
+
 =head2 lexer_class
 
 =over 4
@@ -847,10 +949,14 @@ L<HTML::Mason::Interp|HTML::Mason::Interp>.
 
 =item * Belongs to:          C<HTML::Mason::Compiler>
 
+
+
+
 =back
 
 The class to use when creating a lexer. Defaults to L<HTML::Mason::Lexer|HTML::Mason::Lexer>.
 
+
 =head2 max_recurse
 
 =over 4
@@ -865,12 +971,16 @@ The class to use when creating a lexer. Defaults to L<HTML::Mason::Lexer|HTML::M
 
 =item * Belongs to:          C<HTML::Mason::Request>
 
+
+
+
 =back
 
 The maximum recursion depth for the component stack, for the request
 stack, and for the inheritance stack. An error is signalled if the
 maximum is exceeded.  Default is 32.
 
+
 =head2 named_component_subs
 
 =over 4
@@ -885,6 +995,9 @@ maximum is exceeded.  Default is 32.
 
 =item * Belongs to:          C<HTML::Mason::Compiler::ToObject>
 
+
+
+
 =back
 
 When compiling a component, use uniquely named subroutines for the a
@@ -892,6 +1005,7 @@ component's body, subcomponents, and methods. Doing this allows you to
 effectively profile Mason components. Without this, all components
 simply show up as __ANON__ or something similar in the profiler.
 
+
 =head2 object_file_extension
 
 =over 4
@@ -906,10 +1020,14 @@ simply show up as __ANON__ or something similar in the profiler.
 
 =item * Belongs to:          C<HTML::Mason::Interp>
 
+
+
+
 =back
 
 Extension to add to the end of object files. Default is ".obj".
 
+
 =head2 out_method
 
 =over 4
@@ -924,6 +1042,9 @@ Extension to add to the end of object files. Default is ".obj".
 
 =item * Belongs to:          C<HTML::Mason::Request>
 
+
+
+
 =back
 
 Indicates where to send output. If out_method is a reference to a
@@ -939,6 +1060,7 @@ By default, out_method prints to standard output. Under
 L<Apache|HTML::Mason::ApacheHandler>, standard output is
 redirected to C<< $r->print >>.
 
+
 =head2 plugins
 
 =over 4
@@ -953,12 +1075,16 @@ redirected to C<< $r->print >>.
 
 =item * Belongs to:          C<HTML::Mason::Request>
 
+
+
+
 =back
 
 An array of plugins that will be called at various stages of request
 processing.  Please see L<HTML::Mason::Plugin|HTML::Mason::Plugin> for
 details.
 
+
 =head2 postamble
 
 =over 4
@@ -973,12 +1099,16 @@ details.
 
 =item * Belongs to:          C<HTML::Mason::Compiler::ToObject>
 
+
+
+
 =back
 
 Text given for this parameter is placed at the end of each
 component. See also L<preamble|HTML::Mason::Params/preamble>.  The request will be available as
 C<$m> in postamble code.
 
+
 =head2 postprocess_perl
 
 =over 4
@@ -993,6 +1123,9 @@ C<$m> in postamble code.
 
 =item * Belongs to:          C<HTML::Mason::Compiler>
 
+
+
+
 =back
 
 Sub reference that is called to postprocess the Perl portion of a
@@ -1002,6 +1135,7 @@ reference to the Perl portion of the component.  The sub is expected
 to process the string in-place. See also
 L<preprocess|HTML::Mason::Params/preprocess> and L<postprocess_text|HTML::Mason::Params/postprocess_text>.
 
+
 =head2 postprocess_text
 
 =over 4
@@ -1016,6 +1150,9 @@ L<preprocess|HTML::Mason::Params/preprocess> and L<postprocess_text|HTML::Mason:
 
 =item * Belongs to:          C<HTML::Mason::Compiler>
 
+
+
+
 =back
 
 Sub reference that is called to postprocess the text portion of a
@@ -1025,6 +1162,7 @@ reference to the text portion of the component.  The sub is expected
 to process the string in-place. See also
 L<preprocess|HTML::Mason::Params/preprocess> and L<postprocess_perl|HTML::Mason::Params/postprocess_perl>.
 
+
 =head2 preamble
 
 =over 4
@@ -1039,6 +1177,9 @@ L<preprocess|HTML::Mason::Params/preprocess> and L<postprocess_perl|HTML::Mason:
 
 =item * Belongs to:          C<HTML::Mason::Compiler::ToObject>
 
+
+
+
 =back
 
 Text given for this parameter is placed at the beginning of each
@@ -1046,6 +1187,7 @@ component, but after the execution of any C<< <%once> >> block. See
 also L<postamble|HTML::Mason::Params/postamble>. The request will be available as C<$m> in preamble
 code.
 
+
 =head2 preloads
 
 =over 4
@@ -1060,6 +1202,9 @@ code.
 
 =item * Belongs to:          C<HTML::Mason::Interp>
 
+
+
+
 =back
 
 A list of component paths, optionally with glob wildcards, to load
@@ -1077,6 +1222,7 @@ means that this section will be executed before a Mason or Apache
 request exist, so preloading a component that uses C<$m> or C<$r> in a
 C<< <%once> >> section will fail.
 
+
 =head2 preprocess
 
 =over 4
@@ -1091,6 +1237,9 @@ C<< <%once> >> section will fail.
 
 =item * Belongs to:          C<HTML::Mason::Compiler>
 
+
+
+
 =back
 
 Sub reference that is called to preprocess each component before the compiler does
@@ -1100,6 +1249,7 @@ one way to extend the HTML::Mason syntax with new tags, etc., although a much
 more flexible way is to subclass the Lexer or Compiler class. See also
 L<postprocess_text|HTML::Mason::Params/postprocess_text> and L<postprocess_perl|HTML::Mason::Params/postprocess_perl>.
 
+
 =head2 request_class
 
 =over 4
@@ -1114,11 +1264,15 @@ L<postprocess_text|HTML::Mason::Params/postprocess_text> and L<postprocess_perl|
 
 =item * Belongs to:          C<HTML::Mason::Interp>
 
+
+
+
 =back
 
 The class to use when creating requests. Defaults to
 L<HTML::Mason::Request|HTML::Mason::Request>.
 
+
 =head2 resolver_class
 
 =over 4
@@ -1133,11 +1287,15 @@ L<HTML::Mason::Request|HTML::Mason::Request>.
 
 =item * Belongs to:          C<HTML::Mason::Interp>
 
+
+
+
 =back
 
 The class to use when creating a resolver. Defaults to
 L<HTML::Mason::Resolver::File|HTML::Mason::Resolver::File>.
 
+
 =head2 static_source
 
 =over 4
@@ -1152,6 +1310,9 @@ L<HTML::Mason::Resolver::File|HTML::Mason::Resolver::File>.
 
 =item * Belongs to:          C<HTML::Mason::Interp>
 
+
+
+
 =back
 
 True or false, default is false. When false, Mason checks the
@@ -1170,6 +1331,7 @@ See L<static_source_touch_file|HTML::Mason::Params/static_source_touch_file> for
 We recommend turning this mode on in your production sites if
 possible, if performance is of any concern.
 
+
 =head2 static_source_touch_file
 
 =over 4
@@ -1184,6 +1346,9 @@ possible, if performance is of any concern.
 
 =item * Belongs to:          C<HTML::Mason::Interp>
 
+
+
+
 =back
 
 Specifies a filename that Mason will check once at the beginning of
@@ -1197,6 +1362,7 @@ whenever components change. For Mason's part, checking a single
 file at the beginning of a request is much cheaper than checking
 every component file when static_source=0.
 
+
 =head2 subcomp_class
 
 =over 4
@@ -1211,11 +1377,15 @@ every component file when static_source=0.
 
 =item * Belongs to:          C<HTML::Mason::Compiler::ToObject>
 
+
+
+
 =back
 
 The class into which subcomponent objects are blessed.  This defaults
 to L<HTML::Mason::Component::Subcomponent|HTML::Mason::Component::Subcomponent>.
 
+
 =head2 use_object_files
 
 =over 4
@@ -1230,6 +1400,9 @@ to L<HTML::Mason::Component::Subcomponent|HTML::Mason::Component::Subcomponent>.
 
 =item * Belongs to:          C<HTML::Mason::Interp>
 
+
+
+
 =back
 
 True or false, default is true.  Specifies whether Mason creates
@@ -1237,6 +1410,7 @@ object files to save the results of component parsing. You may want to
 turn off object files for disk space reasons, but otherwise this
 should be left alone.
 
+
 =head2 use_source_line_numbers
 
 =over 4
@@ -1251,6 +1425,9 @@ should be left alone.
 
 =item * Belongs to:          C<HTML::Mason::Compiler>
 
+
+
+
 =back
 
 True or false, default is true. Indicates whether component line
@@ -1260,6 +1437,7 @@ inserting '#line' directives into compiled components.  While source
 line numbers are more immediately helpful, object file line numbers
 may be more appropriate for in-depth debugging sessions.
 
+
 =head2 use_strict
 
 =over 4
@@ -1274,6 +1452,9 @@ may be more appropriate for in-depth debugging sessions.
 
 =item * Belongs to:          C<HTML::Mason::Compiler::ToObject>
 
+
+
+
 =back
 
 True or false, default is true. Indicates whether or not a given
@@ -1297,34 +1478,3 @@ component should C<use strict>.
 
 True or false, default is false. Indicates whether or not a given
 component should C<use warnings>.
-
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
-=cut
@@ -12,10 +12,6 @@ __END__
 
 HTML::Mason::Parser - Old module for compiling components
 
-=head1 VERSION
-
-version 1.54
-
 =head1 DESCRIPTION
 
 The Parser object is no longer part of Mason.  It has been replaced by
@@ -23,33 +19,4 @@ the Compiler and Lexer objects.  See the L<Developer's
 Manual|HTML::Mason::Devel> and the L<Administrator's
 Manual|HTML::Mason::Admin> for more details.
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -1,16 +1,12 @@
 package HTML::Mason::Plugin::Context;
-{
-  $HTML::Mason::Plugin::Context::VERSION = '1.54';
-}
+$HTML::Mason::Plugin::Context::VERSION = '1.56';
 use strict;
 use warnings;
 
 #------------------------------------------------------------
 
 package HTML::Mason::Plugin::Context::StartRequest;
-{
-  $HTML::Mason::Plugin::Context::StartRequest::VERSION = '1.54';
-}
+$HTML::Mason::Plugin::Context::StartRequest::VERSION = '1.56';
 use base qw(HTML::Mason::Plugin::Context);
 
 sub request   { $_[0]->[0] }
@@ -25,9 +21,7 @@ sub args      {
 #------------------------------------------------------------
 
 package HTML::Mason::Plugin::Context::EndRequest;
-{
-  $HTML::Mason::Plugin::Context::EndRequest::VERSION = '1.54';
-}
+$HTML::Mason::Plugin::Context::EndRequest::VERSION = '1.56';
 use base qw(HTML::Mason::Plugin::Context);
 
 sub request   { $_[0]->[0] }
@@ -46,9 +40,7 @@ sub error     { $_[0]->[5] }
 #------------------------------------------------------------
 
 package HTML::Mason::Plugin::Context::StartComponent;
-{
-  $HTML::Mason::Plugin::Context::StartComponent::VERSION = '1.54';
-}
+$HTML::Mason::Plugin::Context::StartComponent::VERSION = '1.56';
 use base qw(HTML::Mason::Plugin::Context);
 
 sub request   { $_[0]->[0] }
@@ -58,9 +50,7 @@ sub args      { $_[0]->[2] }
 #------------------------------------------------------------
 
 package HTML::Mason::Plugin::Context::EndComponent;
-{
-  $HTML::Mason::Plugin::Context::EndComponent::VERSION = '1.54';
-}
+$HTML::Mason::Plugin::Context::EndComponent::VERSION = '1.56';
 use base qw(HTML::Mason::Plugin::Context);
 
 sub request   { $_[0]->[0] }
@@ -76,16 +66,10 @@ sub error     { $_[0]->[5] }
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::Plugin::Context - encapsulates arguments passed to plugin methods
 
-=head1 VERSION
-
-version 1.54
-
 =head1 DESCRIPTION
 
 This file defines the minimalist context classes that are instantiated
@@ -96,33 +80,4 @@ For efficiency these objects have no new() method - they are created
 and blessed by hand inside HTML::Mason::Request just before they are
 used.
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -1,8 +1,5 @@
 package HTML::Mason::Plugin;
-{
-  $HTML::Mason::Plugin::VERSION = '1.54';
-}
-
+$HTML::Mason::Plugin::VERSION = '1.56';
 use strict;
 use warnings;
 
@@ -35,32 +32,10 @@ sub end_component_hook {
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::Plugin - Plugin Base class for Mason
 
-=head1 VERSION
-
-version 1.54
-
-=head1 DESCRIPTION
-
-Use a Mason plugin to have actions occur at the beginning or end of
-requests or components. Plugins are activated by passing L<plugins|HTML::Mason::Params/plugins> in
-the interpreter or request object. Each plugin in the list can be
-specified as a class name (in which case the plugin object is created
-once for each request) or as an actual object of the plugin class.
-
-If your plugin can be configured, place the configuration in class
-variables - for example,
-
-    $MasonX::Plugin::Timer::Units = 'seconds';
-
-These can be set either from httpd.conf via PerlSetVar
-directives, or in perl directly from a handler.pl file.
-
 =head1 SYNOPIS
 
    package MasonX::Plugin::Timer;
@@ -81,6 +56,22 @@ directives, or in perl directly from a handler.pl file.
 
    1;
 
+=head1 DESCRIPTION
+
+Use a Mason plugin to have actions occur at the beginning or end of
+requests or components. Plugins are activated by passing L<plugins|HTML::Mason::Params/plugins> in
+the interpreter or request object. Each plugin in the list can be
+specified as a class name (in which case the plugin object is created
+once for each request) or as an actual object of the plugin class.
+
+If your plugin can be configured, place the configuration in class
+variables - for example,
+
+    $MasonX::Plugin::Timer::Units = 'seconds';
+
+These can be set either from httpd.conf via PerlSetVar
+directives, or in perl directly from a handler.pl file.
+
 =head1 PLUGIN HOOKS
 
 A plugin class defines one or more of the following hooks (methods):
@@ -181,33 +172,4 @@ because output from multiple components combine into a single buffer.
 Do not keep an unweakened reference to a request or component object
 in your plugin object, or you will create a nasty circular reference.
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -31,10 +31,7 @@
 #
 
 package HTML::Mason::Request;
-{
-  $HTML::Mason::Request::VERSION = '1.54';
-}
-
+$HTML::Mason::Request::VERSION = '1.56';
 use strict;
 use warnings;
 
@@ -1551,10 +1548,7 @@ sub log
 }
 
 package Tie::Handle::Mason;
-{
-  $Tie::Handle::Mason::VERSION = '1.54';
-}
-
+$Tie::Handle::Mason::VERSION = '1.56';
 sub TIEHANDLE
 {
     my $class = shift;
@@ -1587,16 +1581,10 @@ sub PRINTF
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::Request - Mason Request Class
 
-=head1 VERSION
-
-version 1.54
-
 =head1 SYNOPSIS
 
     $m->abort (...)
@@ -1906,13 +1894,13 @@ defaults to C<FileCache> in most cases, or C<MemoryCache> if the
 interpreter has no data directory, and must be a backend subclass of
 C<Cache::Cache>. The prefix "Cache::" need not be included.  See the
 C<Cache::Cache> package for a full list of backend subclasses.
-
+ 
 Beyond that, I<cache_options> may include any valid options to the new() method of the
 cache class. e.g. for C<FileCache>, valid options include C<default_expires_in> and
 C<cache_depth>.
 
 See L<HTML::Mason::Cache::BaseCache|HTML::Mason::Cache::BaseCache> for
-information about the object returend from C<$m-E<gt>cache>.
+information about the object returned from C<$m-E<gt>cache>.
 
 =item If data_cache_api = CHI
 
@@ -2109,7 +2097,7 @@ Note that we ignore both the original and the final return value.
     }
     ...
 
-Here is a piece of code that traps all errors occuring anywhere in a
+Here is a piece of code that traps all errors occurring anywhere in a
 component or its children, e.g. for the purpose of handling
 application-specific exceptions. This is difficult to do with a manual
 C<eval> because it would have to span multiple code sections and the
@@ -2544,33 +2532,4 @@ exceptions, like this:
 
 =back
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -3,10 +3,7 @@
 # it under the same terms as Perl itself.
 
 package HTML::Mason::Resolver::File;
-{
-  $HTML::Mason::Resolver::File::VERSION = '1.54';
-}
-
+$HTML::Mason::Resolver::File::VERSION = '1.56';
 use strict;
 use warnings;
 
@@ -105,16 +102,10 @@ sub apache_request_to_comp_path {
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::Resolver::File - Component path resolver for file-based components
 
-=head1 VERSION
-
-version 1.54
-
 =head1 SYNOPSIS
 
   my $resolver = HTML::Mason::Resolver::File->new();
@@ -126,33 +117,4 @@ version 1.54
 This HTML::Mason::Resolver subclass is used when components are stored
 on the filesystem, which is the norm for most Mason-based applications.
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -3,10 +3,7 @@
 # it under the same terms as Perl itself.
 
 package HTML::Mason::Resolver::Null;
-{
-  $HTML::Mason::Resolver::Null::VERSION = '1.54';
-}
-
+$HTML::Mason::Resolver::Null::VERSION = '1.56';
 use strict;
 use warnings;
 
@@ -33,16 +30,10 @@ sub glob_path {
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::Resolver::Null - a do-nothing resolver
 
-=head1 VERSION
-
-version 1.54
-
 =head1 SYNOPSIS
 
   my $resolver = HTML::Mason::Resolver::Null->new;
@@ -59,7 +50,7 @@ of them do anything.
 This means that if you use this method things like C<< $interp->exec >>
 will simply not work at all.
 
-However, if you just want to make a component with an interepreter and
+However, if you just want to make a component with an interpreter and
 execute that component it can be useful.  For example:
 
   my $interp = HTML::Mason::Interp->new( resolver_class => 'HTML::Mason::Resolver::Null',
@@ -76,33 +67,4 @@ EOF
 
   print $buffer;
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -3,10 +3,7 @@
 # under the same terms as Perl itself.
 
 package HTML::Mason::Resolver;
-{
-  $HTML::Mason::Resolver::VERSION = '1.54';
-}
-
+$HTML::Mason::Resolver::VERSION = '1.56';
 use strict;
 use warnings;
 
@@ -42,16 +39,10 @@ sub _virtual
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::Resolver - Component path resolver base class
 
-=head1 VERSION
-
-version 1.54
-
 =head1 SYNOPSIS
 
   # make a subclass and use it
@@ -73,7 +64,7 @@ This class is used by most of the Mason object's to manage constructor
 parameters and has-a relationships with other objects.
 
 See the documentation on this class for details on how to declare what
-paremeters are valid for your subclass's constructor.
+parameters are valid for your subclass's constructor.
 
 HTML::Mason::Resolver is a subclass of Class::Container so you
 do not need to subclass it yourself.
@@ -130,33 +121,4 @@ L<HTML::Mason::ApacheHandler|HTML::Mason::ApacheHandler>.
 
 =back
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -1,17 +1,9 @@
-
-
-__END__
-
 =pod
 
 =head1 NAME
 
 HTML::Mason::Subclassing - Documentation on Subclassing Internal Mason classes
 
-=head1 VERSION
-
-version 1.54
-
 =head1 DESCRIPTION
 
 This is the deep voodoo guide, for folks who want to create their own
@@ -309,33 +301,4 @@ you can still override these defaults explicitly:
 If you need access to the interp object's methods directly, it will be
 always be available via C<< $ah->interp >>.
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -1,8 +1,5 @@
 package HTML::Mason::Tests;
-{
-  $HTML::Mason::Tests::VERSION = '1.54';
-}
-
+$HTML::Mason::Tests::VERSION = '1.56';
 use strict;
 use warnings;
 
@@ -681,16 +678,10 @@ sub _cleanup
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::Tests - Test harness for testing Mason
 
-=head1 VERSION
-
-version 1.54
-
 =head1 SYNOPSIS
 
  use HTML::Mason::Tests;
@@ -969,33 +960,4 @@ that overrides the _make_interp method to use your subclass:
               %interp_params );
     }
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -9,10 +9,7 @@
 #
 
 package HTML::Mason::Tools;
-{
-  $HTML::Mason::Tools::VERSION = '1.54';
-}
-
+$HTML::Mason::Tools::VERSION = '1.56';
 use strict;
 use warnings;
 
@@ -275,16 +272,10 @@ sub checksum {
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::Tools - Function library used internally in Mason
 
-=head1 VERSION
-
-version 1.54
-
 =head1 DESCRIPTION
 
 This module contains exportable functions that are intended to be used
@@ -376,33 +367,4 @@ Computes a simple checksum of a string. Used for Compiler::object_id.
 
 =back
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
@@ -8,10 +8,7 @@
 #
 
 package HTML::Mason::Utils;
-{
-  $HTML::Mason::Utils::VERSION = '1.54';
-}
-
+$HTML::Mason::Utils::VERSION = '1.56';
 use HTML::Mason::Tools qw(compress_path);
 use strict;
 use warnings;
@@ -45,6 +42,7 @@ sub cgi_request_args
 
     foreach my $key ( map { $q->$_() } @methods ) {
         next if exists $args{$key};
+        local $CGI::LIST_CONTEXT_WARN = 0;
         my @values = map { $q->$_($key) } @methods;
         $args{$key} = @values == 1 ? $values[0] : \@values;
     }
@@ -57,16 +55,10 @@ sub cgi_request_args
 
 __END__
 
-=pod
-
 =head1 NAME
 
 HTML::Mason::Utils - Publicly available functions useful outside of Mason
 
-=head1 VERSION
-
-version 1.54
-
 =head1 DESCRIPTION
 
 The functions in this module are useful when you need to interface
@@ -98,33 +90,5 @@ references.
 
 =back
 
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
-=head1 AUTHORS
-
-=over 4
-
-=item *
-
-Jonathan Swartz <swartz@pobox.com>
-
-=item *
-
-Dave Rolsky <autarch@urth.org>
-
-=item *
-
-Ken Williams <ken@mathforum.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is copyright (c) 2012 by Jonathan Swartz.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
 =cut
+
@@ -1,11 +1,10 @@
 package HTML::Mason;
-{
-  $HTML::Mason::VERSION = '1.54';
-}
+# git description: v1.55-2-g3c9481a
+
 # Copyright (c) 1998-2005 by Jonathan Swartz. All rights reserved.
 # This program is free software; you can redistribute it and/or modify it
 # under the same terms as Perl itself.
-
+$HTML::Mason::VERSION = '1.56';
 use 5.006;
 
 use HTML::Mason::Interp;
@@ -17,17 +16,15 @@ sub version
 
 1;
 
+# ABSTRACT: High-performance, dynamic web site authoring system
+
 __END__
 
 =pod
 
-=head1 NAME
-
-Mason - High-performance, dynamic web site authoring system
-
 =head1 VERSION
 
-version 1.54
+version 1.56
 
 =head1 SYNOPSIS
 
@@ -94,16 +91,17 @@ of Perl code (say, to pull records from a database). They can also
 call other components, cache results for later reuse, and perform all
 the tricks you expect from a regular Perl program.
 
+=encoding UTF-8
+
 =head1 WAIT - HAVE YOU SEEN MASON 2?
 
 Version 1 of Mason (this distribution) -- has been around since 1998, is in
 wide use, and is very stable. However it has not changed much in years and
 is no longer actively developed.
 
-Version 2 of Mason -- L<Mason|Mason> -- was released in February of 2011.
-It is being very actively developed and has a much more modern
-architecture. If you are just starting out, we recommend you give Mason 2 a
-try.
+Version 2 of Mason -- L<Mason> -- was released in February of 2011. It is more
+actively developed and has a much more modern architecture. If you are just
+starting out, we recommend you give Mason 2 a try.
 
 For a summary of differences between Mason 1 and 2 see
 
@@ -203,15 +201,6 @@ Bugs and feature requests will be tracked at RT:
     http://rt.cpan.org/NoAuth/Bugs.html?Dist=HTML-Mason
     bug-html-mason@rt.cpan.org
 
-The latest source code can be browsed and fetched at:
-
-    http://github.com/jonswar/perl-html-mason/tree/master
-    git clone git://github.com/jonswar/perl-html-mason.git
-
-=head1 SEE ALSO
-
-L<Mason|Mason>
-
 =head1 AUTHORS
 
 =over 4
@@ -230,9 +219,41 @@ Ken Williams <ken@mathforum.org>
 
 =back
 
+=head1 CONTRIBUTORS
+
+=for stopwords Ævar Arnfjörð Bjarmason Alex Vandiver John Williams Kevin Falcone Patrick Kane Ricardo Signes
+
+=over 4
+
+=item *
+
+Ævar Arnfjörð Bjarmason <avarab@gmail.com>
+
+=item *
+
+Alex Vandiver <alex@chmrr.net>
+
+=item *
+
+John Williams <jwilliams@cpan.org>
+
+=item *
+
+Kevin Falcone <falcone@bestpractical.com>
+
+=item *
+
+Patrick Kane <modus-cpan@pr.es.to>
+
+=item *
+
+Ricardo Signes <rjbs@cpan.org>
+
+=back
+
 =head1 COPYRIGHT AND LICENSE
 
-This software is copyright (c) 2012 by Jonathan Swartz.
+This software is copyright (c) 1998 - 2014 by Jonathan Swartz.
 
 This is free software; you can redistribute it and/or modify it under
 the same terms as the Perl 5 programming language system itself.
@@ -0,0 +1,13 @@
+use strict;
+use warnings;
+
+use File::Spec;
+use lib 'lib', File::Spec->catdir( 't', 'lib' );
+
+use Mason::ApacheTest;
+
+Mason::ApacheTest->run_tests(
+    apache_define => 'CGIHandler',
+    with_handler  => 0,
+    test_sets     => [qw( cgi_handler )],
+);
@@ -0,0 +1,16 @@
+use strict;
+use warnings;
+
+use File::Spec;
+use lib 'lib', File::Spec->catdir( 't', 'lib' );
+
+use Mason::ApacheTest qw( require_libapreq require_apache_filter );
+
+require_libapreq();
+require_apache_filter();
+
+Mason::ApacheTest->run_tests(
+    apache_define => 'filter_tests',
+    with_handler  => 0,
+    test_sets     => [qw( filter )],
+);
@@ -0,0 +1,15 @@
+use strict;
+use warnings;
+
+use File::Spec;
+use lib 'lib', File::Spec->catdir( 't', 'lib' );
+
+use Mason::ApacheTest qw( require_cgi );
+
+require_cgi();
+
+Mason::ApacheTest->run_tests(
+    apache_define => 'CGI_no_handler',
+    with_handler  => 0,
+    test_sets     => [qw( standard cgi )],
+);
@@ -0,0 +1,15 @@
+use strict;
+use warnings;
+
+use File::Spec;
+use lib 'lib', File::Spec->catdir( 't', 'lib' );
+
+use Mason::ApacheTest qw( require_cgi );
+
+require_cgi();
+
+Mason::ApacheTest->run_tests(
+    apache_define => 'CGI',
+    with_handler  => 1,
+    test_sets     => [qw( standard cgi )],
+);
@@ -0,0 +1,15 @@
+use strict;
+use warnings;
+
+use File::Spec;
+use lib 'lib', File::Spec->catdir( 't', 'lib' );
+
+use Mason::ApacheTest qw( require_libapreq );
+
+require_libapreq();
+
+Mason::ApacheTest->run_tests(
+    apache_define => 'mod_perl_no_handler',
+    with_handler  => 0,
+    test_sets     => [qw( standard apache_request )],
+);
@@ -0,0 +1,15 @@
+use strict;
+use warnings;
+
+use File::Spec;
+use lib 'lib', File::Spec->catdir( 't', 'lib' );
+
+use Mason::ApacheTest qw( require_libapreq );
+
+require_libapreq();
+
+Mason::ApacheTest->run_tests(
+    apache_define => 'mod_perl',
+    with_handler  => 1,
+    test_sets     => [qw( standard apache_request )],
+);
@@ -0,0 +1,13 @@
+use strict;
+use warnings;
+
+use File::Spec;
+use lib 'lib', File::Spec->catdir( 't', 'lib' );
+
+use Mason::ApacheTest qw( chmod_data_dir );
+
+Mason::ApacheTest->run_tests(
+    apache_define => 'multi_config',
+    with_handler  => 0,
+    test_sets     => [qw( multi_config )],
+);
@@ -0,0 +1,15 @@
+use strict;
+use warnings;
+
+use File::Spec;
+use lib 'lib', File::Spec->catdir( 't', 'lib' );
+
+use Mason::ApacheTest qw( require_libapreq );
+
+require_libapreq();
+
+Mason::ApacheTest->run_tests(
+    apache_define => 'no_config',
+    with_handler  => 0,
+    test_sets     => [qw( standard )],
+);
@@ -0,0 +1,15 @@
+use strict;
+use warnings;
+
+use File::Spec;
+use lib 'lib', File::Spec->catdir( 't', 'lib' );
+
+use Mason::ApacheTest qw( require_libapreq );
+
+require_libapreq();
+
+Mason::ApacheTest->run_tests(
+    apache_define => 'set_content_type',
+    with_handler  => 0,
+    test_sets     => [qw( set_content_type )],
+);
@@ -0,0 +1,13 @@
+use strict;
+use warnings;
+
+use File::Spec;
+use lib 'lib', File::Spec->catdir( 't', 'lib' );
+
+use Mason::ApacheTest;
+
+Mason::ApacheTest->run_tests(
+    apache_define => 'single_level_serverroot',
+    with_handler  => 0,
+    test_sets     => [qw( standard )],
+);
@@ -0,0 +1,13 @@
+use strict;
+use warnings;
+
+use File::Spec;
+use lib 'lib', File::Spec->catdir( 't', 'lib' );
+
+use Mason::ApacheTest;
+
+Mason::ApacheTest->run_tests(
+    apache_define => 'taint',
+    with_handler  => 0,
+    test_sets     => [qw( standard )],
+);
@@ -0,0 +1,41 @@
+do { my $x = {
+       'configure' => {
+                        'requires' => {
+                                        'ExtUtils::MakeMaker' => '0'
+                                      }
+                      },
+       'develop' => {
+                      'requires' => {
+                                      'Test::More' => '0',
+                                      'Test::NoTabs' => '0',
+                                      'Test::Pod' => '1.41',
+                                      'Test::Spelling' => '0.12'
+                                    }
+                    },
+       'runtime' => {
+                      'requires' => {
+                                      'CGI' => '2.46',
+                                      'Cache::Cache' => '1.00',
+                                      'Class::Container' => '0.07',
+                                      'Exception::Class' => '1.15',
+                                      'File::Spec' => '0.8',
+                                      'HTML::Entities' => '0',
+                                      'Log::Any' => '0.08',
+                                      'Params::Validate' => '0.70',
+                                      'Scalar::Util' => '1.01'
+                                    }
+                    },
+       'test' => {
+                   'recommends' => {
+                                     'CPAN::Meta' => '2.120900'
+                                   },
+                   'requires' => {
+                                   'ExtUtils::MakeMaker' => '0',
+                                   'File::Spec' => '0.8',
+                                   'Test::Deep' => '0',
+                                   'Test::More' => '0.88'
+                                 }
+                 }
+     };
+  $x;
+ }
\ No newline at end of file
@@ -0,0 +1,176 @@
+#!perl
+
+use strict;
+use warnings;
+
+# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.019
+
+use Test::More tests => 1;
+
+use ExtUtils::MakeMaker;
+use File::Spec;
+
+# from $version::LAX
+my $lax_version_re =
+    qr/(?: undef | (?: (?:[0-9]+) (?: \. | (?:\.[0-9]+) (?:_[0-9]+)? )?
+            |
+            (?:\.[0-9]+) (?:_[0-9]+)?
+        ) | (?:
+            v (?:[0-9]+) (?: (?:\.[0-9]+)+ (?:_[0-9]+)? )?
+            |
+            (?:[0-9]+)? (?:\.[0-9]+){2,} (?:_[0-9]+)?
+        )
+    )/x;
+
+# hide optional CPAN::Meta modules from prereq scanner
+# and check if they are available
+my $cpan_meta = "CPAN::Meta";
+my $cpan_meta_pre = "CPAN::Meta::Prereqs";
+my $HAS_CPAN_META = eval "require $cpan_meta; $cpan_meta->VERSION('2.120900')" && eval "require $cpan_meta_pre"; ## no critic
+
+# Verify requirements?
+my $DO_VERIFY_PREREQS = 1;
+
+sub _max {
+    my $max = shift;
+    $max = ( $_ > $max ) ? $_ : $max for @_;
+    return $max;
+}
+
+sub _merge_prereqs {
+    my ($collector, $prereqs) = @_;
+
+    # CPAN::Meta::Prereqs object
+    if (ref $collector eq $cpan_meta_pre) {
+        return $collector->with_merged_prereqs(
+            CPAN::Meta::Prereqs->new( $prereqs )
+        );
+    }
+
+    # Raw hashrefs
+    for my $phase ( keys %$prereqs ) {
+        for my $type ( keys %{ $prereqs->{$phase} } ) {
+            for my $module ( keys %{ $prereqs->{$phase}{$type} } ) {
+                $collector->{$phase}{$type}{$module} = $prereqs->{$phase}{$type}{$module};
+            }
+        }
+    }
+
+    return $collector;
+}
+
+my @include = qw(
+
+);
+
+my @exclude = qw(
+
+);
+
+# Add static prereqs to the included modules list
+my $static_prereqs = do 't/00-report-prereqs.dd';
+
+# Merge all prereqs (either with ::Prereqs or a hashref)
+my $full_prereqs = _merge_prereqs(
+    ( $HAS_CPAN_META ? $cpan_meta_pre->new : {} ),
+    $static_prereqs
+);
+
+# Add dynamic prereqs to the included modules list (if we can)
+my ($source) = grep { -f } 'MYMETA.json', 'MYMETA.yml';
+if ( $source && $HAS_CPAN_META ) {
+    if ( my $meta = eval { CPAN::Meta->load_file($source) } ) {
+        $full_prereqs = _merge_prereqs($full_prereqs, $meta->prereqs);
+    }
+}
+else {
+    $source = 'static metadata';
+}
+
+my @full_reports;
+my @dep_errors;
+my $req_hash = $HAS_CPAN_META ? $full_prereqs->as_string_hash : $full_prereqs;
+
+# Add static includes into a fake section
+for my $mod (@include) {
+    $req_hash->{other}{modules}{$mod} = 0;
+}
+
+for my $phase ( qw(configure build test runtime develop other) ) {
+    next unless $req_hash->{$phase};
+    next if ($phase eq 'develop' and not $ENV{AUTHOR_TESTING});
+
+    for my $type ( qw(requires recommends suggests conflicts modules) ) {
+        next unless $req_hash->{$phase}{$type};
+
+        my $title = ucfirst($phase).' '.ucfirst($type);
+        my @reports = [qw/Module Want Have/];
+
+        for my $mod ( sort keys %{ $req_hash->{$phase}{$type} } ) {
+            next if $mod eq 'perl';
+            next if grep { $_ eq $mod } @exclude;
+
+            my $file = $mod;
+            $file =~ s{::}{/}g;
+            $file .= ".pm";
+            my ($prefix) = grep { -e File::Spec->catfile($_, $file) } @INC;
+
+            my $want = $req_hash->{$phase}{$type}{$mod};
+            $want = "undef" unless defined $want;
+            $want = "any" if !$want && $want == 0;
+
+            my $req_string = $want eq 'any' ? 'any version required' : "version '$want' required";
+
+            if ($prefix) {
+                my $have = MM->parse_version( File::Spec->catfile($prefix, $file) );
+                $have = "undef" unless defined $have;
+                push @reports, [$mod, $want, $have];
+
+                if ( $DO_VERIFY_PREREQS && $HAS_CPAN_META && $type eq 'requires' ) {
+                    if ( $have !~ /\A$lax_version_re\z/ ) {
+                        push @dep_errors, "$mod version '$have' cannot be parsed ($req_string)";
+                    }
+                    elsif ( ! $full_prereqs->requirements_for( $phase, $type )->accepts_module( $mod => $have ) ) {
+                        push @dep_errors, "$mod version '$have' is not in required range '$want'";
+                    }
+                }
+            }
+            else {
+                push @reports, [$mod, $want, "missing"];
+
+                if ( $DO_VERIFY_PREREQS && $type eq 'requires' ) {
+                    push @dep_errors, "$mod is not installed ($req_string)";
+                }
+            }
+        }
+
+        if ( @reports ) {
+            push @full_reports, "=== $title ===\n\n";
+
+            my $ml = _max( map { length $_->[0] } @reports );
+            my $wl = _max( map { length $_->[1] } @reports );
+            my $hl = _max( map { length $_->[2] } @reports );
+            splice @reports, 1, 0, ["-" x $ml, "-" x $wl, "-" x $hl];
+
+            push @full_reports, map { sprintf("    %*s %*s %*s\n", -$ml, $_->[0], $wl, $_->[1], $hl, $_->[2]) } @reports;
+            push @full_reports, "\n";
+        }
+    }
+}
+
+if ( @full_reports ) {
+    diag "\nVersions for all modules listed in $source (including optional ones):\n\n", @full_reports;
+}
+
+if ( @dep_errors ) {
+    diag join("\n",
+        "\n*** WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ***\n",
+        "The following REQUIRED prerequisites were not satisfied:\n",
+        @dep_errors,
+        "\n"
+    );
+}
+
+pass;
+
+# vim: ts=4 sts=4 sw=4 et:
@@ -29,7 +29,7 @@ use CGI qw(-no_debug);  # Prevent "(offline mode: enter name=value pairs on stan
              %interp_params,
             );
         
-        eval { $self->_execute($interp) };
+        eval { local $CGI::LIST_CONTEXT_WARN = 0; $self->_execute($interp) };
         
         return $self->check_result($@);
     }
@@ -1,11 +0,0 @@
-use strict;
-use warnings;
-
-use File::Spec;
-use Test::More;
-
-eval "use Test::Pod 1.20";
-
-plan skip_all => "Test::Pod 1.20 not installed." if $@;
-all_pod_files_ok();
-
@@ -1,21 +0,0 @@
-
-BEGIN {
-  unless ($ENV{AUTHOR_TESTING}) {
-    require Test::More;
-    Test::More::plan(skip_all => 'these tests are for testing by the author');
-  }
-}
-
-use strict;
-use warnings;
-
-use File::Spec;
-use lib 'lib', File::Spec->catdir( 't', 'lib' );
-
-use Mason::ApacheTest;
-
-Mason::ApacheTest->run_tests(
-    apache_define => 'CGIHandler',
-    with_handler  => 0,
-    test_sets     => [qw( cgi_handler )],
-);
@@ -1,24 +0,0 @@
-
-BEGIN {
-  unless ($ENV{AUTHOR_TESTING}) {
-    require Test::More;
-    Test::More::plan(skip_all => 'these tests are for testing by the author');
-  }
-}
-
-use strict;
-use warnings;
-
-use File::Spec;
-use lib 'lib', File::Spec->catdir( 't', 'lib' );
-
-use Mason::ApacheTest qw( require_libapreq require_apache_filter );
-
-require_libapreq();
-require_apache_filter();
-
-Mason::ApacheTest->run_tests(
-    apache_define => 'filter_tests',
-    with_handler  => 0,
-    test_sets     => [qw( filter )],
-);
@@ -1,23 +0,0 @@
-
-BEGIN {
-  unless ($ENV{AUTHOR_TESTING}) {
-    require Test::More;
-    Test::More::plan(skip_all => 'these tests are for testing by the author');
-  }
-}
-
-use strict;
-use warnings;
-
-use File::Spec;
-use lib 'lib', File::Spec->catdir( 't', 'lib' );
-
-use Mason::ApacheTest qw( require_cgi );
-
-require_cgi();
-
-Mason::ApacheTest->run_tests(
-    apache_define => 'CGI_no_handler',
-    with_handler  => 0,
-    test_sets     => [qw( standard cgi )],
-);
@@ -1,23 +0,0 @@
-
-BEGIN {
-  unless ($ENV{AUTHOR_TESTING}) {
-    require Test::More;
-    Test::More::plan(skip_all => 'these tests are for testing by the author');
-  }
-}
-
-use strict;
-use warnings;
-
-use File::Spec;
-use lib 'lib', File::Spec->catdir( 't', 'lib' );
-
-use Mason::ApacheTest qw( require_cgi );
-
-require_cgi();
-
-Mason::ApacheTest->run_tests(
-    apache_define => 'CGI',
-    with_handler  => 1,
-    test_sets     => [qw( standard cgi )],
-);
@@ -1,23 +0,0 @@
-
-BEGIN {
-  unless ($ENV{AUTHOR_TESTING}) {
-    require Test::More;
-    Test::More::plan(skip_all => 'these tests are for testing by the author');
-  }
-}
-
-use strict;
-use warnings;
-
-use File::Spec;
-use lib 'lib', File::Spec->catdir( 't', 'lib' );
-
-use Mason::ApacheTest qw( require_libapreq );
-
-require_libapreq();
-
-Mason::ApacheTest->run_tests(
-    apache_define => 'mod_perl_no_handler',
-    with_handler  => 0,
-    test_sets     => [qw( standard apache_request )],
-);
@@ -1,23 +0,0 @@
-
-BEGIN {
-  unless ($ENV{AUTHOR_TESTING}) {
-    require Test::More;
-    Test::More::plan(skip_all => 'these tests are for testing by the author');
-  }
-}
-
-use strict;
-use warnings;
-
-use File::Spec;
-use lib 'lib', File::Spec->catdir( 't', 'lib' );
-
-use Mason::ApacheTest qw( require_libapreq );
-
-require_libapreq();
-
-Mason::ApacheTest->run_tests(
-    apache_define => 'mod_perl',
-    with_handler  => 1,
-    test_sets     => [qw( standard apache_request )],
-);
@@ -1,21 +0,0 @@
-
-BEGIN {
-  unless ($ENV{AUTHOR_TESTING}) {
-    require Test::More;
-    Test::More::plan(skip_all => 'these tests are for testing by the author');
-  }
-}
-
-use strict;
-use warnings;
-
-use File::Spec;
-use lib 'lib', File::Spec->catdir( 't', 'lib' );
-
-use Mason::ApacheTest qw( chmod_data_dir );
-
-Mason::ApacheTest->run_tests(
-    apache_define => 'multi_config',
-    with_handler  => 0,
-    test_sets     => [qw( multi_config )],
-);
@@ -1,23 +0,0 @@
-
-BEGIN {
-  unless ($ENV{AUTHOR_TESTING}) {
-    require Test::More;
-    Test::More::plan(skip_all => 'these tests are for testing by the author');
-  }
-}
-
-use strict;
-use warnings;
-
-use File::Spec;
-use lib 'lib', File::Spec->catdir( 't', 'lib' );
-
-use Mason::ApacheTest qw( require_libapreq );
-
-require_libapreq();
-
-Mason::ApacheTest->run_tests(
-    apache_define => 'no_config',
-    with_handler  => 0,
-    test_sets     => [qw( standard )],
-);
@@ -1,23 +0,0 @@
-
-BEGIN {
-  unless ($ENV{AUTHOR_TESTING}) {
-    require Test::More;
-    Test::More::plan(skip_all => 'these tests are for testing by the author');
-  }
-}
-
-use strict;
-use warnings;
-
-use File::Spec;
-use lib 'lib', File::Spec->catdir( 't', 'lib' );
-
-use Mason::ApacheTest qw( require_libapreq );
-
-require_libapreq();
-
-Mason::ApacheTest->run_tests(
-    apache_define => 'set_content_type',
-    with_handler  => 0,
-    test_sets     => [qw( set_content_type )],
-);
@@ -1,21 +0,0 @@
-
-BEGIN {
-  unless ($ENV{AUTHOR_TESTING}) {
-    require Test::More;
-    Test::More::plan(skip_all => 'these tests are for testing by the author');
-  }
-}
-
-use strict;
-use warnings;
-
-use File::Spec;
-use lib 'lib', File::Spec->catdir( 't', 'lib' );
-
-use Mason::ApacheTest;
-
-Mason::ApacheTest->run_tests(
-    apache_define => 'single_level_serverroot',
-    with_handler  => 0,
-    test_sets     => [qw( standard )],
-);
@@ -1,21 +0,0 @@
-
-BEGIN {
-  unless ($ENV{AUTHOR_TESTING}) {
-    require Test::More;
-    Test::More::plan(skip_all => 'these tests are for testing by the author');
-  }
-}
-
-use strict;
-use warnings;
-
-use File::Spec;
-use lib 'lib', File::Spec->catdir( 't', 'lib' );
-
-use Mason::ApacheTest;
-
-Mason::ApacheTest->run_tests(
-    apache_define => 'taint',
-    with_handler  => 0,
-    test_sets     => [qw( standard )],
-);
@@ -0,0 +1,107 @@
+
+BEGIN {
+  unless ($ENV{AUTHOR_TESTING}) {
+    require Test::More;
+    Test::More::plan(skip_all => 'these tests are for testing by the author');
+  }
+}
+
+use strict;
+use warnings;
+
+# this test was generated with Dist::Zilla::Plugin::Test::NoTabs 0.09
+
+use Test::More 0.88;
+use Test::NoTabs;
+
+my @files = (
+    'bin/convert0.6.README',
+    'bin/convert0.6.pl',
+    'bin/convert0.8.README',
+    'bin/convert0.8.pl',
+    'bin/mason.pl',
+    'lib/HTML/Mason.pm',
+    'lib/HTML/Mason/Admin.pod',
+    'lib/HTML/Mason/Apache/Request.pm',
+    'lib/HTML/Mason/ApacheHandler.pm',
+    'lib/HTML/Mason/CGIHandler.pm',
+    'lib/HTML/Mason/Cache/BaseCache.pm',
+    'lib/HTML/Mason/Compiler.pm',
+    'lib/HTML/Mason/Compiler/ToObject.pm',
+    'lib/HTML/Mason/Component.pm',
+    'lib/HTML/Mason/Component/FileBased.pm',
+    'lib/HTML/Mason/Component/Subcomponent.pm',
+    'lib/HTML/Mason/ComponentSource.pm',
+    'lib/HTML/Mason/Devel.pod',
+    'lib/HTML/Mason/Escapes.pm',
+    'lib/HTML/Mason/Exceptions.pm',
+    'lib/HTML/Mason/FAQ.pod',
+    'lib/HTML/Mason/FakeApache.pm',
+    'lib/HTML/Mason/Handler.pm',
+    'lib/HTML/Mason/Interp.pm',
+    'lib/HTML/Mason/Lexer.pm',
+    'lib/HTML/Mason/MethodMaker.pm',
+    'lib/HTML/Mason/Params.pod',
+    'lib/HTML/Mason/Parser.pm',
+    'lib/HTML/Mason/Plugin.pm',
+    'lib/HTML/Mason/Plugin/Context.pm',
+    'lib/HTML/Mason/Request.pm',
+    'lib/HTML/Mason/Resolver.pm',
+    'lib/HTML/Mason/Resolver/File.pm',
+    'lib/HTML/Mason/Resolver/Null.pm',
+    'lib/HTML/Mason/Subclassing.pod',
+    'lib/HTML/Mason/Tests.pm',
+    'lib/HTML/Mason/Tools.pm',
+    'lib/HTML/Mason/Utils.pm',
+    't/00-report-prereqs.dd',
+    't/00-report-prereqs.t',
+    't/01-syntax.t',
+    't/01a-comp-calls.t',
+    't/02-sections.t',
+    't/02a-filter.t',
+    't/04-misc.t',
+    't/05-request.t',
+    't/05a-stack-corruption.t',
+    't/06-compiler.t',
+    't/06a-compiler_obj.t',
+    't/06b-compiler-named-subs.t',
+    't/06c-compiler-spaces-path.t',
+    't/07-interp.t',
+    't/07a-interp-mcr.t',
+    't/07b-interp-static-source.t',
+    't/09-component.t',
+    't/09a-comp_content.t',
+    't/10-cache.t',
+    't/10a-cache-1.0x.t',
+    't/10b-cache-chi.t',
+    't/11-inherit.t',
+    't/12-taint.t',
+    't/13-errors.t',
+    't/14-cgi.t',
+    't/14a-fake_apache.t',
+    't/15-subclass.t',
+    't/17-print.t',
+    't/18-leak.t',
+    't/19-subrequest.t',
+    't/20-plugins.t',
+    't/21-escapes.t',
+    't/22-path-security.t',
+    't/23-leak2.t',
+    't/24-tools.t',
+    't/25-flush-in-content.t',
+    't/25-log.t',
+    't/author-no-tabs.t',
+    't/author-pod-spell.t',
+    't/lib/Apache/test.pm',
+    't/lib/BadModule.pm',
+    't/lib/LoadTest.pm',
+    't/lib/Mason/ApacheTest.pm',
+    't/release-pod-syntax.t',
+    't/run_one_test',
+    't/run_tests',
+    't/single_test.pl',
+    't/taint.comp'
+);
+
+notabs_ok($_) foreach @files;
+done_testing;
@@ -0,0 +1,265 @@
+
+BEGIN {
+  unless ($ENV{AUTHOR_TESTING}) {
+    require Test::More;
+    Test::More::plan(skip_all => 'these tests are for testing by the author');
+  }
+}
+
+use strict;
+use warnings;
+use Test::More;
+
+# generated by Dist::Zilla::Plugin::Test::PodSpelling 2.006008
+use Test::Spelling 0.12;
+use Pod::Wordlist;
+
+
+add_stopwords(<DATA>);
+all_pod_files_spelling_ok( qw( bin lib  ) );
+__DATA__
+DROLSKY
+DROLSKY's
+Rolsky
+Rolsky's
+AUTOHANDLERS
+Adminstrator
+ApacheModPerl
+ApacheReload
+Autohandlers
+Bekman
+CGI
+ContactUs
+DSO
+DeWitt
+DocumentRoot
+DocumentRoots
+FastCGI
+FilesMatch
+Follett
+ForceFileDownload
+GIF
+Georgiou
+HPUX
+HUP
+HandlingDirectoriesWithDhandlers
+Khera
+Kiriakos
+Kirwan
+Kumar
+LFU
+LogLevel
+MSIE
+MailingLists
+Mallah
+MasonAllowGlobals
+MasonApacheStatusTitle
+MasonArgsMethod
+MasonAutoSendHeaders
+MasonAutoflush
+MasonAutohandlerName
+MasonBufferPreallocateSize
+MasonCodeCacheMaxSize
+MasonCompClass
+MasonCompRoot
+MasonCompilerClass
+MasonComponentErrorHandler
+MasonDataCacheApi
+MasonDataCacheDefaults
+MasonDataDir
+MasonDeclineDirs
+MasonDefaultEscapeFlags
+MasonDefineArgsHash
+MasonDhandlerName
+MasonDynamicCompRoot
+MasonEnableAutoflush
+MasonErrorFormat
+MasonErrorMode
+MasonEscapeFlags
+MasonIgnoreWarningsExpr
+MasonInPackage
+MasonInterpClass
+MasonLexerClass
+MasonMaxRecurse
+MasonNamedComponentSubs
+MasonObjectFileExtension
+MasonOutMethod
+MasonPlugins
+MasonPostamble
+MasonPostprocessPerl
+MasonPostprocessText
+MasonPreamble
+MasonPreloads
+MasonPreprocess
+MasonRequestClass
+MasonResolverClass
+MasonStaticSource
+MasonStaticSourceTouchFile
+MasonSubcompClass
+MasonUseObjectFiles
+MasonUseSourceLineNumbers
+MasonUseStrict
+MasonUseWarnings
+NullCache
+O'Reilly
+PerlFreshRestart
+PerlHandler
+PerlModule
+PerlSetVar
+Preallocating
+Preloading
+RPMs
+Rajesh
+RedHat
+ReloadAll
+SUBCLASSABLE
+SYNOPIS
+Solaris
+SpeedyCGI
+Stas
+Subcomponents
+Subrequests
+TIEHASH
+USR
+UserDir
+Vivek
+ala
+apachectl
+apachehandler
+attr
+autohandler
+autohandlers
+bgcolor
+breakpoint'able
+certian
+checksum
+conf
+corrup
+defined'ness
+dhandler
+dhandlers
+dynamicImage
+faq
+fh
+fido
+filenaming
+foobarbaz
+gif
+gifs
+htaccess
+html
+interp
+isNetscape
+ized
+izing
+jpegs
+lexed
+libapreq
+libexpat
+mc
+mcomp
+mhtml
+mpl
+mtxt
+nh
+onwards
+optimizations
+overrideable
+perlsub
+postprocess
+predeclaring
+preload
+preloaded
+preloading
+preloads
+prepopulate
+preprocess
+profiler
+rdist
+reallocations
+reparsed
+reuseability
+scomp
+se
+serializable
+sql
+srm
+subcomponent
+subcomponents
+subcomps
+subexec
+subrequest
+subrequests
+taglibs
+tgz
+tmp
+todo
+un
+undeclarable
+unweakened
+updateable
+uring
+use'd
+xml
+Jonathan
+Swartz
+swartz
+Dave
+autarch
+Ken
+Williams
+ken
+Ævar
+Arnfjörð
+Bjarmason
+avarab
+Alex
+Vandiver
+alex
+John
+jwilliams
+Kevin
+Falcone
+falcone
+Patrick
+Kane
+modus
+Ricardo
+Signes
+rjbs
+lib
+HTML
+Mason
+Compiler
+Devel
+Params
+Resolver
+File
+Plugin
+Context
+Utils
+ToObject
+FakeApache
+Subclassing
+Component
+FileBased
+Null
+Escapes
+Tests
+Request
+Subcomponent
+Exceptions
+Admin
+Parser
+Interp
+Apache
+Tools
+Lexer
+ApacheHandler
+FAQ
+Handler
+CGIHandler
+Cache
+BaseCache
+ComponentSource
+MethodMaker
@@ -0,0 +1,14 @@
+#!perl
+
+BEGIN {
+  unless ($ENV{RELEASE_TESTING}) {
+    require Test::More;
+    Test::More::plan(skip_all => 'these tests are for release candidate testing');
+  }
+}
+
+# This file was automatically generated by Dist::Zilla::Plugin::PodSyntaxTests.
+use Test::More;
+use Test::Pod 1.41;
+
+all_pod_files_ok();
diff --git a/var/tmp/source/DROLSKY/HTML-Mason-1.56/HTML-Mason-1.56/tidyall.ini b/var/tmp/source/DROLSKY/HTML-Mason-1.56/HTML-Mason-1.56/tidyall.ini
new file mode 100644
index 00000000..e69de29b
@@ -0,0 +1,10 @@
+[@CorePrep]
+[Generic / NAME]
+[Version]
+[Generic / SYNOPSIS]
+[Generic / DESCRIPTION]
+[Leftovers]
+[=inc::Pod::Weaver::Section::SeeAlsoMason]
+[Authors]
+[Contributors]
+[Legal]