fix manual so search.cpan.org indexes it properly (it uses the NAME section for cross...

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@330 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/Changes b/Changes
index 64f042b46de542d6bb6a108d29bd970fb331786a..1af0f4c5d30aad92d2e8ded54ec400f29780c461 100644 (file)
--- a/Changes
+++ b/Changes
@@ -2,9 +2,11 @@ This file documents the revision history for Perl extension Maypole.
 For information about current developments and future releases, see:
     http://maypole.perl.org/?TheRoadmap
 
-2.06  XXX
+2.06  Wed Dec 29 01:30:00 2004
     Fixes:
+    - Minor restructuring of the manual so search.cpan.org indexes it better
     - #9129: Skip t/apache_mvc.t if Apache::Request isn't installed
+    
 
 2.05  Fri Dec 24 03:20:00 2004
     - Revised and updated documentation. Many thanks to Dave Howorth for his

diff --git a/lib/Maypole/Manual.pod b/lib/Maypole/Manual.pod
index 9c5dd0c97077d7b937eb14faa4e70cb2988b9b4b..dc60222467a234b8cae8cd4ab54ac94e323bfde6 100644 (file)
--- a/lib/Maypole/Manual.pod
+++ b/lib/Maypole/Manual.pod
@@ -1,4 +1,8 @@
-=head1 The Maypole Manual
+=head1 NAME
+
+Maypole::Manual - The Maypole Manual
+
+=head1 DESCRIPTION
 
 The Maypole documentation is arranged over several files; this is 
 the right one to start with, as it provides an overview of the

diff --git a/lib/Maypole/Manual/About.pod b/lib/Maypole/Manual/About.pod
index f2ab8598b155f48b79b0b3868dd45d01a398be3f..d78be34aea8df871866f7706dea05b054598062d 100644 (file)
--- a/lib/Maypole/Manual/About.pod
+++ b/lib/Maypole/Manual/About.pod
@@ -1,5 +1,9 @@
 
-=head1 Introduction to Maypole
+=head1 NAME
+
+Maypole::Manual::About - Introduction to Maypole
+
+=head1 DESCRIPTION
 
 This chapter serves as a gentle introduction to Maypole and setting up
 Maypole applications. We look at what Maypole is, how to get it up and

diff --git a/lib/Maypole/Manual/Beer.pod b/lib/Maypole/Manual/Beer.pod
index b6bd66975f4055c7e3dfa0d4dce1b578f9739ae7..542b570caa7fbd04cd8c75b718a4fd85b51d3365 100644 (file)
--- a/lib/Maypole/Manual/Beer.pod
+++ b/lib/Maypole/Manual/Beer.pod
@@ -1,4 +1,8 @@
-=head1 The Beer Database, Twice
+=head1 NAME
+
+Maypole::Manual::Beer - The Beer Database, Twice
+
+=head1 DESCRIPTION
 
 We briefly introduced the "beer database" example in the
 L<Introduction to Maypole|Maypole::Manual::About> chapter, where we

diff --git a/lib/Maypole/Manual/BuySpy.pod b/lib/Maypole/Manual/BuySpy.pod
index bf828a3279c4a9a07214870ae185698d3a0a7714..622b4d9698a98f08ea27845775355581edd2023d 100644 (file)
--- a/lib/Maypole/Manual/BuySpy.pod
+++ b/lib/Maypole/Manual/BuySpy.pod
@@ -1,4 +1,8 @@
-=head1 The Maypole iBuySpy Portal
+=head1 NAME
+
+Maypole::Manual::BugSpy - The Maypole iBuySpy Portal
+
+=head1 DESCRIPTION
 
 I think it's good fun to compare Maypole against other frameworks,
 so here's how to build the ASP.NET tutorial site in Maypole.

diff --git a/lib/Maypole/Manual/Flox.pod b/lib/Maypole/Manual/Flox.pod
index 3a1e92eca79dc61e63431b55a9d0805d7c1baecb..ed3309c7ec05b0ed52309e89e524f4c94b4e7926 100644 (file)
--- a/lib/Maypole/Manual/Flox.pod
+++ b/lib/Maypole/Manual/Flox.pod
@@ -1,4 +1,8 @@
-=head1 Flox: A Free Social Networking Site
+=head1 NAME
+
+Maypole::Manual::Flox - Flox: A Free Social Networking Site
+
+=head1 DESCRIPTION
 
 Friendster, Tribe, and now Google's Orkut - it seems like in early 2004,
 everyone wanted to be a social networking site. At the time, I was too

diff --git a/lib/Maypole/Manual/Model.pod b/lib/Maypole/Manual/Model.pod
index 9add8934c6f6f6e9b42ee7e3ac83f6908bc80673..5f310fe7f091a7c290b01aef776b55dbe525ad4b 100644 (file)
--- a/lib/Maypole/Manual/Model.pod
+++ b/lib/Maypole/Manual/Model.pod
@@ -1,4 +1,8 @@
-=head1 Maypole Model Classes
+=head1 NAME
+
+Maypole::Manual::Model - Maypole Model Classes
+
+=head1 DESCRIPTION
 
 Maypole's model classes provide an interface to your data store.
 In principle Maypole can connect to pretty much any data source,

diff --git a/lib/Maypole/Manual/Request.pod b/lib/Maypole/Manual/Request.pod
index d3d66f299c66d6116d27c2ba1dba747b23226471..f9788bd4dd90e4aa9d0c40f8336bc0cdeaeaf0f5 100644 (file)
--- a/lib/Maypole/Manual/Request.pod
+++ b/lib/Maypole/Manual/Request.pod
@@ -1,4 +1,8 @@
-=head1 Maypole Request Hacking Cookbook
+=head1 NAME
+
+Maypole::Manual::Request - Maypole Request Hacking Cookbook
+
+=head1 DESCRIPTION
 
 Hacks; design patterns; recipes: call it what you like, this chapter is a
 developing collection of techniques which can be slotted in to Maypole

diff --git a/lib/Maypole/Manual/StandardTemplates.pod b/lib/Maypole/Manual/StandardTemplates.pod
index 35f9a8a86cca5befa0347d1808cc4a4643727af6..dbf127998c9963c88cf6363942c3339b01ecf6b5 100644 (file)
--- a/lib/Maypole/Manual/StandardTemplates.pod
+++ b/lib/Maypole/Manual/StandardTemplates.pod
@@ -1,5 +1,9 @@
 
-=head1 Maypole's Standard Templates and Actions
+=head1 NAME
+
+Maypole::Manual::StandardTemplates - Maypole's Standard Templates and Actions
+
+=head1 DESCRIPTION
 
 As we saw in our Create-Read-Update-Delete (CRUD) example,
 Maypole does all it can to make your life

diff --git a/lib/Maypole/Manual/View.pod b/lib/Maypole/Manual/View.pod
index 01745ed8a5f6c6c15778f9fea03a4572c6917794..5477d050719635b33847af694f08f3f62a6a9445 100644 (file)
--- a/lib/Maypole/Manual/View.pod
+++ b/lib/Maypole/Manual/View.pod
@@ -1,4 +1,8 @@
-=head1 Maypole View Classes
+=head1 NAME
+
+Maypole::Manual::View - Maypole View Classes
+
+=head1 DESCRIPTION
 
 In a large application, you will almost certainly want to customize the
 layout and design of the output pages. This task may even be the purview

diff --git a/lib/Maypole/Manual/Workflow.pod b/lib/Maypole/Manual/Workflow.pod
index d860523b1dc9ebe60a8ef5c345feb517534d6a34..0ab32671b14c3a6d3f6272707fb4a41e43419df2 100644 (file)
--- a/lib/Maypole/Manual/Workflow.pod
+++ b/lib/Maypole/Manual/Workflow.pod
@@ -1,6 +1,10 @@
 =pod
 
-=head1 Maypole's Request Workflow
+=head1 NAME
+
+Maypole::Manual::Workflow - Maypole's Request Workflow
+
+=head1 DESCRIPTION
 
 This chapter describes the progress of a request through Maypole.
 
@@ -154,4 +158,4 @@ Next L<The Beer Database Revisited|Maypole::Manual::Beer>,
 Previous
 L<Standard Templates and Actions|Maypole::Manual::StandardTemplates>
 
-
+=cut

diff --git a/lib/Maypole/View/Base.pm b/lib/Maypole/View/Base.pm
index f687309d5057f4e66e8b3e2608c17be904bc3417..f7881a2e27106c9bc7bd536993ba3d4ff0c23232 100644 (file)
--- a/lib/Maypole/View/Base.pm
+++ b/lib/Maypole/View/Base.pm
@@ -151,8 +151,8 @@ during view initialization.
 
 =head2 paths
 
-Returns search paths for templates. the default method returns factory, custom
-and E<lt>tablenameE<gt> under the configured template root.
+Returns search paths for templates. the default method returns folders for the
+model class's C<moniker>, factory, custom under the configured template root.
 
 =head2 vars
 

diff --git a/t/cgi_maypole.t b/t/cgi_maypole.t
index 977201a638d2137b9f5bd2cdfd6bd9cb706b07f8..e1798667303f12b20eabf887b729664b13317547 100644 (file)
--- a/t/cgi_maypole.t
+++ b/t/cgi_maypole.t
@@ -14,7 +14,8 @@ my $mock_maypole = new Test::MockModule('CGI::Maypole');
 my $mock_cgi = new Test::MockModule('CGI::Simple');
 $mock_cgi->mock(path_info => sub {
     delete $_[0]->{'.path_info'};
-    goto $mock_cgi->original('path_info')
+    my $orig_path_info = $mock_cgi->original('path_info');
+    goto $orig_path_info;
 });
 
 # run()