X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Manual.git;a=blobdiff_plain;f=lib%2FCatalyst%2FManual%2FDevelopmentProcess.pod;h=910649f826178afc9df7dba62b4eaf29d1f4e32d;hp=bee50d9163a2cc4c7c45613aab6aa3158e15e99a;hb=56a12748311fdb2580d7ad7cd84c255cd4447d8b;hpb=46a5f2f5cf41f746d2a20ce0b64b6112f5283ac3

diff --git a/lib/Catalyst/Manual/DevelopmentProcess.pod b/lib/Catalyst/Manual/DevelopmentProcess.pod
index bee50d9..910649f 100644
--- a/lib/Catalyst/Manual/DevelopmentProcess.pod
+++ b/lib/Catalyst/Manual/DevelopmentProcess.pod
@@ -2,23 +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 Schedule
+=head2 Discussing proposed bugfixes or improvements
 
-There is no dated release cycle for Catalyst. New releases will be made
-when sufficient small fixes have accumulated; or an important bugfix, or
-significant feature addition, is completed.
+L<http://wiki.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://wiki.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 Roadmap for features
+=head2 Repositories
 
-The Catalyst Roadmap is kept at
-L<http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-Runtime/5.80/trunk/lib/Roadmap.pod>
+The Catalyst git repository can be found at:
 
-=head2 Bug list
+    read: git://git.shadowcat.co.uk/catagits/PROJECTNAME
+    write: catagits@git.shadowcat.co.uk:PROJECTNAME
+    browser: https://git.shadowcat.co.uk/gitweb/gitweb.cgi
 
-The TODO list with known bugs / deficiences is kept at
-L<http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-Runtime/5.80/trunk/TODO>
+=head2 Schedule
+
+There is no dated release cycle for Catalyst. New releases will be made
+when sufficient small fixes have accumulated; or an important bugfix, or
+significant feature addition, is completed.
 
 =head1 The Catalyst Core Team
 
@@ -81,9 +106,9 @@ current members.
 Any change to the Catalyst core which can not be conceived as a
 correction of an error in the current feature set will need to be
 accepted by at least 3 members of the Core Team before it can be
-commited to the trunk (which is the basis for CPAN releases). Anyone
+committed to master (which is the basis for CPAN releases). Anyone
 with access is at any time free to make a branch to develop a proof of
-concept for a feature to be committed to trunk.
+concept for a feature to be committed to master.
 
 =head2 Organizational and Philosophical Decisions.
 
@@ -107,30 +132,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
@@ -160,4 +161,3 @@ This library is free software. You can redistribute it and/or modify it under
 the same terms as Perl itself.
 
 =cut
-