From: Tomas Doran <bobtfish@bobtfish.net>
Date: Sun, 7 Aug 2011 10:17:49 +0000 (+0100)
Subject: Expand
X-Git-Tag: 5.8901~5
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Manual.git;a=commitdiff_plain;h=2d62c370d643f3abbe765aaba07ed2e188f31de7

Expand
---

diff --git a/lib/Catalyst/Manual/Deployment.pod b/lib/Catalyst/Manual/Deployment.pod
index 665eff8..745bdcf 100644
--- a/lib/Catalyst/Manual/Deployment.pod
+++ b/lib/Catalyst/Manual/Deployment.pod
@@ -4,17 +4,27 @@ Catalyst::Manual::Deployment - Deploying Catalyst
 
 =head1 DEPLOYMENT OPTIONS
 
-=head2 Deployment for shared hosting
+Catalyst applications most often deployed as a FastCGI or mod_perl application, however
+as Catalyst is based on the L<PSGI> specification, any web handler implementing that specification
+can be used to run Catalyst applications.
 
-L<Catalyst::Manual::Deployment::SharedHosting>
+This documentation most thoroughly covers the normal and traditional deployment options, but
+will mention alternate methods of deployment, and we welcome additional documentation from
+people deploying Catalyst in non-standard environments.
 
-=head2 mod_perl
+=head2 Deployment for shared hosting
+
+Almost all shared hosting environments involve deploying Catalyst as a FastCGI on Apache.
 
-L<Catalyst::Manual::Deployment::Apache::mod_perl>
+You will usually want to have a set of libraries specific to your application installed on
+your shared host, and there are instructions about
+this in L<Catalyst::Manual::Deployment::SharedHosting>.
 
 =head2 FastCGI
 
-L<Catalyst::Manual::Deployment::FastCGI>
+FastCGI is the most common Catalyst deployment option, it is documented generally in
+L<Catalyst::Manual::Deployment::FastCGI>, and there are specific instructions for common
+web servers linked below:
 
 =head3 Apache
 
@@ -32,12 +42,38 @@ L<Catalyst::Manual::Deployment::lighttpd::FastCGI>
 
 L<Catalyst::Manual::Deployment::IIS::FastCGI>
 
+=head2 mod_perl
+
+Traditionally a common deployment option for dedicated applications, with some advantages and
+disadvantages over FastCGI. This is documented in L<Catalyst::Manual::Deployment::Apache::mod_perl>.
+
 =head2 Development Server
 
-L<Catalyst::Manual::Deployment::DevelopmentServer>.
+It is possible to deploy the Catalyst development server behind a reverse proxy. This may work
+well for small scale applications which are in an early development phase, but you want to be
+able to show to people. See: L<Catalyst::Manual::Deployment::DevelopmentServer>.
 
 =head2 PSGI
 
+Catalyst can be deployed with any PSGI compliant handler. See L<Catalyst::PSGI> for more information,
+and a list of possible deployment servers are shown below:
+
+=head3 Starman
+
+L<Starman> is a high performance pure perl server implementation, which is designed to be used
+directly.
+
+=head3 Starlet.
+
+XXX - FIXME
+
++ other options?
+
+=head3 Twiggy
+
+L<Twiggy> is a high-performance asynchronous web server. It can be used in conjunction with Catalyst,
+but with a number of caveats which mean that it is not suitable for most deployments.
+
 =head1 AUTHORS
 
 Catalyst Contributors, see Catalyst.pm
diff --git a/lib/Catalyst/Manual/Deployment/FastCGI.pod b/lib/Catalyst/Manual/Deployment/FastCGI.pod
index f966d8c..13bbabb 100644
--- a/lib/Catalyst/Manual/Deployment/FastCGI.pod
+++ b/lib/Catalyst/Manual/Deployment/FastCGI.pod
@@ -5,7 +5,8 @@ Catalyst::Manual::Deployment::FastCGI - Deploying Catalyst with FastCGI
 =head1 FastCGI Deployment
 
 FastCGI is a high-performance extension to CGI. It is suitable
-for production environments.
+for production environments, and is the standard method for deploying Catalyst
+in shared hosting environments.
 
 =head2 Pros
 
@@ -76,6 +77,28 @@ Command line options for fastcgi.pl include:
 See below for the specific web server configurations for using the external
 server.
 
+=head1 WEB SERVERS
+
+Any web server which supports FastCGI should work with Catalyst. Configuration recipies for
+well-known web servers are linked below, and we would welcome contributions from people
+deploying Catalyst against other web servers.
+
+=head2 Apache
+
+L<Catalyst::Manual::Deployment::Apache::FastCGI>
+
+=head2 nginx
+
+L<Catalyst::Manual::Deployment::nginx::FastCGI>
+
+=head2 lighttpd
+
+L<Catalyst::Manual::Deployment::lighttpd::FastCGI>
+
+=head2 Microsoft IIS
+
+L<Catalyst::Manual::Deployment::IIS::FastCGI>
+
 =head1 AUTHORS
 
 Catalyst Contributors, see Catalyst.pm
diff --git a/lib/Catalyst/Manual/Deployment/SharedHosting.pod b/lib/Catalyst/Manual/Deployment/SharedHosting.pod
index eee5ef4..25c4214 100644
--- a/lib/Catalyst/Manual/Deployment/SharedHosting.pod
+++ b/lib/Catalyst/Manual/Deployment/SharedHosting.pod
@@ -36,8 +36,7 @@ myapp_fastcgi.fcgi and/or use a SetHandler directive):
   RewriteRule ^(.*)$ script/myapp_fastcgi.pl/$1 [PT,L]
 
 Now C<http://mydomain.com/> should now Just Work. Congratulations, now
-you can tell your friends about your new website (or in our case, tell
-the client it's time to pay the invoice :) )
+you can tell your friends about your new website. 
 
 =head1 AUTHORS