Merge in final set of changes from wolfman2000. A big thanks to wolfman2000 for...

diff --git a/lib/Catalyst/Manual/Components.pod b/lib/Catalyst/Manual/Components.pod
index c64a261..3641ade 100644 (file)
--- a/lib/Catalyst/Manual/Components.pod
+++ b/lib/Catalyst/Manual/Components.pod
@@ -230,10 +230,10 @@ the C<< Cache:: >> APO, such as:
 
 =head2 L<Catalyst::Plugin::CGI::Untaint>
 
-=head2 L<Catalyst::Plugin::Charsets::Japanese>
-
 Provides specific charset handlers for the Japanese charsets.
 
+=head2 L<Catalyst::Plugin::Charsets::Japanese>
+
 =head2 L<Catalyst::Plugin::Compress::Bzip2>
 
 =head2 L<Catalyst::Plugin::Compress::Deflate>

diff --git a/lib/Catalyst/Manual/Cookbook.pod b/lib/Catalyst/Manual/Cookbook.pod
index b788e91..b6496ad 100644 (file)
--- a/lib/Catalyst/Manual/Cookbook.pod
+++ b/lib/Catalyst/Manual/Cookbook.pod
@@ -446,7 +446,7 @@ determines what this user is allowed to do.
 
 Under role based access control each user is allowed to perform any
 number of roles. For example, at a zoo no one but specially trained
-personnel can enter the moose cage (Mynd you, møøse bites kan be
+personnel can enter the moose cage (Mynd you, møøse bites kan be
 pretty nasti!). For example:
 
     package Zoo::Controller::MooseCage;
@@ -745,7 +745,7 @@ display your data; you can choose to generate HTML, PDF files, or plain
 text if you wanted.
 
 Most Catalyst applications use a template system to generate their HTML,
-and though there are several template systems available,
+and though there are several template systems available, 
 L<Template Toolkit|Template> is probably the most popular.
 
 Once again, the Catalyst developers have done all the hard work, and

diff --git a/lib/Catalyst/Manual/DevelopmentProcess.pod b/lib/Catalyst/Manual/DevelopmentProcess.pod
index bee50d9..d839c6a 100644 (file)
--- a/lib/Catalyst/Manual/DevelopmentProcess.pod
+++ b/lib/Catalyst/Manual/DevelopmentProcess.pod
@@ -2,8 +2,48 @@
 
 Catalyst::Manual::DevelopmentProcess - Administrative structure of the Catalyst Development Process
 
+=head1 Contributing to Catalyst
+
+The main philosophy behind Catalyst development can be summarized as:
+
+    Patches welcome!
+
+Everyone is welcome (and will be encouraged) to contribute to Catalyst
+in whatever capacity they're able to. People in #catalyst-dev will be
+more than happy to talk newcomers through contributing their first patch,
+or how best to go about their first CPAN extension module....
+
 =head1 Catalyst development
 
+=head2 Discussing proposed bugfixes or improvements
+
+L<http://dev.catalystframework.org/wiki/#Community> has information about how
+to get in touch with the Catalyst "community".  In particular, you would
+want to discuss a proposed change on the mailing list:
+
+    http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/catalyst-dev
+
+or on IRC:
+
+    irc://irc.perl.org/catalyst-dev
+    http://dev.catalystframework.org/wiki/livegroups
+
+Usually, the core team will be more than happy for you to contribute, and
+will talk you through how to submit a patch, or get a "commit bit".
+
+=head2 Repositories
+
+The Catalyst subversion repository can be found at:
+
+    svn: http://dev.catalyst.perl.org/repos/Catalyst
+    browser: http://dev.catalyst.perl.org/svnweb/Catalyst
+
+and the git repository can be found at:
+
+    read: git://git.shadowcat.co.uk/catagits/PROJECTNAME
+    write: catagits@git.shadowcat.co.uk:PROJECTNAME
+    browser: https://git.shadowcat.co.uk/gitweb/gitweb.cgi
+
 =head2 Schedule
 
 There is no dated release cycle for Catalyst. New releases will be made
@@ -107,30 +147,6 @@ The Core Team should strive to appear publicly as a group when answering
 questions or other correspondence. In cases where this is not possible,
 the same order as for CPAN releases applies.
 
-=head1 Contributing to Catalyst
-
-The main philosophy behind Catalyst development can be summarized as:
-
-    Patches welcome!
-
-Everyone is welcome (and will be encouraged) to contribute to Catalyst
-in whatever capacity they're able to. People in #catalyst-dev will be
-more than happy to talk newcomers through contributing their first patch,
-or how best to go about their first CPAN extension module....
-
-=head2 Repositories
-
-The Catalyst subversion repository can be found at:
-
-    svn: http://dev.catalyst.perl.org/repos/Catalyst
-    browser: http://dev.catalyst.perl.org/svnweb/Catalyst
-
-and the git repository can be found at:
-
-    read: git://git.shadowcat.co.uk/catagits/PROJECTNAME
-    write: catagits@git.shadowcat.co.uk:PROJECTNAME
-    browser: https://git.shadowcat.co.uk/gitweb/gitweb.cgi
-
 =head2 New Catalyst Extensions
 
 As Catalyst is deliberately designed for extension, there is an ecosystem of