Merge remote-tracking branch 'origin/master'

* origin/master:
  Fixed wrong app name for socket in non-root config

diff --git a/Changes b/Changes
index 7d84e24..c0df5cf 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,14 +1,15 @@
 Revision history for Catalyst-Manual
 
+5.9003 17 Feb 2012
     - Mention PSGI in Manual::Ingro RT 74872 (thanks William Blunn).
     - Better docs of :Global inspired by RT 74869 (thanks William Blunn)
-    - Highlight the importance of uncommenting the template line in the list action
+    - Highlight the importance of uncommenting the template line in the
+      list action
     - Clarify docs for nginx in non-root - a trailing slash on the
       location block is very much needed.
-
-5.9003
     - Clarified Data::Dumper usage.  RT#71410 Thanks to Bill Corr
-    - Mention Chef deployment in Manual::Deployment (thanks to Alexey Melezhik)
+    - Mention Chef deployment in Manual::Deployment (thanks to Alexey
+      Melezhik)
 
 5.9002 3 Sept 2011
     - Tutorial

diff --git a/lib/Catalyst/Manual.pm b/lib/Catalyst/Manual.pm
index e207c9e..e889c8a 100644 (file)
--- a/lib/Catalyst/Manual.pm
+++ b/lib/Catalyst/Manual.pm
@@ -6,7 +6,7 @@ package Catalyst::Manual;
 use strict;
 use warnings;
 
-our $VERSION = '5.9002';
+our $VERSION = '5.9003';
 
 =head1 NAME
 

diff --git a/lib/Catalyst/Manual/Intro.pod b/lib/Catalyst/Manual/Intro.pod
index bf9353f..998b6a1 100644 (file)
--- a/lib/Catalyst/Manual/Intro.pod
+++ b/lib/Catalyst/Manual/Intro.pod
@@ -122,14 +122,14 @@ separately - which will turn the built server into a fully fledged production
 ready server (although you'll probably want to run it behind a front end proxy
 if you end up using it).
 
-=back
-
 =item * PSGI Support
 
 Starting with Catalyst version 5.9 Catalyst ships with L<PSGI> integration
 for even more powerful and flexible testing and deployment options.  See
 L<Catalyst::PSGI> for details.
 
+=back
+
 =head3 Simplicity
 
 The best part is that Catalyst implements all this flexibility in a very

diff --git a/lib/Catalyst/Manual/Tutorial/.gitignore b/lib/Catalyst/Manual/Tutorial/.gitignore
deleted file mode 100644 (file)
index 2e854ec..0000000
--- a/lib/Catalyst/Manual/Tutorial/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_ignore