X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Manual.git;a=blobdiff_plain;f=lib%2FCatalyst%2FManual%2FTutorial%2F01_Intro.pod;h=297e0b91dda13def394456c7542d054fce77d9cc;hp=fa3a3608ea70099e255d014873233232a6985ad8;hb=d35624c1e68939a527c25ff751c312ed3235594f;hpb=ec5b24b2e4c907cb9ea2a099ebf6fe69a9042cbd

diff --git a/lib/Catalyst/Manual/Tutorial/01_Intro.pod b/lib/Catalyst/Manual/Tutorial/01_Intro.pod
index fa3a360..297e0b9 100644
--- a/lib/Catalyst/Manual/Tutorial/01_Intro.pod
+++ b/lib/Catalyst/Manual/Tutorial/01_Intro.pod
@@ -70,21 +70,29 @@ form management).
 The most recent code for the tutorial is included on the Tutorial Virtual
 Machine you can download from:
 
+L<http://cattut.shadowcat.co.uk/>
+
+See L</STARTING WITH THE TUTORIAL VIRTUAL MACHINE> below for
+instructions getting and using the VM.
+
+Should you wish to download the code directly, you get pull it via the
+following command (note: will probably be switching to git soon):
+
     svn co http://dev.catalyst.perl.org/repos/Catalyst/trunk/examples/Tutorial/ CatalystTutorial
 
 This will download the most recent code for each chapter of the
 tutorial into the CatalystTutorial directory on your machine.
 
-B<These reference implementations are provided so that when you follow
+These reference implementations are provided so that when you follow
 the tutorial, you can use the code to ensure that your system is set up
 correctly (which shouldn't be an issue if you use the Tutorial Virtual
 Machine), :-) and that you have not inadvertently made any typographic
-errors, or accidentally skipped part of the tutorial.>
+errors, or accidentally skipped part of the tutorial.
 
 B<NOTE: You can use any Perl-supported OS and environment to run
 Catalyst.> It should make little or no difference to Catalyst's
 operation, B<but this tutorial has been written using the Debian-based
-Tutorial Virtual Machine that you can download and use to work through
+Tutorial Virtual Machine> that you can download and use to work through
 the full tutorial step by step.  B<WE STRONGLY RECOMMEND THAT YOU USE
 THE VIRTUAL MACHINE IMAGE TO WORK THROUGH THE TUTORIAL> to avoid issues
 that may crop up if you are working with a different configuration.  We
@@ -176,8 +184,6 @@ applications can be found at
 L<http://wiki.catalystframework.org/wiki/resources/catalystexamples> and
 in the C<examples> area of the Catalyst Subversion repository at
 L<http://dev.catalyst.perl.org/repos/Catalyst/trunk/examples/>.
-***Todo: update link above?
-
 
 
 =head1 STARTING WITH THE TUTORIAL VIRTUAL MACHINE
@@ -202,8 +208,11 @@ C<aptitude> (or C<apt-get>) Debian commands.
 
 =item 1 
 
-Download the C<debian-live-6.0.1-i386-rescue.iso> image from
-L<http://cdimage.debian.org/cdimage/release/current-live/i386/iso-hybrid/>.
+Download a Tutorial Virtual Machine image from
+L<http://cattut.shadowcat.co.uk/>
+
+B<A big thanks to Shadowcat Systems for hosting the virtual machines>
+B<(and everything else they do for the Perl community)!>
 
 =item 2
 
@@ -258,10 +267,10 @@ If you are not seeing a valid IP address or it's not responding to pings
 (for example, you get error messages along the lines of "Request timed
 out", "100% packet loss", or "Destination Host Unreachable"), there
 could be a few network-related issues you might need to sort out.  See
-the section below L<Sorting Out Virtual Machine Network-Related Issues>
+the section below L</Sorting Out Virtual Machine Network-Related Issues>
 for additional information and troubleshooting advice.
 
-L<Note:> Remember this IP address... you will be using it throughout the
+B<Note:> Remember this IP address... you will be using it throughout the
 tutorial.
 
 
@@ -329,6 +338,13 @@ modules across development, staging, and production servers.  (The
 B<and> Perl itself from your home directory [or any other directory you
 chose]).
 
+B<Note>: Please provide feedback on how the Virtual Machine approach for
+the tutorial works for you.  If you have suggestions or comments, you
+can reach the author through the email address at the bottom of this
+page or via an RT ticket at
+L<https://rt.cpan.org/Public/Dist/Display.html?Name=Catalyst-Manual>.
+
+
 
 =head2 Sorting Out Virtual Machine Network-Related Issues
 
@@ -384,15 +400,15 @@ help:
 
 =item *
 
-L<VMFAQ.com|http://vmfaq.com/entry/34/>
+L<http://vmfaq.com/entry/34/>
 
 =item *
 
-L<VMWare Player Docs|http://www.vmware.com/support/pubs/player_pubs.html>
+L<http://www.vmware.com/support/pubs/player_pubs.html>
 
 =item *
 
-L<Virtual Box Documentation|http://www.virtualbox.org/manual/ch06.html>
+L<http://www.virtualbox.org/manual/ch06.html>
 
 =back
 
@@ -469,13 +485,14 @@ C<http://192.168.0.12:3000>.  Note that the development server
 defaults to port 3000 (you can change with with the "-p" option on the
 command line.
 
-B<Please Note:> Depending on the web browser you are using, you might need
-to hit C<Shift+Reload> or C<Ctrl+Reload> to pull a fresh page when
+B<Please Note:> Depending on the web browser you are using, you might
+need to hit C<Shift+Reload> or C<Ctrl+Reload> to pull a fresh page when
 testing your application at various points (see
-L<http://en.wikipedia.org/wiki/Bypass_your_cache> for a comprehensive
-list of options for each browser).  Also, the C<-k> keepalive option to
-the development server can be necessary with some browsers (especially
-Internet Explorer).
+L<http://en.wikipedia.org/wiki/Wikipedia:Bypass_your_cache> for a
+comprehensive list of options for each browser).
+
+Also, the C<-k> B<keepalive option> to the development server can be
+necessary with some browsers (B<especially Internet Explorer>).
 
 =back
 
@@ -501,10 +518,10 @@ L<Catalyst Basics|Catalyst::Manual::Tutorial::02_CatalystBasics>
 
 Kennedy Clark, C<hkclark@gmail.com>
 
-Please report any errors, issues or suggestions to the author.  The
-most recent version of the Catalyst Tutorial can be found at
-L<http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-Manual/5.80/trunk/lib/Catalyst/Manual/Tutorial/>.
+Feel free to contact the author for any errors or suggestions, but the
+best way to report issues is via the CPAN RT Bug system at
+L<https://rt.cpan.org/Public/Dist/Display.html?Name=Catalyst-Manual>.
 
-Copyright 2006-2010, Kennedy Clark, under the
+Copyright 2006-2011, Kennedy Clark, under the
 Creative Commons Attribution Share-Alike License Version 3.0
 (L<http://creativecommons.org/licenses/by-sa/3.0/us/>).